ohm 0.0.28 → 0.0.29

data/lib/ohm.rb

@@ -368,15 +368,18 @@ module Ohm
     #
     # @param name [Symbol] Name of the attribute.
     def self.attribute(name)
-      define_method(name) do
-        read_local(name)
-      end
+      unless attributes.include?(name)
 
-      define_method(:"#{name}=") do |value|
-        write_local(name, value)
-      end
+        define_method(name) do
+          read_local(name)
+        end
 
-      attributes << name
+        define_method(:"#{name}=") do |value|
+          write_local(name, value)
+        end
+
+        attributes << name
+      end
     end
 
     # Defines a counter attribute for the model. This attribute can't be assigned, only incremented
@@ -384,11 +387,14 @@ module Ohm
     #
     # @param name [Symbol] Name of the counter.
     def self.counter(name)
-      define_method(name) do
-        read_local(name).to_i
-      end
+      unless counters.include?(name)
+
+        define_method(name) do
+          read_local(name).to_i
+        end
 
-      counters << name
+        counters << name
+      end
     end
 
     # Defines a list attribute for the model. It can be accessed only after the model instance
@@ -396,8 +402,10 @@ module Ohm
     #
     # @param name [Symbol] Name of the list.
     def self.list(name, model = nil)
-      attr_list_reader(name, model)
-      collections << name
+      unless collections.include?(name)
+        attr_list_reader(name, model)
+        collections << name
+      end
     end
 
     # Defines a set attribute for the model. It can be accessed only after the model instance
@@ -406,8 +414,10 @@ module Ohm
     #
     # @param name [Symbol] Name of the set.
     def self.set(name, model = nil)
-      attr_set_reader(name, model)
-      collections << name
+      unless collections.include?(name)
+        attr_set_reader(name, model)
+        collections << name
+      end
     end
 
     # Creates an index (a set) that will be used for finding instances.
@@ -426,7 +436,9 @@ module Ohm
     #
     # @param name [Symbol] Name of the attribute to be indexed.
     def self.index(att)
-      indices << att
+      unless indices.include?(att)
+        indices << att
+      end
     end
 
     def self.attr_list_reader(name, model = nil)
@@ -609,10 +621,37 @@ module Ohm
       self.class.key(id, *args)
     end
 
+    # Rewrite at runtime to use either SET or MSET for persisting to
+    # Redis. The idea is to use MSET when possible.
     def write
+      if legacy_redis_version?
+        def write
+          write_with_set
+        end
+      else
+        def write
+          write_with_mset
+        end
+      end
+      write
+    end
+
+    # Write attributes using SET
+    # This method will be removed once MSET becomes standard.
+    def write_with_set
+      attributes.each do |att|
+        (value = send(att)) ?
+          db.set(key(att), value) :
+          db.del(key(att))
+      end
+    end
+
+    # Write attributes using MSET
+    # This is the preferred method, and will be the only option
+    # available once MSET becomes standard.
+    def write_with_mset
       unless attributes.empty?
         rems, adds = attributes.map { |a| [key(a), send(a)] }.partition { |t| t.last.nil? }
-
         db.del(*rems.flatten.compact) unless rems.empty?
         db.mset(adds.flatten)         unless adds.empty?
       end
@@ -620,6 +659,13 @@ module Ohm
 
   private
 
+    # Determine if MSET is available. This method
+    # and the branch at #write will be deprecated
+    # once Redis 1.1 becomes the recommended version.
+    def legacy_redis_version?
+      db.info[:redis_version] <= "1.02"
+    end
+
     def self.db
       Ohm.redis
     end

data/test/model_test.rb

