bodega 0.2.0 → 0.3.0

data/Gemfile

@@ -1,6 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'configurator2', '>= 0.1.1'
+gem 'configurator2', '>= 0.1.2'
+gem 'i18n'
+gem 'money-rails'
 
 group :development, :test do
   gem 'jeweler', '1.8.4'

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionpack (3.2.9)
       activemodel (= 3.2.9)
@@ -19,7 +19,7 @@ GEM
       multi_json (~> 1.0)
     builder (3.0.4)
     coderay (1.0.8)
-    configurator2 (0.1.1)
+    configurator2 (0.1.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
@@ -31,8 +31,14 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     method_source (0.8.1)
+    money (5.1.0)
+      i18n (~> 0.6.0)
+    money-rails (0.7.1)
+      activesupport (~> 3.0)
+      money (~> 5.1.0)
+      railties (~> 3.0)
     multi_json (1.5.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
@@ -52,13 +58,13 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -79,7 +85,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  configurator2 (>= 0.1.1)
+  configurator2 (>= 0.1.2)
+  i18n
   jeweler (= 1.8.4)
+  money-rails
   pry
   rspec-rails

data/README.md

@@ -1,16 +1,278 @@
 # Bodega
 
-**Bodega allows any ActiveRecord::Base subclass to be purchased with a few simple steps:**
+**Bodega is a lightweight Rails engine that allows any ActiveRecord::Base subclass to be purchased.** It lives seamlessly next to your Rails app, so installation and configuration is simple and fun.
 
-1. Install Bodega (add `gem 'bodega'` to your Gemfile and bundle)
-2. For existing models:
-	1. `rails g bodega:productize existing_class_name`
-	2. Add `include Bodega::Product` to your class definition
-3. For new models:
-	1. `rails g bodega:product new_class_name`
-4. Add `mount Bodega::Engine => 'cart'` to your `config/routes.rb` file
-5. Profit (literally, for once)
+## Installation
+1. Add `gem 'bodega'` to your Gemfile and bundle
+2. Run the install generator: `rails generator bodega:install`
+3. Route to Bodega, like so:
+	  
+	```ruby
+	MyApp::Application.routes.draw do
+	  mount Bodega::Engine => 'cart'
+	end
+	```
+4. Profit (literally, for once)
 
-## WIP
+## Configuration
 
-This is a work-in-progress and is currently only in use on [womannyc.com](http://www.womannyc.com). Play with it if you want. It's not that exciting; shut up.
+Bodega configuration happens inside of `config/initializers/bodega.rb`. This file is created when you run the installation generator. Configuration is done via a block, like you're used to:
+
+```ruby
+Bodega.config do
+  option_name :option_value
+  boolean_option_name false
+end
+```
+
+### Options you can configure
+
+<table>
+	<thead>
+		<tr>
+			<th>Name</th>
+			<th>Default</th>
+			<th>Description</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>customer_method</td>
+			<td>:current_user</td>
+			<td>The method on the controller used to associate a customer to an order. Set to nil if you don't want to associate customers to orders.</td>
+		</tr>
+		<tr>
+			<td>payment_method</td>
+			<td>:paypal</td>
+			<td>The payment method used to process payments. Currently only Paypal is supported.</td>
+		</tr>
+		<tr>
+			<td>test_mode</td>
+			<td>`true` in test or development modes; `false` otherwise</td>
+			<td>Whether or not to process payments in test mode. Useful for development. You can override this if you need to but generally you won't need to.</td>
+		</tr>
+	</tbody>
+</table>
+
+
+### Sample configuration
+
+Here's an example of how you might configure Bodega:
+
+```ruby
+Bodega.config do
+  # We don't associate orders to user / customer records
+  customer_method nil
+end
+
+if Rails.env.production?
+  Bodega.config do
+    paypal(
+      username: ENV['PAYPAL_USERNAME'],
+      password: ENV['PAYPAL_PASSWORD'],
+      signature: ENV['PAYPAL_SIGNATURE']
+    )
+  end
+else
+  Bodega.config do
+    paypal(
+      username: 'my_paypal_sandbox@username.com',
+      password: 'paypal_sandbox_password',
+      signature: 'SOME_SIGNATURE_I_GOT_FROM_PAYPAL'
+    )
+  end
+end
+```
+
+## Making a model purchasable ("productizing")
+
+Bodega just needs a few database columns and a mixin on a model to make it purchasable. You can do this to models you've already created in your app, or create new product models.
+
+### Pre-existing models 
+For existing models, you need to run the "productize" generator:
+
+1. `rails generate bodega:productize existing_class_name`
+2. Add `include Bodega::Product` to your class definition, so something like this:
+	```ruby
+	class User < ActiveRecord::Base
+	  include Bodega::Product
+	  # etc …
+	end
+	```
+3. `rake db:migrate`
+ 
+### New models
+
+Just generate new models using the "product" generator:
+
+1. `rails generate bodega:product new_class_name`
+2. `rake db:migrate`
+
+## Adding an item to the cart
+
+Once you've productized a model, it's trivial to create an "Add to Cart" button for it. Build your controllers and views the way you want, and when you're ready to make, say, a `Bucket` model purchasable, use the following helper method:
+
+```ruby
+<%= button_to_cart(@bucket) %>
+```
+
+As long as you've correctly productized using the instructions above, this will render a button that adds that instance of `Bucket` to the cart.
+
+## Associating users to orders
+
+Bodega will automatically attempt to use `current_user` as the `Bodega::Order#customer` association. If you use a different controller method for accessing the current user / customer / administrator / whatever, just provide it to the config block in your `config/initializers/bodega.rb`:
+
+```ruby
+Bodega.config do
+  customer_method :this_method_returns_the_customer_on_all_controllers
+end
+```
+
+If you don't want to associate a customer record, just set it to nil:
+
+```ruby
+Bodega.config do
+  customer_method nil
+end
+```
+
+## Customizing the cart appearance
+
+The philosophy behind Bodega is that you decide on text, and we'll decide on markup. There are three ways to customize the cart's appearance.
+
+### HTML & CSS
+
+The cart uses the following markup:
+
+```html
+<table id="bodega-cart">
+  <thead>
+    <tr>
+      <th class="product-name" colspan="2">Product</th>
+      <th class="price">Price</th>
+      <th class="total" colspan="2">Total</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td class="quantity-field">
+        <input class="quantity" id="products__quantity" max="7" min="1" name="products[][quantity]" type="number" value="1" />
+      </td>
+      <td class="product-name">
+        {{Product Name}}
+      </td>
+      <td class="price">
+        {{Product Price}}
+      </td>
+      <td class="subtotal">
+        {{Total For Product}}
+      </td>
+      <td class="remove">
+        <a href="#">Remove</a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<button id="bodega-update" type="submit">Update Cart</button>
+<button id="bodega-checkout" type="submit">Checkout</button>
+```
+
+This should create ample room for you to style the cart / checkout view as you see fit. Here's an example from [WomanNYC](http://www.womannyc.com/):
+
+```css
+#bodega-cart {
+  border-collapse: collapse;
+  border-width: 0;
+  width: 100%;
+}
+
+#bodega-cart thead {
+  border-bottom: 1px solid #ccc;
+  text-align: left;
+}
+
+#bodega-cart td,
+#bodega-cart th {
+  font-size: 110%;
+  padding: 0.2em 1em 0.2em 0;
+}
+
+#bodega-cart .product-name img {
+  vertical-align: middle;
+  width: 2em;
+}
+
+#bodega-cart .quantity-field {
+  width: 3em;
+}
+
+#bodega-cart .quantity-field input {
+  display: inline-block;
+  font-size: 110%;
+  width: 3em;
+}
+```
+
+### I18N
+
+Bodega allows you to customize the text labels for the "Product", "Price", and "Total" columns, the "Check Out", "Remove", and "Update Cart" button labels, and the empty cart notification text. Here's an example locale for configuring Bodega:
+
+```yaml
+en:
+  bodega:
+    product: "Bucket Name"
+    price: "Bucket Price"
+    total: "Total Price"    
+    check_out: "Check Out Now"
+    remove: "Remove From Cart"
+    update_cart: "Save Cart Changes"
+    empty_cart: "You don't have any buckets in your cart yet!"
+```
+
+### Decorators
+
+If your product instances respond to a method `Product#decorator`, which returns a decorator class, Bodega will automatically use that to present your product instead of the direct instance. It does this by following the convention of calling `DecoratorClass.decorate(instance)`. Given the following productized model:
+
+```ruby
+class Deck < ActiveRecord::Base
+  include Bodega::Product
+
+  def decorator
+    Deckorator
+  end
+end
+```
+
+Bodega would use `Deckorator.decorate(@deck)` to use a decorator for the Deck instance. A common pattern in decorators is something like the following:
+
+```ruby
+class Deckorator
+  attr_accessor :product
+
+  class << self
+    def decorate(products)
+      if products.respond_to?(:each)
+        products.map { |product| new(product) }
+      else
+        new(products)
+      end
+    end
+  end
+
+  def initialize(product)
+    self.product = product
+  end
+
+  def name
+    %[<img alt="#{product.name}" src="#{photo.url(:thumb)}" /> #{artist.name}: #{product.name}].html_safe
+  end
+
+  protected
+  def method_missing(method, *args)
+    product.send(method, *args)
+  end
+end
+
+```
+
+Use this to provide Bodega-specific labels for products which are being purchased.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/app/controllers/bodega/orders_controller.rb

@@ -1,6 +1,5 @@
 class Bodega::OrdersController < ApplicationController
   helper 'bodega/cart'
-  include Bodega::CartHelper
   include Bodega::PaymentMethod
 
   before_filter :find_order, only: [:show, :update]
@@ -13,9 +12,13 @@ class Bodega::OrdersController < ApplicationController
   end
 
   def complete
-    current_order.payment_id = payment_method.complete!
-    current_order.save!
-    redirect_to order_path(current_order)
+    if current_order.finalize!(payment_method)
+      current_products.clear
+      redirect_to order_path(current_order)
+    else
+      flash[:error] = "There was a problem processing this order. Your account has not been charged."
+      redirect_to new_order_path
+    end
   end
 
   def create
@@ -29,23 +32,31 @@ class Bodega::OrdersController < ApplicationController
     end
   end
 
+  def remove
+    current_products.delete params[:product_id]
+    redirect_to :back
+  end
+
   protected
   def find_order
-    raise ActiveRecord::NotFound unless @order = Bodega::Order.where(id: params[:order_id] || params[:id]).first
+    raise ActiveRecord::RecordNotFound unless @order = Bodega::Order.where(identifier: params[:order_id] || params[:id]).first
   end
 
-  def update_cart(product)
-    product_id = "#{product[:type]}.#{product[:id]}"
-    if product[:remove]
+  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 = current_products[product_id]
-        current_quantity = current[:quantity].to_i
+      if current_product = current_products[product_id]
+        current_quantity = current_product[:quantity].to_i
       else
         current_quantity = 0
       end
-      new_quantity = product[:quantity] ? product[:quantity] : current_quantity + 1
-      current_products[product_id] = product.merge(quantity: new_quantity)
+      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)
     end
   end
 end

data/app/helpers/bodega/application_helper.rb

@@ -1,11 +1,17 @@
 module Bodega
   module ApplicationHelper
-    def button_to_cart(product, label = 'Add to Cart')
-      form_tag(bodega.add_path) do
-        hidden_field_tag('product[type]', product.class) +
-        hidden_field_tag('product[id]', product.id) +
-        button_tag(label)
+    def self.included(base)
+      base.class_eval do
+        alias :method_missing_without_bodega :method_missing
+        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)
+        return main_app.send(method_name, *args)
+      end
+      method_missing_without_bodega method_name, *args
+    end
   end
 end

data/app/helpers/bodega/cart_helper.rb

@@ -1,15 +1,26 @@
 module Bodega
   module CartHelper
+    def button_to_cart(product, label = 'Add to Cart', options = {})
+      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)
+      end
+    end
+
     protected
     def current_order
       @current_order ||= Bodega::Order.new.tap do |order|
