carter 0.5.6 → 0.6.0

data/app/models/cart_item.rb

@@ -10,16 +10,16 @@ class CartItem < ActiveRecord::Base
   after_update :check_quantity
   
   # Match a cart_item by owner and cartable
-  named_scope :for_cartable, lambda { |cartable|
-    { :conditions => { :cartable_type => cartable.class.to_s, :cartable_id => cartable.id } }
+  scope :for_cartable, lambda { |cartable|
+    where({ :cartable_type => cartable.class.to_s, :cartable_id => cartable.id })
   }
   
-  named_scope :for_owner, lambda {|owner|
-    { :conditions => { :owner_id => (owner ? owner.id : nil), :owner_type =>  (owner ? owner.class.to_s : nil) } }
+  scope :for_owner, lambda {|owner|
+    where({ :owner_id => (owner ? owner.id : nil), :owner_type =>  (owner ? owner.class.to_s : nil) }) 
   }
   
-  named_scope :for_cartable_and_owner, lambda {|cartable, owner| 
-    { :conditions => for_owner(owner).proxy_options[:conditions].merge!(for_cartable(cartable).proxy_options[:conditions])}
+  scope :for_cartable_and_owner, lambda {|cartable, owner| 
+    for_owner(owner).for_cartable(cartable)
   }
    
   money_composed_column :total_price, 

data/lib/carter.rb

@@ -6,3 +6,4 @@ require 'carter/controller_resource'
 require 'carter/state_machine'
 require 'carter/errors'
 require 'carter/active_record/extensions'
+require 'rails/init'

data/lib/carter/state_machine.rb

@@ -9,7 +9,6 @@ module Carter
       
       module ClassMethods
         def init_states
-          
           state_machine :state, :initial => :active do
             state :active, :processing, :failure, :success, :expired
             

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ require 'factory_girl'
 require 'action_pack'
 require 'state_machine'
 require 'money'
+require 'active_support'
+require 'active_support/test_case'
 
 Carter::Initializer.setup 
 # Requires supporting files with custom matchers and macros, etc,

data/spec/support/active_record_helper.rb

@@ -16,7 +16,7 @@ end
 def load_schema
 
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+  # ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 
   db_adapter = ENV['DB']
  

data/spec/support/factories.rb

@@ -1,25 +1,43 @@
-Factory.sequence :name do |n|
-   "name_#{n}"
- end
- 
-Factory.define :product do |f|
-  f.sequence(:name) {|n| "name#{n}" }
-  f.price 2.00
+
+FactoryGirl.define do
+  sequence :name do |n|
+     "name_#{n}"
+  end
+   
+  factory :product do
+    Factory.next(:name) {|n| "name#{n}" }
+    price 2.00
+  end
 end
 
-Factory.define :thing do |f|
-  f.sequence(:name) {|n| "name#{n}" }
-  f.price 4.00
+FactoryGirl.define do
+  factory :thing do
+    Factory.next(:name) {|n| "name#{n}" }
+    price 4.00
+  end
 end
 
-Factory.define :user do |f|
-  f.sequence(:name) {|n| "name#{n}" }
+FactoryGirl.define do
+  factory :user do
+    Factory.next(:name) {|n| "name#{n}" }
+  end
 end
 
-Factory.define :cart do |f|
-  f.shopper {|a| a.association(:user) }
+FactoryGirl.define do
+
+  factory :cart do
+    shopper {|a| a.association(:user) }
+    state "active"
+    after_create {|cart_item| cart_item.send(:initialize_state_machines, :dynamic => :force)}
+  end
 end
 
-Factory.define :cart_item do |f|
-  f.cart {|a| a.association(:cart) }
+FactoryGirl.define do
+
+  factory :cart_item do
+    state "in_cart"
+    cart {|a| a.association(:cart) }
+    after_create {|cart_item| cart_item.send(:initialize_state_machines, :dynamic => :force)}
+  end
 end
+

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Louis Gillies
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +00:00
+date: 2011-10-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,12 +119,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 2
+        version: 1.0.2
   requirement: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -142,38 +142,6 @@ dependencies:
         - 5
         version: 3.1.5
   requirement: *id008
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: state_machine
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: money
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 1
-        - 5
-        version: 3.1.5
-  requirement: *id010
 description: A really simple shopping cart implementation for rails.
 email: louisgillies@ygmail.com
 executables: []