active_cart 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/active_cart/acts_as_cart.rb

@@ -63,27 +63,27 @@ module ActiveCart
             end
 
             #:nodoc
-            def find_cart_item(item)
+            def find_cart_item(item, options = {})
               self.send(:cart_items).find(:first, :conditions => [ 'original_id = ? AND original_type = ?', item.id, item.class.to_s ])
             end
 
             #:nodoc
-            def add_to_cart(item, quantity = 1)
-              cart_item = find_cart_item(item)
+            def add_to_cart(item, quantity = 1, options = {})
+              cart_item = find_cart_item(item, options)
               if cart_item
                 cart_item.quantity += quantity
                 cart_item.save!
               else
-                cart_item = self.send(:cart_items).create!(self.aac_config[:cart_items].to_s.classify.constantize.new_from_item(item).attributes.merge(:quantity => quantity, :original_id => item.id, :original_type => item.class.to_s))
+                cart_item = self.send(:cart_items).create!(self.aac_config[:cart_items].to_s.classify.constantize.new_from_item(item, options).attributes.merge(:quantity => quantity, :original_id => item.id, :original_type => item.class.to_s))
               end
               self.reload 
             end
 
             #:nodoc
-            def remove_from_cart(item, quantity = 1)
-              cart_item = find_cart_item(item)
+            def remove_from_cart(item, quantity = 1, options = {})
+              cart_item = find_cart_item(item, options)
               if cart_item
-                quantity = cart_item.quantity if quantity == :all #TEST!!!
+                quantity = cart_item.quantity if quantity == :all
 
                 if cart_item.quantity - quantity > 0
                   cart_item.quantity = cart_item.quantity - quantity
@@ -96,18 +96,18 @@ module ActiveCart
             end
 
             #:nodoc
-            def update_cart(item, quantity = 1)
-              cart_item = find_cart_item(item)
+            def update_cart(item, quantity = 1, options = {})
+              cart_item = find_cart_item(item, options)
               if cart_item
                 diff = quantity - cart_item.quantity
                 
                 if diff < 0
-                  return remove_from_cart(item, -1 * diff)
+                  return remove_from_cart(item, -1 * diff, options)
                 else
-                  return add_to_cart(item, diff)
+                  return add_to_cart(item, diff, options)
                 end
               else
-                return add_to_cart(item, quantity)
+                return add_to_cart(item, quantity, options)
               end
             end
           end
@@ -200,11 +200,13 @@ module ActiveCart
           #
           # The default copies all the common attributes from the passed in item to new cart_item (Except id). Override it if you want to do something special.
           #
-          def new_from_item(item)
+          def new_from_item(item, options = {})
             cart_item = self.new
             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
+            # TODO Add a callback
             cart_item
+            # TODO Add a callback
           end
 
           belongs_to self.aaci_config[:cart], :foreign_key => self.aaci_config[:foreign_key]

data/lib/active_cart/cart.rb

@@ -103,9 +103,9 @@ module ActiveCart
     # Calls the storage engines before_add_to_cart(item, quantity) and after_add_to_cart(item, quantity) methods (if they exist). If before_add_to_cart returns false, the add will be halted.
     # 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)
-      with_callbacks(:add_to_cart, item, quantity) do
-        @storage_engine.add_to_cart(item, quantity)
+    def add_to_cart(item, quantity = 1, options = {})
+      with_callbacks(:add_to_cart, item, quantity, options) do
+        @storage_engine.add_to_cart(item, quantity, options)
       end
     end
 
@@ -118,18 +118,18 @@ module ActiveCart
     #   @cart.update_cart(item, 2)
     #   @cart[0].quantity # => 2
     #
-    def update_cart(item, quantity = 1)
+    def update_cart(item, quantity = 1, options = {})
       if @storage_engine.include?(item)
         index = @storage_engine.index(item)
         diff = quantity - @storage_engine.at(index).quantity
         
         if diff < 0
-          return remove_from_cart(item, -1 * diff)
+          return remove_from_cart(item, -1 * diff, options)
         else
-          return add_to_cart(item, diff)
+          return add_to_cart(item, diff, options)
         end
       else
-        return add_to_cart(item, quantity)
+        return add_to_cart(item, quantity, options)
       end
     end
 
@@ -147,9 +147,9 @@ module ActiveCart
     # Calls the storage engines before_remove_from_cart(item, quantity) and after_remove_from_cart(item, quantity) methods (if they exist). If before_remove_from_cart returns false, the remove will be halted.
     # 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)
-      with_callbacks(:remove_from_cart, item, quantity) do
-        @storage_engine.remove_from_cart(item, quantity)
+    def remove_from_cart(item, quantity = 1, options = {})
+      with_callbacks(:remove_from_cart, item, quantity, options) do
+        @storage_engine.remove_from_cart(item, quantity, options)
       end
     end
     
@@ -176,14 +176,14 @@ module ActiveCart
     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)