-        #begin
+        begin
           if Bodega.config.customer_method
             order.customer = send(Bodega.config.customer_method)
           end
-        #rescue NoMethodError
+        rescue NoMethodError
           raise "Please configure Bodega.config.customer_method to point to a valid method for accessing a customer record (default: current_user)"
-        #end
+        end
         order.order_products = current_products.map do |type, product|
           product = product.symbolize_keys
           OrderProduct.new do |order_product|

data/app/models/bodega/order.rb

@@ -1,19 +1,34 @@
 module Bodega
   class Order < ActiveRecord::Base
-    extend Bodega::Monetize
-
+    before_save :set_total
     before_create :set_identifier
 
     belongs_to :customer, polymorphic: true
     has_many :order_products, class_name: 'Bodega::OrderProduct', dependent: :destroy
     has_many :products, through: :order_products
 
-    monetize :subtotal
-    monetize :tax
-    monetize :total
+    monetize :tax_cents
+    monetize :total_cents
+
+    def finalize!(payment_method)
+      self.class.transaction do
+        self.save!
+        begin
+          self.payment_id = payment_method.complete!
+          self.save!
+        rescue Exception => e
+          raise ActiveRecord::Rollback
+          raise e.inspect
+        end
+      end
+    end
 
     def subtotal
-      order_products.inject(0) {|sum, order_product| sum += order_product.subtotal }
+      @subtotal ||= order_products.inject(Money.new(0)) {|sum, order_product| sum += order_product.subtotal }
+    end
+
+    def set_total
+      self.total = subtotal + tax
     end
 
     def to_param
