active_cart 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/active_cart/acts_as_cart.rb

@@ -184,7 +184,8 @@ module ActiveCart
           #
           def new_from_item(item)
             cart_item = self.new
-            item.class.columns.each { |col| cart_item.send((col.to_s + "=").to_sym, item.send(col)) if cart_item.respond_to?((col.to_s + "=").to_sym) }
+            item.class.columns.map {|col| col.name }.each { |col| cart_item.send((col.to_s + "=").to_sym, item.send(col)) if cart_item.respond_to?((col.to_s + "=").to_sym) }
+            cart_item.original = item
             cart_item
           end
 

data/lib/active_cart/cart.rb

@@ -42,6 +42,26 @@ module ActiveCart
 
     extend Forwardable
     # Storage Engine Array delegators
+    # TODO: Consolidate - not all of these make sense, and some need overriding so they take the callbacks into account
+    # 
+    # Candidates for removal:
+    #   delete_at
+    #   delete_if
+    #   []=
+    #   replace
+    #   insert
+    #   shift
+    #   unshift
+    #   pop
+    #
+    # Aliases
+    #   delete => remove_from_cart(obj, 1)
+    #   << => add_to_cart(obj, 1)
+    #   push => add_to_cart(obj, 1)
+    #
+    # Overrides
+    #   clear => .each { |obj| self.remove_from_cart(obj) }
+    #
     def_delegators :@storage_engine, :[], :<<, :[]=, :at, :clear, :collect, :map, :delete, :delete_at, :each, :each_index, :empty?, :eql?, :first, :include?, :index, :inject, :last, :length, :pop, :push, :shift, :size, :unshift
     
     # Returns a unique id for the invoice. It's upto the storage engine to generate and track these numbers
@@ -84,11 +104,9 @@ module ActiveCart
     # Calls the items before_add_to_item(quantity) and after_add_to_cart(quantity) methods (if they exist). If before_add_to_cart returns false, the add will be halted.
     #
     def add_to_cart(item, quantity = 1)
-      return false unless item.before_add_to_cart(quantity) if item.respond_to?(:before_add_to_cart)
-      return false unless @storage_engine.before_add_to_cart(item, quantity) if @storage_engine.respond_to?(:before_add_to_cart)
-      @storage_engine.add_to_cart(item, quantity)
-      @storage_engine.after_add_to_cart(item, quantity) if @storage_engine.respond_to?(:after_add_to_cart)
-      item.after_add_to_cart(quantity) if item.respond_to?(:after_add_to_cart)
+      with_callbacks(:add_to_cart, item, quantity) do
+        @storage_engine.add_to_cart(item, quantity)
+      end
     end
 
     # Removes an item from the cart (identified by the id of the item). If the supplied quantity is greater than equal to the number in the cart, the item will be removed, otherwise the quantity will simply be decremented by the supplied amount
@@ -106,11 +124,9 @@ module ActiveCart
     # Calls the items before_remove_from_item(quantity) and after_remove_from_cart(quantity) methods (if they exist). If before_remove_from_cart returns false, the remove will be halted.
     #
     def remove_from_cart(item, quantity = 1)
-      return false unless item.before_remove_from_cart(quantity) if item.respond_to?(:before_remove_from_cart)
-      return false unless @storage_engine.before_remove_from_cart(item, quantity) if @storage_engine.respond_to?(:before_remove_from_cart)
-      @storage_engine.remove_from_cart(item, quantity)
-      @storage_engine.after_remove_from_cart(item, quantity) if @storage_engine.respond_to?(:after_remove_from_cart)
-      item.after_remove_from_cart(quantity) if item.respond_to?(:after_remove_from_cart)
+      with_callbacks(:remove_from_cart, item, quantity) do
+        @storage_engine.remove_from_cart(item, quantity)
+      end
     end
     
     # Returns the total of the cart. This includes all the order_total calculations
@@ -134,5 +150,16 @@ module ActiveCart
         super
       end
     end
+
+  private
+    def with_callbacks(type, item, quantity, &blk)
+      return false unless item.send("before_#{type}".to_sym, quantity) if item.respond_to?("before_#{type}".to_sym)
+      return false unless @storage_engine.send("before_#{type}".to_sym, item, quantity) if @storage_engine.respond_to?("before_#{type}".to_sym)
+      
+      yield
+      
+      @storage_engine.send("after_#{type}".to_sym, item, quantity) if @storage_engine.respond_to?("after_#{type}".to_sym)
+      item.send("after_#{type}".to_sym, quantity) if item.respond_to?("after_#{type}".to_sym)
+    end
   end
 end

data/lib/active_cart/cart_storage.rb

@@ -20,7 +20,7 @@ module ActiveCart
       base.aasm_state :shopping, :enter => :enter_shopping, :exit => :exit_shopping
       base.aasm_state :checkout, :enter => :enter_checkout, :exit => :exit_checkout
       base.aasm_state :verifying_payment, :enter => :enter_verifying_payment, :exit => :exit_verifying_payment
-      base.aasm_state :completed, :enter => :enter_completed, :ext => :exit_completed
+      base.aasm_state :completed, :enter => :enter_completed, :exit => :exit_completed
       base.aasm_state :failed, :enter => :enter_failed, :exit => :exit_failed
 
       base.aasm_event :continue_shopping do

data/test/unit/acts_as_cart_test.rb

@@ -292,6 +292,18 @@ class ActsAsCartTest < ActiveSupport::TestCase
       end
     end
 
+    context 'new_from_item' do
+      should 'copy all the relevent paramaters from the supplied item into a new cart item' do
+        @item = Item.make
+        @cart_item = CartItem.new_from_item(@item)
+        assert @cart_item.valid?
+        assert_equal @item.name, @cart_item.name
+        assert_equal @item.price, @cart_item.price
+        assert_equal @item, @cart_item.original
+      end
+    end
+
+
     context 'acts_as_order_total' do
        context 'configuration' do
         should 'set defaults' do

data/test/unit/cart_test.rb

@@ -17,7 +17,7 @@ class CartTest < ActiveSupport::TestCase
             assert_equal 1, @cart.quantity
           end
 
-          should 'halt and return false if beforee_add_to_cart returnds false' do
+          should 'halt and return false if before_add_to_cart returns false' do
             item = TestItem.new
             item.expects(:before_add_to_cart).with(1).returns(false)
             assert !@cart.add_to_cart(item, 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_cart
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Myles Eftos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 +08:00
+date: 2010-03-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency