bodega 0.4.4 → 0.4.9

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem 'activerecord', '>= 3.2.11'
+gem 'addressabler'
 gem 'configurator2', '>= 0.1.3'
 gem 'i18n'
 gem 'maintain'

data/Gemfile.lock

@@ -31,6 +31,10 @@ GEM
     activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.3.3)
+    addressabler (0.0.5)
+      addressable
+      addressable (>= 2.2.2)
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.8)
@@ -111,6 +115,7 @@ PLATFORMS
 DEPENDENCIES
   active_shipping
   activerecord (>= 3.2.11)
+  addressabler
   configurator2 (>= 0.1.3)
   database_cleaner
   i18n

data/Rakefile

@@ -4,13 +4,13 @@
 require 'rubygems'
 require 'bundler'
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+#begin
+  #Bundler.setup(:default, :development)
+#rescue Bundler::BundlerError => e
+  #$stderr.puts e.message
+  #$stderr.puts "Run `bundle install` to install missing gems"
+  #exit e.status_code
+#end
 require 'rake'
 
 require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.9

data/app/controllers/bodega/orders_controller.rb

@@ -22,7 +22,7 @@ class Bodega::OrdersController < ApplicationController
   def create
     if current_order.update_attributes(params[:order])
       if !current_order.new_shipping_rates? && params[:checkout]
-        redirect_to current_order.payment_method.checkout_url(complete_order_url, new_order_url)
+        redirect_to current_order.payment_method.checkout_url(complete_order_url, new_order_url, params)
       else
         redirect_to new_order_path
       end

data/app/models/bodega/order.rb

@@ -16,7 +16,7 @@ module Bodega
     has_many :order_products, class_name: 'Bodega::OrderProduct', dependent: :destroy
     accepts_nested_attributes_for :order_products
 
-    delegate :empty?, to: :order_products
+    delegate :count, :empty?, :size, to: :order_products
 
     maintain :status do
       state :new, 1, default: true
@@ -89,6 +89,10 @@ module Bodega
       order_products.inject(Money.new(0)) {|sum, order_product| sum += order_product.subtotal }
     end
 
+    def summary
+      order_products.map(&:quantity_and_name).to_sentence
+    end
+
     def to_param
       identifier
     end

data/app/models/bodega/order_product.rb

@@ -9,6 +9,8 @@ module Bodega
     belongs_to :order, class_name: 'Bodega::Order'
     belongs_to :product, polymorphic: true
 
+    default_scope order(:created_at)
+
     delegate :keep_stock?, :price, to: :product
 
     monetize :total_cents

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

@@ -1,4 +1,4 @@
-<%= form_for(current_order, method: :post, url: new_order_path) do |form| %>
+<%= form_for(current_order, method: :post, url: new_order_path, id: 'bodega-checkout') 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>
@@ -13,7 +13,7 @@
       <% 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 class="product-total" nowrap="nowrap"><%= humanized_money_with_symbol current_order.total %></td>
         <td></td>
       </tr>
       <% end -%>
@@ -26,3 +26,4 @@
   <%= button_tag t('bodega.calculate_shipping'), id: 'bodega-update', name: :update, value: 1 %>
   <% end -%>
 <% end =%>
+<%= render Bodega.config.payment_method.to_s %>

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

@@ -1,8 +1,6 @@
 <tr>
-  <td class="shipping-postal-code">
+  <td class="shipping-postal-code" colspan="3">
     <%= 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 -%>

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

@@ -0,0 +1,24 @@
+<%= javascript_include_tag 'https://checkout.stripe.com/v2/checkout.js' %>
+<script type="text/javascript">
+  $('#bodega-checkout').click(function(event) {
+    event.preventDefault();
+    var button = $(this);
+    var form = button.parents('form');
+
+    var token = function(response) {
+      button.attr('name', '');
+      input = $('<input type="hidden" name="stripe" />').val(response.id);
+      form.append('<input type="hidden" name="checkout" value="1" />');
+      form.append(input).submit();
+    };
+
+    StripeCheckout.open({
+      key: <%= Bodega.config.stripe.publishable_key.inspect.html_safe %>,
+      amount: <%= current_order.total_cents %>,
+      name: <%= Bodega.config.store_name.inspect.html_safe %>,
+      description: <%= current_order.summary.inspect.html_safe %>,
+      panelLabel: 'Confirm:',
+      token: token
+    });
+  });
+</script>

data/bodega.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.4.4"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2013-02-05"
+  s.date = "2013-03-31"
   s.description = "Bodega adds checkout logic to any model in your app!"
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/flipsasser/bodega"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Bodega adds checkout logic to any model in your app!"
 
   if s.respond_to? :specification_version then
@@ -73,12 +73,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.2.11"])
+      s.add_runtime_dependency(%q<addressabler>, [">= 0"])
       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"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.2.11"])
