cartman 2.1.1 → 2.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f8970cd6c3e345a3149d132f149a9b7c87961346
+  data.tar.gz: 35fa2ab61ce928ceae66b7f0ccd40db9eb30a95b
+SHA512:
+  metadata.gz: 49a16516e74c510e7454269397259b7b9af119f7e1d63cc2d3efe8cfc0f7e9c2e206e1ebd6bc132920ffdeb94136f9e7e8002060cc542aa577ddc1926ae5fc80
+  data.tar.gz: b95aa0e012bde84807f2dcfb6b8792aceeb4ec831412385f219831d9a08490b21624aa4ac9a99498f0f1d8399bade7ce541237fcbb5c144a1f1517da00a1f85a

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+services:
+  - redis
 script: bundle exec rspec spec

data/cartman.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("redis")
 
-  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rspec", "~> 3.0.0")
 end

data/lib/cartman/cart.rb

@@ -60,7 +60,7 @@ module Cartman
     def total
       items.collect { |item|
         (item.cost * 100).to_i
-      }.inject{|sum,cost| sum += cost} / 100.0
+      }.inject(0){|sum,cost| sum += cost} / 100.0
     end
 
     def ttl

data/lib/cartman/item.rb

@@ -46,16 +46,22 @@ module Cartman
     end
 
     def method_missing(method, *args, &block)
-      if method.to_s =~ /=\z/
+      if method.to_s.end_with?("=")
         redis.hset _key, method[0..-2], args[0].to_s
         @data.store(method[0..-2].to_sym, args[0].to_s)
         version = touch
         @data.store(:_version, version)
-      else
+      elsif @data.keys.include?(method)
         @data.fetch(method)
+      else
+        super
       end
     end
 
+    def respond_to_missing?(method, include_private = false)
+      method.to_s.end_with?("=") || @data.keys.include?(method) || super
+    end
+
     private
 
     def redis

data/lib/cartman/version.rb

@@ -1,3 +1,3 @@
 module Cartman
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/cart_spec.rb

@@ -11,7 +11,7 @@ describe Cartman do
 
     describe "#key" do
       it "should return a proper key string" do
-        cart.send(:key).should eq("cartman:cart:1")
+        expect(cart.send(:key)).to eq("cartman:cart:1")
       end
     end
 
@@ -21,21 +21,21 @@ describe Cartman do
       end
 
       it "creates a line item key" do
-        Cartman.config.redis.exists("cartman:line_item:1").should be_true
+        expect(Cartman.config.redis.exists("cartman:line_item:1")).to be true
       end
 
       it "adds that line item key's id to the cart set" do
-        Cartman.config.redis.sismember(cart.send(:key), 1).should be_true
+        expect(Cartman.config.redis.sismember(cart.send(:key), 1)).to be true
       end
 
       it "should expire the line_item_keys in the amount of time specified" do
-        cart.ttl.should eq(Cartman.config.cart_expires_in)
-        Cartman.config.redis.ttl("cartman:line_item:1").should eq(Cartman.config.cart_expires_in)
+        expect(cart.ttl).to eq(Cartman.config.cart_expires_in)
+        expect(Cartman.config.redis.ttl("cartman:line_item:1")).to eq(Cartman.config.cart_expires_in)
       end
 
       it "should add an index key to be able to look up by type and ID" do
-        Cartman.config.redis.exists("cartman:cart:1:index").should be_true
-        Cartman.config.redis.sismember("cartman:cart:1:index", "Bottle:17").should be_true
+        expect(Cartman.config.redis.exists("cartman:cart:1:index")).to be true
+        expect(Cartman.config.redis.sismember("cartman:cart:1:index", "Bottle:17")).to be true
       end
 
       it "should squack if type and/or ID are not set" do
@@ -46,7 +46,7 @@ describe Cartman do
 
       it "should return an Item" do
         item = cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, quantity: 2)
-        item.class.should eq(Cartman::Item)
+        expect(item.class).to eq(Cartman::Item)
       end
     end
 
@@ -55,18 +55,18 @@ describe Cartman do
         item = cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
         item_id = item._id
         cart.remove_item(item)
