bodega 0.3.0 → 0.4.0

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

@@ -1,41 +1,5 @@
-<% if current_products.empty? -%>
+<% if current_order.empty? -%>
 <h3><%= t 'bodega.empty_cart' %></h3>
 <% else -%>
-<%= form_for(current_order, url: root_path) do |form| %>
-  <table id="bodega-cart">
-    <thead>
-      <tr><th class="product-name" colspan="2"><%= t 'bodega.product' %></th><th class="price"><%= t 'bodega.price' %></th><th class="total" colspan="2"><%= t 'bodega.total' %></th></tr>
-    </thead>
-    <tbody>
-      <% current_order.order_products.each do |order_product| -%>
-      <tr>
-        <td class="quantity-field">
-          <%= number_field_tag 'products[][quantity]', order_product.quantity, class: 'quantity', max: order_product.product.max_for_sale, min: 1 %>
-        </td>
-        <td class="product-name">
-          <%= order_product.name %>
-          <%= hidden_field_tag 'products[][type]', order_product.product_type %>
-          <%= hidden_field_tag 'products[][id]', order_product.product_id %>
-        </td>
-        <td class="price">
-          <%= humanized_money_with_symbol order_product.price %>
-        </td>
-        <td class="subtotal">
-          <%= humanized_money_with_symbol order_product.subtotal %>
-        </td>
-        <td class="remove">
-          <%= link_to t('bodega.remove'), bodega.remove_path(product_id: order_product.identifier) %>
-        </td>
-      </tr>
-      <% end -%>
-      <tr>
-        <td colspan="3"></td>
-        <td><%= humanized_money_with_symbol current_order.subtotal %></td>
-        <td></td>
-      </tr>
-    </tbody>
-  </table>
-  <%= button_tag t('bodega.update_cart'), id: 'bodega-update', name: :update, value: 1 %>
-  <%= button_tag t('bodega.checkout'), id: 'bodega-checkout', name: :checkout, value: 1 %>
-<% end =%>
+<%= render :partial => 'cart' %>
 <% end -%>

data/bodega.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2013-01-07"
+  s.date = "2013-02-04"
   s.description = "Bodega adds checkout logic to any model in your app!"
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -33,6 +33,10 @@ Gem::Specification.new do |s|
     "app/models/bodega/order.rb",
     "app/models/bodega/order_product.rb",
     "app/models/bodega/product.rb",
+    "app/views/bodega/orders/_cart.html.erb",
+    "app/views/bodega/orders/_cart_row.html.erb",
+    "app/views/bodega/orders/_shipping_row.html.erb",
+    "app/views/bodega/orders/edit.html.erb",
     "app/views/bodega/orders/new.html.erb",
     "app/views/bodega/orders/show.html.erb",
     "bodega.gemspec",
@@ -42,9 +46,13 @@ Gem::Specification.new do |s|
     "db/migrate/20121111170420_create_bodega_order_products.rb",
     "lib/bodega.rb",
     "lib/bodega/engine.rb",
+    "lib/bodega/optional.rb",
     "lib/bodega/payment_method.rb",
     "lib/bodega/payment_method/base.rb",
     "lib/bodega/payment_method/paypal.rb",
+    "lib/bodega/shipping_method.rb",
+    "lib/bodega/shipping_method/base.rb",
+    "lib/bodega/shipping_method/ups.rb",
     "lib/bodega/version.rb",
     "lib/generators/bodega/install/install_generator.rb",
     "lib/generators/bodega/product/USAGE",
@@ -55,7 +63,17 @@ Gem::Specification.new do |s|
     "lib/generators/bodega/productize/productize_generator.rb",
     "lib/generators/bodega/productize/templates/migration.rb",
     "lib/tasks/bodega_tasks.rake",
-    "script/rails"
+    "script/rails",
+    "spec/lib/bodega/payment_method/base_spec.rb",
+    "spec/lib/bodega/shipping_method/base_spec.rb",
+    "spec/lib/bodega_spec.rb",
+    "spec/models/order_product_spec.rb",
+    "spec/models/order_spec.rb",
+    "spec/models/product_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/active_record.rb",
+    "spec/support/rails.rb",
+    "spec/support/vcr.rb"
   ]
   s.homepage = "http://github.com/flipsasser/bodega"
   s.licenses = ["MIT"]
