shop_bunny 0.8.4 → 0.8.5

data/app/models/coupon.rb

@@ -1,17 +1,20 @@
 class Coupon < ActiveRecord::Base
+  InvalidEvent = Class.new(NoMethodError)
   has_many :coupon_uses, :dependent => :destroy
   has_many :carts, :through => :coupon_uses
+  belongs_to :bonus_article, :class_name => ShopBunny.item_model_class_name
 
   validates_presence_of :code
   validates_uniqueness_of :code
   validates_presence_of :title
   
+  after_initialize { self.state ||= 'inactive' }
   after_save :touch_cart
   after_destroy :touch_cart
   
   # TODO Add self destruction when coupon has expired?
   
-  scope :valid, lambda {{:conditions => ['(coupons.valid_from IS NULL OR coupons.valid_from <= ?) AND (coupons.valid_until IS NULL OR coupons.valid_until >= ?) AND coupons.active = ?', Time.now, Time.now, true]}}
+  scope :valid, lambda {{:conditions => ['(coupons.valid_from IS NULL OR coupons.valid_from <= ?) AND (coupons.valid_until IS NULL OR coupons.valid_until >= ?) AND coupons.state = ?', Time.now, Time.now, 'active']}}
   scope :automatically_added_over, lambda {|value| {:conditions => ['value_of_automatic_add <= ?', value]}}
   
   def expired?
@@ -28,9 +31,19 @@ class Coupon < ActiveRecord::Base
   end
 
   def redeemable?
-    !not_yet_valid? && !has_expired? && active?
+    !not_yet_valid? && !has_expired? && state == 'active'
   end
-  
+
+  def activate!
+    raise InvalidEvent unless state == 'inactive'
+    self.state = 'active'
+  end
+
+  def redeem!
+    raise InvalidEvent unless redeemable?
+    self.state = 'redeemed'
+  end
+
   protected
   def touch_cart
     carts.each {|cart| cart.touch}

data/db/migrate/20111130123434_add_state_and_remove_active_from_coupons.rb

@@ -0,0 +1,11 @@
+class AddStateAndRemoveActiveFromCoupons < ActiveRecord::Migration
+  def self.up
+    add_column :coupons, :state, :string
+    remove_column :coupons, :active
+  end
+
+  def self.down
+    remove_column :coupons, :state
+    add_column :coupons, :active, :boolean
+  end
+end

data/lib/shop_bunny/cart_module.rb

@@ -15,7 +15,11 @@ module ShopBunny
     def items
       self.cart_items
     end
-    
+
+    def bonus_items
+      coupons.map(&:bonus_article).compact
+    end
+
     def item_count
       self.cart_items.inject(0) {|sum,e| sum += e.quantity}
     end
@@ -110,7 +114,7 @@ module ShopBunny
     
     # Check if the cart is empty
     def empty?
-      cart_items.empty?
+      cart_items.empty? && bonus_items.empty?
     end
     
     # Remove all items from the cart

metadata

@@ -1,102 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shop_bunny
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.8.5
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
 platform: ruby
-authors: 
+authors:
 - kopfmaschine.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-24 00:00:00 +01:00
-default_executable: 
+date: 2012-02-01 00:00:00.000000000Z
 dependencies: []
-
 description: A simple shop gem that integrates a cart and coupons functionality
-email: 
+email:
 - jan@kopfmaschine.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/shop_bunny.rb
-- lib/generators/shop_bunny/install_generator.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
+files:
 - lib/shop_bunny/cart_module.rb
-- lib/shop_bunny/engine.rb
 - lib/shop_bunny/shipping_cost_calculator.rb
-- app/controllers/application_controller.rb
+- lib/shop_bunny/cart_controller_module.rb
+- lib/shop_bunny/engine.rb
+- 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
 - app/controllers/carts_controller.rb
-- app/views/carts/show.html.erb
-- app/models/item.rb
+- app/controllers/application_controller.rb
+- app/models/coupon_use.rb
 - app/models/cart_item.rb
-- app/models/cart.rb
 - app/models/coupon.rb
-- app/models/coupon_use.rb
-- db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
+- app/models/item.rb
+- app/models/cart.rb
+- app/views/carts/show.html.erb
+- db/migrate/20100915162029_remove_owner_id_from_carts.rb
 - db/migrate/20110821124655_add_max_uses_to_coupon.rb
-- db/migrate/20111123234953_add_active_flag_to_coupon.rb
-- db/migrate/20110202235446_add_raw_item_to_cart_items.rb
+- db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
 - db/migrate/20110203005514_remove_item_id_from_cart_items.rb
-- db/migrate/20100902115757_create_cart_items.rb
-- db/migrate/20100915162029_remove_owner_id_from_carts.rb
+- db/migrate/20111130123434_add_state_and_remove_active_from_coupons.rb
+- db/migrate/20100915093821_create_coupon_uses.rb
+- db/migrate/20101125151017_change_valid_from_and_until_to_datetime_on_coupons.rb
 - db/migrate/20100916194407_set_default_column_value_for_cart_items_quantity.rb
 - db/migrate/20100915091059_create_coupons.rb
-- db/migrate/20101125151017_change_valid_from_and_until_to_datetime_on_coupons.rb
-- db/migrate/20100902115627_create_carts.rb
-- db/migrate/20100915093821_create_coupon_uses.rb
+- db/migrate/20100902115757_create_cart_items.rb
+- db/migrate/20111123234953_add_active_flag_to_coupon.rb
 - db/migrate/20100915073016_create_items.rb
-- config/initializers/machinist.rb
+- db/migrate/20100902115627_create_carts.rb
+- db/migrate/20110202235446_add_raw_item_to_cart_items.rb
 - config/initializers/shop_bunny.rb
 - config/initializers/add_cart_finder_to_controllers.rb
+- config/initializers/machinist.rb
 - config/routes.rb
-has_rdoc: true
 homepage: http://kopfmaschine.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A shop template for your needs
 test_files: []
-