@@ -626,4 +626,24 @@ class TestRedis < Test::Unit::TestCase
       assert_equal %Q{#<Bar:#{bar.id} name="Albert" friends=#<Set: ["1", "2"]> comments=#<List: ["A"]> visits=1>}, Bar[bar.id].inspect
     end
   end
+
+  context "Overwritting write" do
+    class ::Baz < Ohm::Model
+      attribute :name
+
+      def write
+        self.name = "Foobar"
+        super
+      end
+    end
+
+    should "work properly" do
+      baz = Baz.new
+      baz.name = "Foo"
+      baz.save
+      baz.name = "Foo"
+      baz.save
+      assert_equal "Foobar", Baz[baz.id].name
+    end
+  end
 end

data/test/redis_test.rb

@@ -14,6 +14,12 @@ class Foo
 end
 
 class RedisTest < Test::Unit::TestCase
+  setup do
+    @legacy ||= begin
+                  Ohm.redis.info[:redis_version] <= "1.02"
+                end
+  end
+
   describe "redis" do
     setup do
       @r ||= Ohm.redis
@@ -41,9 +47,11 @@ class RedisTest < Test::Unit::TestCase
     end
 
     should "be able to MSET keys" do
-      @r.mset(:foo => "foobar", :bar => 1000)
-      assert_equal ["foobar", "1000"], @r.mget("foo", "bar")
-      assert_equal ["foobar", "1000", nil], @r.mget("foo", "bar", "baz")
+      unless @legacy
+        @r.mset(:foo => "foobar", :bar => 1000)
+        assert_equal ["foobar", "1000"], @r.mget("foo", "bar")
+        assert_equal ["foobar", "1000", nil], @r.mget("foo", "bar", "baz")
+      end
     end
 
     should "be able to MGET keys" do
@@ -224,19 +232,21 @@ class RedisTest < Test::Unit::TestCase
     end
 
     should "be able to pop values from a list and push them onto a temp list with RPOPLPUSH" do
-      @r.rpush "list", 'one'
-      @r.rpush "list", 'two'
-      @r.rpush "list", 'three'
-      assert_equal "list", @r.type('list')
-      assert_equal 3, @r.llen('list')
-      assert_equal %w(one two three), @r.lrange('list',0,-1)
-      assert_equal [], @r.lrange('tmp',0,-1)
-      assert_equal "three", @r.rpoplpush('list', 'tmp')
-      assert_equal %w(three), @r.lrange('tmp',0,-1)
-      assert_equal "two", @r.rpoplpush('list', 'tmp')
-      assert_equal %w(two three), @r.lrange('tmp',0,-1)
-      assert_equal "one", @r.rpoplpush('list', 'tmp')
-      assert_equal %w(one two three), @r.lrange('tmp',0,-1)
+      unless @legacy
+        @r.rpush "list", 'one'
+        @r.rpush "list", 'two'
+        @r.rpush "list", 'three'
+        assert_equal "list", @r.type('list')
+        assert_equal 3, @r.llen('list')
+        assert_equal %w(one two three), @r.lrange('list',0,-1)
+        assert_equal [], @r.lrange('tmp',0,-1)
+        assert_equal "three", @r.rpoplpush('list', 'tmp')
+        assert_equal %w(three), @r.lrange('tmp',0,-1)
+        assert_equal "two", @r.rpoplpush('list', 'tmp')
+        assert_equal %w(two three), @r.lrange('tmp',0,-1)
+        assert_equal "one", @r.rpoplpush('list', 'tmp')
+        assert_equal %w(one two three), @r.lrange('tmp',0,-1)
+      end
     end
 
     should "be able add members to a set" do
@@ -310,58 +320,70 @@ class RedisTest < Test::Unit::TestCase
     end
 
     should "be able add members to a zset ZADD" do
-      @r.zadd 'zset', 1, 'set'
-      assert_equal %w(set), @r.zrange('zset', 0, 1)
-      assert_equal 1, @r.zcard('zset')
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'set'
+        assert_equal %w(set), @r.zrange('zset', 0, 1)
+        assert_equal 1, @r.zcard('zset')
+        @r.del('zset')
+      end
     end
 
     should "be able count the members of a zset ZCARD" do
-      @r.zadd 'zset', 1, 'foo'
-      @r.zcard('zset')
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'foo'
+        @r.zcard('zset')
+        @r.del('zset')
+      end
     end
 
 
     should "be able delete members of a zset ZREM" do
-      @r.zadd 'zset', 1, 'set'
-      assert_equal 1, @r.zcard('zset')
-      @r.zadd 'zset', 2, 'set2'
-      assert_equal 2, @r.zcard('zset')
-      @r.zrem 'zset', 'set'
-      assert_equal 1, @r.zcard('zset')
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'set'
+        assert_equal 1, @r.zcard('zset')
+        @r.zadd 'zset', 2, 'set2'
+        assert_equal 2, @r.zcard('zset')
+        @r.zrem 'zset', 'set'
+        assert_equal 1, @r.zcard('zset')
+        @r.del('zset')
+      end
     end
 
     should "be able to get a range of values from a zset ZRANGE" do
-      @r.zadd 'zset', 1, 'set'
-      @r.zadd 'zset', 2, 'set2'
-      @r.zadd 'zset', 3, 'set3'
-      assert_equal 3, @r.zcard('zset')
-      assert_equal %w(set set2 set3), @r.zrange('zset', 0, 3)
-      @r.del('set')
-      @r.del('set2')
-      @r.del('set3')
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'set'
+        @r.zadd 'zset', 2, 'set2'
+        @r.zadd 'zset', 3, 'set3'
+        assert_equal 3, @r.zcard('zset')
+        assert_equal %w(set set2 set3), @r.zrange('zset', 0, 3)
+        @r.del('set')
+        @r.del('set2')
+        @r.del('set3')
+        @r.del('zset')
+      end
     end
 
     should "be able to get a reverse range of values from a zset ZREVRANGE" do
-      @r.zadd 'zset', 1, 'set'
-      @r.zadd 'zset', 2, 'set2'
-      @r.zadd 'zset', 3, 'set3'
-      assert_equal 3, @r.zcard('zset')
-      assert_equal %w(set3 set2 set), @r.zrevrange('zset', 0, 3)
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'set'
+        @r.zadd 'zset', 2, 'set2'
+        @r.zadd 'zset', 3, 'set3'
+        assert_equal 3, @r.zcard('zset')
+        assert_equal %w(set3 set2 set), @r.zrevrange('zset', 0, 3)
+        @r.del('zset')
+      end
     end
 
     should "be able to get a range by score of values from a zset ZRANGEBYSCORE" do
-      @r.zadd 'zset', 1, 'set'
-      @r.zadd 'zset', 2, 'set2'
-      @r.zadd 'zset', 3, 'set3'
-      @r.zadd 'zset', 4, 'set4'
-      assert_equal 4, @r.zcard('zset')
-      assert_equal %w(set2 set3), @r.zrangebyscore('zset', 2, 3)
-      @r.del('zset')
+      unless @legacy
+        @r.zadd 'zset', 1, 'set'
+        @r.zadd 'zset', 2, 'set2'
+        @r.zadd 'zset', 3, 'set3'
+        @r.zadd 'zset', 4, 'set4'
+        assert_equal 4, @r.zcard('zset')
+        assert_equal %w(set2 set3), @r.zrangebyscore('zset', 2, 3)
+        @r.del('zset')
+      end
     end
 
     should "provide info" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors: 
 - Michel Martens