acts_as_shopping_cart 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85f11cafab5fc9f037e657dbbdcbd035445d530
-  data.tar.gz: cdbe305d67dd94f1123dfa266a60cf87c951e541
+  metadata.gz: f09938fd8e7495c32243f0cb4a69d70fe5aff445
+  data.tar.gz: 7c8104c31546c9e5c01f3e4679139877acb5965b
 SHA512:
-  metadata.gz: 214a68adaac36287bc20b766e8fce424f3064b97942628099cffb7ede9ff3acaba7f9d01242653d79eab09d1349dd363cf4be2257a9ef759293ef162477943aa
-  data.tar.gz: 71106c56751b7a8d41517fff58806123a8e6669af43a745720c074f374b979ddf042ff06f42349ef72e1b2a3e61b4d731229261c867b6fa18e07ca02d166b994
+  metadata.gz: 3d13a26996a653514f856f2b5ae21f36f880406404abbd2de4c22771139c3439b702d634f6d7a4c2750f570312d17b32c9bd82b70d32298ea32cc012b926eb5e
+  data.tar.gz: 468552fcf3518fbfc9ffb6f2db9d1a8efed4ca28d5aa0e9e44385e441a4aa06a977163b5b91a8680dce88abce76623c1473249ea04b9e8123234a7deb715513e

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1.5
 
 gemfile:
   - Gemfile.4.0
   - Gemfile.4.1
+  - Gemfile.4.2

data/Gemfile.4.2

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in acts_as_shopping_cart.gemspec
+gemspec
+
+gem 'activerecord', '~> 4.2.0'

data/README.markdown

@@ -52,7 +52,7 @@ For the items:
       acts_as_shopping_cart_item_for :cart
     end
 
-or, if you want to use convention over configuration, make sure your models are called *ShoppingCart* and *ShoppingCartItems*,
+or, if you want to use convention over configuration, make sure your models are called *ShoppingCart* and *ShoppingCartItem*,
 then just use the shortcuts:
 
     class ShoppingCart < ActiveRecord::Base

data/acts_as_shopping_cart.gemspec

@@ -18,11 +18,13 @@ 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', '~> 4'
+  s.add_dependency 'rails', '~> 4'
+  s.add_dependency 'money-rails', '~> 1.3'
+
   s.add_development_dependency "cucumber", '~> 1.3.14'
   s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "rake", "~> 10.0.0"
   s.add_development_dependency "rspec", "~> 2.12.0"
   s.add_development_dependency "sqlite3", "~> 1.3.0"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "rake", "~> 10.0.0"
 end

data/features/step_definitions/shopping_cart_steps.rb

@@ -4,12 +4,12 @@ end
 
 Then /^the total for the cart should be "([^"]*)"$/ do |total|
   @cart.reload
-  @cart.total.should eq(total.to_f)
+  @cart.total.should eq(Money.new(total.to_f * 100))
 end
 
 Then /^the subtotal for the cart should be "([^"]*)"$/ do |subtotal|
   @cart.reload
