Lumbersexuals - completed betsy (Hipsterly)

.gitignore

@@ -11,5 +11,5 @@
 /log/*
 !/log/.keep
 /tmp
-
+coverage
 .DS_Store

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 ruby '2.3.0'
-
+gem 'pry'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.6'
 # Use postgresql as the database for Active Record
-gem 'pg', '~> 0.15'
+
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -24,7 +24,11 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
+
+
+
+gem 'traceroute'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
@@ -35,13 +39,22 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'simplecov', '~> 0.11.2'
 end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'
+  gem "pry-rails"
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem 'rails-erd'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
 
+group :production do
+  gem 'rails_12factor'
+  gem 'pg', '~> 0.15'
+end

Gemfile.lock

@@ -37,10 +37,17 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    bcrypt (3.1.11)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (8.2.5)
+    choice (0.2.0)
+    coderay (1.1.1)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -50,6 +57,7 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.1)
     debug_inspector (0.0.2)
+    docile (1.1.5)
     erubis (2.7.0)
     execjs (2.6.0)
     globalid (0.3.6)
@@ -67,6 +75,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.0)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0221)
@@ -76,6 +85,12 @@ GEM
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.4)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -96,8 +111,18 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
+    rails-erd (1.4.7)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      choice (~> 0.2.0)
+      ruby-graphviz (~> 1.2)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.2.6)
       actionpack (= 4.2.6)
       activesupport (= 4.2.6)
@@ -106,6 +131,7 @@ GEM
     rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)
+    ruby-graphviz (1.2.2)
     sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -116,6 +142,12 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
     spring (1.7.1)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -127,6 +159,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
+    traceroute (0.5.0)
+      rails (>= 3.0.0)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -143,18 +177,30 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  better_errors
+  binding_of_caller
   byebug
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
   pg (~> 0.15)
+  pry
+  pry-rails
   rails (= 4.2.6)
+  rails-erd
+  rails_12factor
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  simplecov (~> 0.11.2)
   spring
+  traceroute
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 
+RUBY VERSION
+   ruby 2.3.0p0
+
 BUNDLED WITH
    1.12.1

README.md

@@ -28,7 +28,7 @@
 1. Have one person on your team fork/clone the project master as per usual
   1. Add all other team members as collaborators
   1. Each team member should clone the repo to their computer
-1. Figure out your workflow for the project, re: Git and Task management 
+1. Figure out your workflow for the project, re: Git and Task management
   1. Determine who will be the Stand Up Leader and Task Leader for the first week
 1. Create a Trello board and ensure that all team members and instructors have access
 1. Review the User Storie below and create Trello tasks to represent them
@@ -49,48 +49,65 @@ Build an online system for listing, selling, reviewing, and buying a wide variet
 #### Guest User (Unauthenticated)
 As a guest to the website (not signed in) I **can**:
 
-- Browse all products
-- Browse products by category
-- Browse products by merchant (users)
-- View any individual product with additional details
-- Leave a review for a product providing:
+- Browse all products <!-- product#index -->
+- Browse products by category <!-- product#index -->
+- Browse products by merchant (users) <!-- product#index -->
+- View any individual product with additional details <!-- product#show -->
+- Leave a review for a product providing: <!-- product/:id/review/create *no review nested under user -->
     - A Text review
     - A rating out of 5
-- Add in-stock products to my cart
-- Remove products from my cart
-- Change the quantity of an existing product in my cart
-- Purchase the items in my cart, providing:
+- Add in-stock products to my cart <!-- order#add ??? -->
+- Remove products from my cart <!-- order#remove ??? -->
+- Change the quantity of an existing product in my cart <!-- order#update ??? -->
+- Purchase the items in my cart, providing: <!-- order#checkout *custom route need a get and a post -->  
+  <!-- get '/order/:id/cart/' => 'order#show' -->
     - Email Address
     - Mailing Address
     - Name on credit card
     - Credit card number
     - Credit cart expiration
     - Credit Card CVV (security code)
     - Billing zip code
+  <!-- post '/order/:id/checkout/' => 'order#create' -->
 - Purchasing an order makes the following changes:
     - Reduces the number of inventory for each product
     - Changes the order state from "pending" to "paid"
     - Clears the current cart
 - After purchasing an order, I can view a confirmation screen including:
+<!-- have a cart and a controller for the cart, it would just be a show
+this one will be an order#show (which is info down below). cart#add cart
+session is like a database, but it's not stored.  It will be stored in
+the guests session, not a database.  Maybe use the session controller for
+the cart?  Look up session for a cart.  The user holds on to their cart
+in the session -->
     - Each item in the order with a quantity and line-item subtotal
     - A link to the item description page
     - Order total price
     - DateTime the order was placed
     - The current status of the order
-- Sign up to be a merchant, providing:
+- Sign up to be a merchant, providing: <!-- user#create, have a checkbox for
+asking if they are a merchant, which then raises a flag and updates type -->
     - Email Address
     - Username
     - Password (plain text passwords cannot be stored in the database)
     - Password confirmation
 - Sign in to my merchant account
+<!-- User has a merchant_id? -->
 
 As a guest I **cannot**:
 
 - Add products to the cart that are out of stock
-- View any link or page to manage any products
+- View any link or page to manage any products <!--  -->
 - View any of the account pages
 
+<!-- if session user_id exists, then they can do things, if not,
+then the person can only do certain things.  All the things they can do are the above
+if they try to do other things, redirect to log in? -->
+
 #### Authenticated Users
+<!-- Most of this bottom will used ternaries in different ways.  If @user logout
+else, log in.  We will be checking @user a lot to see if they are signed in
+with a user_id, or if it's just a session -->
 As a signed-in user, I **can**:
 
 - Do everything a guest user can do except for sign up and sign in

app/assets/javascripts/cart.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/home.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/order_items.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/orders.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/products.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/reviews.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/sessions.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/users.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/