+    def with_callbacks(type, item, quantity, options, &blk)
+      return false unless item.send("before_#{type}".to_sym, quantity, options) if item.respond_to?("before_#{type}".to_sym)
+      return false unless @storage_engine.send("before_#{type}".to_sym, quantity, options) 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)
+      @storage_engine.send("after_#{type}".to_sym, quantity, options) if @storage_engine.respond_to?("after_#{type}".to_sym)
+      item.send("after_#{type}".to_sym, quantity, options) if item.respond_to?("after_#{type}".to_sym)
     end
   end
 end

data/lib/active_cart/cart_storage.rb

@@ -150,7 +150,7 @@ module ActiveCart
     #   @cart[0].quantity # => 7
     #   @cart[1].quantity # => 4
     #
-    def add_to_cart(item, quantity = 1)
+    def add_to_cart(item, quantity = 1, options = {})
       if self.include?(item)
         index = self.index(item)
         self.at(index).quantity += quantity
@@ -173,7 +173,7 @@ module ActiveCart
     #   @cart[0].quantity # => 3
     #   @cart_remove_from_cart(item, :all)
     #   @cart[[0].quantity # => 0
-    def remove_from_cart(item, quantity = 1)
+    def remove_from_cart(item, quantity = 1, option = {})
       if self.include?(item)
         index = self.index(item)
         

data/test/unit/acts_as_cart_test.rb

@@ -363,6 +363,29 @@ class ActsAsCartTest < ActiveSupport::TestCase
       end
     end
 
+    context 'option passing' do
+      should 'pass options from add_to_cart to find_cart_item' do
+        item = Item.make
+        @cart.expects(:find_cart_item).with(item, { :options => 'value' })
+        @cart.add_to_cart(item, 1, { :options => 'value' })
+      end
+
+      should 'pass options from remove_from_cart to find_cart_item' do
+        item = Item.make
+        @cart.add_to_cart(item, 1)
+        @cart.expects(:find_cart_item).with(item, { :options => 'value' })
+        @cart.remove_from_cart(item, 1, { :options => 'value' })
+      end
+
+      should 'pass options from update_cart to find_cart_item' do
+        item = Item.make
+        @cart.add_to_cart(item, 1)
+        @cart.expects(:find_cart_item).with(item, { :options => 'value' }).times(2)
+        @cart.update_cart(item, 3, { :options => 'value' })
+      end
+
+    end
+
     context 'add to cart' do
       should 'add an item to the cart if the cart is empty' do
         assert @cart.empty?
@@ -459,8 +482,6 @@ class ActsAsCartTest < ActiveSupport::TestCase
       end
     end
 
-
-
     context 'remove_from_cart' do
       should 'remove the quantity supplied from the cart' do
         item = Item.make

data/test/unit/cart_test.rb

@@ -45,28 +45,28 @@ class CartTest < ActiveSupport::TestCase
         context 'items' do
           should 'fire the item before_add_to_cart callback on add to cart' do
             item = TestItem.new
-            item.expects(:before_add_to_cart).with(1).returns(true)
+            item.expects(:before_add_to_cart).with(1, {}).returns(true)
             @cart.add_to_cart(item, 1)
             assert_equal 1, @cart.quantity
           end
 
           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)
+            item.expects(:before_add_to_cart).with(1, { :option => 'value' }).returns(false)
+            assert !@cart.add_to_cart(item, 1, { :option => 'value' })
             assert_equal 0, @cart.quantity
           end
 
           should 'fire the item after_add_to_cart callback' do
             item = TestItem.new
-            item.expects(:after_add_to_cart).with(1)
-            @cart.add_to_cart(item, 1)
+            item.expects(:after_add_to_cart).with(1, { :option => 'value' })
+            @cart.add_to_cart(item, 1, { :option => 'value' })
           end
 
           should 'fire the item before_remove_from_cart callback on add to cart' do
             item = TestItem.new
-            item.expects(:before_remove_from_cart).with(1).returns(true)
-            @cart.remove_from_cart(item, 1)
+            item.expects(:before_remove_from_cart).with(1, { :option => 'value' }).returns(true)
+            @cart.remove_from_cart(item, 1, { :option => 'value' })
             assert_equal 0, @cart.quantity
           end
 
@@ -74,21 +74,21 @@ class CartTest < ActiveSupport::TestCase
             item = TestItem.new
             @cart.add_to_cart(item, 1)
             assert_equal 1, @cart.quantity
-            item.expects(:before_remove_from_cart).with(1).returns(false)
+            item.expects(:before_remove_from_cart).with(1, {}).returns(false)
             assert !@cart.remove_from_cart(item, 1)
             assert_equal 1, @cart.quantity
           end
 
           should 'fire the item after_remove_from_cart callback' do
             item = TestItem.new
-            item.expects(:after_remove_from_cart).with(1)
-            @cart.remove_from_cart(item, 1)
+            item.expects(:after_remove_from_cart).with(1, { :option => 'value' })
+            @cart.remove_from_cart(item, 1, { :option => 'value' })
           end
 
           should 'fire the item before_add_to_cart callback if update_cart adds items to the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:before_add_to_cart).with(10).returns(true)
