Final Merge

CONTRIBUTING.md

@@ -1,37 +1,37 @@
-# Contributing to Learn.co Curriculum
+Contributor Code of Conduct
 
-We're really excited that you're about to contribute to the [open curriculum](https://learn.co/content-license) on [Learn.co](https://learn.co). If this is your first time contributing, please continue reading to learn how to make the most meaningful and useful impact possible.
+Our Pledge
 
-## Raising an Issue to Encourage a Contribution
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
 
-If you notice a problem with the curriculum that you believe needs improvement
-but you're unable to make the change yourself, you should raise a Github issue
-containing a clear description of the problem. Include relevant snippets of
-the content and/or screenshots if applicable. Curriculum owners regularly review
-issue lists and your issue will be prioritized and addressed as appropriate.
+Our Standards
 
-## Submitting a Pull Request to Suggest an Improvement
+Examples of behavior that contributes to creating a positive environment include:
+Using welcoming and inclusive language
+Being respectful of differing viewpoints and experiences
+Gracefully accepting constructive criticism
+Focusing on what is best for the community
+Showing empathy towards other community members
+Examples of unacceptable behavior by participants include:
+The use of sexualized language or imagery and unwelcome sexual attention or advances
+Trolling, insulting/derogatory comments, and personal or political attacks
 
-If you see an opportunity for improvement and can make the change yourself go
-ahead and use a typical git workflow to make it happen:
+Public or private harassment
 
-* Fork this curriculum repository
-* Make the change on your fork, with descriptive commits in the standard format
-* Open a Pull Request against this repo
+Publishing others’ private information, such as a physical or electronic address, without explicit permission
+Other conduct which could reasonably be considered inappropriate in a professional setting
 
-A curriculum owner will review your change and approve or comment on it in due
-course.
+Our Responsibilities
 
-# Why Contribute?
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
-Curriculum on Learn is publicly and freely available under Learn's
-[Educational Content License](https://learn.co/content-license). By
-embracing an open-source contribution model, our goal is for the curriculum
-on Learn to become, in time, the best educational content the world has
-ever seen.
+Scope
 
-We need help from the community of Learners to maintain and improve the
-educational content. Everything from fixing typos, to correcting
-out-dated information, to improving exposition, to adding better examples,
-to fixing tests—all contributions to making the curriculum more effective are
-welcome.
+This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the project or its community in public spaces. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [INSERT EMAIL ADDRESS]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with 
+regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership.

Gemfile

@@ -5,3 +5,6 @@ gem "sinatra-activerecord"
 gem "sqlite3"
 gem "pry"
 gem "require_all"
+gem "tty-prompt"
+gem "colorize"
+gem "tty-font"

Gemfile.lock

@@ -1,56 +1,74 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    coderay (1.1.1)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.2)
+    coderay (1.1.3)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    method_source (0.8.2)
-    minitest (5.14.1)
-    mustermann (1.0.3)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
-    rack-protection (2.0.7)
+    rack-protection (2.1.0)
       rack
-    require_all (1.3.3)
-    sinatra (2.0.7)
+    require_all (3.0.0)
+    ruby2_keywords (0.0.2)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.7)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.12)
-      activerecord (>= 3.2)
+    sinatra-activerecord (2.0.21)
+      activerecord (>= 4.1)
       sinatra (>= 1.0)