+      s.add_dependency(%q<addressabler>, [">= 0"])
       s.add_dependency(%q<configurator2>, [">= 0.1.3"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<maintain>, [">= 0"])
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.2.11"])
+    s.add_dependency(%q<addressabler>, [">= 0"])
     s.add_dependency(%q<configurator2>, [">= 0.1.3"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<maintain>, [">= 0"])

data/lib/bodega.rb

@@ -11,12 +11,14 @@ module Bodega
   option :customer_method, :current_user
   option :max_quantity, 1000
 
+  option :store_name, "Store name (override in Bodega.config.store_name)"
+
   # 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
   # starts.
   option :payment_method, lambda {
-    defined?(::Plinq) ? :plinq : defined?(::Paypal) ? :paypal : raise("No payment method detected. Please set one using `Bodega.config.payment_method=`")
+    defined?(::Plinq) ? :plinq : defined?(::Paypal) ? :paypal : defined?(::Stripe) ? :stripe : 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

data/lib/bodega/payment_method.rb

@@ -2,5 +2,6 @@ module Bodega
   module PaymentMethod
     autoload :Paypal, 'bodega/payment_method/paypal'
     autoload :Plinq, 'bodega/payment_method/plinq'
+    autoload :Stripe, 'bodega/payment_method/stripe'
   end
 end

data/lib/bodega/payment_method/base.rb

@@ -7,7 +7,7 @@ module Bodega
 
       attr_accessor :options, :order
 
-      def checkout_url(success_url, cancel_url)
+      def checkout_url(success_url, cancel_url, params = {})
         raise "Implement #{self.class.name}#checkout_url"
       end
 

data/lib/bodega/payment_method/paypal.rb

@@ -5,7 +5,7 @@ module Bodega
     class Paypal < Base
       options :username, :password, :signature
 
-      def checkout_url(success_url, cancel_url)
+      def checkout_url(success_url, cancel_url, params = {})
         response = client.setup(request, success_url, cancel_url)
         response.redirect_uri
       end
@@ -32,7 +32,7 @@ module Bodega
       def request
         @request ||= ::Paypal::Payment::Request.new(
           amount: order.total.to_f,
-          description: order.order_products.map(&:quantity_and_name).to_sentence,
+          description: order.summary,
           items: order.order_products.map {|order_product|
             {
               name: order_product.name,

data/lib/bodega/payment_method/stripe.rb

@@ -0,0 +1,53 @@
+require 'bodega/payment_method/base'
+require 'addressabler'
+
+module Bodega
+  module PaymentMethod
+    class Stripe < Base
+      options :secret_key, :publishable_key
+
+      # Redirect to /cart/complete?stripe=tokenToVerifyPayment
+      def checkout_url(success_url, cancel_url, params = {})
+        uri = Addressable::URI.heuristic_parse(success_url)
+        uri.query_hash[:stripe] = params[:stripe]
+        uri.to_s
+      end
+
+      def complete!(options = {})
+        ::Stripe.api_key = Bodega.config.stripe.secret_key
+        ::Stripe::Charge.create(
+          amount: order.total_cents,
+          currency: 'usd',
+          card: options[:stripe],
+          description: order.summary
+        ).id
+      end
+
+      protected
+      def client
+        ::Paypal.sandbox! if Bodega.config.test_mode
+        @client ||= ::Paypal::Express::Request.new(
+          username:  Bodega.config.paypal.username,
+          password:  Bodega.config.paypal.password,
+          signature: Bodega.config.paypal.signature
+        )
+      end
+
+      def request
+        @request ||= ::Paypal::Payment::Request.new(
+          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
+  end
+end

data/lib/bodega/shipping_method/base.rb

@@ -45,19 +45,18 @@ module Bodega
       def packages
         @packages ||= [].tap do |packages|
           order.order_products.each do |order_product|
-            packages.push(package_for(order_product)) if shippable?(order_product.product)
+            packages.push(*packages_for(order_product)) if shippable?(order_product.product)
           end
         end
       end
 
-      def package_for(order_product)
+      def packages_for(order_product)
         product = order_product.product
-        weight = product.weight * order_product.quantity
-
-        dimensions = product.dimensions
-        dimensions[2] = dimensions[2] * order_product.quantity
-
-        Package.new(weight, dimensions, units: Bodega.config.shipping.units)
+        packages = []
+        order_product.quantity.times do
+          packages.push(Package.new(product.weight, product.dimensions, units: Bodega.config.shipping.units))
+        end
+        packages
       end
 
       def shippable?(product)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: addressabler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: configurator2
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +131,9 @@ files:
 - app/models/bodega/product.rb
 - app/views/bodega/orders/_cart.html.erb
 - app/views/bodega/orders/_cart_row.html.erb
+- app/views/bodega/orders/_paypal.html.erb
 - app/views/bodega/orders/_shipping_row.html.erb
+- app/views/bodega/orders/_stripe.html.erb
 - app/views/bodega/orders/edit.html.erb
 - app/views/bodega/orders/new.html.erb
 - app/views/bodega/orders/show.html.erb
@@ -130,6 +148,7 @@ files:
 - lib/bodega/payment_method.rb
 - lib/bodega/payment_method/base.rb
 - lib/bodega/payment_method/paypal.rb
+- lib/bodega/payment_method/stripe.rb
 - lib/bodega/shipping_method.rb
 - lib/bodega/shipping_method/base.rb
 - lib/bodega/shipping_method/ups.rb
@@ -156,9 +175,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 272964422154723195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Bodega adds checkout logic to any model in your app!