@@ -22,7 +37,7 @@ module Bodega
 
     protected
     def set_identifier
-      self.identifier = "#{Time.now.to_i}--#{rand(12)}"
+      self.identifier = self.class.count.succ.to_s(36)
     end
   end
 end

data/app/models/bodega/order_product.rb

@@ -1,25 +1,25 @@
 module Bodega
   class OrderProduct < ActiveRecord::Base
-    extend Bodega::Monetize
+    after_save :update_stock
+    before_save :calculate_total
 
     belongs_to :order, class_name: 'Bodega::Order'
     belongs_to :product, polymorphic: true
 
-    delegate :price, to: :product
+    delegate :keep_stock?, :price, to: :product
 
-    monetize :subtotal
-    monetize :tax
-    monetize :total
+    monetize :total_cents
 
     validates_numericality_of :quantity, allow_blank: true, minimum: 1
     validates_presence_of :quantity
+    validate :product_available?
 
-    def decorated_product
-      product.respond_to?(:decorator) ? product.decorator.decorate(product) : product
+    def identifier
+      "#{product_type}.#{product_id}"
     end
 
     def name
-      decorated_product.respond_to?(:name) ? decorated_product.name : product.to_s
+      product.respond_to?(:name) ? product.name : product.to_s
     end
 
     def quantity_and_name