-        Cartman.config.redis.sismember(cart.send(:key), item_id).should be_false
-        Cartman.config.redis.exists("cartman:line_item:#{item_id}").should be_false
+        expect(Cartman.config.redis.sismember(cart.send(:key), item_id)).to be false
+        expect(Cartman.config.redis.exists("cartman:line_item:#{item_id}")).to be false
       end
 
       it "should not delete the indecies for other items" do
         item = cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
         item2 = cart.add_item(id: 18, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17").should be_true
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:18").should be_true
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17")).to be true
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:18")).to be true
         cart.remove_item(item)
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17").should be_false
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:18").should be_true
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:18")).to be true
       end
     end
 
@@ -78,20 +78,20 @@ describe Cartman do
       end
 
       it "should return an ItemCollection of Items" do
-        cart.items.class.should be(Cartman::ItemCollection)
-        cart.items.first.class.should be(Cartman::Item)
-        cart.items.first.id.should eq("17")
-        cart.items.first.name.should eq("Bordeux")
+        expect(cart.items.class).to be(Cartman::ItemCollection)
+        expect(cart.items.first.class).to be(Cartman::Item)
+        expect(cart.items.first.id).to eq("17")
+        expect(cart.items.first.name).to eq("Bordeux")
       end
 
       it "should return all items in cart if no filter is given" do
-        cart.items.size.should eq(3)
+        expect(cart.items.size).to eq(3)
       end
 
       it "should return a subset of the items if a filter is given" do
-        cart.items("Bottle").size.should eq(2)
-        cart.items("GiftCard").size.should eq(1)
-        cart.items("SomethingElse").size.should eq(0)
+        expect(cart.items("Bottle").size).to eq(2)
+        expect(cart.items("GiftCard").size).to eq(1)
+        expect(cart.items("SomethingElse").size).to eq(0)
       end
     end
 
@@ -106,18 +106,18 @@ describe Cartman do
       end
 
       it "should be able to tell you that an item in the cart is present" do
-        cart.contains?(Bottle.new(17)).should be_true
+        expect(cart.contains?(Bottle.new(17))).to be true
       end
 
       it "should be able to tell you that an item in the cart is absent" do
-        cart.contains?(Bottle.new(20)).should be_false
+        expect(cart.contains?(Bottle.new(20))).to be false
       end
 
       it "should be able to tell you that an item in the cart is absent if it's been removed" do
         cart.remove_item(cart.items.first)
-        cart.contains?(Bottle.new(17)).should be_false
+        expect(cart.contains?(Bottle.new(17))).to be false
         cart.remove_item(cart.items.last)
-        cart.contains?(Bottle.new(34)).should be_false
+        expect(cart.contains?(Bottle.new(34))).to be false
       end
     end
 
@@ -129,13 +129,13 @@ describe Cartman do
       end
 
       it "should take some object, and return the Item that corresponds to it" do
-        cart.find(Bottle.new(17)).quantity.should eq("2")
-        cart.find(Bottle.new(17)).name.should eq("Bordeux")
-        cart.find(Bottle.new(34)).name.should eq("Cabernet")
+        expect(cart.find(Bottle.new(17)).quantity).to eq("2")
+        expect(cart.find(Bottle.new(17)).name).to eq("Bordeux")
+        expect(cart.find(Bottle.new(34)).name).to eq("Cabernet")
       end
 
       it "should return nil if the Item is not in the cart" do
-        cart.find(Bottle.new(23)).should be(nil)
+        expect(cart.find(Bottle.new(23))).to be(nil)
       end
     end
 
@@ -143,7 +143,7 @@ describe Cartman do
       it "should return the number of items in the cart" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, quantity: 2)
-        cart.count.should eq(2)
+        expect(cart.count).to eq(2)
       end
     end
 
@@ -151,7 +151,7 @@ describe Cartman do
       it "should return the sum of the default quantity field" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, quantity: 2)
-        cart.quantity.should eq(4)
+        expect(cart.quantity).to eq(4)
       end
 
       it "should return the sum of the defined quantity field" do
@@ -160,7 +160,7 @@ describe Cartman do
         end
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, qty: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, qty: 2)
-        cart.quantity.should eq(4)
+        expect(cart.quantity).to eq(4)
         Cartman.config do |c|
           c.quantity_field = :quantity
         end
@@ -168,10 +168,14 @@ describe Cartman do
     end
 
     describe "#total" do
+      it "should return 0 when no items are in the cart" do
+        expect(cart.total).to eq(0)
+      end
+
       it "should total the default costs field" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, quantity: 2)
-        cart.total.should eq(368.48)
+        expect(cart.total).to eq(368.48)
       end
 
       it "should total whatever cost field the user sets" do
@@ -180,7 +184,7 @@ describe Cartman do
         end
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost_in_cents: 9212, quantity: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost_in_cents: 9212, quantity: 2)
-        cart.total.should eq(36848)
+        expect(cart.total).to eq(36848)
         Cartman.config do |c|
           c.unit_cost_field = :unit_cost
         end
