shop_bunny 0.7.1 → 0.7.3

data/app/controllers/carts_controller.rb

@@ -1,53 +1,4 @@
 class CartsController < ApplicationController
-  respond_to :html, :json
-  before_filter :find_cart
-  before_filter :find_item, :only => [:add_item, :remove_item]
+  include ShopBunny::CartControllerModule
   
-  if ShopBunny.controller_enhancement
-    include ShopBunny.controller_enhancement
-  end
-    
-  def show
-    respond_with @cart
-  end  
-  
-  def add_item
-    @cart.add_item(@item) if @item
-    respond_with @cart do |format|
-      format.html { redirect_to :action => :show }
-    end
-  end
-  
-  def remove_item
-    @cart.remove_item(@item) if @item
-    respond_with @cart do |format|
-      format.html { redirect_to :action => :show }
-    end
-  end
-
-  def checkout
-  end
-  
-  def update
-    @cart.update_attributes(params[:cart])
-    respond_with @cart do |format|
-      format.html { 
-        if @cart.errors.any?
-          render 'show' 
-        else
-          # We have to redirect by hand here, because 
-          # url_for(@cart) returns "/cart.x" when cart is a singular resource
-          # (see routes.rb). This is a known limitation of Rails.
-          # See https://rails.lighthouseapp.com/projects/8994/tickets/4168
-          redirect_to :action => :show 
-        end
-      }
-    end
-  end
-  
-  private
-  
-  def find_item
-    @item = @cart.item_model.find(params[:item_id])
-  end
 end

data/app/models/cart.rb

@@ -1,121 +1,3 @@
 class Cart < ActiveRecord::Base
-  attr_accessor :coupon_code
-  has_many :cart_items, :dependent => :destroy
-  has_many :coupon_uses, :dependent => :destroy
-  has_many :coupons, :through => :coupon_uses
-  accepts_nested_attributes_for :cart_items, :allow_destroy => true 
-  before_save :update_coupons
-  attr_accessible :coupon_code, :cart_items_attributes
-  validate :coupon_code_must_be_valid    
-  
-  def items
-    self.cart_items
-  end
-  
-  def item_count
-    self.cart_items.inject(0) {|sum,e| sum += e.quantity}
-  end
-  
-  def shipping_costs
-    return 0 if coupons.any?(&:removes_shipping_cost)
-    shipping_cost_calculator.costs_for(self)
-  end
-
-  # Calculates the sum of all cart_items, excluding the coupons discount!
-  def item_sum
-    self.cart_items.inject(0) {|sum,e| sum += e.quantity*e.item.price}
-  end
-
-  # Calculates the total sum and applies the coupons discount! 
-  def total
-    sum = item_sum
-
-    absolute_discount = coupons.sum(:discount_credit)
-    relative_discount = coupons.inject(1) {|s,coupon| s * coupon.discount_percentage }
-
-    sum -= absolute_discount
-    sum *= relative_discount
-    
-    sum += shipping_costs
-    
-    [0, sum].max
-  end
-  
-  #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.quantity += options[:quantity]
-    cart_item.save!
-    self.reload
-    cart_item
-  end
-  
-  #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)
-    
-    options[:quantity] ||= cart_item.quantity
-    if cart_item
-      cart_item.quantity -= options[:quantity]
-      cart_item.save!
-      self.reload
-    end
-    cart_item
-  end
-
-  #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)
-    if cart_item
-      cart_item.quantity = options[:quantity]
-      cart_item.save!
-      self.reload
-    end
-    cart_item
-  end
-  
-  def shipping_cost_calculator
-    ShopBunny.shipping_cost_calculator
-  end
-  
-  # Returns the class/model of the items you can buy. (Products)
-  def item_model
-    ShopBunny.item_model_class_name.constantize
-  end
-  
-  # Make
-  def as_json(options={})
-    { 
-      :cart => attributes.
-      merge(
-        :cart_items => cart_items.as_json,                
-        :item_count => item_count,
-        :coupons => coupons.as_json,
-        :item_sum => item_sum,
-        :shipping_costs => shipping_costs,
-        :total => total
-      )
-    }
-  end
-  
-  private
-  
-  def update_coupons
-    Array(@coupon_code).each { |code|
-      coupon = Coupon.find_by_code(code)
-      coupons << coupon if coupon
-    }
-  end
-  
-  def coupon_code_must_be_valid
-    Array(@coupon_code).each { |code|
-      coupon = Coupon.find_by_code(code)
-      if coupon.nil?
-        errors.add(:coupon_code, "is unknown")
-      elsif coupon.expired?
-        errors.add(:coupon_code, "is expired")
-      end
-    }
-  end
+  include ShopBunny::CartModule
 end