@@ -27,21 +27,41 @@ module Bodega
     end
 
     def subtotal
-      read_attribute(:subtotal) || price * quantity
+      price * quantity
     end
 
-    def total
-      read_attribute(:total) || subtotal + calculate_tax
+    protected
+    def calculate_total
+      self.total = subtotal
     end
 
-    protected
-    def calculate_tax
-      self.tax = 0
+    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."
+        else
+          "There are now #{quantity} in stock."
+        end
+
+        errors.add(:quantity, "#{quantity_error} #{quantity_message}.")
+      end
     end
 
-    def calculate_total
-      self.subtotal = price * quantity
-      self.total = subtotal + calculate_tax
+    def update_stock
+      if keep_stock?
+        product.number_in_stock = product.number_in_stock - quantity
+        product.save(validate: false)
+      end
     end
   end
 end

data/app/models/bodega/product.rb

@@ -2,15 +2,20 @@ module Bodega
   module Product
     def self.included(base)
       base.class_eval do
-        extend Bodega::Monetize
-
         has_many :order_products, as: :product, class_name: 'Bodega::OrderProduct'
         has_many :orders, through: :order_products
 
-        monetize :price
+        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))', today: Date.today)
+          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
         }
 
         # TODO: Get this to use a regular JOIN

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

@@ -1,7 +1,10 @@
+<% if current_products.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"><%= Bodega.config.product_name.titleize %></th><th class="price">Price</th><th class="total">Total</th></tr>
+      <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| -%>
@@ -15,15 +18,24 @@
           <%= hidden_field_tag 'products[][id]', order_product.product_id %>
         </td>
         <td class="price">
