acts_as_shopping_cart 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eb74faf4e8e1ab7a2a84ae44b351e8d0f0e12e69
+  data.tar.gz: 56f5c146d75b6b7c823f09039d5fac7e29e7f0ae
+SHA512:
+  metadata.gz: 61cfd0d719b47dc26f72d8f0ca735af97541409717fe34fc6b01404732288ab5347211aab8ca83e93d6a33f4635112f24c754b2daa2e7de2b1987bfe9cb97700
+  data.tar.gz: 75dd9884120efe0e5b80b3db1afde432cdda75822c689d6fd67dfaec5a1a61d517fdafd7eb7aa4cc60488e9c801fdf82c9acd17dc352f71bd8163f73d84ed920

data/.travis.yml

@@ -1,4 +1,2 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in acts_as_shopping_cart.gemspec
 gemspec

data/README.markdown

@@ -10,14 +10,27 @@ You can find an example application [here](https://github.com/crowdint/acts_as_s
 
 ### Rails 3
 
+**As of Version 0.2.0 Rails 3 is no longer supported. Please use the 0-1-x branch
+if you still need to implement this gem in a Rails 3 app**
+
 Include it in your Gemfile
 
-    gem 'acts_as_shopping_cart', '~> 0.1.4'
+    gem 'acts_as_shopping_cart', :github => 'crowdint/acts_as_shopping_cart', :branch => '0-1-x'
 
 And run bundler
 
     bundle install
 
+### Rails 4
+
+Just include it in your Gemfile as:
+
+    gem 'acts_as_shopping_cart', '~> 0.2.0'
+
+And run bundle install
+
+    bundle install
+
 ## Usage
 
 You need two models, one to hold the Shopping Carts and another to hold the Items

data/acts_as_shopping_cart.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '~> 3.0'
+  s.add_dependency 'activerecord', '~> 4.0.0'
   s.add_development_dependency "cucumber", "~> 1.2.1"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "rspec", "~> 2.12.0"

data/lib/active_record/acts/shopping_cart/collection.rb

@@ -0,0 +1,88 @@
+module ActiveRecord
+  module Acts
+    module ShoppingCart
+      module Collection
+        #
+        # Adds a product to the cart
+        #
+        def add(object, price, quantity = 1, cumulative = true)
+          cart_item = item_for(object)
+
+          unless cart_item
+            shopping_cart_items.create(:item => object, :price => price, :quantity => quantity)
+          else
+            cumulative = cumulative == true ? cart_item.quantity : 0
+            cart_item.quantity = (cumulative + quantity)
+            cart_item.save
+          end
+        end
+
+        #
+        # Deletes all shopping_cart_items in the shopping_cart
+        #
+        def clear
+          shopping_cart_items.clear
+        end
+
+        #
+        # Returns true when the cart is empty
+        #
+        def empty?
+          shopping_cart_items.empty?
+        end
+
+        #
+        # Remove an item from the cart
+        #
+        def remove(object, quantity = 1)
+          if cart_item = item_for(object)
+            if cart_item.quantity <= quantity
+              cart_item.delete
+            else
+              cart_item.quantity = (cart_item.quantity - quantity)
+              cart_item.save
+            end
+          end
+        end
+
+        #
+        # Returns the subtotal by summing the price times quantity for all the items in the cart
+        #
+        def subtotal
+          ("%.2f" % shopping_cart_items.inject(0) { |sum, item| sum += (item.price * item.quantity) }).to_f
+        end
+
+        def shipping_cost
+          0
+        end
+
+        def taxes
+          subtotal * self.tax_pct * 0.01
+        end
+
+        def tax_pct
+          8.25
+        end
+
+        #
+        # Returns the total by summing the subtotal, taxes and shipping_cost
+        #
+        def total
+          ("%.2f" % (self.subtotal + self.taxes + self.shipping_cost)).to_f
+        end
+
+        #
+        # Return the number of unique items in the cart
+        #
+        def total_unique_items
+          shopping_cart_items.inject(0) { |sum, item| sum += item.quantity }
+        end
+
+        def cart_items
+          warn "ShoppingCart#cart_items WILL BE DEPRECATED IN LATER VERSIONS OF acts_as_shopping_cart, please use ShoppingCart#shopping_cart_items instead"
+          self.shopping_cart_items
+        end
+      end
+    end
+  end
+end

data/lib/active_record/acts/shopping_cart/item.rb

@@ -0,0 +1,56 @@
+module ActiveRecord
+  module Acts
+    module ShoppingCart
+      module Item
+
+        #
+        # Returns the cart item for the specified object
+        #
+        def item_for(object)
+          shopping_cart_items.where(:item => object).first
+        end
+
+        #
+        # Returns the subtotal of a specified item by multiplying the quantity times
+        # the price of the item.
+        #
+        def subtotal_for(object)
+          item = item_for(object)
+          item ? item.subtotal : 0
+        end
+
+        #
+        # Returns the quantity of the specified object
+        #
+        def quantity_for(object)
+          item = item_for(object)
+          item ? item.quantity : 0
+        end
+
+        #
+        # Updates the quantity of the specified object
+        #
+        def update_quantity_for(object, new_quantity)
+          item = item_for(object)
+          item.update_quantity(new_quantity) if item
+        end
+
+        #
+        # Returns the price of the specified object
+        #
+        def price_for(object)
+          item = item_for(object)
+          item ? item.price : 0
+        end
+
+        #
+        # Updates the price of the specified object
+        #
+        def update_price_for(object, new_price)
+          item = item_for(object)
+          item.update_price(new_price) if item
+        end
+      end
+    end
+  end
+end

data/lib/active_record/acts/shopping_cart.rb

@@ -17,8 +17,8 @@ module ActiveRecord
         #
         #
         def acts_as_shopping_cart_using(item_class)
-          self.send :include, ActiveRecord::Acts::ShoppingCart::Cart::InstanceMethods
-          self.send :include, ActiveRecord::Acts::ShoppingCart::Item::InstanceMethods
+          self.send :include, ActiveRecord::Acts::ShoppingCart::Collection
+          self.send :include, ActiveRecord::Acts::ShoppingCart::Item
           has_many :shopping_cart_items, :class_name => item_class.to_s.classify,
               :as => :owner, :dependent => :destroy
         end

data/lib/acts_as_shopping_cart/version.rb

@@ -1,3 +1,3 @@
 module ActsAsShoppingCart
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/acts_as_shopping_cart.rb

@@ -1,25 +1,13 @@
 require 'acts_as_shopping_cart/version'
 require 'active_record/acts/shopping_cart'
 require 'active_record/acts/shopping_cart_item'
-
-# require 'active_record/acts/shopping_cart/cart_instance_methods'
-# require 'active_record/acts/shopping_cart/item_instance_methods'
-
-# require 'active_record/acts/shopping_cart_item'
-# require 'active_record/acts/shopping_cart_item/cart_item_instance_methods'
-
 require 'acts_as_shopping_cart/schema'
 
 module ActiveRecord
   module Acts
     module ShoppingCart
-      module Cart
-        autoload :InstanceMethods, 'active_record/acts/shopping_cart/cart/instance_methods'
-      end
-
-      module Item
-        autoload :InstanceMethods, 'active_record/acts/shopping_cart/item/instance_methods'
-      end
+      autoload :Collection , 'active_record/acts/shopping_cart/collection'
+      autoload :Item       , 'active_record/acts/shopping_cart/item'
     end
 
     module ShoppingCartItem

data/spec/active_record/acts/shopping_cart/{cart/instance_methods_spec.rb → collection_spec.rb}

@@ -1,10 +1,10 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '../../../../spec_helper')
 # require 'spec_helper'
 
