acts_as_shopping_cart 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f09938fd8e7495c32243f0cb4a69d70fe5aff445
-  data.tar.gz: 7c8104c31546c9e5c01f3e4679139877acb5965b
+  metadata.gz: f4f7ed62db4ed5b247d005dcafc10eb7ebdb3773
+  data.tar.gz: 68c2a98c28d253d7077e1d0b93d1054f9c3c0820
 SHA512:
-  metadata.gz: 3d13a26996a653514f856f2b5ae21f36f880406404abbd2de4c22771139c3439b702d634f6d7a4c2750f570312d17b32c9bd82b70d32298ea32cc012b926eb5e
-  data.tar.gz: 468552fcf3518fbfc9ffb6f2db9d1a8efed4ca28d5aa0e9e44385e441a4aa06a977163b5b91a8680dce88abce76623c1473249ea04b9e8123234a7deb715513e
+  metadata.gz: 4d841c20dcd7cd9344422fb99b95248dd1f92bb02ab0b8335de1b97f4b4d6b43ba6329332f04d7423d0ec7123ffebb5066a9db547a8f332476ec1fecb00748b0
+  data.tar.gz: 63e9b2b8e4e2df46e1efd4db8afe96933336c51d57ee7136e251a184eff66b438080d9618f72624bbdbc869c83fbc3b922bc5c9399715cfcc6df17f03f3b4979

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,11 @@
+AllCops:
+  RunRailsCops: true
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  StyleGuideCopsOnly: true
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Metrics/LineLength:
+  Max: 110

data/.travis.yml

@@ -1,8 +1,12 @@
+language: ruby
+cache: bundler
+
 rvm:
-  - 2.0.0
-  - 2.1.5
+  - 2.2.4
+  - 2.3.0
 
 gemfile:
   - Gemfile.4.0
   - Gemfile.4.1
   - Gemfile.4.2
+  - Gemfile.5.0

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# CHANGELOG
+
+## 0.4.0
+
+- Updated dependencies to use it on Rails 5
+
+### Breaking changes
+
+- Remove the `empty?` method and add `has_items?` and `has_no_items?`.
+- Updated money-rails dependency to at least 1.5 which can potentially break your app.

data/Gemfile.4.0

@@ -3,4 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in acts_as_shopping_cart.gemspec
 gemspec
 
+gem 'rails', '~> 4.0.0'
 gem 'activerecord', '~> 4.0.0'

data/Gemfile.4.1

@@ -3,4 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in acts_as_shopping_cart.gemspec
 gemspec
 
+gem 'rails', '~> 4.1.0'
 gem 'activerecord', '~> 4.1.0'

data/Gemfile.4.2

@@ -3,4 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in acts_as_shopping_cart.gemspec
 gemspec
 
+gem 'rails', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0'

data/Gemfile.5.0

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in acts_as_shopping_cart.gemspec
+gemspec
+
+gem 'rails', '5.0.0.beta3'
+gem 'activerecord', '5.0.0.beta3'

data/README.markdown

@@ -2,9 +2,11 @@
 
 A simple shopping cart implementation.
 
