bodega 0.3.0 → 0.4.0

data/.rspec

@@ -1 +1,4 @@
 --color
+-I app/controllers
+-I app/helpers
+-I app/models

data/Gemfile

@@ -1,14 +1,18 @@
 source "https://rubygems.org"
 
-gem 'configurator2', '>= 0.1.2'
+gem 'activerecord', '>= 3.2.11'
+gem 'configurator2', '>= 0.1.3'
 gem 'i18n'
+gem 'maintain'
 gem 'money-rails'
 
-group :development, :test do
-  gem 'jeweler', '1.8.4'
-  gem 'pry', require: false
-end
-
 group :test do
+  gem 'active_shipping'
+  gem 'database_cleaner'
+  gem 'jeweler', '1.8.4'
+  gem 'pry'
+  gem 'simplecov'
+  gem 'sqlite3'
   gem 'rspec-rails'
+  gem 'vcr'
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -11,15 +11,31 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    active_shipping (0.9.14)
+      active_utils (>= 1.0.1)
+      activesupport (>= 2.3.5)
+      builder
+      i18n
+      json (>= 1.5.1)
+    active_utils (1.0.5)
+      activesupport (>= 2.3.11)
+      i18n
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activesupport (3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.8)
-    configurator2 (0.1.2)
+    configurator2 (0.1.3)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
@@ -32,6 +48,7 @@ GEM
       rdoc
     journey (1.0.4)
     json (1.7.6)
+    maintain (0.2.23)
     method_source (0.8.1)
     money (5.1.0)
       i18n (~> 0.6.0)
@@ -40,20 +57,20 @@ GEM
       money (~> 5.1.0)
       railties (~> 3.0)
     multi_json (1.5.0)
