active_cart 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/lib/active_cart/acts_as_cart.rb

@@ -74,7 +74,7 @@ module ActiveCart
                 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, options).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, { :quantity => quantity }.merge(options)).attributes.merge(:quantity => quantity, :original_id => item.id, :original_type => item.class.to_s))
               end
               self.reload 
             end

data/lib/active_cart/cart_storage.rb

@@ -8,7 +8,7 @@ module ActiveCart
   #   @cart.check_payment! # transistions from checkout to verifying_payment
   #   @cart.payment_successful! # transitions from verifying_payment to completed
   #   @cart.payment_failed! # transitions from verifying_payment to failed
-  #   @cart.continue_shopping # transitions from checkout or verifying_payment to shopping
+  #   @cart.continue_shopping # transitions from checkout, verifying_payment or failed to shopping
   #   
   #   It will fire before_ and after callbacks with the same name as the transitions
   #

data/test/unit/acts_as_cart_test.rb

@@ -370,6 +370,18 @@ class ActsAsCartTest < ActiveSupport::TestCase
         @cart.add_to_cart(item, 1, { :options => 'value' })
       end
 
+      should 'add the quantity to the options hash' do
+        item = Item.make
+        CartItem.expects(:new_from_item).with(item, { :quantity => 2 }).returns(CartItem.make)
+        @cart.add_to_cart(item, 2)
+      end
+
+      should 'allow the quantity to be overriden in the options hash' do
+        item = Item.make
+        CartItem.expects(:new_from_item).with(item, { :quantity => 4 }).returns(CartItem.make)
+        @cart.add_to_cart(item, 2, { :quantity => 4 })
+      end
+
       should 'pass options from remove_from_cart to find_cart_item' do
         item = Item.make
         @cart.add_to_cart(item, 1)
@@ -383,7 +395,6 @@ class ActsAsCartTest < ActiveSupport::TestCase
         @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

metadata

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