-    slop (3.6.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-font (0.5.0)
+    tty-prompt (0.22.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.8.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    wisper (2.0.1)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize
   pry
   require_all
   sinatra-activerecord
   sqlite3
+  tty-font
+  tty-prompt
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

LICENSE.md

@@ -1,7 +1,20 @@
-#Learn.co Educational Content License
+MIT License
 
-Copyright (c) 2015 Flatiron School, Inc
+Copyright (c) [2020] [Ruby Tank]
 
-The Flatiron School, Inc. owns this Educational Content. However, the Flatiron School supports the development and availability of educational materials in the public domain. Therefore, the Flatiron School grants Users of the Flatiron Educational Content set forth in this repository certain rights to reuse, build upon and share such Educational Content subject to the terms of the Educational Content License set forth [here](http://learn.co/content-license) (http://learn.co/content-license). You must read carefully the terms and conditions contained in the Educational Content License as such terms govern access to and use of the Educational Content.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-Flatiron School is willing to allow you access to and use of the Educational Content only on the condition that you accept all of the terms and conditions contained in the Educational Content License set forth [here](http://learn.co/content-license) (http://learn.co/content-license).  By accessing and/or using the Educational Content, you are agreeing to all of the terms and conditions contained in the Educational Content License.  If you do not agree to any or all of the terms of the Educational Content License, you are prohibited from accessing, reviewing or using in any way the Educational Content.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,59 +1,35 @@
-# Module One Final Project Guidelines
+Application Features:
 
-Congratulations, you're at the end of module one! You've worked crazy hard to get here and have learned a ton.
+- A user can create a new user profile
+- A user can create a virtual fish tank with a name and a specified number of fish
+- User can add and remove fish from each tank that was created
+- User can add other existing users as owners to their tank allowing the user to update the tank
+- User can view their exisiting tanks
+- User can update their tank and the tanks to which they are added to as an owner
+- User can delete their existing tanks
 
-For your final project, we'll be building a Command Line database application.
+Built With:
+- Ruby
+- SQLite3 as database for Active Record
+- Gems Used: 
+    tty-prompt, 
+    tty-font, 
+    colorize
 
-## Project Requirements
+Install Instructions:
+    - Run bundle install
+    - Run ruby bin/run.rb
 
-### Option One - Data Analytics Project
+Contributing:
+Constributing.md
 
-1. Access a Sqlite3 Database using ActiveRecord.
-2. You should have at minimum three models including one join model. This means you must have a many-to-many relationship.
-3. You should seed your database using data that you collect either from a CSV, a website by scraping, or an API.
-4. Your models should have methods that answer interesting questions about the data. For example, if you've collected info about movie reviews, what is the most popular movie? What movie has the most reviews?
-5. You should provide a CLI to display the return values of your interesting methods.  
-6. Use good OO design patterns. You should have separate classes for your models and CLI interface.
+Authors:
+- Dominik Szarkiel
+- Bartosz Minczuk
 
-  **Resource:** [Easy Access APIs](https://github.com/learn-co-curriculum/easy-access-apis)
+Supporting Authors:
+- Derick Castillo
 
-### Option Two - Command Line CRUD App
+License:
+License.md
 
-1. Access a Sqlite3 Database using ActiveRecord.
-2. You should have a minimum of three models.
-3. You should build out a CLI to give your user full CRUD ability for at least one of your resources. For example, build out a command line To-Do list. A user should be able to create a new to-do, see all todos, update a todo item, and delete a todo. Todos can be grouped into categories, so that a to-do has many categories and categories have many to-dos.
-4. Use good OO design patterns. You should have separate classes for your models and CLI interface.
-
-### Brainstorming and Proposing a Project Idea
-
-Projects need to be approved prior to launching into them, so take some time to brainstorm project options that will fulfill the requirements above.  You must have a minimum of four [user stories](https://en.wikipedia.org/wiki/User_story) to help explain how a user will interact with your app.  A user story should follow the general structure of `"As a <role>, I want <goal/desire> so that <benefit>"`. For example, if we were creating an app to randomly choose nearby restaurants on Yelp, we might write:
-
-* As a user, I want to be able to enter my name to retrieve my records
-* As a user, I want to enter a location and be given a random nearby restaurant suggestion
-* As a user, I should be able to reject a suggestion and not see that restaurant suggestion again
-* As a user, I want to be able to save to and retrieve a list of favorite restaurant suggestions
-
-## Instructions
-
-1. Fork and clone this repository.
-2. Build your application. Make sure to commit early and commit often. Commit messages should be meaningful (clearly describe what you're doing in the commit) and accurate (there should be nothing in the commit that doesn't match the description in the commit message). Good rule of thumb is to commit every 3-7 mins of actual coding time. Most of your commits should have under 15 lines of code and a 2 line commit is perfectly acceptable.
-3. Make sure to create a good README.md with a short description, install instructions, a contributor's guide and a link to the license for your code.
-4. Make sure your project checks off each of the above requirements.
-5. Prepare a video demo (narration helps!) describing how a user would interact with your working project.
-    * The video should:
-      - Have an overview of your project. (2 minutes max)
-6. Prepare a presentation to follow your video. (3 minutes max)
-    * Your presentation should:
-      - Describe something you struggled to build, and show us how you ultimately implemented it in your code.
-      - Discuss 3 things you learned in the process of working on this project.
-      - Address what, if anything, you would change or add to what you have today.
-      - Present any code you would like to highlight.   
-7. *OPTIONAL, BUT RECOMMENDED*: Write a blog post about the project and process.
-
----
-### Common Questions:
-- How do I turn off my SQL logger?
-```ruby
-# in config/environment.rb add this line:
-ActiveRecord::Base.logger = nil
-```

bin/run.rb

@@ -1,5 +1,5 @@
 require_relative '../config/environment'
 
-
-
-puts "HELLO WORLD"
+App.new.run
+system "clear"
+puts "Thank you for playing, see you next time!"

config/environment.rb

@@ -2,4 +2,5 @@
 Bundler.require
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'db/development.db')
+ActiveRecord::Base.logger = nil
 require_all 'lib'

db/migrate/01_create_owners.rb

@@ -0,0 +1,9 @@
+class CreateOwners < ActiveRecord::Migration[5.2]
+
+    def change 
+        create_table :owners do |t|
+            t.string :name
+        end
+    end
+
+end

db/migrate/02_create_tanks.rb

@@ -0,0 +1,9 @@
+class CreateTanks < ActiveRecord::Migration[5.2]
+
+    def change
+        create_table :tanks do |t|
+            t.string :name
+            t.integer :fish_limit
+        end
+    end
+end

db/migrate/03_create_tank_owner_ids.rb

@@ -0,0 +1,10 @@
+class CreateTankOwnerIds < ActiveRecord::Migration[5.2]
+
+    def change
+        create_table :tank_owner_ids do |t|
+            t.integer :owner_id
+            t.integer :tank_id    
+        end
+    end
+
+end

db/migrate/04_create_fish.rb

@@ -0,0 +1,11 @@
+class CreateFish < ActiveRecord::Migration[5.2]
+
+    def change 
+        create_table :fish do |t|
+            t.string :name
+            t.string :color
+            t.integer :tank_id
+        end
+    end
+
+end

db/schema.rb

@@ -0,0 +1,35 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 4) do
+
+  create_table "fish", force: :cascade do |t|
+    t.string "name"
+    t.string "color"
+    t.integer "tank_id"
+  end
+
+  create_table "owners", force: :cascade do |t|
+    t.string "name"
+  end
+
+  create_table "tank_owner_ids", force: :cascade do |t|
+    t.integer "owner_id"
+    t.integer "tank_id"
+  end
+
+  create_table "tanks", force: :cascade do |t|
+    t.string "name"
+    t.integer "fish_limit"
+  end
+
+end