-[![Build Status](https://secure.travis-ci.org/crowdint/acts_as_shopping_cart.png?branch=master)](http://travis-ci.org/crowdint/acts_as_shopping_cart)
+[![Build Status](https://secure.travis-ci.org/dabit/acts_as_shopping_cart.png?branch=master)](http://travis-ci.org/dabit/acts_as_shopping_cart)
+[![Code Climate](https://codeclimate.com/github/dabit/acts_as_shopping_cart/badges/gpa.svg)](https://codeclimate.com/github/dabit/acts_as_shopping_cart)
+[![Test Coverage](https://codeclimate.com/github/dabit/acts_as_shopping_cart/badges/coverage.svg)](https://codeclimate.com/github/dabit/acts_as_shopping_cart/coverage)
 
-You can find an example application [here](https://github.com/crowdint/acts_as_shopping_cart_app).
+You can find an example application [here](https://github.com/dabit/acts_as_shopping_cart_app).
 
 ## Install
 
@@ -15,7 +17,7 @@ if you still need to implement this gem in a Rails 3 app**
 
 Include it in your Gemfile
 
-    gem 'acts_as_shopping_cart', :github => 'crowdint/acts_as_shopping_cart', :branch => '0-1-x'
+    gem 'acts_as_shopping_cart', :github => 'dabit/acts_as_shopping_cart', :branch => '0-1-x'
 
 And run bundler
 
@@ -190,11 +192,3 @@ Run cucumber features
 Both:
 
     rake
-
-# About the author
-
-[Crowd Interactive](http://www.crowdint.com) is a leading Ruby and Rails
-consultancy firm based in Mexico currently doing business with startups in the
-United States. We specialize in building and growing Rails applications, by increasing
-your IT crew onsite or offsite. We pick our projects carefully, as we only work
-with companies we believe in.

data/Rakefile

@@ -1,13 +1,13 @@
 require "bundler/gem_tasks"
 
-require 'cucumber/rake/task'
+require "cucumber/rake/task"
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format progress}
+  t.cucumber_opts = "--format progress"
 end
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new do |t|
   t.fail_on_error = true
 end
 
-task :default => [:spec, :cucumber]
+task default: [:spec, :cucumber]

data/acts_as_shopping_cart.gemspec

@@ -1,15 +1,16 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
 require "acts_as_shopping_cart/version"
 
 Gem::Specification.new do |s|
   s.name        = "acts_as_shopping_cart"
   s.version     = ActsAsShoppingCart::VERSION
   s.authors     = ["David Padilla"]
-  s.email       = ["david@crowdint.com"]
+  s.email       = ["david@padilla.io"]
   s.homepage    = ""
-  s.summary     = %q{Simple Shopping Cart implementation}
-  s.description = %q{Simple Shopping Cart implementation}
+  s.summary     = "Simple Shopping Cart implementation"
+  s.description = "Simple Shopping Cart implementation"
 
   s.rubyforge_project = "acts_as_shopping_cart"
 
@@ -18,13 +19,15 @@ 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 'rails', '~> 4'
-  s.add_dependency 'money-rails', '~> 1.3'
+  s.add_dependency "rails", "> 4"
+  s.add_dependency "money-rails", "~> 1.5"
 
-  s.add_development_dependency "cucumber", '~> 1.3.14'
+  s.add_development_dependency "cucumber"
   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 "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "rubocop"
+  s.add_development_dependency "codeclimate-test-reporter"
 end

data/features/step_definitions/product_steps.rb

@@ -1,3 +1,3 @@
 Given /^a product "([^"]*)" exists$/ do |name|
-  Product.create(:name => name)
+  Product.create(name: name)
 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(Money.new(total.to_f * 100))
+  expect(@cart.total).to eq(Money.new(total.to_f * 100))
 end
 
 Then /^the subtotal for the cart should be "([^"]*)"$/ do |subtotal|
   @cart.reload
-  @cart.subtotal.should eq(Money.new(subtotal.to_f * 100))
+  expect(@cart.subtotal).to eq(Money.new(subtotal.to_f * 100))
 end
 
 When /^I add product "([^"]*)" to cart with price "([^"]*)"$/ do |product_name, price|
@@ -24,10 +24,10 @@ end
 
 Then /^the total unique items on the cart should be "([^"]*)"$/ do |total|
   @cart.reload
-  @cart.total_unique_items.should eq(total.to_i)
+  expect(@cart.total_unique_items).to eq(total.to_i)
 end
 
-When /^I remove (\d+) "([^"]*)" unit(s?) from cart$/ do |quantity, product_name, plural|
+When /^I remove (\d+) "([^"]*)" unit(s?) from cart$/ do |quantity, product_name, _|
   @cart.reload
   product = Product.find_by_name(product_name)
   @cart.remove(product, quantity.to_i)
@@ -39,7 +39,7 @@ end
 
 Then /^cart should be empty$/ do
   @cart.reload
