shop_bunny 0.7.4.16 → 0.7.4.17

data/app/models/cart_item.rb

@@ -1,9 +1,9 @@
 class CartItem < ActiveRecord::Base
   belongs_to :cart
-  belongs_to :item, :class_name => ShopBunny.item_model_class_name
+  # belongs_to :item, :class_name => ShopBunny.item_model_class_name
   
   validates_presence_of :cart_id
-  validates_presence_of :item_id
+  # validates_presence_of :item_id
   validates_numericality_of :quantity
   
   before_validation :set_default_quantity
@@ -17,6 +17,24 @@ class CartItem < ActiveRecord::Base
   def total_price
     quantity * item.price
   end
+  
+  def item=(new_item)
+    write_attribute(:raw_item, new_item.to_json)
+    @parsed_raw_item = nil
+    new_item
+  end
+  
+  def item
+    return nil unless raw_item
+    unless @parsed_raw_item
+      json = JSON.parse(raw_item).values.first
+      if json
+        @parsed_raw_item = ShopBunny.item_model_class_name.constantize.new(json)
+        @parsed_raw_item.id = json['id']
+      end
+    end
+    @parsed_raw_item
+  end
 
   private
   

data/db/migrate/20110202235446_add_raw_item_to_cart_items.rb

@@ -0,0 +1,16 @@
+class AddRawItemToCartItems < ActiveRecord::Migration
+  def self.up
+    add_column :cart_items, :raw_item, :text
+    
+    CartItem.all.each do |e|
+      if e.item
+        e.raw_item = e.item.to_json
+        e.save!
+      end
+    end
+  end
+
+  def self.down
+    remove_column :cart_items, :raw_item
+  end
+end

data/db/migrate/20110203005514_remove_item_id_from_cart_items.rb

@@ -0,0 +1,9 @@
+class RemoveItemIdFromCartItems < ActiveRecord::Migration
+  def self.up
+    remove_column :cart_items, :item_id
+  end
+
+  def self.down
+    add_column :cart_items, :item_id, :integer
+  end
+end

data/lib/shop_bunny/cart_module.rb

@@ -56,7 +56,8 @@ module ShopBunny
     #increases the quantity of an article. creates a new one if it doesn't exist
     def add_item(item,options = {})
       options[:quantity] ||= 1
-      cart_item = self.cart_items.find_or_create_by_item_id(item.id)
+      cart_item = self.cart_items.select {|e| e.item.id == item.id}.first
+      cart_item ||= self.cart_items.build(:item => item)
       cart_item.quantity += options[:quantity]
       cart_item.save!
       
@@ -69,7 +70,7 @@ module ShopBunny
     
     #removes a quantity of an article specified by :article_id, returns nil if no article has been found
     def remove_item(item,options = {})
-      cart_item = self.cart_items.find_by_item_id(item)
+      cart_item = self.cart_items.select {|e| e.item.id == item.id}.first
       if cart_item
         options[:quantity] ||= cart_item.quantity
         if cart_item
@@ -86,7 +87,7 @@ module ShopBunny
 
     #sets the quantity of an article specified by :article_id, returns nil if no article has been found
     def update_item(item,options)
-      cart_item = self.cart_items.find_by_item_id(item)
+      cart_item = self.cart_items.select {|e| e.item.id == item.id}.first
       if cart_item
         cart_item.quantity = options[:quantity]
         cart_item.save!
@@ -143,7 +144,7 @@ module ShopBunny
         use.destroy if use.coupon.value_of_automatic_add
       end
 
-      save!
+      save
       reload
 
       Coupon.valid.automatically_added_over(item_sum).each do |coupon|

data/lib/shop_bunny.rb

@@ -18,5 +18,28 @@ module ShopBunny
   # initializer which gets generated by `rails generate shop_bunny:install`
   def self.setup
     yield self
+    
+    item_class = ShopBunny.item_model_class_name.constantize
+    
+    unless item_class.method_defined?(:as_json_with_included_id)
+      item_class.class_eval do
+        def shop_bunny_json_options(options)
+          options ||= {}
+          options[:methods] ||= []
+          if options[:methods].kind_of?(Array)
+            options[:methods] += [:id]
+          else
+            options[:methods] = [options[:methods], :id]
+          end
+          options[:methods].uniq!
+          options
+        end
+      
+        def as_json_with_included_id(options = {})
+          as_json_without_included_id(shop_bunny_json_options(options))
+        end
+        alias_method_chain :as_json, :included_id
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: shop_bunny
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 7
   - 4
-  - 16
-  version: 0.7.4.16
+  - 17
+  version: 0.7.4.17
 platform: ruby
 authors: 
 - kopfmaschine.com
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,34 +30,36 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/generators/shop_bunny/templates/shopbunny_model_template.rb
-- lib/generators/shop_bunny/templates/shopbunny_controller_template.rb
 - lib/generators/shop_bunny/install_generator.rb
-- lib/shop_bunny.rb
+- lib/generators/shop_bunny/templates/shopbunny_controller_template.rb
+- lib/generators/shop_bunny/templates/shopbunny_model_template.rb
 - lib/shop_bunny/cart_controller_module.rb
 - lib/shop_bunny/cart_module.rb
-- lib/shop_bunny/shipping_cost_calculator.rb
 - lib/shop_bunny/engine.rb
-- app/views/carts/show.html.erb
+- lib/shop_bunny/shipping_cost_calculator.rb
+- lib/shop_bunny.rb
+- app/controllers/application_controller.rb
+- app/controllers/carts_controller.rb
 - app/models/cart.rb
-- app/models/coupon_use.rb
 - app/models/cart_item.rb
 - app/models/coupon.rb
+- app/models/coupon_use.rb
 - app/models/item.rb
-- app/controllers/application_controller.rb
-- app/controllers/carts_controller.rb
-- db/migrate/20101125151017_change_valid_from_and_until_to_datetime_on_coupons.rb
-- db/migrate/20100915162029_remove_owner_id_from_carts.rb
-- db/migrate/20100915091059_create_coupons.rb
-- db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
-- db/migrate/20100915073016_create_items.rb
+- app/views/carts/show.html.erb
 - db/migrate/20100902115627_create_carts.rb
+- db/migrate/20100902115757_create_cart_items.rb
+- db/migrate/20100915073016_create_items.rb
+- db/migrate/20100915091059_create_coupons.rb
 - db/migrate/20100915093821_create_coupon_uses.rb
+- db/migrate/20100915162029_remove_owner_id_from_carts.rb
 - db/migrate/20100916194407_set_default_column_value_for_cart_items_quantity.rb
-- db/migrate/20100902115757_create_cart_items.rb
+- db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
+- db/migrate/20101125151017_change_valid_from_and_until_to_datetime_on_coupons.rb
+- db/migrate/20110202235446_add_raw_item_to_cart_items.rb
+- db/migrate/20110203005514_remove_item_id_from_cart_items.rb
 - config/initializers/add_cart_finder_to_controllers.rb
-- config/initializers/shop_bunny.rb
 - config/initializers/machinist.rb
+- config/initializers/shop_bunny.rb
 - config/routes.rb
 has_rdoc: true
 homepage: http://kopfmaschine.com