-          $<%= order_product.price %>
+          <%= humanized_money_with_symbol order_product.price %>
         </td>
         <td class="subtotal">
-          $<%= order_product.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 'Update Cart', name: :update, value: 1 %>
-  <%= button_tag 'Checkout', name: :checkout, value: 1 %>
+  <%= 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 =%>
+<% end -%>

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

@@ -1 +1,27 @@
-<%= @order.inspect %>
+<h2>Order #<%= @order.identifier %></h2>
+<table id="bodega-cart">
+  <thead>
+    <tr><th class="product-name"><%= t 'bodega.product' %></th><th class="price"><%= t 'bodega.price' %></th><th class="total"><%= t 'bodega.total' %></th></tr>
+  </thead>
+  <tbody>
+    <% @order.order_products.each do |order_product| -%>
+    <tr>
+      <td class="product-name">
+        <%= order_product.quantity %> x
+        <%= order_product.name %>
+      </td>
+      <td class="price">
+        <%= humanized_money_with_symbol order_product.price %>
+      </td>
+      <td class="subtotal">
+        <%= humanized_money_with_symbol order_product.subtotal %>
+      </td>
+    </tr>
+    <% end -%>
+    <tr>
+      <td colspan="2"></td>
+      <td><%= humanized_money_with_symbol @order.total %></td>
+      <td></td>
+    </tr>
+  </tbody>
+</table>

data/bodega.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-12-26"
+  s.date = "2013-01-07"
   s.description = "Bodega adds checkout logic to any model in your app!"
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "app/assets/images/bodega/.gitkeep",
     "app/assets/javascripts/bodega/application.js",
     "app/assets/stylesheets/bodega/application.css",
-    "app/controllers/bodega/application_controller.rb",
     "app/controllers/bodega/orders_controller.rb",
     "app/helpers/bodega/application_helper.rb",
     "app/helpers/bodega/cart_helper.rb",
@@ -37,12 +36,12 @@ Gem::Specification.new do |s|
     "app/views/bodega/orders/new.html.erb",
     "app/views/bodega/orders/show.html.erb",
     "bodega.gemspec",
+    "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/20121111170337_create_bodega_orders.rb",
     "db/migrate/20121111170420_create_bodega_order_products.rb",
     "lib/bodega.rb",
     "lib/bodega/engine.rb",
-    "lib/bodega/monetize.rb",
     "lib/bodega/payment_method.rb",
     "lib/bodega/payment_method/base.rb",
     "lib/bodega/payment_method/paypal.rb",
@@ -51,6 +50,7 @@ Gem::Specification.new do |s|
     "lib/generators/bodega/product/USAGE",
     "lib/generators/bodega/product/product_generator.rb",
     "lib/generators/bodega/product/templates/migration.rb",
+    "lib/generators/bodega/product/templates/model.rb",
     "lib/generators/bodega/productize/USAGE",
     "lib/generators/bodega/productize/productize_generator.rb",
     "lib/generators/bodega/productize/templates/migration.rb",