data/config/initializers/shop_bunny.rb

@@ -15,10 +15,4 @@ ShopBunny.setup do  |config|
   #
   # config.shipping_cost_calculator = MyShippingCostCalculator
   
-  # ShopBunny.controller_enhancement is a module that is included into the
-  # CartsController. You can e.g. control which layout is used for rendering
-  # the cart or add filters. E.g. just drop a ShopBunnyEnhancements module in
-  # lib/shop_bunny_enhancements.rb and use it like this:
-  # require 'shop_bunny_enhancements'
-  # config.controller_enhancement = ShopBunnyEnhancements
 end

data/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
-  resource :cart, :only => [:show, :update] do 
+  resource :cart, :only => [:show, :update] do
+      match ':action'
       get :checkout
       get :add_item, :as => 'add_item_to'
       get :remove_item, :as => 'remove_item_from'

data/lib/generators/shop_bunny/install_generator.rb

@@ -1,11 +1,16 @@
 module ShopBunny  
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("../../../../", __FILE__)
-
+    class_option :controller, :type => :boolean, :default => true, :desc => "copy controller templatefile."
+    class_option :model, :type => :boolean, :default => true, :desc => "copy model templatefile."
+    
+    
     def copy_files
      puts Dir['.']
      directory 'db/migrate'
      copy_file 'config/initializers/shop_bunny.rb'
+     copy_file 'lib/generators/shop_bunny/templates/shopbunny_controller_template.rb', 'app/controllers/carts_controller.rb' if options.controller?
+     copy_file 'lib/generators/shop_bunny/templates/shopbunny_model_template.rb', 'app/models/cart.rb' if options.model?
     end
   end
 end

data/lib/generators/shop_bunny/templates/shopbunny_controller_template.rb

@@ -0,0 +1,3 @@
+class CartsController < ApplicationController
+  include ShopBunny::CartControllerModule
+end

data/lib/generators/shop_bunny/templates/shopbunny_model_template.rb

@@ -0,0 +1,3 @@
+class Cart < ActiveRecord::Base
+  include ShopBunny::CartModule
+end

data/lib/shop_bunny/cart_controller_module.rb

@@ -0,0 +1,53 @@
+module ShopBunny
+  module CartControllerModule
+    def self.included(clazz)
+      clazz.send(:respond_to, :html, :json)
+      clazz.send(:before_filter, :find_cart)
+      clazz.send(:before_filter, :find_item, :only => [:add_item, :remove_item])
+    end
+
+    def show
+      respond_with @cart
+    end  
+    
+    def add_item
+      @cart.add_item(@item) if @item
+      respond_with @cart do |format|
+        format.html { redirect_to :action => :show }
+      end
+    end
+    
+    def remove_item
+      @cart.remove_item(@item) if @item
+      respond_with @cart do |format|
+        format.html { redirect_to :action => :show }
+      end
+    end
+
+    def checkout
+    end
+    
+    def update
+      @cart.update_attributes(params[:cart])
+      respond_with @cart do |format|
+        format.html { 
+          if @cart.errors.any?
+            render 'show' 
+          else
+            # We have to redirect by hand here, because 
+            # url_for(@cart) returns "/cart.x" when cart is a singular resource
+            # (see routes.rb). This is a known limitation of Rails.
+            # See https://rails.lighthouseapp.com/projects/8994/tickets/4168
+            redirect_to :action => :show 
+          end
+        }
+      end
+    end
+    
+    private
+    
+    def find_item
+      @item = @cart.item_model.find(params[:item_id])
+    end
+  end
+end      

data/lib/shop_bunny/cart_module.rb