@@ -192,11 +196,11 @@ describe Cartman do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost_in_cents: 18424, quantity: 2)
         cart.add_item(id: 34, type: "Bottle", name: "Cabernet", unit_cost: 92.12, cost_in_cents: 18424, quantity: 2)
         cart.destroy!
-        Cartman.config.redis.exists("cartman:cart:1").should be_false
-        Cartman.config.redis.exists("cartman:line_item:1").should be_false
-        Cartman.config.redis.exists("cartman:line_item:2").should be_false
-        Cartman.config.redis.exists("cartman:cart:1:index").should be_false
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17").should be_false
+        expect(Cartman.config.redis.exists("cartman:cart:1")).to be false
+        expect(Cartman.config.redis.exists("cartman:line_item:1")).to be false
+        expect(Cartman.config.redis.exists("cartman:line_item:2")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1:index")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17")).to be false
       end
     end
 
@@ -204,52 +208,52 @@ describe Cartman do
       it "should reset the TTL" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost_in_cents: 18424, quantity: 2)
         cart.touch
-        cart.ttl.should eq(Cartman.config.cart_expires_in)
-        Cartman.config.redis.ttl("cartman:cart:1:index").should eq(Cartman.config.cart_expires_in)
-        Cartman.config.redis.ttl("cartman:cart:1:index:Bottle:17").should eq(Cartman.config.cart_expires_in)
+        expect(cart.ttl).to eq(Cartman.config.cart_expires_in)
+        expect(Cartman.config.redis.ttl("cartman:cart:1:index")).to eq(Cartman.config.cart_expires_in)
+        expect(Cartman.config.redis.ttl("cartman:cart:1:index:Bottle:17")).to eq(Cartman.config.cart_expires_in)
       end
 
       it "should record that the cart was updated" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost_in_cents: 18424, quantity: 2)
         cart.touch
-        cart.version.should eq(2)
+        expect(cart.version).to eq(2)
       end
     end
 
     describe "#reassign" do
       it "should only change the @uid if no key exists" do
         cart.reassign(2)
-        cart.send(:key)[-1].should eq("2")
+        expect(cart.send(:key)[-1]).to eq("2")
       end
 
       it "should rename the key, and index_key if it exists" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost_in_cents: 18424, quantity: 1)
         cart.add_item(id: 18, type: "Bottle", name: "Merlot", unit_cost: 92.12, cost_in_cents: 18424, quantity: 3)
-        cart.quantity.should be(4)
+        expect(cart.quantity).to be(4)
         cart.reassign(2)
-        cart.items.size.should be(2)
-        Cartman::Cart.new(2).quantity.should be(4)
-        Cartman.config.redis.exists("cartman:cart:1").should be_false
-        Cartman.config.redis.exists("cartman:cart:1:index").should be_false
-        Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17").should be_false
-        Cartman.config.redis.exists("cartman:cart:2").should be_true
-        Cartman.config.redis.exists("cartman:cart:2:index").should be_true
-        Cartman.config.redis.exists("cartman:cart:2:index:Bottle:17").should be_true
-        cart.send(:key)[-1].should eq("2")
+        expect(cart.items.size).to be(2)
+        expect(Cartman::Cart.new(2).quantity).to be(4)
+        expect(Cartman.config.redis.exists("cartman:cart:1")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1:index")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1:index:Bottle:17")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:2")).to be true
+        expect(Cartman.config.redis.exists("cartman:cart:2:index")).to be true
+        expect(Cartman.config.redis.exists("cartman:cart:2:index:Bottle:17")).to be true
+        expect(cart.send(:key)[-1]).to eq("2")
         cart.add_item(id: 19, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost_in_cents: 18424, quantity: 2)
         cart.reassign(1)