-    pry (0.9.10)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.1)
+      slop (~> 3.4)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -64,30 +81,44 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.0)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    slop (3.3.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
+    sqlite3 (1.3.7)
+    thor (0.17.0)
     tilt (1.3.3)
+    tzinfo (0.3.35)
+    vcr (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  configurator2 (>= 0.1.2)
+  active_shipping
+  activerecord (>= 3.2.11)
+  configurator2 (>= 0.1.3)
+  database_cleaner
   i18n
   jeweler (= 1.8.4)
+  maintain
   money-rails
   pry
   rspec-rails
+  simplecov
+  sqlite3
+  vcr

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app/controllers/bodega/orders_controller.rb

@@ -1,62 +1,53 @@
 class Bodega::OrdersController < ApplicationController
-  helper 'bodega/cart'
-  include Bodega::PaymentMethod
+  before_filter :find_order, only: %w(show)
 
-  before_filter :find_order, only: [:show, :update]
+  helper 'bodega/cart'
 
   def add
-    if product = params[:product]
+    if product = params[:order_product]
       update_cart(product)
     end
-    redirect_to root_path
+    redirect_to new_order_path
   end
 
   def complete
-    if current_order.finalize!(payment_method)
-      current_products.clear
-      redirect_to order_path(current_order)
+    if current_order.finalize!(params)
+      session.delete(:bodega_order_id)
+      redirect_to order_path(current_order), notice: t('bodega.order_processed')
     else
-      flash[:error] = "There was a problem processing this order. Your account has not been charged."
-      redirect_to new_order_path
+      redirect_to new_order_path, error: t('bodega.order_failed')
     end
   end
 
   def create
-    params[:products].each do |product|
-      update_cart(product)
-    end
-    if params[:checkout]
-      redirect_to payment_method.checkout_url(complete_url, root_url)
+    if current_order.update_attributes(params[:order])
+      if params[:checkout]
+        redirect_to current_order.payment_method.checkout_url(complete_order_url, new_order_url)
+      else
+        redirect_to new_order_path
+      end
     else
       render :new
     end
   end
 
   def remove
-    current_products.delete params[:product_id]
+    current_order.remove_product params[:product_id]
     redirect_to :back
   end
 
+  def show
+    render :edit unless @order.complete?
+  end
+
   protected
   def find_order
     raise ActiveRecord::RecordNotFound unless @order = Bodega::Order.where(identifier: params[:order_id] || params[:id]).first
   end
 
   def update_cart(product_hash)
-    product_id = "#{product_hash[:type]}.#{product_hash[:id]}"
-    if product_hash[:remove]
-      current_products.delete product_id
-    else
-      if current_product = current_products[product_id]
-        current_quantity = current_product[:quantity].to_i
-      else
-        current_quantity = 0
-      end
-      new_quantity = product_hash[:quantity] ? product_hash[:quantity].to_i : current_quantity + 1
-      if product = product_hash[:type].constantize.where(id: product_hash[:id], keep_stock: true).first
-        new_quantity = [product.number_in_stock, new_quantity].min
-      end
-      current_products[product_id] = product_hash.merge(quantity: new_quantity)
+    if current_order.update_product(product_hash)
+      session[:bodega_order_id] = current_order.identifier
     end
   end
 end

data/app/helpers/bodega/application_helper.rb

@@ -6,6 +6,7 @@ module Bodega
         alias :method_missing :method_missing_with_bodega
       end
     end
+
     protected
     def method_missing_with_bodega(method_name, *args)
       if method_name.to_s =~ /.+_(url|path)$/ && main_app.respond_to?(method_name)

data/app/helpers/bodega/cart_helper.rb

@@ -1,39 +1,23 @@
 module Bodega
   module CartHelper
-    def button_to_cart(product, label = 'Add to Cart', options = {})
+    def button_to_cart(product, label = 'Add to Cart', options = {}, &block)
       unless options.key? :disabled
         options[:disabled] = !product.in_stock?
       end
-      form_tag(bodega.add_path) do
-        hidden_field_tag('product[type]', product.class) +
-        hidden_field_tag('product[id]', product.id) +
-        button_tag(label, options)
+      form_contents = hidden_field_tag('order_product[product_type]', product.class)
+      form_contents << hidden_field_tag('order_product[product_id]', product.id) +
+      if block_given?
+        form_contents << capture(&block)
       end
+      form_contents << button_tag(label, options)
+      form_tag(bodega.add_to_order_path) { form_contents }
     end
 
     protected
     def current_order
-      @current_order ||= Bodega::Order.new.tap do |order|
-        begin
-          if Bodega.config.customer_method
-            order.customer = send(Bodega.config.customer_method)
-          end
-        rescue NoMethodError
-          raise "Please configure Bodega.config.customer_method to point to a valid method for accessing a customer record (default: current_user)"
-        end
-        order.order_products = current_products.map do |type, product|
-          product = product.symbolize_keys
-          OrderProduct.new do |order_product|
-            order_product.product_type = product[:type]
-            order_product.product_id = product[:id]
-            order_product.quantity = product[:quantity]
-          end
-        end
+      @current_order ||= Bodega::Order.where(identifier: session[:bodega_order_id]).first || Bodega::Order.new.tap do |order|
+        order.customer = send(Bodega.config.customer_method) if Bodega.config.customer_method
       end
     end
-
-    def current_products
-      session[:bodega_products] ||= {}
-    end
   end
 end

data/app/models/bodega/order.rb

@@ -1,43 +1,145 @@
+require 'maintain'
+
 module Bodega
   class Order < ActiveRecord::Base
-    before_save :set_total
+    self.table_name = :bodega_orders
+
+    attr_accessible :order_products_attributes, :street_1, :street_2, :city, :state, :postal_code, :shipping_rate_code
+
     before_create :set_identifier
+    before_save :set_shipping_rates, if: :postal_code_changed?
+    before_save :calculate_shipping, if: :shipping_rate_code_changed?
+    before_save :set_total
 
     belongs_to :customer, polymorphic: true
+
     has_many :order_products, class_name: 'Bodega::OrderProduct', dependent: :destroy
-    has_many :products, through: :order_products
+    accepts_nested_attributes_for :order_products
 
+    delegate :empty?, to: :order_products
+
+    maintain :status do
+      state :new, 1, default: true
+      state :complete, 2
+
+      on :enter, :complete, :mark_order_products_as_purchased
+    end
+
+    monetize :shipping_cents
     monetize :tax_cents
     monetize :total_cents
 
-    def finalize!(payment_method)
+    serialize :shipping_rates
+
+    def finalize!(options)
       self.class.transaction do
+        self.status = :complete
         self.save!
         begin
-          self.payment_id = payment_method.complete!
-          self.save!
-        rescue Exception => e
+          self.payment_id = payment_method.complete!(options)
+          self.save
+        rescue Exception
           raise ActiveRecord::Rollback
-          raise e.inspect
         end
       end
     end
 
-    def subtotal
-      @subtotal ||= order_products.inject(Money.new(0)) {|sum, order_product| sum += order_product.subtotal }
+    def payment_method
+      return nil unless Bodega.config.payment_method
+      @payment_method ||= "Bodega::PaymentMethod::#{Bodega.config.payment_method.to_s.camelize}".constantize.new(self)
     end
 
-    def set_total
-      self.total = subtotal + tax
+    def products
+      order_products.map(&:product)
+    end
+
+    def ready?
+      shipping_method.present? || shipping_rates.any?
+    end
+
+    def remove_product(item)
+      unless item.is_a?(Bodega::OrderProduct)
+        item = order_product(item)
+      end
+      item.destroy
+      order_products.delete(item)
+    end
+
+    def shipping_method
+      case Bodega.config.shipping_method
+      when :ups
+        Bodega::ShippingMethod::UPS.new(self)
+      end
+    end
+
+    def shipping_rate_options
+      @shipping_rate_options ||= ActiveSupport::OrderedHash.new.tap do |rates|
+        shipping_rates.sort_by {|code, rate| rate[:price] }.each do |code, rate|
+          name = rate[:name]
+          price = Money.new(rate[:price])
+          rates["#{name}: #{price.format}"] = code
+        end
+      end
+    end
+
+    def subtotal
+      order_products.inject(Money.new(0)) {|sum, order_product| sum += order_product.subtotal }
     end
 
     def to_param
       identifier
     end
 
+    def update_product(item)
+      if order_product = order_product(item)
+        if item[:remove]
+          remove_product(order_product)
+        else
+          current_quantity = order_product.quantity
+          new_quantity = item[:quantity] ? item[:quantity].to_i : current_quantity + 1
+          order_product.update_attributes(quantity: new_quantity)
+        end
+      else
+        order_product = order_products.build({quantity: 1}.merge(item))
+      end
+      save unless empty?
+    end
+
     protected
+    def calculate_shipping
+      self.shipping = 0
+      if shipping_rate_code
+        self.shipping_rate_name = shipping_rates[shipping_rate_code][:name]
+        self.shipping = shipping_rates[shipping_rate_code][:price] / 100.0
+      end
+    end
+
+    def calculate_tax
+      self.tax = 0
+    end
+
+    def mark_order_products_as_purchased
+      order_products.each(&:update_stock)
+    end
+
+    def order_product(item)
+      if item.is_a?(Hash)
+        order_products.detect {|order_product| order_product.product_type == item[:product_type] && order_product.product_id == item[:product_id].to_i }
+      else
+        order_products.detect {|order_product| order_product.identifier == item }
+      end
+    end
+
     def set_identifier
       self.identifier = self.class.count.succ.to_s(36)
     end
+
+    def set_shipping_rates
+      self.shipping_rates = postal_code.present? ? shipping_method.rates : nil
+    end
+
+    def set_total
+      self.total = subtotal + tax + shipping
+    end
   end
 end

data/app/models/bodega/order_product.rb

@@ -1,6 +1,9 @@
 module Bodega
   class OrderProduct < ActiveRecord::Base
-    after_save :update_stock
+    self.table_name = :bodega_order_products
+
+    attr_accessible :quantity, :product, :product_id, :product_type
+
     before_save :calculate_total
 
     belongs_to :order, class_name: 'Bodega::Order'
@@ -11,7 +14,7 @@ module Bodega
     monetize :total_cents
 
     validates_numericality_of :quantity, allow_blank: true, minimum: 1
-    validates_presence_of :quantity
+    validates_presence_of :product, :quantity
     validate :product_available?
 
     def identifier
@@ -19,7 +22,14 @@ module Bodega
     end
 
     def name
-      product.respond_to?(:name) ? product.name : product.to_s
+      product.respond_to?(:name) ? product.name : "#{product_type.titleize} ##{product_id}"
+    end
+
+    def update_stock
+      if keep_stock?
+        product.number_in_stock = product.number_in_stock - quantity
+        product.save(validate: false)
+      end
     end
 
     def quantity_and_name
@@ -36,31 +46,15 @@ module Bodega
     end
 
     def product_available?
-      unless product.number_in_stock >= quantity
-        quantity_error = case quantity
-        when 1
-          "We're sorry, but the #{name} you requested is no longer in stock."
-        else
-          "We're sorry, but there are no longer #{quantity} #{name.pluralize} in stock."
-        end
-
-        quantity_message = case product.number_in_stock
-        when 0
-          "They are now sold out."
-        when 1
-          "There is now one in stock."
+      return true unless product.keep_stock?
+      if !product.in_stock?
+        errors.add(:quantity, I18n.t("bodega.sold_out"))
+      elsif product.number_in_stock < quantity
+        if product.number_in_stock == 1
+          errors.add(:quantity, I18n.t("bodega.one_in_stock"))
         else
-          "There are now #{quantity} in stock."
+          errors.add(:quantity, I18n.t("bodega.x_in_stock").gsub(' x ', " #{product.number_in_stock} "))
         end
-
-        errors.add(:quantity, "#{quantity_error} #{quantity_message}.")
-      end
-    end
-
-    def update_stock
-      if keep_stock?
-        product.number_in_stock = product.number_in_stock - quantity
-        product.save(validate: false)
       end
     end
   end

data/app/models/bodega/product.rb

@@ -8,31 +8,28 @@ module Bodega
         monetize :price_cents
 
         scope :for_sale, lambda {
-          where %[
-            for_sale IS TRUE OR
-            (
-              (for_sale_at >= :today OR for_sale_at IS NULL) AND
-              (not_for_sale_at <= :today OR not_for_sale_at IS NULL) AND
-              (for_sale_at IS NULL AND not_for_sale_at IS NULL) IS NOT TRUE
-            )
-          ], today: Date.today
+          today = Date.today
+          where(for_sale: true).
+          where(arel_table[:for_sale_at].lteq(today).or(arel_table[:for_sale_at].eq(nil))).
+          where(arel_table[:not_for_sale_at].gteq(today).or(arel_table[:not_for_sale_at].eq(nil)))
         }
 
-        # TODO: Get this to use a regular JOIN
         scope :popular, joins(%(LEFT JOIN "bodega_order_products" ON "bodega_order_products"."product_id" = "#{table_name}"."id" AND "bodega_order_products"."product_type" = '#{name}')).order('SUM(bodega_order_products.quantity) DESC').group("#{table_name}.id")
+
+        validates_numericality_of :number_in_stock, :if => :keep_stock?
       end
     end
 
     def in_stock?
-      if keep_stock?
+      if keep_stock? && number_in_stock
         number_in_stock > 0
       else
         true
       end
     end
 
-    def max_for_sale
-      keep_stock? ? number_in_stock : 1000
+    def max_quantity
+      keep_stock? ? number_in_stock : Bodega.config.max_quantity
     end
   end
 end

data/app/views/bodega/orders/_cart.html.erb

@@ -0,0 +1,26 @@
+<%= form_for(current_order, method: :post, url: new_order_path) do |form| %>
+  <table id="bodega-cart">
+    <thead>
+      <tr><th class="product-name" colspan="2"><%= t 'bodega.product' %></th><th class="product-price"><%= t 'bodega.price' %></th><th class="product-total" colspan="2"><%= t 'bodega.total' %></th></tr>
+    </thead>
+    <tbody>
+      <%= form.fields_for(:order_products) do |order_product_form| -%>
+      <%= render partial: 'cart_row', locals: {form: order_product_form, order_product: order_product_form.object} %>
+      <% end =%>
+    </tbody>
+    <tfoot>
+      <%= render partial: 'shipping_row', locals: {form: form} if current_order.shipping_method %>
+      <% if current_order.ready? -%>
+      <tr>
+        <td class="product-total-label" colspan="3"><%= t 'bodega.total' %></td>
+        <td class="product-total"><%= humanized_money_with_symbol current_order.total %></td>
+        <td></td>
+      </tr>
+      <% end -%>
+    </tfoot>
+  </table>
+  <%= button_tag t('bodega.update_cart'), id: 'bodega-update', name: :update, value: 1 %>
+  <% if current_order.ready? -%>
+  <%= button_tag t('bodega.checkout'), id: 'bodega-checkout', name: :checkout, value: 1 %>
+  <% end -%>
+<% end =%>

data/app/views/bodega/orders/_cart_row.html.erb

@@ -0,0 +1,24 @@
+<tr id="<%= order_product.identifier.parameterize %>">
+  <td class="product-quantity">
+    <%= form.number_field :quantity, class: 'quantity', max: order_product.product.max_quantity, min: 1 %>
+    <% if order_product.errors[:quantity].any? -%>
+    <span class="bodega-errors">
+      <%= order_product.errors[:quantity].join('<br />').html_safe %>
+    </span>
+    <% end -%>
+  </td>
+  <td class="product-name">
+    <%= order_product.name %>
+    <%= form.hidden_field :product_type %>
+    <%= form.hidden_field :product_id %>
+  </td>
+  <td class="product-price">
+    <%= humanized_money_with_symbol order_product.price %>
+  </td>
+  <td class="product-subtotal">
+    <%= humanized_money_with_symbol order_product.subtotal %>
+  </td>
+  <td class="product-remove">
+    <%= link_to t('bodega.remove'), bodega.remove_from_order_path(product_id: order_product.identifier) %>
+  </td>
+</tr>

data/app/views/bodega/orders/_shipping_row.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td class="shipping-postal-code">
+    <%= form.text_field :postal_code, placeholder: t('bodega.postal_code') %>
+  </td>
+  <td class="shipping-rates" colspan="2">
+    <% if current_order.postal_code.present? -%>
+    <%= form.select :shipping_rate_code, current_order.shipping_rate_options %>
+    <% end -%>
+  </td>
+  <td class="shipping-total" colspan="2">
+    <%= humanized_money_with_symbol current_order.shipping %>
+  </td>
+</tr>

data/app/views/bodega/orders/edit.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'cart' %>