-  @cart.should be_empty
+  expect(@cart.has_no_items?).to be true
 end
 
 Given /^I add (\d+) "([^"]*)" products to cart with price "([^"]*)"$/ do |quantity, product_name, price|
@@ -50,19 +50,19 @@ end
 Then /^the subtotal for "([^"]*)" on the cart should be "([^"]*)"$/ do |product_name, subtotal|
   @cart.reload
   product = Product.find_by_name(product_name)
-  @cart.subtotal_for(product).should eq(subtotal.to_f)
+  expect(@cart.subtotal_for(product)).to eq(subtotal.to_f)
 end
 
 Then /^the quantity for "([^"]*)" on the cart should be "([^"]*)"$/ do |product_name, quantity|
   @cart.reload
   product = Product.find_by_name(product_name)
-  @cart.quantity_for(product).should eq(quantity.to_f)
+  expect(@cart.quantity_for(product)).to eq(quantity.to_f)
 end
 
 Then /^the price for "([^"]*)" on the cart should be "([^"]*)"$/ do |product_name, price|
   @cart.reload
   product = Product.find_by_name(product_name)
-  @cart.price_for(product).should eq(price.to_f)
+  expect(@cart.price_for(product)).to eq(Money.from_amount(price.to_f))
 end
 
 When /^I update the "([^"]*)" quantity to "([^"]*)"$/ do |product_name, quantity|
@@ -77,9 +77,8 @@ When /^I update the "([^"]*)" price to "([^"]*)"$/ do |product_name, price|
   @cart.update_price_for(product, price.to_f)
 end
 
-Then /^shopping cart item "([^"]*)" should belong to cart$/ do |arg1|
+Then /^shopping cart item "([^"]*)" should belong to cart$/ do |_|
   @cart.reload
   shopping_cart_item = ShoppingCartItem.last
-  shopping_cart_item.owner.should == @cart
+  expect(shopping_cart_item.owner).to eq @cart
 end
-

data/features/support/env.rb

@@ -1,18 +1,26 @@
-require 'bundler/setup'
+require "bundler/setup"
 
-require 'active_record'
-require 'database_cleaner'
-require 'money-rails'
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
-$: << './lib'
+require "active_record"
+require "database_cleaner"
+require "money-rails"
+require "rspec"
 
-require 'acts_as_shopping_cart'
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
+require "acts_as_shopping_cart"
 
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 MoneyRails::Hooks.init
 
-require 'simplecov'
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+end
+
+require "simplecov"
 
-SimpleCov.coverage_dir 'coverage.features'
+SimpleCov.coverage_dir "coverage.features"
 SimpleCov.start

data/features/support/rails_env.rb

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

data/lib/active_record/acts/shopping_cart.rb

@@ -17,10 +17,9 @@ module ActiveRecord
         #
         #
         def acts_as_shopping_cart_using(item_class)
-          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
+          send :include, ActiveRecord::Acts::ShoppingCart::Collection
+          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/active_record/acts/shopping_cart/collection.rb

@@ -25,24 +25,34 @@ module ActiveRecord
           shopping_cart_items.clear
         end
 
+        #
+        # Returns true when the cart has items
+        #
+        def has_items?
+          shopping_cart_items.any?
+        end
+
         #
         # Returns true when the cart is empty
         #
-        def empty?
+        def has_no_items?
           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
+          cart_item = item_for(object)
+
+          return unless cart_item
+
+          if cart_item.quantity <= quantity
+            cart_item.delete
+          else
+            cart_item.quantity = (cart_item.quantity - quantity)
+            cart_item.save
           end
         end
 
@@ -51,7 +61,7 @@ module ActiveRecord
         # items in the cart
         #
         def subtotal
-          shopping_cart_items.inject(Money.new(0)) { |sum, item| sum += (item.price * item.quantity) }
+          shopping_cart_items.inject(Money.new(0)) { |a, e| a + (e.price * e.quantity) }
         end
 
         def shipping_cost
@@ -59,7 +69,7 @@ module ActiveRecord
         end
 
         def taxes
-          subtotal * self.tax_pct * 0.01
+          subtotal * tax_pct * 0.01
         end
 
         def tax_pct
@@ -70,19 +80,21 @@ module ActiveRecord
         # Returns the total by summing the subtotal, taxes and shipping_cost
         #
         def total
-          self.subtotal + self.taxes + self.shipping_cost
+          subtotal + taxes + shipping_cost
         end
 
         #
         # Return the number of unique items in the cart
         #
         def total_unique_items
-          shopping_cart_items.inject(0) { |sum, item| sum += item.quantity }
+          shopping_cart_items.map(&:quantity).sum
         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
+          warn "ShoppingCart#cart_items WILL BE DEPRECATED IN LATER VERSIONS OF acts_as_shopping_cart," \
+            " please use ShoppingCart#shopping_cart_items instead"
+
+          shopping_cart_items
         end
       end
     end

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

@@ -7,7 +7,7 @@ module ActiveRecord
         # Returns the cart item for the specified object
         #
         def item_for(object)
-          shopping_cart_items.where(:item => object).first
+          shopping_cart_items.where(item: object).first
         end
 
         #

data/lib/active_record/acts/shopping_cart_item.rb

@@ -16,10 +16,10 @@ module ActiveRecord
         #   acts_as_shopping_cart_item :cart
         #
         #
-        def acts_as_shopping_cart_item_for(cart_class)
-          self.send :include, ActiveRecord::Acts::ShoppingCartItem::InstanceMethods
-          belongs_to :owner, :polymorphic => true
-          belongs_to :item, :polymorphic => true
+        def acts_as_shopping_cart_item_for(*)
+          send :include, ActiveRecord::Acts::ShoppingCartItem::InstanceMethods
+          belongs_to :owner, polymorphic: true
+          belongs_to :item, polymorphic: true
           monetize :price_cents
         end
 

data/lib/active_record/acts/shopping_cart_item/instance_methods.rb

@@ -6,23 +6,23 @@ module ActiveRecord
         # Returns the subtotal, multiplying the quantity times the price of the item.
         #
         def subtotal
-          ("%.2f" % (self.quantity * self.price)).to_f
+          format("%.2f", quantity * price).to_f
         end
 
         #
         # Updates the quantity of the item
         #
         def update_quantity(new_quantity)
-            self.quantity = new_quantity
-            self.save
+          self.quantity = new_quantity
+          save
         end
 
         #
         # Updates the price of the item
         #
         def update_price(new_price)
-            self.price = new_price
-            self.save
+          self.price = new_price
+          save
         end
       end
     end

data/lib/acts_as_shopping_cart.rb

@@ -1,19 +1,19 @@
-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'
+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"
 
 module ActiveRecord
   module Acts
     module ShoppingCart
-      autoload :Collection , 'active_record/acts/shopping_cart/collection'
-      autoload :Item       , 'active_record/acts/shopping_cart/item'
+      autoload :Collection , "active_record/acts/shopping_cart/collection"
+      autoload :Item       , "active_record/acts/shopping_cart/item"
     end
 
     module ShoppingCartItem
-      autoload :InstanceMethods, 'active_record/acts/shopping_cart_item/instance_methods'
+      autoload :InstanceMethods, "active_record/acts/shopping_cart_item/instance_methods"
     end
   end
 end

data/lib/acts_as_shopping_cart/schema.rb

@@ -1,4 +1,4 @@
-require 'active_record/connection_adapters/abstract/schema_definitions'
+require "active_record/connection_adapters/abstract/schema_definitions"
 
 module ActsAsShoppingCart
   module Schema

data/lib/acts_as_shopping_cart/version.rb

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

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

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../spec_helper')
-# require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + "../../../../spec_helper")
+# require "spec_helper"
 
 describe ActiveRecord::Acts::ShoppingCart::Collection do
   let(:klass) do
@@ -9,62 +9,62 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
 
   let(:subject) do
     subject = klass.new
-    subject.stub(:shopping_cart_items).and_return([])
+    allow(subject).to receive(:shopping_cart_items).and_return([])
     subject
   end
 
-  let(:object) { stub }
+  let(:object) { double }
 
   let(:shopping_cart_item) do
-    stub(:quantity => 2, :save => true)
+    instance_double("shopping_cart_item", quantity: 2, save: true)
   end
 
   describe :add do
     context "item is not on cart" do
       before do
-        subject.stub(:item_for).with(object)
+        allow(subject).to receive(:item_for).with(object)
       end
 
       it "creates a new shopping cart item" do
-        created_object = mock
-        subject.shopping_cart_items.should_receive(:create).
-            with(:item => object, :price => 19.99, :quantity => 3).
-            and_return(created_object)
+        created_object = double
+        expect(subject.shopping_cart_items).to receive(:create)
+          .with(item: object, price: 19.99, quantity: 3)
+          .and_return(created_object)
         item = subject.add(object, 19.99, 3)
-        item.should be created_object
+        expect(item).to be created_object
       end
     end
 
     context "item is not in cart" do
       before do
-        subject.stub(:item_for).with(object)
+        allow(subject).to receive(:item_for).with(object)
       end
 
       it "creates a new shopping cart item non-cumulatively" do
-        subject.shopping_cart_items.should_receive(:create).with(:item => object, :price => 19.99, :quantity => 3)
+        expect(subject.shopping_cart_items).to receive(:create).with(item: object, price: 19.99, quantity: 3)
         subject.add(object, 19.99, 3, false)
       end
     end
 
     context "item is already on cart" do
       before do
