active_cart 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/active_cart/acts_as_cart.rb

@@ -83,6 +83,8 @@ module ActiveCart
             def remove_from_cart(item, quantity = 1)
               cart_item = find_cart_item(item)
               if cart_item
+                quantity = cart_item.quantity if quantity == :all #TEST!!!
+
                 if cart_item.quantity - quantity > 0
                   cart_item.quantity = cart_item.quantity - quantity
                   cart_item.save!

data/lib/active_cart/cart.rb

@@ -109,6 +109,30 @@ module ActiveCart
       end
     end
 
+    # Sets the quantity of an item to the supplied value
+    #
+    #   @cart.add_to_cart(item, 5)
+    #   @cart[0].quantity # => 5
+    #   @cart.update_cart(item, 15)
+    #   @cart[0].quantity # => 15
+    #   @cart.update_cart(item, 2)
+    #   @cart[0].quantity # => 2
+    #
+    def update_cart(item, quantity = 1)
+      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)
+        else
+          return add_to_cart(item, diff)
+        end
+      else
+        return 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
     #
     #   @cart.add_to_cart(item, 5)

data/lib/active_cart/cart_storage.rb

@@ -168,10 +168,17 @@ module ActiveCart
     #   @cart[0].quantity # => 2
     #   @cart.remove_from_cart(item, 2)
     #   @cart[0] # => nil
-    #
+    #   
+    #   @cart.add_to_cart(item, 3)
+    #   @cart[0].quantity # => 3
+    #   @cart_remove_from_cart(item, :all)
+    #   @cart[[0].quantity # => 0
     def remove_from_cart(item, quantity = 1)
       if self.include?(item)
         index = self.index(item)
+        
+        quantity = self.at(index).quantity if quantity == :all
+
         if (existing = self.at(index)).quantity - quantity > 0
           existing.quantity = existing.quantity - quantity
         else

data/test/unit/acts_as_cart_test.rb

@@ -459,6 +459,18 @@ class ActsAsCartTest < ActiveSupport::TestCase
         assert_not_nil Item.find(item.id)
       end
 
+      should 'remove all the items from the cart if the quantity is set to :all' do
+        item = Item.make
+        @cart.add_to_cart(item, 10)
+        assert_equal 1, @cart.size
+        assert_equal 10, @cart.quantity
+
+        @cart.remove_from_cart(item, :all)
+        assert_equal 0, @cart.size
+
+        assert_not_nil Item.find(item.id)
+      end
+
       should "simply return if the item doesn't exist in the cart" do
         item = Item.make
         @cart.add_to_cart(item, 10)

data/test/unit/cart_storage_test.rb

@@ -297,6 +297,17 @@ class CartStorageTest < ActiveSupport::TestCase
         assert_equal 1, @cart.size
         assert_equal 10, @cart.quantity
       end
+
+      should "remove all items if the quantity is set to :all" do
+        item = TestItem.new(1)
+        @cart.add_to_cart(item, 10)
+        assert_equal 1, @cart.size
+        assert_equal 10, @cart.quantity
+        
+        @cart.remove_from_cart(item, :all)
+        assert_equal 0, @cart.size
+        assert_equal 0, @cart.quantity
+      end
     end
   end
 end

data/test/unit/cart_test.rb

@@ -8,6 +8,39 @@ class CartTest < ActiveSupport::TestCase
         @cart = ActiveCart::Cart.new(@cart_storage_engine)
       end
 
+      context 'update_cart' do
+        should 'update the number of items in the cart if the item is in the cart' do
+          item = TestItem.new(1)
+          @cart.add_to_cart(item, 10)
+          assert_equal 1, @cart.size
+          assert_equal 10, @cart.quantity
+
+          @cart.update_cart(item, 20)
+          assert_equal 1, @cart.size
+          assert_equal 20, @cart.quantity
+        end
+
+        should 'set the given quantity of items in to the cart if the item is not yet in the cart' do
+          item = TestItem.new(1)
+          
+          @cart.update_cart(item, 20)
+          assert_equal 1, @cart.size
+          assert_equal 20, @cart.quantity
+        end
+
+        should 'set the given quantity of item in to the cart if the requested value is lower than the current quantity' do
+          item = TestItem.new(1)
+
+          @cart.add_to_cart(item, 10)
+          assert_equal 1, @cart.size
+          assert_equal 10, @cart.quantity
+
+          @cart.update_cart(item, 4)
+          assert_equal 1, @cart.size
+          assert_equal 4, @cart.quantity
+        end
+      end
+
       context 'callbacks' do
         context 'items' do
           should 'fire the item before_add_to_cart callback on add to cart' do
@@ -51,6 +84,55 @@ class CartTest < ActiveSupport::TestCase
             item.expects(:after_remove_from_cart).with(1)
             @cart.remove_from_cart(item, 1)
           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)
+            @cart.update_cart(item, 20)
+            assert 20, @cart.quantity
+          end
+
+          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)
+            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)
+            @cart.update_cart(item, 20)
+            assert 20, @cart.quantity
+          end
+
+           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)
+            @cart.update_cart(item, 5)
+            assert 5, @cart.quantity
+          end
+
+          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)
+            assert 10, @cart.quantity
+          end
+
+
+          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)
+            @cart.update_cart(item, 5)
+            assert 10, @cart.quantity
+          end
         end
 
         context 'storage engines' do

metadata

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