+            item.expects(:before_add_to_cart).with(10, {}).returns(true)
             @cart.update_cart(item, 20)
             assert 20, @cart.quantity
           end
@@ -96,15 +96,15 @@ class CartTest < ActiveSupport::TestCase
           should 'halt and return false if before_add_to_cart callback returns fale when update_cart adds items to the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:before_add_to_cart).with(10).returns(false)
-            assert !@cart.update_cart(item, 20)
+            item.expects(:before_add_to_cart).with(10, { :option => 'value' }).returns(false)
+            assert !@cart.update_cart(item, 20, { :option => 'value' })
             assert 10, @cart.quantity
           end
 
           should 'fire the item after_add_to_cart callback if update_cart adds items to the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:after_add_to_cart).with(10).returns(true)
+            item.expects(:after_add_to_cart).with(10, {}).returns(true)
             @cart.update_cart(item, 20)
             assert 20, @cart.quantity
           end
@@ -112,7 +112,7 @@ class CartTest < ActiveSupport::TestCase
            should 'fire the item after_remove_from_cart callback if update_cart removes items from the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:before_remove_from_cart).with(5).returns(true)
+            item.expects(:before_remove_from_cart).with(5, {}).returns(true)
             @cart.update_cart(item, 5)
             assert 5, @cart.quantity
           end
@@ -120,8 +120,8 @@ class CartTest < ActiveSupport::TestCase
           should 'halt and return false if after_remove_from_cart callback returns false when update_cart removes items from the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:before_remove_from_cart).with(5).returns(false)
-            assert !@cart.update_cart(item, 5)
+            item.expects(:before_remove_from_cart).with(5, { :option => 'value' }).returns(false)
+            assert !@cart.update_cart(item, 5, { :option => 'value' })
             assert 10, @cart.quantity
           end
 
@@ -129,7 +129,7 @@ class CartTest < ActiveSupport::TestCase
           should 'fire the item after_remove_from_cart callback if update_cart adds items to the cart' do
             item = TestItem.new
             @cart.add_to_cart(item, 10)
-            item.expects(:after_remove_from_cart).with(5).returns(true)
+            item.expects(:after_remove_from_cart).with(5, {}).returns(true)
             @cart.update_cart(item, 5)
             assert 10, @cart.quantity
           end
@@ -138,27 +138,27 @@ class CartTest < ActiveSupport::TestCase
         context 'storage engines' do
           should 'fire the storage engines before_add_to_cart callback on add to cart' do
             item = TestItem.new
-            @cart_storage_engine.expects(:before_add_to_cart).with(item, 1).returns(true)
-            @cart.add_to_cart(item, 1)
+            @cart_storage_engine.expects(:before_add_to_cart).with(1, { :option => 'value' }).returns(true)
+            @cart.add_to_cart(item, 1, { :option => 'value' })
             assert_equal 1, @cart.quantity
           end
 
           should 'halt and return false if before_add_to_cart returns false' do
             item = TestItem.new
-            @cart_storage_engine.expects(:before_add_to_cart).with(item, 1).returns(false)
-            assert !@cart.add_to_cart(item, 1)
+            @cart_storage_engine.expects(:before_add_to_cart).with(1,  { :option => 'value' }).returns(false)
+            assert !@cart.add_to_cart(item, 1, { :option => 'value' })
             assert_equal 0, @cart.quantity
           end
 
           should 'fire the storage engines after_add_to_cart callback' do
             item = TestItem.new
-            @cart_storage_engine.expects(:after_add_to_cart).with(item, 1)
+            @cart_storage_engine.expects(:after_add_to_cart).with(1, {})
             @cart.add_to_cart(item, 1)
           end
 
           should 'fire the storage engines before_remove_from_cart callback on add to cart' do
             item = TestItem.new
-            @cart_storage_engine.expects(:before_remove_from_cart).with(item, 1).returns(true)
+            @cart_storage_engine.expects(:before_remove_from_cart).with(1, {}).returns(true)
             @cart.remove_from_cart(item, 1)
             assert_equal 0, @cart.quantity
           end
@@ -167,15 +167,15 @@ class CartTest < ActiveSupport::TestCase
             item = TestItem.new
             @cart.add_to_cart(item, 1)
             assert_equal 1, @cart.quantity
-            @cart_storage_engine.expects(:before_remove_from_cart).with(item, 1).returns(false)
-            assert !@cart.remove_from_cart(item, 1)
+            @cart_storage_engine.expects(:before_remove_from_cart).with(1,  { :option => 'value' }).returns(false)
+            assert !@cart.remove_from_cart(item, 1, { :option => 'value' })
             assert_equal 1, @cart.quantity
           end
 
           should 'fire the storage engines after_remove_from_cart callback' do
             item = TestItem.new
-            @cart_storage_engine.expects(:after_remove_from_cart).with(item, 1)
-            @cart.remove_from_cart(item, 1)
+            @cart_storage_engine.expects(:after_remove_from_cart).with(1,  { :option => 'value' })
+            @cart.remove_from_cart(item, 1, { :option => 'value' })
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_cart
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Myles Eftos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +08:00
+date: 2010-05-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency