Penguin/master - Lindsey & Alice

.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--format doc

Gemfile

@@ -20,12 +20,14 @@ gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc
-
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'
-
+# Styling
 gem 'bootstrap-sass', '~> 3.3.5'
 
+# Reading APIs
+gem 'httparty'
+
 # Use Unicorn as the app server
 # gem 'unicorn'
 
@@ -42,24 +44,24 @@ group :development, :test do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 
+  # Troubleshooting
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'pry-rails'
 
+  # Testing
   gem 'simplecov', require: false
   gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails', "~> 4.0"
 
   gem 'traceroute'
 
-  gem 'pry'
-
   # Use sqlite3 as the database for Active Record
   gem 'sqlite3'
 
 end
 
 group :production do
   gem 'pg'
-
   gem 'rails_12factor'
-
 end

Gemfile.lock

@@ -67,8 +67,16 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.5.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
+    httparty (0.13.5)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     i18n (0.7.0)
     jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
@@ -87,13 +95,16 @@ GEM
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.2)
+    multi_xml (0.5.5)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pg (0.18.2)
     pry (0.10.1)
       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)
@@ -120,7 +131,7 @@ GEM
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
-    rails_stdout_logging (0.0.3)
+    rails_stdout_logging (0.0.4)
     railties (4.2.3)
       actionpack (= 4.2.3)
       activesupport (= 4.2.3)
@@ -197,10 +208,12 @@ DEPENDENCIES
   bootstrap-sass (~> 3.3.5)
   byebug
   coffee-rails (~> 4.1.0)
+  factory_girl_rails (~> 4.0)
+  httparty
   jbuilder (~> 2.0)
   jquery-rails
   pg
-  pry
+  pry-rails
   rails (= 4.2.3)
   rails_12factor
   rspec-rails (~> 3.0)

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+require 'penguin_shipper_interface'
+
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
@@ -29,10 +31,10 @@ def logged_in
 
     # guards from errors when order hasn't been initalized yet
     if session[:order_id] != nil
-      @order = Order.find(session[:order_id])
-      @cart_quantity = quantity_in_cart(@order)
-    else
-      @cart_quantity = 0
+      @order = Order.find_by(id: session[:order_id])
+      # @cart_quantity = quantity_in_cart(@order)
+    # else
+      # @cart_quantity = 0
     end
   end
 
@@ -42,7 +44,7 @@ def view_active
 
   private
 
-  def quantity_in_cart(order)
-    order.order_items.reduce(0) { |sum, n| sum + n.quantity }
-  end
+  # def quantity_in_cart(order)
+  #   order.order_items.reduce(0) { |sum, n| sum + n.quantity }
+  # end
 end

app/controllers/order_items_controller.rb

@@ -15,6 +15,7 @@ def index
   end
 
   def create
+    # FIXME is this checking for the current order_id? (it isn't!)
     if OrderItem.find_by(product_id: params[:id])
       @order_item = OrderItem.find_by(product_id: params[:product_id])
       @order_item.quantity += 1
@@ -24,6 +25,7 @@ def create
       @order_item = OrderItem.create!(order_id: @order.id, product_id: params[:product_id])
       @order.order_items << @order_item
     end
+    # OPTIMIZE why do you need to specify the method get here?
     redirect_to order_path(@order), method: :get
   end
 

app/controllers/orders_controller.rb

@@ -1,6 +1,10 @@
 class OrdersController < ApplicationController
   before_action :find_order, except: [ :index, :new, :create, :empty]
 
+  PENGUIN_LOG_CHOICE_URI  = Rails.env.production? ?
+    "http://whispering-shore-8365.herokuapp.com/log_shipping_choice" :
+    "http://localhost:4000/log_shipping_choice"
+
   def find_order
     @order = Order.find(params[:id])
   end
@@ -9,13 +13,14 @@ def index; end
 
   def show
     if session[:order_id] == @order.id
-      if @cart_quantity > 0
+      # if @cart_quantity > 0
+      if @order.order_items
         @order_items = @order.order_items
       else
-        render :index
+        render :index # there is session[:order_id], but no items in cart
       end
     else
-      redirect_to root_path
+      redirect_to root_path # no session[:order_id]
     end
   end
 
@@ -42,36 +47,100 @@ def payment
   end
 
   def update
-    # check for appropriate amount of inventory before accepting payment
+     # check for appropriate amount of inventory before accepting payment
+     check_inventory(@order)
+
+     if @enough_inventory
+       @order.update(order_params)
+       @order.card_last_4 = @order.card_number[-4, 4]
+       if @order.save # move and account for whether the order is cancelled?
+         redirect_to shipping_path(@order)
+       else
+         render :payment
+       end
+     else
+       redirect_to order_path(@order), notice: "#{@order_item.product.name} only has #{@order_item.product.inventory} item(s) in stock."
+     end
+   end
+
+  def shipping
+    @order_items = @order.order_items
+
+    @calculated_rates = PenguinShipperInterface.process_order(@order)
+
+    if @calculated_rates.first.keys.length > 1
+      @subtotal = 0
+      @shipping_cost = session[:shipping_option] ? 
+        session[:shipping_option]["total_price"] : 0
+      render :shipping
+    elsif @calculated_rates.first.values.first == "422"
+      redirect_to :shipping, notice: "Error in shipping choice. Please try again."
+    elsif @calculated_rates.first.values.first == "408"
+      redirect_to :shipping, notice: "We could not process your request in a timely manner. Please try again later."
+    elsif @calculated_rates.first.values.first == "bad"
+      redirect_to root_path, notice: "NOPE. Please try again."
+    end
+  end
+
+  def update_total
+    ## this is how :shipping_option is getting passed in the params before eval
+    ## "{\"service_name\"=>\"UPS Next Day Air\", \"total_price\"=>15985, \"delivery_date\"=>\"2015-08-21T00:00:00.000+00:00\"}"
+
+    ## WARNING eval is an unsafe method as it will run commands in the evaluated object
+    ## FIXME change this to a safer way to convert the params data to something we can use
+    session[:shipping_option] = eval(params["shipping_option"])
+
+    redirect_to :shipping
+  end
+
+  def finalize
+    # secondary check for appropriate amount of inventory before accepting payment
     check_inventory(@order)
 
     if @enough_inventory
-      @order.email = params[:order][:email]
-      @order.address1 = params[:order][:address1]
-      @order.address2 = params[:order][:address2]
-      @order.city = params[:order][:city]
-      @order.state = params[:order][:state]
-      @order.zipcode = params[:order][:zipcode]
-      @order.card_last_4 = params[:order][:card_number][-4, 4]
-      # @order.ccv = params[:order][:ccv]
-      @order.card_exp = params[:order][:card_exp]
+      shipping_option = session[:shipping_option]
+      @order.shipping_service = shipping_option["service_name"]
+      @order.shipping_cost = shipping_option["total_price"]
+
       @order.status = "paid"
+
       if @order.save # move and account for whether the order is cancelled?
-        update_inventory(@order)
-        session[:order_id] = nil # emptying the cart after confirming order
-        redirect_to order_confirmation_path(@order)
+
+        shipping_choice = {}
+        shipping_choice["shipping_choice"] = {} # create wrapper for JSON
+        shipping_choice["shipping_choice"]["shipping_service"] = @order.shipping_service
+        # multiply by 100 since PenguinShipper stores costs in cents
+        shipping_choice["shipping_choice"]["shipping_cost"] = @order.shipping_cost
+        shipping_choice["shipping_choice"]["order_id"] = @order.id
+        shipping_choice = shipping_choice.to_json
+
+        response = HTTParty.post(PENGUIN_LOG_CHOICE_URI, query: { json_data: shipping_choice })
+        case response.code
+        when 201
+          update_inventory(@order)
+          redirect_to order_confirmation_path(@order)
+        when 422
+          redirect_to :shipping, notice: "Error in shipping choice. Please try again."
+        when 408
+          redirect_to :shipping, notice: "We could not process your request in a timely manner. Please try again later."
+        else
+          redirect_to :shipping, notice: "NOPE. Please try again."
+        end
       else
-        render :payment
+        redirect_to :shipping, notice: "Order could not be saved. Please try again."
       end
-    else
+    else # if not enough_inventory
       redirect_to order_path(@order), notice: "#{@order_item.product.name} only has #{@order_item.product.inventory} item(s) in stock."
     end
   end
 
   def confirmation
     session[:order_id] = nil # clears cart
+    session[:shipping_option] = nil
+    @subtotal = 0
     @purchase_time = Time.now
     @order_items = @order.order_items
+    render :confirmation
   end
 
   def destroy
@@ -94,6 +163,11 @@ def completed
 
   private
 
+  def order_params
+    params.require(:order).permit(:email, :address1, :address2, :city, :state,
+      :zip, :card_number, :ccv, :card_exp)
+  end
+
   def self.model
     Order
   end # USED FOR RSPEC SHARED EXAMPLES

app/controllers/products_controller.rb

@@ -99,6 +99,10 @@ def create_params
       :inventory,
       :active,
       :user_id,
+      :weight_in_gms,
+      :length_in_cms,
+      :width_in_cms,
+      :height_in_cms,
       category_ids: []
     )
   end

app/controllers/users_controller.rb

@@ -114,7 +114,7 @@ def self.model
   end # USED FOR RSPEC SHARED EXAMPLES
 
   def user_params
-    params.require(:user).permit(:username, :email, :password, :password_confirmation)
+    params.require(:user).permit(:username, :email, :password, :password_confirmation, :city, :state, :zip, :country)
   end
 
   def nil_flash_errors

app/helpers/application_helper.rb

@@ -1,2 +1,5 @@
 module ApplicationHelper
+  def readable_date(datetime)
+    datetime.strftime("%b %d, %Y")
+  end
 end

app/helpers/orders_helper.rb

@@ -6,4 +6,27 @@ def order_error_check_for(element)
       return (@order.errors.messages[element][0].capitalize + ".")
     end
   end
+
+  def shipping_option_label(shipping_option)
+    %Q{#{shipping_option["service_name"]}: 
+    #{display_dollars(shipping_option["total_price"])}, 
+    Estimated delivery: 
+    #{delivery_date(shipping_option["delivery_date"])}}
+  end
+
+  def delivery_date(date)
+    if date
+      readable_date(date.to_datetime)
+    else
+      "(none available)"
+    end
+  end
+
+  def finalize_button
+    @shipping_cost == 0 ? "btn btn-default disabled" : "btn btn-success"
+  end
+
+  def display_dollars(cents)
+   number_to_currency(cents/100.00)
+ end
 end

app/helpers/products_helper.rb

@@ -1,2 +1,10 @@
 module ProductsHelper
+  # eg. "10.0 x 15.3 x 2.5"
+  def dimensions(product)
+    length = product.length_in_cms
+    width = product.width_in_cms
+    height = product.height_in_cms
+
+    "#{length} cm x #{width} cm x #{height} cm"
+  end
 end

app/models/category.rb

@@ -9,6 +9,6 @@ class Category < ActiveRecord::Base
   before_validation :normalize_names!
 
   def normalize_names!
-    self.name = self.name.titlecase
+    self.name = self.name.titlecase unless name == nil
   end
 end