@@ -67,24 +85,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<configurator2>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2.11"])
+      s.add_runtime_dependency(%q<configurator2>, [">= 0.1.3"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<maintain>, [">= 0"])
       s.add_runtime_dependency(%q<money-rails>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["= 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<configurator2>, [">= 0.1.2"])
+      s.add_dependency(%q<activerecord>, [">= 3.2.11"])
+      s.add_dependency(%q<configurator2>, [">= 0.1.3"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<maintain>, [">= 0"])
       s.add_dependency(%q<money-rails>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["= 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<configurator2>, [">= 0.1.2"])
+    s.add_dependency(%q<activerecord>, [">= 3.2.11"])
+    s.add_dependency(%q<configurator2>, [">= 0.1.3"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<maintain>, [">= 0"])
     s.add_dependency(%q<money-rails>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["= 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/config/locales/en.yml

@@ -1,3 +1,16 @@
 en:
   bodega:
+    total: "Total"
+    grand_total: "Grand total:"
+    check_out: "Check Out"
+    update_cart: "Update Cart"
     empty_cart: "Your cart is currently empty."
+    sold_out: "Sorry, this product is sold out."
+    one_in_stock: "There is only one in stock!"
+    x_in_stock: "There are only x in stock!"
+    street_1: "123 Main Street"
+    street_2: "Apartment #1B"
+    city: "City"
+    postal_code: "Zip"
+    order_processed: "Your order has been processed! Thank you!"
+    order_failed: "There was a problem processing this order. Your account has not been charged."

data/config/routes.rb

@@ -1,15 +1,15 @@
 Bodega::Engine.routes.draw do
   # Building orders
-  get '', as: :root, to: 'orders#new'
-  post '', to: 'orders#create'
+  get '', as: :new_order, to: 'orders#new'
+  resource :order, only: :create, path: '' do
+    # Add products to an order
+    post :add, as: :add_to, to: 'orders#add'
+    get 'remove/:product_id', as: :remove_from, constraints: {product_id: /.+\.\d+/}, to: 'orders#remove'
 
-  # Add products to an order
-  post :add, to: 'orders#add'
-  get 'remove/:product_id', as: :remove, constraints: {product_id: /.+\.\d+/}, to: 'orders#remove'
-
-  # Processing orders
-  get  :complete, to: 'orders#complete'
-  post :complete, to: 'orders#complete'
+    # Processing orders
+    get  :complete, to: 'orders#complete'
+    post :complete, to: 'orders#complete'
+  end
 
   # Existing orders
   get  ':id', as: :order, to: 'orders#show'

data/db/migrate/20121111170337_create_bodega_orders.rb

@@ -4,8 +4,20 @@ class CreateBodegaOrders < ActiveRecord::Migration
   def change
     create_table :bodega_orders do |t|
       t.belongs_to :customer, polymorphic: true
+      t.integer :status
       t.string :identifier, limit: 20
       t.string :payment_id
+      t.string :shipping_rate_code
+      t.string :shipping_rate_name, limit: 50
+      t.text :shipping_rates
+      t.string :tracking_number
+      t.string :street_1, limit: 60
+      t.string :street_2, limit: 60
+      t.string :city, limit: 60
+      t.string :state, limit: 3
+      t.string :postal_code, limit: 11
+      t.string :country, limit: 3
+      t.money :shipping
       t.money :tax
       t.money :total
       t.timestamps

data/lib/bodega/engine.rb

@@ -4,7 +4,6 @@ module Bodega
 
     initializer "bodega.hookses" do
       ActiveSupport.on_load :action_controller do
-        #helper 'bodega/application'
         helper 'bodega/cart'
         include Bodega::CartHelper
       end

data/lib/bodega/optional.rb

@@ -0,0 +1,12 @@
+module Bodega
+  module Optional
+    def options(*new_options)
+      option_namespace = self.name.split('::').pop.underscore
+      Bodega.class_eval do
+        option option_namespace do
+          options(*new_options.flatten)
+        end
+      end
+    end
+  end
+end

data/lib/bodega/payment_method/base.rb

@@ -1,16 +1,9 @@
+require 'bodega/optional'
+
 module Bodega
   module PaymentMethod
     class Base
-      class << self
-        def options(*new_options)
-          option_namespace = self.name.split('::').pop.underscore
-          Bodega.class_eval do
-            option option_namespace do
-              options(*new_options.flatten)
-            end
-          end
-        end
-      end
+      extend Bodega::Optional
 
       attr_accessor :options, :order
 
@@ -18,13 +11,12 @@ module Bodega
         raise "Implement #{self.class.name}#checkout_url"
       end
 
-      def complete!
+      def complete!(options = {})
         raise "Implement #{self.class.name}#complete!"
       end
 
-      def initialize(order, options)
+      def initialize(order)
         self.order = order
-        self.options = options
       end
     end
   end

data/lib/bodega/payment_method/paypal.rb

@@ -10,13 +10,12 @@ module Bodega
         response.redirect_uri
       end
 
-      def complete!
+      def complete!(options = {})
         response = client.checkout!(
           options[:token],
           options[:PayerID],
           request
         )
-        require 'pry'; binding.pry
         response.payment_info.last.transaction_id
       end
 
@@ -32,8 +31,17 @@ module Bodega
 
       def request
         @request ||= ::Paypal::Payment::Request.new(
-          amount: order.subtotal.to_f,
-          description: order.order_products.map(&:quantity_and_name).to_sentence
+          amount: order.total.to_f,
+          description: order.order_products.map(&:quantity_and_name).to_sentence,
+          items: order.order_products.map {|order_product|
+            {
+              name: order_product.name,
+              amount: order_product.price.to_f,
+              quantity: order_product.quantity
+            }
+          },
+          shipping_amount: order.shipping.to_f,
+          tax_amount: order.tax.to_f
         )
       end
     end

data/lib/bodega/payment_method.rb

@@ -2,9 +2,5 @@ module Bodega
   module PaymentMethod
     autoload :Paypal, 'bodega/payment_method/paypal'
     autoload :Plinq, 'bodega/payment_method/plinq'
-
-    def payment_method
-      @payment_method ||= "Bodega::PaymentMethod::#{Bodega.config.payment_method.to_s.classify}".constantize.new(current_order, params)
-    end
   end
 end

data/lib/bodega/shipping_method/base.rb

@@ -0,0 +1,71 @@
+require 'bodega/optional'
+
+module Bodega
+  module ShippingMethod
+    class Base
+      extend Bodega::Optional
+      include ActiveMerchant::Shipping if defined?(ActiveMerchant)
+
+      attr_accessor :order
+
+      def initialize(order)
+        self.order = order
+      end
+
+      def rates
+        return {} unless packages.any?
+        @rates ||= {}.tap do |rates|
+          response = client.find_rates(origin, destination, packages)
+          response.rates.sort_by(&:price).each do |rate|
+            rates[rate.service_code] = {
+              name: rate.service_name,
+              price: rate.price
+            }
+          end
+        end
+      end
+
+      private
+      def client
+        raise "Implement #{self.class}#client to return an instance of an ActiveMerchant::Shipping method"
+      end
+
+      def destination
+        @destination ||= location_for(order)
+      end
+
+      def location_for(location_object)
+        Location.new(
+          city: location_object.city,
+          state: location_object.state,
+          zip: location_object.postal_code,
+          country: location_object.country
+        )
+      end
+
+      def origin
+        @origin ||= location_for(Bodega.config.shipping.origin)
+      end
+
+      def packages
+        @packages ||= [].tap do |packages|
+          order.products.each do |product|
+            packages.push(package_for(product)) if shippable?(product)
+          end
+        end
+      end
+
+      def package_for(product)
+        Package.new(
+          product.weight,
+          product.dimensions,
+          units: Bodega.config.shipping.units
+        )
+      end
+
+      def shippable?(product)
+        product.respond_to?(:weight) && product.respond_to?(:dimensions)
+      end
+    end
+  end
+end

data/lib/bodega/shipping_method/ups.rb

@@ -0,0 +1,18 @@
+require 'bodega/shipping_method/base'
+
+module Bodega
+  module ShippingMethod
+    class UPS < Base
+      options :login, :password, :api_key
+
+      protected
+      def client
+        @client ||= ActiveMerchant::Shipping::UPS.new(
+          login: Bodega.config.ups.login,
+          password: Bodega.config.ups.password,
+          key: Bodega.config.ups.api_key
+        )
+      end
+    end
+  end
+end

data/lib/bodega/shipping_method.rb

@@ -0,0 +1,5 @@
+module Bodega
+  module ShippingMethod
+    autoload :UPS, 'bodega/shipping_method/ups'
+  end
+end

data/lib/bodega.rb

@@ -1,13 +1,16 @@
-require 'bodega/engine'
+require 'bodega/engine' if defined?(Rails)
 require 'configurator'
 require 'i18n'
 require 'money-rails'
 
 module Bodega
   autoload :PaymentMethod, 'bodega/payment_method'
+  autoload :ShippingMethod, 'bodega/shipping_method'
 
   extend Configurator
   option :customer_method, :current_user
+  option :max_quantity, 1000
+
   # Auto-detect payment method. If a user has the Paypal gem installed,
   # it'll use that. If a user has the Plinq gem installed, it'll use that.
   # Otherwise, it'll be all, "HEY I NEED A PAYMENT METHOD" when checkout
@@ -16,6 +19,21 @@ module Bodega
     defined?(::Plinq) ? :plinq : defined?(::Paypal) ? :paypal : raise("No payment method detected. Please set one using `Bodega.config.payment_method=`")
   }
 
+  # Defaults to no shipping. Change to :fedex, :ups, or :usps and add
+  # `gem "active_shipping"` to gain access to various shipping calculations
+  # in the checkout process.
+  option :shipping_method, nil
+  option :shipping do
+    origin do
+      city nil
+      state nil
+      postal_code nil
+      country nil
+    end
+    states []
+    units :metric
+  end
+
   # Auto-detect test mode. Defaults to true if running in development or test
   # mode.
   option :test_mode, lambda { Rails.env.development? || Rails.env.test? }

data/spec/lib/bodega/payment_method/base_spec.rb

@@ -0,0 +1,12 @@
+require 'bodega'
+require 'bodega/payment_method/base'
+require 'active_support/core_ext/string/inflections'
+
+describe Bodega::PaymentMethod::Base do
+  describe ".options" do
+    it "defines options on the Bodega configuration instance" do
+      described_class.options(:a, :b, :z)
+      Bodega.config.base.should_not be_nil
+    end
+  end
+end

data/spec/lib/bodega/shipping_method/base_spec.rb

@@ -0,0 +1,12 @@
+require 'bodega'
+require 'bodega/shipping_method/base'
+require 'active_support/core_ext/string/inflections'
+
+describe Bodega::PaymentMethod::Base do
+  describe ".options" do
+    it "defines options on the Bodega configuration instance" do
+      described_class.options(:a, :b, :z)
+      Bodega.config.base.should_not be_nil
+    end
+  end
+end

data/spec/lib/bodega_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Bodega do
+  describe ".config" do
+    describe "#payment_method" do
+      it "auto-detects Paypal" do
+        class Paypal; end
+        Bodega.config.payment_method.should == :paypal
+      end
+    end
+
+    describe "test_mode" do
+      it "auto-detects test mode" do
+        Bodega.config.test_mode.should be_true
+      end
+    end
+  end
+end

data/spec/models/order_product_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+require 'bodega/order_product'
+
+describe Bodega::OrderProduct do
+  let(:product) { TestProduct.create!(product_attrs) }
+  let(:product_attrs) { {price: 49.95} }
+  let(:order_product) { described_class.new(product: product, quantity: 1) }
+
+  describe "#identifier" do
+    it "returns a friendly identifier" do
+      order_product.identifier.should == "TestProduct.1"
+    end
+  end
+
+  describe "#name" do
+    it "defaults to a human-readable name" do
+      order_product.name.should == "Test Product #1"
+    end
+
+    it "delegates to the product" do
+      def product.name
+        "Ohai"
+      end
+      order_product.name.should == "Ohai"
+    end
+  end
+
+  describe "#quantity_and_name" do
+    it "returns the quantity and the name" do
+      order_product.quantity_and_name.should == "1 x Test Product #1"
+    end
+  end
+
+  describe "#subtotal" do
+    it "returns the subtotal for the product quantity" do
+      product.stub(:price) { 25.0 }
+      order_product.quantity = 2
+      order_product.subtotal.should == 50.0
+    end
+  end
+
+  describe "for stock-kept products" do
+    let(:product_attrs) { {price: 49.95, keep_stock: true, number_in_stock: 1} }
+
+    it "can't be saved if the product is out-of-stock" do
+      product.stub(:in_stock?) { false }
+      product.save!
+      order_product.save
+      order_product.errors[:quantity].first.should == "Sorry, this product is sold out."
+    end
+
+    it "notifies me if my quantity is higher than the number left" do
+      order_product.quantity = 2
+      order_product.save
+      order_product.errors[:quantity].first.should == "There is only one in stock!"
+    end
+
+    it "can't be saved if the quantity is too high" do
+      product.stub(:number_in_stock) { 2 }
+      order_product.quantity = 3
+      order_product.save
+      order_product.errors[:quantity].first.should == "There are only 2 in stock!"
+    end
+
+    it "reduces Product#number_in_stock when #update_stock is called" do
+      order_product.stub(:order) { OpenStruct.new }
+      order_product.save!
+      order_product.update_stock
+      product.reload.number_in_stock.should == 0
+    end
+  end
+end

data/spec/models/order_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+require 'bodega/order'
+require 'bodega/order_product'
+require 'bodega/product'
+
+describe Bodega::Order do
+  before do
+    TestProduct.send :include, Bodega::Product
+  end
+
+  let!(:product_1) { TestProduct.create!(price: 30) }
+  let!(:product_2) { TestProduct.create!(price: 25) }
+  let(:order) { Bodega::Order.new }
+
+  describe "#payment_method" do
+    require 'bodega'
+    require 'bodega/payment_method'
+    class Paypal; end
+
+    it "returns an instance of Bodega::PaymentMethod::Base" do
+      order.payment_method.should be_instance_of(Bodega::PaymentMethod::Paypal)
+    end
+
+    it "returns an instance of Bodega::PaymentMethod::Base with a reference to the order" do
+      order.payment_method.order.should == order
+    end
+  end
+
+  describe "#shipping_method" do
+    require 'bodega'
+    require 'bodega/shipping_method'
+
+    before do
+      Bodega.config { shipping_method :ups }
+      module ActiveMerchant; module Shipping; class UPS; end; end; end
+    end
+
+    it "returns an instance of Bodega::ShippingMethod::Base" do
+      order.shipping_method.should be_instance_of(Bodega::ShippingMethod::UPS)
+    end
+  end
+
+  describe "#subtotal" do
+    let(:cart) do
+      {
+        "TestProduct.1" => {
+          product_type: "TestProduct",
+          product_id: "1",
+          quantity: "1"
+        },
+        "TestProduct.2" => {
+          product_type: "TestProduct",
+          product_id: "2",
+          quantity: "2"
+        }
+      }
+    end
+
+    it "adds up the #order_products subtotals" do
+      cart.each do |identifier, item|
+        order.update_product(item)
+      end
+      order.save!
+      order.subtotal.should == 80
+    end
+  end
+
+  describe "cart management" do
+    before { order.save! }
+
+    it "defaults to quantity 1 when none given" do
+      order.update_product(product_type: "TestProduct", product_id: 1)
+      order.send(:order_product, "TestProduct.1").quantity.should == 1
+    end
+
+    it "accepts new quantities" do
+      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
+      order.send(:order_product, "TestProduct.1").quantity.should == 10
+    end
+
+    it "updates old quantities when no new quantity is given" do
+      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
+      order.update_product(product_type: "TestProduct", product_id: 1)
+      order.send(:order_product, "TestProduct.1").quantity.should == 11
+    end
+
+    it "removes products when told to" do
+      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
+      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 30, remove: "1")
+      order.send(:order_product, "TestProduct.1").should be_nil
+    end
+  end
+end