cartman 1.0.0 → 1.1.0

data/lib/cartman/cart.rb

@@ -12,6 +12,7 @@ module Cartman
       line_item_id = @@redis.incr CART_LINE_ITEM_ID_KEY
       @@redis.pipelined do
         @@redis.mapped_hmset("cartman:line_item:#{line_item_id}", options)
+        @@redis.hincrby("cartman:line_item:#{line_item_id}", :_version, 1)
         @@redis.sadd key, line_item_id
         @@redis.sadd index_key, "#{options[:type]}:#{options[:id]}"
         @@redis.set index_key_for(options), line_item_id
@@ -91,6 +92,11 @@ module Cartman
           @@redis.expire item, Cartman::Configuration.cart_expires_in
         end
       end
+      @@redis.hincrby self.class.versions_key, version_key, 1
+    end
+
+    def version
+      @@redis.hget(self.class.versions_key, version_key).to_i
     end
 
     def reassign(new_id)
@@ -107,6 +113,10 @@ module Cartman
       @uid = new_id
     end
 
+    def cache_key
+      "cart/#{@uid}-#{version}"
+    end
+
     private
 
     def key(id=@uid)
@@ -117,6 +127,14 @@ module Cartman
       key(id) + ":index"
     end
 
+    def version_key(id=@uid)
+      id
+    end
+
+    def self.versions_key
+      "cartman:cart:versions"
+    end
+
     def index_keys(id=@uid)
       @@redis.keys "#{index_key(id)}:*"
     end

data/lib/cartman/item.rb

@@ -28,14 +28,29 @@ module Cartman
       @id == item._id
     end
 
+    def touch
+      cart.touch
+      Cartman::Configuration.redis.hincrby _key, :_version, 1
+    end
+
     def _key
       "cartman:line_item:#{@id}"
     end
 
+    def _version
+      super.to_i
+    end
+
+    def cache_key
+      "item/#{@id}-#{_version}"
+    end
+
     def method_missing(method, *args, &block)
       if method.to_s =~ /=\z/
         Cartman::Configuration.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
         @data.fetch(method)
       end

data/lib/cartman/version.rb

@@ -1,3 +1,3 @@
 module Cartman
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/cart_spec.rb

@@ -187,6 +187,12 @@ describe Cartman do
         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)
       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)
+      end
     end
 
     describe "#reassign" do
@@ -214,5 +220,11 @@ describe Cartman do
         cart.send(:key)[-1].should 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}")
+      end
+    end
   end
 end

data/spec/item_spec.rb

@@ -24,6 +24,10 @@ describe Cartman do
         new_item = cart.send(:get_item, item._id)
         new_item.quantity.should eq("3")
       end
+
+      it "should touch the item and cart" do
+        expect{item.quantity = 4}.to change{item._version}.by(1)
+      end
     end
 
     describe "#cost" do
@@ -43,5 +47,18 @@ describe Cartman do
       end
     end
 
+    describe "#touch" do
+      it "should record that the record was changed" do
+        item.touch
+        item._version.should 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}")
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartman
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4477531500718157343
+      hash: -2016413100471598065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4477531500718157343
+      hash: -2016413100471598065
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23