-describe ActiveRecord::Acts::ShoppingCart::Cart::InstanceMethods do
+describe ActiveRecord::Acts::ShoppingCart::Collection do
   let(:klass) do
     klass = Class.new
-    klass.send(:include, ActiveRecord::Acts::ShoppingCart::Cart::InstanceMethods)
+    klass.send(:include, ActiveRecord::Acts::ShoppingCart::Collection)
   end
 
   let(:subject) do

data/spec/active_record/acts/shopping_cart/{item/instance_methods_spec.rb → item_spec.rb}

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '../../../../spec_helper')
 
-describe ActiveRecord::Acts::ShoppingCart::Item::InstanceMethods do
+describe ActiveRecord::Acts::ShoppingCart::Item do
   let(:klass) do
     klass = Class.new
-    klass.send :include, ActiveRecord::Acts::ShoppingCart::Item::InstanceMethods
+    klass.send :include, ActiveRecord::Acts::ShoppingCart::Item
     klass
   end
 
@@ -21,7 +21,7 @@ describe ActiveRecord::Acts::ShoppingCart::Item::InstanceMethods do
   describe :item_for do
     context "no cart item exists for the object" do
       before do
-        shopping_cart_items.should_receive(:where).with(:item_id => object.id, :item_type => object.class.name).and_return([])
+        shopping_cart_items.should_receive(:where).with(:item => object).and_return([])
       end
 
       it "returns the shopping cart item object for the requested object" do
@@ -31,7 +31,7 @@ describe ActiveRecord::Acts::ShoppingCart::Item::InstanceMethods do
 
     context "a cart item exists for the object" do
       before do
-        shopping_cart_items.should_receive(:where).with(:item_id => object.id, :item_type => object.class.name).and_return([ item ])
+        shopping_cart_items.should_receive(:where).with(:item => object).and_return([ item ])
       end
 
       it "returns that item" do

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shopping_cart
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -144,8 +129,8 @@ files:
 - features/support/env.rb
 - features/support/rails_env.rb
 - lib/active_record/acts/shopping_cart.rb
-- lib/active_record/acts/shopping_cart/cart/instance_methods.rb
-- lib/active_record/acts/shopping_cart/item/instance_methods.rb
+- lib/active_record/acts/shopping_cart/collection.rb
+- lib/active_record/acts/shopping_cart/item.rb
 - lib/active_record/acts/shopping_cart_item.rb
 - lib/active_record/acts/shopping_cart_item/instance_methods.rb
 - lib/acts_as_shopping_cart.rb