@@ -0,0 +1,130 @@
+module ShopBunny
+  module CartModule
+  
+  
+    def self.included(clazz)
+      clazz.send(:attr_accessor, :coupon_code)
+      clazz.send(:has_many, :cart_items, :dependent => :destroy)
+      clazz.send(:has_many, :coupon_uses, :dependent => :destroy)
+      clazz.send(:has_many, :coupons, :through => :coupon_uses)
+      clazz.send(:accepts_nested_attributes_for, :cart_items, :allow_destroy => true )
+      clazz.send(:before_save, :update_coupons)
+      clazz.send(:attr_accessible, :coupon_code, :cart_items_attributes)
+      clazz.send(:validate, :coupon_code_must_be_valid)
+    end
+  
+  
+  
+    
+    def items
+      self.cart_items
+    end
+    
+    def item_count
+      self.cart_items.inject(0) {|sum,e| sum += e.quantity}
+    end
+    
+    def shipping_costs
+      return 0 if coupons.any?(&:removes_shipping_cost)
+      shipping_cost_calculator.costs_for(self)
+    end
+
+    # Calculates the sum of all cart_items, excluding the coupons discount!
+    def item_sum
+      self.cart_items.inject(0) {|sum,e| sum += e.quantity*e.item.price}
+    end
+
+    # Calculates the total sum and applies the coupons discount! 
+    def total
+      sum = item_sum
+
+      absolute_discount = coupons.sum(:discount_credit)
+      relative_discount = coupons.inject(1) {|s,coupon| s * coupon.discount_percentage }
+
+      sum -= absolute_discount
+      sum *= relative_discount
+      
+      sum += shipping_costs
+      
+      [0, sum].max
+    end
+    
+    #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.quantity += options[:quantity]
+      cart_item.save!
+      self.reload
+      cart_item
+    end
+    
+    #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)
+      
+      options[:quantity] ||= cart_item.quantity
+      if cart_item
+        cart_item.quantity -= options[:quantity]
+        cart_item.save!
+        self.reload
+      end
+      cart_item
+    end
+
+    #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)
+      if cart_item
+        cart_item.quantity = options[:quantity]
+        cart_item.save!
+        self.reload
+      end
+      cart_item
+    end
+    
+    def shipping_cost_calculator
+      ShopBunny.shipping_cost_calculator
+    end
+    
+    # Returns the class/model of the items you can buy. (Products)
+    def item_model
+      ShopBunny.item_model_class_name.constantize
+    end
+    
+    # Make
+    def as_json(options={})
+      { 
+        :cart => attributes.
+        merge(
+          :cart_items => cart_items.as_json,                
+          :item_count => item_count,
+          :coupons => coupons.as_json,
+          :item_sum => item_sum,
+          :shipping_costs => shipping_costs,
+          :total => total
+        )
+      }
+    end
+    
+    protected
+    
+    def update_coupons
+      Array(@coupon_code).each { |code|
+        coupon = Coupon.find_by_code(code)
+        coupons << coupon if coupon
+      }
+    end
+    
+    def coupon_code_must_be_valid
+      Array(@coupon_code).each { |code|
+        coupon = Coupon.find_by_code(code)
+        if coupon.nil?
+          errors.add(:coupon_code, "is unknown")
+        elsif coupon.expired?
+          errors.add(:coupon_code, "is expired")
+        end
+      }
+    end
+  end
+end

data/lib/shop_bunny.rb

@@ -2,6 +2,8 @@
 module ShopBunny
   require 'shop_bunny/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'shop_bunny/shipping_cost_calculator'
+  require 'shop_bunny/cart_module'
+  require 'shop_bunny/cart_controller_module'
   
   mattr_accessor :item_model_class_name
   @@item_model_class_name = 'Item'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shop_bunny
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - kopfmaschine.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,28 +29,32 @@ 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/shop_bunny/engine.rb
+- lib/shop_bunny/cart_controller_module.rb
+- lib/shop_bunny/cart_module.rb
 - lib/shop_bunny/shipping_cost_calculator.rb
-- lib/generators/shop_bunny/install_generator.rb
+- lib/shop_bunny/engine.rb
 - app/views/carts/show.html.erb
+- app/models/cart.rb
 - app/models/coupon_use.rb
+- app/models/cart_item.rb
 - app/models/coupon.rb
-- app/models/cart.rb
 - app/models/item.rb
-- app/models/cart_item.rb
 - app/controllers/application_controller.rb
 - app/controllers/carts_controller.rb
-- db/migrate/20100915093821_create_coupon_uses.rb
-- db/migrate/20100915091059_create_coupons.rb
 - db/migrate/20100915162029_remove_owner_id_from_carts.rb
+- db/migrate/20100915091059_create_coupons.rb
+- db/migrate/20100915073016_create_items.rb
 - db/migrate/20100902115627_create_carts.rb
+- db/migrate/20100915093821_create_coupon_uses.rb
 - db/migrate/20100916194407_set_default_column_value_for_cart_items_quantity.rb
-- db/migrate/20100915073016_create_items.rb
 - db/migrate/20100902115757_create_cart_items.rb
+- config/initializers/add_cart_finder_to_controllers.rb
 - config/initializers/shop_bunny.rb
 - config/initializers/machinist.rb
-- config/initializers/add_cart_finder_to_controllers.rb
 - config/routes.rb
 has_rdoc: true
 homepage: http://kopfmaschine.com