-        cart.items.size.should be(3)
-        Cartman.config.redis.exists("cartman:cart:2").should be_false
-        Cartman.config.redis.exists("cartman:cart:2:index").should be_false
-        Cartman.config.redis.exists("cartman:cart:1").should be_true
-        Cartman.config.redis.exists("cartman:cart:1:index").should be_true
-        cart.send(:key)[-1].should eq("1")
+        expect(cart.items.size).to be(3)
+        expect(Cartman.config.redis.exists("cartman:cart:2")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:2:index")).to be false
+        expect(Cartman.config.redis.exists("cartman:cart:1")).to be true
+        expect(Cartman.config.redis.exists("cartman:cart:1:index")).to be true
+        expect(cart.send(:key)[-1]).to eq("1")
       end
     end
 
     describe "#cache_key" do
       it "should return /cart/{cart_id}-{version}/" do
-        cart.cache_key.should eq("cart/#{cart.instance_variable_get(:@uid)}-#{cart.version}")
+        expect(cart.cache_key).to eq("cart/#{cart.instance_variable_get(:@uid)}-#{cart.version}")
       end
     end
   end

data/spec/item_collection_spec.rb

@@ -8,7 +8,7 @@ describe Cartman do
       Cartman.config.redis.flushdb
       Object.send(:remove_const, :Bottle) if defined?(Bottle)
       Bottle = double
-      Bottle.stub(:find).and_return(bottle)
+      allow(Bottle).to receive(:find).and_return(bottle)
     end
 
     describe "#each_with_object" do
@@ -22,7 +22,7 @@ describe Cartman do
       it "should work with items('Type')" do
         cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, cost: 184.24, quantity: 2)
         cart.add_item(id: 27, type: "UserGiftCard", unit_cost: 25, quantity: 1)
-        expect { |b| cart.items("Bottle").each_with_object(&b)}.to_not raise_error(ArgumentError)
+        expect { cart.items("Bottle").each_with_object{}}.not_to raise_error
       end
 
     end

data/spec/item_spec.rb

@@ -4,37 +4,46 @@ describe Cartman do
   describe Cartman::Item do
     let(:cart) { Cartman::Cart.new(1) }
     let(:item) { cart.add_item(id: 17, type: "Bottle", name: "Bordeux", unit_cost: 92.12, quantity: 2) }
- 
+
     describe "data getters and setters" do
       it "should let me get data stored for the item" do
-        item.id.should eq("17")
-        item.type.should eq("Bottle")
-        item.cost.should eq(184.24)
+        expect(item.id).to eq("17")
+        expect(item.type).to eq("Bottle")
+        expect(item.cost).to eq(184.24)
       end
 
       it "should let me modify data stored for the item" do
-        item.quantity.should eq("2")
+        expect(item.quantity).to eq("2")
         item.quantity = 3
-        item.quantity.should eq("3")
+        expect(item.quantity).to eq("3")
       end
 
       it "should immediately save data back to redis" do
-        item.quantity.should eq("2")
+        expect(item.quantity).to eq("2")
         item.quantity = 3
         new_item = cart.send(:get_item, item._id)
-        new_item.quantity.should eq("3")
+        expect(new_item.quantity).to eq("3")
       end
 
       it "should touch the item and cart" do
         expect{item.quantity = 4}.to change{item._version}.by(1)
       end
+
+      it "should raise NoMethodError if you use a getter that there isn't a key for" do
+        expect{ item.weight }.to raise_error(NoMethodError)
+      end
+
+      it "should respond_to the getters and setters" do
+        expect(item.respond_to?(:name)).to be true
+        expect(item.respond_to?(:name=)).to be true
+      end
     end
 
     describe "#cost" do
       it "should be equal to the unit_cost multiplied by the quantity" do
-        item.cost.should eq(184.24)
+        expect(item.cost).to eq(184.24)
         item.quantity = 3
-        item.cost.should eq(276.36)
+        expect(item.cost).to eq(276.36)
       end
     end
 
@@ -42,21 +51,21 @@ describe Cartman do
       it "should remove the item from the cart" do
         item_id = item._id
         item.destroy
-        Cartman.config.redis.sismember(cart.send(:key), item_id).should be_false
-        Cartman.config.redis.exists("cartman:line_item:#{item_id}").should be_false
+        expect(Cartman.config.redis.sismember(cart.send(:key), item_id)).to be false
+        expect(Cartman.config.redis.exists("cartman:line_item:#{item_id}")).to be false
       end
     end
 
     describe "#touch" do
       it "should record that the record was changed" do
         item.touch
-        item._version.should eq(1)
+        expect(item._version).to eq(1)
       end
     end
 
     describe "#cache_key" do
       it "should return item/{id}-{version}" do
-        item.cache_key.should eq("item/#{item._id}-#{item._version}")
+        expect(item.cache_key).to eq("item/#{item._id}-#{item._version}")
       end
     end
 

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cartman
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 2.1.2
 platform: ruby
 authors:
 - Will Cosgrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: Cartman is a frameworke agnostic, redis-backed, shopping cart system
 email:
 - will@willcosgrove.com
@@ -50,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,31 +64,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/willcosgrove/cartman
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Doing shopping carts like a boss since 2012
 test_files:
 - spec/cart_spec.rb
 - spec/item_collection_spec.rb
 - spec/item_spec.rb
 - spec/spec_helper.rb
-has_rdoc: