remodel 0.4.0 → 0.4.1

data/README.md

@@ -66,7 +66,9 @@ now you can do:
 
 	>> require './example/book'
 	=> true
-	>> book = Book.create 'shelf', :title => 'Moby Dick', :year => 1851
+	>> context = Remodel.create_context('shelf')
+	=> #<Remodel::Context(shelf)> 
+	>> book = Book.create context, :title => 'Moby Dick', :year => 1851
 	=> #<Book(shelf, 1) title: "Moby Dick", year: 1851, author: "(anonymous)"> 
 	>> chapter = book.chapters.create :title => 'Ishmael'
 	=> #<Chapter(shelf, 1) title: "Ishmael"> 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/remodel/caching_context.rb

@@ -17,6 +17,20 @@ module Remodel
       @context.key
     end
 
+    def batched
+      raise InvalidUse, "cannot nest batched blocks" if @dirty
+      begin
+        @dirty = Set.new
+        yield
+      ensure
+        to_delete = @dirty.select { |field| @cache[field].nil? }
+        to_update = (@dirty - to_delete).to_a
+        @context.hmset(*to_update.zip(@cache.values_at(*to_update)).flatten)
+        @context.hmdel(*to_delete)
+        @dirty = nil
+      end
+    end
+
     def hget(field)
       @cache[field] = @context.hget(field) unless @cache.has_key?(field)
       @cache[field]
@@ -30,18 +44,19 @@ module Remodel
     def hset(field, value)
       value = value.to_s if value
       @cache[field] = value
-      @context.hset(field, value)
+      @dirty ? @dirty.add(field) : @context.hset(field, value)
     end
 
     def hincrby(field, value)
-      result = @context.hincrby(field, value)
-      @cache[field] = result.to_s
-      result
+      new_value = @dirty ? hget(field).to_i + value : @context.hincrby(field, value)
+      @cache[field] = new_value.to_s
+      @dirty.add(field) if @dirty
+      new_value
     end
 
     def hdel(field)
       @cache[field] = nil
-      @context.hdel(field)
+      @dirty ? @dirty.add(field) : @context.hdel(field)
     end
 
     def inspect

data/lib/remodel/context.rb

@@ -25,6 +25,11 @@ module Remodel
       Remodel.redis.hset(@key, field, value)
     end
 
+    def hmset(*fields_and_values)
+      return if fields_and_values.empty?
+      Remodel.redis.hmset(@key, *fields_and_values)
+    end
+
     def hincrby(field, value)
       Remodel.redis.hincrby(@key, field, value)
     end
@@ -33,6 +38,13 @@ module Remodel
       Remodel.redis.hdel(@key, field)
     end
 
+    def hmdel(*fields)
+      return if fields.empty?
+      Remodel.redis.pipelined do
+        fields.each { |field| Remodel.redis.hdel(@key, field) }
+      end
+    end
+
     def inspect
       "\#<#{self.class.name}(#{@key})>"
     end

data/lib/remodel.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'redis'
 require 'date'
+require 'set'
 
 # If available, use the superfast YAJL lib to parse JSON.
 begin
@@ -37,6 +38,7 @@ module Remodel
   class InvalidKeyPrefix < Error; end
   class InvalidType < Error; end
   class MissingContext < Error; end
+  class InvalidUse < Error; end
 
   # By default, the redis server is expected to listen at `localhost:6379`.
   # Otherwise you will have to set `Remodel.redis` to a suitably initialized

data/test/test_caching_context.rb

@@ -111,6 +111,60 @@ class TestCachingContext < Test::Unit::TestCase
         assert @cache.cache.has_key?('x')
       end
     end
+
+    context 'batched' do
+      should "ensure batched blocks are not nested" do
+        assert_raise(Remodel::InvalidUse) do
+          @cache.batched do
+            @cache.batched do
+            end
+          end
+        end
+      end
+
+      should "collect hset calls into one hmset" do
+        context.expects(:hset).never
+        context.expects(:hmset).with('a', '3', 'b', '2') #might break in ruby 1.8
+        @cache.batched do
+          @cache.hset('a', 1)
+          @cache.hset('b', 2)
+          @cache.hset('a', 3)
+        end
+      end
+
+      should "collect hdel calls into one hmdel" do
+        context.expects(:hdel).never
+        context.expects(:hmdel).with('a', 'b')
+        @cache.batched do
+          @cache.hdel('a')
+          @cache.hdel('b')
+          @cache.hdel('a')
+        end
+      end
+
+      should "handle multiple hset and hdel to the same field" do
+        context.expects(:hset).never
+        context.expects(:hdel).never
+        context.expects(:hmset).with('a', '3')
+        context.expects(:hmdel).with()
+        @cache.batched do
+          @cache.hset('a', 1)
+          @cache.hdel('a')
+          @cache.hset('a', 3)
+        end
+      end
+
+      should "handle hincrby" do
+        context.expects(:hset).never
+        context.expects(:hmset).with('i', '2')
+        @cache.batched do
+          @cache.hdel('i')
+          @cache.hincrby('i', 1)
+          @cache.hincrby('i', 1)
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tim Lossen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: []