@@ -67,16 +67,22 @@ 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.1"])
+      s.add_runtime_dependency(%q<configurator2>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<i18n>, [">= 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.1"])
+      s.add_dependency(%q<configurator2>, [">= 0.1.2"])
+      s.add_dependency(%q<i18n>, [">= 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.1"])
+    s.add_dependency(%q<configurator2>, [">= 0.1.2"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<money-rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["= 1.8.4"])
     s.add_dependency(%q<pry>, [">= 0"])
   end

data/config/locales/en.yml

@@ -0,0 +1,3 @@
+en:
+  bodega:
+    empty_cart: "Your cart is currently empty."

data/config/routes.rb

@@ -5,6 +5,7 @@ Bodega::Engine.routes.draw do
 
   # 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'

data/db/migrate/20121111170337_create_bodega_orders.rb

@@ -1,12 +1,13 @@
+require 'money-rails'
+
 class CreateBodegaOrders < ActiveRecord::Migration
   def change
     create_table :bodega_orders do |t|
       t.belongs_to :customer, polymorphic: true
       t.string :identifier, limit: 20
       t.string :payment_id
-      t.integer :subtotal_in_cents
-      t.integer :tax_in_cents
-      t.integer :total_in_cents
+      t.money :tax
+      t.money :total
       t.timestamps
     end
   end

data/db/migrate/20121111170420_create_bodega_order_products.rb

@@ -4,10 +4,8 @@ class CreateBodegaOrderProducts < ActiveRecord::Migration
       t.belongs_to :order
       t.belongs_to :product, polymorphic: true
       t.integer :quantity
-      t.integer :price_in_cents
-      t.integer :subtotal_in_cents
-      t.integer :tax_in_cents
-      t.integer :total_in_cents
+      t.money :price
+      t.money :total
     end
   end
 end

data/lib/bodega/engine.rb

@@ -4,16 +4,12 @@ module Bodega
 
     initializer "bodega.hookses" do
       ActiveSupport.on_load :action_controller do
-        #require 'bodega/action_controller'
+        #helper 'bodega/application'
+        helper 'bodega/cart'
         include Bodega::CartHelper
       end
 
       ActiveSupport.on_load :active_record do
-        require 'bodega/monetize'
-      end
-
-      ActiveSupport.on_load :paypal_express do
-        raise 'w0tf'
       end
     end
   end

data/lib/bodega/payment_method/paypal.rb

@@ -16,11 +16,13 @@ module Bodega
           options[:PayerID],
           request
         )
+        require 'pry'; binding.pry
         response.payment_info.last.transaction_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,
@@ -30,11 +32,10 @@ module Bodega
 
       def request
         @request ||= ::Paypal::Payment::Request.new(
-          amount: order.subtotal,
+          amount: order.subtotal.to_f,
           description: order.order_products.map(&:quantity_and_name).to_sentence
         )
       end
-
     end
   end
 end

data/lib/bodega.rb

@@ -1,12 +1,13 @@
 require 'bodega/engine'
 require 'configurator'
+require 'i18n'
+require 'money-rails'
 
 module Bodega
   autoload :PaymentMethod, 'bodega/payment_method'
 
   extend Configurator
   option :customer_method, :current_user
-  option :product_name, 'product'
   # 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
@@ -14,4 +15,8 @@ module Bodega
   option :payment_method, lambda {
     defined?(::Plinq) ? :plinq : defined?(::Paypal) ? :paypal : raise("No payment method detected. Please set one using `Bodega.config.payment_method=`")
   }
+
+  # Auto-detect test mode. Defaults to true if running in development or test
+  # mode.
+  option :test_mode, lambda { Rails.env.development? || Rails.env.test? }
 end

data/lib/generators/bodega/product/product_generator.rb