-        subject.stub(:item_for).with(object).and_return(shopping_cart_item)
+        allow(subject).to receive(:item_for).with(object).and_return(shopping_cart_item)
       end
 
       it "updates the quantity for the item" do
-        shopping_cart_item.should_receive(:quantity=).with(5)
+        expect(shopping_cart_item).to receive(:quantity=).with(5)
         item = subject.add(object, 19.99, 3)
-        item.should be shopping_cart_item
+        expect(item).to be shopping_cart_item
       end
     end
 
     context "item is already in cart" do
       before do
-        subject.stub(:item_for).with(object).and_return(shopping_cart_item)
+        allow(subject).to receive(:item_for).with(object).and_return(shopping_cart_item)
       end
 
       it "updates the quantity for the item non-cumulatively" do
-        shopping_cart_item.should_receive(:quantity=).with(3) # not 5
+        expect(shopping_cart_item).to receive(:quantity=).with(3) # not 5
         subject.add(object, 19.99, 3, false)
       end
     end
@@ -72,29 +72,47 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
 
   describe :clear do
     before do
-      subject.shopping_cart_items.should_receive(:clear)
+      expect(subject.shopping_cart_items).to receive(:clear)
     end
 
     it "clears all the items in the cart" do
       subject.clear
-      subject.empty?.should be_true
+      expect(subject.has_no_items?).to be true
     end
   end
 
-  describe "empty?" do
+  describe "has_items?" do
     context "cart has items" do
       before do
-        subject.shopping_cart_items << mock
+        subject.shopping_cart_items << double
+      end
+
+      it "returns true" do
+        expect(subject.has_items?).to be true
+      end
+    end
+
+    context "cart is empty" do
+      it "returns false" do
+        expect(subject.has_items?).to be false
+      end
+    end
+  end
+
+  describe "has_no_items?" do
+    context "cart has items" do
+      before do
+        subject.shopping_cart_items << double
       end
 
       it "returns false" do
-        subject.empty?.should be_false
+        expect(subject.has_no_items?).to be false
       end
     end
 
     context "cart is empty" do
       it "returns true" do
-        subject.empty?.should be_true
+        expect(subject.has_no_items?).to be true
       end
     end
   end
@@ -102,7 +120,7 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
   describe :remove do
     context "item is not on cart" do
       before do
-        subject.stub(:item_for).with(object)
+        allow(subject).to receive(:item_for).with(object)
       end
 
       it "does nothing" do
@@ -112,19 +130,19 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
 
     context "item is on cart" do
       before do
-        subject.stub(:item_for).with(object).and_return(shopping_cart_item)
+        allow(subject).to receive(:item_for).with(object).and_return(shopping_cart_item)
       end
 
       context "remove less items than those on cart" do
         it "just updates the shopping cart item quantity" do
-          shopping_cart_item.should_receive(:quantity=).with(1)
+          expect(shopping_cart_item).to receive(:quantity=).with(1)
           subject.remove(object, 1)
         end
       end
 
       context "remove more items than those on cart" do
         it "removes the shopping cart item object completely" do
-          shopping_cart_item.should_receive(:delete)
+          expect(shopping_cart_item).to receive(:delete)
           subject.remove(object, 99)
         end
       end
@@ -134,82 +152,86 @@ describe ActiveRecord::Acts::ShoppingCart::Collection do
   describe :subtotal do
     context "cart has no items" do
       before do
-        subject.stub(:shopping_cart_items).and_return([])
+        allow(subject).to receive(:shopping_cart_items).and_return([])
       end
 
       it "returns 0" do
-        subject.subtotal.should be_an_instance_of(Money)
-        subject.subtotal.should eq(Money.new(0))
+        expect(subject.subtotal).to be_an_instance_of(Money)
+        expect(subject.subtotal).to eq(Money.new(0))
       end
     end
 
     context "cart has items" do
       before do
-        items = [stub(:quantity => 2, :price => Money.new(3399)), stub(:quantity => 1, :price => Money.new(4599))]
-        subject.stub(:shopping_cart_items).and_return(items)
+        items = [instance_double("item 1", quantity: 2, price: Money.new(3399)),
+                 instance_double("item 2", quantity: 1, price: Money.new(4599))]
+        allow(subject).to receive(: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)
+        expect(subject.subtotal).to be_an_instance_of(Money)
+        expect(subject.subtotal).to eq(Money.new(11397))
       end
     end
   end
 
   describe :shipping_cost do
     it "returns 0" do