-  @cart.subtotal.should eq(subtotal.to_f)
+  @cart.subtotal.should eq(Money.new(subtotal.to_f * 100))
 end
 
 When /^I add product "([^"]*)" to cart with price "([^"]*)"$/ do |product_name, price|

data/features/support/env.rb

@@ -1,10 +1,17 @@
+require 'bundler/setup'
+
 require 'active_record'
 require 'database_cleaner'
+require 'money-rails'
 
 $: << './lib'
 
 require 'acts_as_shopping_cart'
 
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+MoneyRails::Hooks.init
+
 require 'simplecov'
 
 SimpleCov.coverage_dir 'coverage.features'

data/features/support/rails_env.rb

@@ -1,4 +1,5 @@
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table :shopping_carts

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

@@ -47,14 +47,15 @@ module ActiveRecord
         end
 
         #
-        # Returns the subtotal by summing the price times quantity for all the items in the cart
+        # 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
+          shopping_cart_items.inject(Money.new(0)) { |sum, item| sum += (item.price * item.quantity) }
         end
 
         def shipping_cost
-          0
+          Money.new(0)
         end
 
         def taxes
@@ -69,7 +70,7 @@ module ActiveRecord
         # Returns the total by summing the subtotal, taxes and shipping_cost
         #
         def total
-          ("%.2f" % (self.subtotal + self.taxes + self.shipping_cost)).to_f
+          self.subtotal + self.taxes + self.shipping_cost
         end
 
         #

data/lib/active_record/acts/shopping_cart_item.rb

@@ -20,6 +20,7 @@ module ActiveRecord
           self.send :include, ActiveRecord::Acts::ShoppingCartItem::InstanceMethods
           belongs_to :owner, :polymorphic => true
           belongs_to :item, :polymorphic => true
+          monetize :price_cents
         end
 
         #

data/lib/acts_as_shopping_cart/schema.rb

@@ -3,12 +3,13 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 module ActsAsShoppingCart
   module Schema
     def shopping_cart_item_fields
-      integer :owner_id   # Holds the owner id, for polymorphism
-      string  :owner_type # Holds the type of the owner, for polymorphism
-      integer :quantity   # Holds the quantity of the object
-      integer :item_id    # Holds the object id
-      string  :item_type  # Holds the type of the object, for polymorphism
-      float   :price      # Holds the price of the item
+      integer :owner_id       # Holds the owner id, for polymorphism
+      string  :owner_type     # Holds the type of the owner, for polymorphism
+      integer :quantity       # Holds the quantity of the object
+      integer :item_id        # Holds the object id
+      string  :item_type      # Holds the type of the object, for polymorphism
+      integer :price_cents, default: 0, null: false  # Holds the price of the item
+      string  :price_currency, default: "USD", null: false # Holds the currency for the price
     end
   end
 end

data/lib/acts_as_shopping_cart/version.rb

@@ -1,3 +1,3 @@
 module ActsAsShoppingCart
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/acts_as_shopping_cart.rb

@@ -1,4 +1,6 @@
 require 'acts_as_shopping_cart/version'
+require 'rails'
+require 'money-rails'
 require 'active_record/acts/shopping_cart'
 require 'active_record/acts/shopping_cart_item'
 require 'acts_as_shopping_cart/schema'

data/spec/active_record/acts/shopping_cart/collection_spec.rb

@@ -138,17 +138,19 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
       end
 
       it "returns 0" do
-        subject.subtotal.should eq(0)
+        subject.subtotal.should be_an_instance_of(Money)
+        subject.subtotal.should eq(Money.new(0))
       end
     end
 
     context "cart has items" do
       before do
-        items = [stub(:quantity => 2, :price => 33.99), stub(:quantity => 1, :price => 45.99)]
+        items = [stub(:quantity => 2, :price => Money.new(3399)), stub(:quantity => 1, :price => Money.new(4599))]
         subject.stub(:shopping_cart_items).and_return(items)
       end
 
       it "returns the sum of the price * quantity for all items" do
+        subject.subtotal.should be_an_instance_of(Money)
         subject.subtotal.should eq(113.97)
       end
     end
@@ -156,6 +158,7 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
 
   describe :shipping_cost do
     it "returns 0" do
+      subject.shipping_cost.should be_an_instance_of Money
       subject.shipping_cost.should eq(0)
     end
   end
@@ -163,10 +166,11 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
   describe :taxes do
     context "subtotal is 100" do
       before do
-        subject.stub(:subtotal).and_return(100)
+        subject.stub(:subtotal).and_return(Money.new(10000))
       end
 
       it "returns 8.25" do
+        subject.taxes.should be_an_instance_of Money
         subject.taxes.should eq(8.25)
       end
     end
@@ -180,12 +184,13 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
 
   describe :total do
     before do
-      subject.stub(:subtotal).and_return(10.99)
-      subject.stub(:taxes).and_return(13.99)
-      subject.stub(:shipping_cost).and_return(12.99)
+      subject.stub(:subtotal).and_return(Money.new(1099))
+      subject.stub(:taxes).and_return(Money.new(1399))
+      subject.stub(:shipping_cost).and_return(Money.new(1299))
     end
 
     it "returns subtotal + taxes + shipping_cost" do
+      subject.total.should be_an_instance_of Money
       subject.total.should eq(37.97)
     end
   end

data/spec/spec_helper.rb

@@ -5,8 +5,13 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'simplecov'
+require 'rails'
 require 'active_record'
+require 'money-rails'
 
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+MoneyRails::Hooks.init
 require 'acts_as_shopping_cart'
 
 SimpleCov.start

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shopping_cart
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: money-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.0.0
 description: Simple Shopping Cart implementation
 email:
 - david@crowdint.com
@@ -121,6 +135,7 @@ files:
 - Gemfile
 - Gemfile.4.0
 - Gemfile.4.1
+- Gemfile.4.2
 - LICENSE
 - README.markdown
 - Rakefile
@@ -163,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acts_as_shopping_cart
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Shopping Cart implementation