@@ -153,39 +138,32 @@ files:
 - lib/acts_as_shopping_cart/version.rb
 - script/build.sh
 - spec/.rspec
-- spec/active_record/acts/shopping_cart/cart/instance_methods_spec.rb
-- spec/active_record/acts/shopping_cart/item/instance_methods_spec.rb
+- spec/active_record/acts/shopping_cart/collection_spec.rb
+- spec/active_record/acts/shopping_cart/item_spec.rb
 - spec/active_record/acts/shopping_cart_item/instance_methods_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3103435119654864797
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3103435119654864797
 requirements: []
 rubyforge_project: acts_as_shopping_cart
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Shopping Cart implementation
 test_files:
 - features/shopping_cart.feature
@@ -193,7 +171,7 @@ test_files:
 - features/step_definitions/shopping_cart_steps.rb
 - features/support/env.rb
 - features/support/rails_env.rb
-- spec/active_record/acts/shopping_cart/cart/instance_methods_spec.rb
-- spec/active_record/acts/shopping_cart/item/instance_methods_spec.rb
+- spec/active_record/acts/shopping_cart/collection_spec.rb
+- spec/active_record/acts/shopping_cart/item_spec.rb
 - spec/active_record/acts/shopping_cart_item/instance_methods_spec.rb
 - spec/spec_helper.rb

data/lib/active_record/acts/shopping_cart/cart/instance_methods.rb

@@ -1,90 +0,0 @@
-module ActiveRecord
-  module Acts
-    module ShoppingCart
-      module Cart
-        module InstanceMethods
-          #
-          # Adds a product to the cart
-          #
-          def add(object, price, quantity = 1, cumulative = true)
-            cart_item = item_for(object)
-
-            unless cart_item
-              shopping_cart_items.create(:item => object, :price => price, :quantity => quantity)
-            else
-              cumulative = cumulative == true ? cart_item.quantity : 0
-              cart_item.quantity = (cumulative + quantity)
-              cart_item.save
-            end
-          end
-
-          #
-          # Deletes all shopping_cart_items in the shopping_cart
-          #
-          def clear
-            shopping_cart_items.clear
-          end
-
-          #
-          # Returns true when the cart is empty
-          #
-          def empty?
-            shopping_cart_items.empty?
-          end
-
-          #
-          # Remove an item from the cart
-          #
-          def remove(object, quantity = 1)
-            if cart_item = item_for(object)
-              if cart_item.quantity <= quantity
-                cart_item.delete
-              else
-                cart_item.quantity = (cart_item.quantity - quantity)
-                cart_item.save
-              end
-            end
-          end
-
-          #
-          # Returns the subtotal by summing the price times quantity for all the items in the cart
-          #
-          def subtotal
-            ("%.2f" % shopping_cart_items.inject(0) { |sum, item| sum += (item.price * item.quantity) }).to_f
-          end
-
-          def shipping_cost
-            0
-          end
-
-          def taxes
-            subtotal * self.tax_pct * 0.01
-          end
-
-          def tax_pct
-            8.25
-          end
-
-          #
-          # Returns the total by summing the subtotal, taxes and shipping_cost
-          #
-          def total
-            ("%.2f" % (self.subtotal + self.taxes + self.shipping_cost)).to_f
-          end
-
-          #
-          # Return the number of unique items in the cart
-          #
-          def total_unique_items
-            shopping_cart_items.inject(0) { |sum, item| sum += item.quantity }
-          end
-
-          def cart_items
-            warn "ShoppingCart#cart_items WILL BE DEPRECATED IN LATER VERSIONS OF acts_as_shopping_cart, please use ShoppingCart#shopping_cart_items instead"
-            self.shopping_cart_items
-          end
-        end
-      end
-    end
-  end
-end

data/lib/active_record/acts/shopping_cart/item/instance_methods.rb

@@ -1,58 +0,0 @@
-module ActiveRecord
-  module Acts
-    module ShoppingCart
-      module Item
-        module InstanceMethods
-
-          #
-          # Returns the cart item for the specified object
-          #
-          def item_for(object)
-            shopping_cart_items.where(:item_id => object.id, :item_type => object.class.name).first
-          end
-
-          #
-          # Returns the subtotal of a specified item by multiplying the quantity times
-          # the price of the item.
-          #
-          def subtotal_for(object)
-            item = item_for(object)
-            item ? item.subtotal : 0
-          end
-
-          #
-          # Returns the quantity of the specified object
-          #
-          def quantity_for(object)
-            item = item_for(object)
-            item ? item.quantity : 0
-          end
-
-          #
-          # Updates the quantity of the specified object
-          #
-          def update_quantity_for(object, new_quantity)
-            item = item_for(object)
-            item.update_quantity(new_quantity) if item
-          end
-
-          #
-          # Returns the price of the specified object
-          #
-          def price_for(object)
-            item = item_for(object)
-            item ? item.price : 0
-          end
-
-          #
-          # Updates the price of the specified object
-          #
-          def update_price_for(object, new_price)
-            item = item_for(object)
-            item.update_price(new_price) if item
-          end
-        end
-      end
-    end
-  end
-end