-      subject.shipping_cost.should be_an_instance_of Money
-      subject.shipping_cost.should eq(0)
+      expect(subject.shipping_cost).to be_an_instance_of Money
+      expect(subject.shipping_cost).to eq(Money.new(0))
     end
   end
 
   describe :taxes do
     context "subtotal is 100" do
       before do
-        subject.stub(:subtotal).and_return(Money.new(10000))
+        allow(subject).to receive(:subtotal).and_return(Money.new(10_000))
       end
 
       it "returns 8.25" do
-        subject.taxes.should be_an_instance_of Money
-        subject.taxes.should eq(8.25)
+        expect(subject.taxes).to be_an_instance_of Money
+        expect(subject.taxes).to eq(Money.new(825))
       end
     end
   end
 
   describe :tax_pct do
     it "returns 8.25" do
-      subject.tax_pct.should eq(8.25)
+      expect(subject.tax_pct).to eq(8.25)
     end
   end
 
   describe :total do
     before do
-      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))
+      allow(subject).to receive_messages(
+        subtotal: Money.new(1099),
+        taxes: Money.new(1399),
+        shipping_cost: 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)
+      expect(subject.total).to be_an_instance_of Money
+      expect(subject.total).to eq(Money.new(3797))
     end
   end
 
   describe :total_unique_items do
     context "cart has no items" do
       it "returns 0" do
-        subject.total_unique_items.should eq(0)
+        expect(subject.total_unique_items).to eq(0)
       end
     end
 
     context "cart has some items" do
       before do
-        items = [stub(:quantity => 2, :price => 33.99), stub(:quantity => 1, :price => 45.99)]
-        subject.stub(:shopping_cart_items).and_return(items)
+        items = [instance_double("item 1", quantity: 2, price: 33.99),
+                 instance_double("item 2", quantity: 1, price: 45.99)]
+        allow(subject).to receive(:shopping_cart_items).and_return(items)
       end
 
       it "returns the sum of the quantities of all shopping cart items" do
-        subject.total_unique_items.should eq(3)
+        expect(subject.total_unique_items).to eq(3)
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "../../../../spec_helper")
 
 describe ActiveRecord::Acts::ShoppingCart::Item do
   let(:klass) do
@@ -7,35 +7,35 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
     klass
   end
 
-  let(:shopping_cart_items) { stub }
+  let(:shopping_cart_items) { double }
 
   let(:subject) do
     subject = klass.new
-    subject.stub(:shopping_cart_items).and_return(shopping_cart_items)
+    allow(subject).to receive(:shopping_cart_items).and_return(shopping_cart_items)
     subject
   end
 
-  let(:object) { stub(:id => 1) }
-  let(:item)   { stub(:subtotal => 47.98, :price => 23.99, :quantity => 2, :save => true)}
+  let(:object) { instance_double("object", id: 1) }
+  let(:item)   { instance_double("item", subtotal: 47.98, price: 23.99, quantity: 2, save: true)}
 
   describe :item_for do
     context "no cart item exists for the object" do
       before do
-        shopping_cart_items.should_receive(:where).with(:item => object).and_return([])
+        expect(shopping_cart_items).to receive(:where).with(item: object).and_return([])
       end
 
       it "returns the shopping cart item object for the requested object" do
-        subject.item_for(object).should be_nil
+        expect(subject.item_for(object)).to be_nil
       end
     end
 
     context "a cart item exists for the object" do
       before do
-        shopping_cart_items.should_receive(:where).with(:item => object).and_return([ item ])
+        expect(shopping_cart_items).to receive(:where).with(item: object).and_return([item])
       end
 
       it "returns that item" do
-        subject.item_for(object).should be(item)
+        expect(subject.item_for(object)).to be(item)
       end
     end
   end
@@ -43,21 +43,21 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
   describe :subtotal_for do
     context "no cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object)
+        expect(subject).to receive(:item_for).with(object)
       end
 
       it "returns 0" do
-        subject.subtotal_for(object).should eq(0.0)
+        expect(subject.subtotal_for(object)).to eq(0.0)
       end
     end
 
     context "the cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object).and_return(item)
+        expect(subject).to receive(:item_for).with(object).and_return(item)
       end
 
       it "returns the subtotal for the item" do
-        subject.subtotal_for(object).should eq(47.98)
+        expect(subject.subtotal_for(object)).to eq(47.98)
       end
     end
   end
