active_cart 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

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, { :quantity => quantity }.merge(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.delete_if {|key, value| value == nil})
               end
               self.reload 
             end
@@ -114,8 +114,8 @@ module ActiveCart
          
           aasm_column self.aac_config[:state_column]
 
-          has_many self.aac_config[:cart_items]
-          has_many self.aac_config[:order_totals]
+          has_many self.aac_config[:cart_items], :dependent => :destroy
+          has_many self.aac_config[:order_totals], :dependent => :destroy
 
           extend Forwardable
           def_delegators self.aac_config[:cart_items], :[], :<<, :[]=, :at, :clear, :collect, :map, :delete, :delete_at, :each, :each_index, :empty?, :eql?, :first, :include?, :index, :inject, :last, :length, :pop, :push, :shift, :size, :unshift
@@ -198,12 +198,11 @@ module ActiveCart
           
           # Creates a new cart_item item for the passed in concrete item
           #
-          # 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.
+          # The default copies all the common attributes from the passed in item to new cart_item (Except id and timestamps). Override it if you want to do something special.
           #
           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
+            cart_item = item.send(self.to_s.tableize).build(options)
+            cart_item.attributes.map {|attribute| attribute if item.respond_to?(attribute[0].to_s) && !attribute[0].to_s.include?("_at") }.compact.each {|attribute| cart_item.send("#{attribute[0]}=", item.send(attribute[0].to_s))}
             # TODO Add a callback
             cart_item
             # TODO Add a callback

data/test/fixtures/cart_item.rb

@@ -1,3 +1,5 @@
 class CartItem < ActiveRecord::Base
   acts_as_cart_item
+  
+  attr_accessor :options
 end

data/test/fixtures/item.rb

@@ -1,2 +1,3 @@
 class Item < ActiveRecord::Base
+  has_many :cart_items, :as => :original
 end

data/test/unit/acts_as_cart_test.rb

@@ -11,8 +11,8 @@ class ActsAsCartTest < ActiveSupport::TestCase
       context 'configuration' do
         should 'set defaults' do
           Cart.expects(:aasm_column).with(:state)
-          Cart.expects(:has_many).with(:cart_items)
-          Cart.expects(:has_many).with(:order_totals)
+          Cart.expects(:has_many).with(:cart_items, {:dependent => :destroy})
+          Cart.expects(:has_many).with(:order_totals, {:dependent => :destroy})
          
           Cart.acts_as_cart
 
@@ -26,8 +26,8 @@ class ActsAsCartTest < ActiveSupport::TestCase
         context 'override' do
           should 'change state' do
             Cart.expects(:aasm_column).with(:dummy)
-            Cart.expects(:has_many).with(:cart_items)
-            Cart.expects(:has_many).with(:order_totals)
+            Cart.expects(:has_many).with(:cart_items, {:dependent => :destroy})
+            Cart.expects(:has_many).with(:order_totals, {:dependent => :destroy})
             
             Cart.acts_as_cart :state_column => :dummy
             
@@ -53,8 +53,8 @@ class ActsAsCartTest < ActiveSupport::TestCase
           
           should 'change cart_items' do
             Cart.expects(:aasm_column).with(:state)
-            Cart.expects(:has_many).with(:test)
-            Cart.expects(:has_many).with(:order_totals)
+            Cart.expects(:has_many).with(:test, {:dependent => :destroy})
+            Cart.expects(:has_many).with(:order_totals, {:dependent => :destroy})
             
             Cart.acts_as_cart :cart_items => :test
             
@@ -66,8 +66,8 @@ class ActsAsCartTest < ActiveSupport::TestCase
 
           should 'change order_totals' do
             Cart.expects(:aasm_column).with(:state)
-            Cart.expects(:has_many).with(:cart_items)
-            Cart.expects(:has_many).with(:test)
+            Cart.expects(:has_many).with(:cart_items, {:dependent => :destroy})
+            Cart.expects(:has_many).with(:test, {:dependent => :destroy})
             
             Cart.acts_as_cart :order_totals => :test
             

metadata

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