carter 0.6.4 → 0.7.0

data/lib/carter/controller_additions.rb

@@ -6,12 +6,13 @@ module Carter
     module ClassMethods
       
       def has_cart(*args)
-        ControllerResource.add_before_filter(self, :load_cart, *args)
+        has_cart_options = args.extract_options!
+        before_filter :load_cart, has_cart_options.slice(:only, :except)
         include InstanceMethods
       end
 
       def has_cart_for_checkout(*args)
-        ControllerResource.add_before_filter(self, :load_cart_for_checkout, *args)
+        before_filter :load_cart_for_checkout, args.extract_options!.slice(:only, :except)
         include InstanceMethods
       end
 
@@ -21,6 +22,7 @@ module Carter
       base.extend ClassMethods
       base.class_attribute :checking_out
       base.class_attribute :shopping
+      base.class_attribute :has_cart_options
       base.helper_method :cart, :has_cart?, :shopper
     end
     
@@ -43,7 +45,7 @@ module Carter
       end
       
       def continue_shopping_or_default_url(default)
-        session[:continue_shopping_url] || default || root_url
+        session[:continue_shopping_url] || default
       end
       
       # to stop the has_cart method called from super class from setting the continue_shopping_url when checking out.
@@ -55,6 +57,49 @@ module Carter
         shopping == true
       end
       
+
+      def load_cart
+        store_shopping_location if self.shopping? && !self.checking_out?
+        @cart = load_cart_instance
+        @shopper = current_shopper
+      end
+
+      def load_cart_for_checkout
+        @cart = load_cart_instance
+        @shopper = current_shopper
+      end
+
+      private
+
+      def load_cart_instance
+        find_cart_by_session || find_cart_by_shopper  || ::Cart.new
+      end
+
+
+      def find_cart_by_shopper
+        ::Cart.with_state(default_cart_state).first(:conditions => {:shopper_id => current_shopper.id, :shopper_type => current_shopper.class.name} ) if current_shopper && Carter.settings.persist_by_shopper?
+      end
+
+      def find_cart_by_session
+        ::Cart.with_state(default_cart_state).find_by_id(session[:cart_id]) 
+      end
+
+      def current_shopper
+        self.respond_to?(:current_user) ? self.send(:current_user) : nil
+      end
+
+      def store_shopping_location
+        session[:continue_shopping_url] = self.request.fullpath 
+      end
+
+      def name_from_carter_controller
+        params[:controller].sub("Controller", "").underscore.split('/').last.singularize
+      end
+
+      def default_cart_state
+        :active
+      end
+      
       protected
 
       def find_cartable(cartable_id=params[:cartable_id])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Louis Gillies
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2011-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,10 +29,10 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
+  requirement: *id001
   prerelease: false
+  name: rspec
   type: :development
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +45,10 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  name: yard
+  requirement: *id002
   prerelease: false
+  name: yard
   type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,10 +59,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: cucumber
+  requirement: *id003
   prerelease: false
+  name: cucumber
   type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,10 +75,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
+  requirement: *id004
   prerelease: false
+  name: bundler
   type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,10 +91,10 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
+  requirement: *id005
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,10 +105,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
+  requirement: *id006
   prerelease: false
+  name: rcov
   type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -121,10 +121,10 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  name: state_machine
+  requirement: *id007
   prerelease: false
+  name: state_machine
   type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -137,10 +137,10 @@ dependencies:
         - 1
         - 5
         version: 3.1.5
-  name: money
+  requirement: *id008
   prerelease: false
+  name: money
   type: :development
-  requirement: *id008
 description: A really simple shopping cart implementation for rails.
 email: louisgillies@ygmail.com
 executables: []