@@ -65,21 +65,21 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
   describe :quantity_for do
     context "no cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object)
+        expect(subject).to receive(:item_for).with(object)
       end
 
       it "returns 0" do
-        subject.quantity_for(object).should eq(0)
+        expect(subject.quantity_for(object)).to eq(0)
       end
     end
 
     context "the cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object).and_return(item)
+        expect(subject).to receive(:item_for).with(object).and_return(item)
       end
 
       it "returns the quantity for the object" do
-        subject.quantity_for(object).should eq(2)
+        expect(subject.quantity_for(object)).to eq(2)
       end
     end
   end
@@ -87,11 +87,11 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
   describe :update_quantity_for do
     context "the cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object).and_return(item)
+        expect(subject).to receive(:item_for).with(object).and_return(item)
       end
 
       it "updates the item quantity to the specified quantity" do
-        item.should_receive(:update_quantity).with(3)
+        expect(item).to receive(:update_quantity).with(3)
         subject.update_quantity_for(object, 3)
       end
     end
@@ -100,21 +100,21 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
   describe :price_for do
     context "no cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object)
+        expect(subject).to receive(:item_for).with(object)
       end
 
       it "returns 0" do
-        subject.price_for(object).should eq(0.0)
+        expect(subject.price_for(object)).to eq(0.0)
       end
     end
 
     context "the cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object).and_return(item)
+        expect(subject).to receive(:item_for).with(object).and_return(item)
       end
 
       it "returns the price of the item" do
-        subject.price_for(object).should eq(23.99)
+        expect(subject.price_for(object)).to eq(23.99)
       end
     end
   end
@@ -122,11 +122,11 @@ describe ActiveRecord::Acts::ShoppingCart::Item do
   describe :update_price_for do
     context "the cart item exists for the object" do
       before do
-        subject.should_receive(:item_for).with(object).and_return(item)
+        expect(subject).to receive(:item_for).with(object).and_return(item)
       end
 
       it "updates the price on the item" do
-        item.should_receive(:update_price).with(99.99)
+        expect(item).to receive(:update_price).with(99.99)
         subject.update_price_for(object, 99.99)
       end
     end

data/spec/active_record/acts/shopping_cart_item/instance_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "../../../../spec_helper")
 
 describe ActiveRecord::Acts::ShoppingCartItem::InstanceMethods do
   let(:klass) do
@@ -9,29 +9,29 @@ describe ActiveRecord::Acts::ShoppingCartItem::InstanceMethods do
 
   let(:subject) do
     subject = klass.new
-    subject.stub(:save => true)
+    allow(subject).to receive(:save).and_return(true)
     subject
   end
 
   describe :subtotal do
     it "returns the quantity * price" do
-      subject.stub(:quantity => 2, :price => 33.99)
-      subject.subtotal.should eq(67.98)
+      allow(subject).to receive_messages(quantity: 2, price: 33.99)
+      expect(subject.subtotal).to eq(67.98)
     end
   end
 
   describe :update_quantity do
     it "updates the item quantity" do
-      subject.should_receive(:quantity=).with(5)
-      subject.should_receive(:save)
+      expect(subject).to receive(:quantity=).with(5)
+      expect(subject).to receive(:save)
       subject.update_quantity(5)
     end
   end
 
   describe :update_price do
     it "updates the item price" do
-      subject.should_receive(:price=).with(55.99)
-      subject.should_receive(:save)
+      expect(subject).to receive(:price=).with(55.99)
+      expect(subject).to receive(:save)
       subject.update_price(55.99)
     end
   end

data/spec/spec_helper.rb

@@ -1,21 +1,25 @@
+require "rubygems"
+require "bundler/setup"
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'rubygems'
-require 'bundler/setup'
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
-require 'simplecov'
-require 'rails'
-require 'active_record'
-require 'money-rails'
+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'
+require "acts_as_shopping_cart"
 
 SimpleCov.start
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.raise_errors_for_deprecations!
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shopping_cart
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.14
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -70,44 +70,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,52 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Shopping Cart implementation
 email:
-- david@crowdint.com
+- david@padilla.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.4.0
 - Gemfile.4.1
 - Gemfile.4.2
+- Gemfile.5.0
 - LICENSE
 - README.markdown
 - Rakefile
@@ -178,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acts_as_shopping_cart
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Shopping Cart implementation