@@ -12,7 +12,11 @@ module Bodega
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_migration
-        migration_template("migration.rb", "db/migrate/bodegaize_#{product_name.tableize}")
+        migration_template "migration.rb", "db/migrate/create_#{product_name.tableize}"
+      end
+
+      def copy_model
+        template "model.rb", "app/models/#{product_name.tableize.singularize}"
       end
     end
   end

data/lib/generators/bodega/product/templates/migration.rb

@@ -1,7 +1,7 @@
 class Create<%= product_name.classify.pluralize %> < ActiveRecord::Migration
   def change
     create_table :<%= product_name.tableize %> do
-      t.integer :price_in_cents
+      t.money :price
       t.boolean :for_sale, default: true
       t.boolean :keep_stock, default: false
       t.integer :number_in_stock

data/lib/generators/bodega/product/templates/model.rb

@@ -0,0 +1,5 @@
+class <%= product_name.singularize.classify %> < ActiveRecord::Base
+  include Bodega::Product
+
+
+end

data/lib/generators/bodega/productize/productize_generator.rb

@@ -12,7 +12,7 @@ module Bodega
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_migration
-        migration_template("migration.rb", "db/migrate/bodegaize_#{product_name.tableize}")
+        migration_template("migration.rb", "db/migrate/productize_#{product_name.tableize}")
       end
     end
   end

data/lib/generators/bodega/productize/templates/migration.rb

@@ -1,6 +1,6 @@
-class Bodegaize<%= product_name.classify.pluralize %> < ActiveRecord::Migration
+class Productize<%= product_name.classify.pluralize %> < ActiveRecord::Migration
   def change
-    add_column :<%= product_name.tableize %>, :price_in_cents, :integer
+    add_money :<%= product_name.tableize %>, :price
     add_column :<%= product_name.tableize %>, :for_sale, :boolean, default: true
     add_column :<%= product_name.tableize %>, :keep_stock, :boolean, default: false
     add_column :<%= product_name.tableize %>, :number_in_stock, :integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurator2
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: i18n
+  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: money-rails
+  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: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +109,6 @@ files:
 - app/assets/images/bodega/.gitkeep
 - app/assets/javascripts/bodega/application.js
 - app/assets/stylesheets/bodega/application.css
-- app/controllers/bodega/application_controller.rb
 - app/controllers/bodega/orders_controller.rb
 - app/helpers/bodega/application_helper.rb
 - app/helpers/bodega/cart_helper.rb
@@ -87,12 +118,12 @@ files:
 - app/views/bodega/orders/new.html.erb
 - app/views/bodega/orders/show.html.erb
 - bodega.gemspec
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20121111170337_create_bodega_orders.rb
 - db/migrate/20121111170420_create_bodega_order_products.rb
 - lib/bodega.rb
 - lib/bodega/engine.rb
-- lib/bodega/monetize.rb
 - lib/bodega/payment_method.rb
 - lib/bodega/payment_method/base.rb
 - lib/bodega/payment_method/paypal.rb
@@ -101,6 +132,7 @@ files:
 - lib/generators/bodega/product/USAGE
 - lib/generators/bodega/product/product_generator.rb
 - lib/generators/bodega/product/templates/migration.rb
+- lib/generators/bodega/product/templates/model.rb
 - lib/generators/bodega/productize/USAGE
 - lib/generators/bodega/productize/productize_generator.rb
 - lib/generators/bodega/productize/templates/migration.rb
@@ -121,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 640289259444713481
+      hash: 2412431068173395090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/bodega/application_controller.rb

@@ -1,4 +0,0 @@
-module Bodega
-  class ApplicationController < ActionController::Base
-  end
-end

data/lib/bodega/monetize.rb

@@ -1,15 +0,0 @@
-module Bodega
-  module Monetize
-    def monetize(attribute)
-      class_eval <<-monetize
-        def #{attribute}=(value)
-          self.#{attribute}_in_cents = (value.to_f * 100).to_i
-        end
-
-        def #{attribute}
-          (#{attribute}_in_cents || 0) / 100.0
-        end
-      monetize
-    end
-  end
-end