ohm 0.0.29 → 0.0.30

data/lib/ohm.rb

@@ -352,6 +352,16 @@ module Ohm
       end
     end
 
+    class RedefinitionError < Error
+      def initialize(att)
+        @att = att
+      end
+
+      def message
+        "Cannot redefine #{@att.inspect}"
+      end
+    end
+
     @@attributes = Hash.new { |hash, key| hash[key] = [] }
     @@collections = Hash.new { |hash, key| hash[key] = [] }
     @@counters = Hash.new { |hash, key| hash[key] = [] }
@@ -368,18 +378,17 @@ module Ohm
     #
     # @param name [Symbol] Name of the attribute.
     def self.attribute(name)
-      unless attributes.include?(name)
+      raise RedefinitionError, name if attributes.include?(name)
 
-        define_method(name) do
-          read_local(name)
-        end
-
-        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
 
     # Defines a counter attribute for the model. This attribute can't be assigned, only incremented
@@ -387,14 +396,13 @@ module Ohm
     #
     # @param name [Symbol] Name of the counter.
     def self.counter(name)
-      unless counters.include?(name)
+      raise RedefinitionError, name if counters.include?(name)
 
-        define_method(name) do
-          read_local(name).to_i
-        end
-
-        counters << name
+      define_method(name) do
+        read_local(name).to_i
       end
+
+      counters << name
     end
 
     # Defines a list attribute for the model. It can be accessed only after the model instance
@@ -402,10 +410,10 @@ module Ohm
     #
     # @param name [Symbol] Name of the list.
     def self.list(name, model = nil)
-      unless collections.include?(name)
-        attr_list_reader(name, model)
-        collections << name
-      end
+      raise RedefinitionError, name if collections.include?(name)
+
+      attr_list_reader(name, model)
+      collections << name
     end
 
     # Defines a set attribute for the model. It can be accessed only after the model instance
@@ -414,10 +422,10 @@ module Ohm
     #
     # @param name [Symbol] Name of the set.
     def self.set(name, model = nil)
-      unless collections.include?(name)
-        attr_set_reader(name, model)
-        collections << name
-      end
+      raise RedefinitionError, name if collections.include?(name)
+
+      attr_set_reader(name, model)
+      collections << name
     end
 
     # Creates an index (a set) that will be used for finding instances.
@@ -436,9 +444,9 @@ module Ohm
     #
     # @param name [Symbol] Name of the attribute to be indexed.
     def self.index(att)
-      unless indices.include?(att)
-        indices << att
-      end
+      raise RedefinitionError, att if indices.include?(att)
+
+      indices << att
     end
 
     def self.attr_list_reader(name, model = nil)
@@ -621,19 +629,11 @@ 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.
+    # Use MSET if possible, SET otherwise.
     def write
-      if legacy_redis_version?
-        def write
-          write_with_set
-        end
-      else
-        def write
-          write_with_mset
-        end
-      end
-      write
+      db.support_mset? ?
+        write_with_mset :
+        write_with_set
     end
 
     # Write attributes using SET
@@ -659,13 +659,6 @@ 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/lib/ohm/redis.rb

@@ -54,14 +54,7 @@ module Ohm
     PROCESSOR_IDENTITY = lambda { |reply| reply }
     PROCESSOR_CONVERT_TO_BOOL = lambda { |reply| reply == 0 ? false : reply }
     PROCESSOR_SPLIT_KEYS = lambda { |reply| reply.split(" ") }
-    PROCESSOR_INFO = lambda do |reply|
-      info = Hash.new
-      reply.each_line do |line|
-        key, value = line.split(":", 2).map { |part| part.chomp }
-        info[key.to_sym] = value
-      end
-      info
-    end
+    PROCESSOR_INFO = lambda { |reply| Hash[*(reply.lines.map { |l| l.chomp.split(":") }.flatten)] }
 
     REPLY_PROCESSOR = {
       :exists => PROCESSOR_CONVERT_TO_BOOL,
@@ -93,6 +86,16 @@ module Ohm
       connect
     end
 
+    def version
+      @version ||= info["redis_version"]
+    end
+
+    def support_mset?
+      @support_mset.nil? ?
+        @support_mset = version >= "1.05" :
+        @support_mset
+    end
+
     def to_s
       "Redis Client connected to #{@host}:#{@port} against DB #{@db}"
     end

data/test/model_test.rb

@@ -98,6 +98,63 @@ class TestRedis < Test::Unit::TestCase
     end
   end
 
+  context "Model definition" do
+    should "raise if an attribute is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          attribute :name
+          attribute :name
+        end
+      end
+    end
+
+    should "raise if a counter is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          counter :age
+          counter :age
+        end
+      end
+    end
+
+    should "raise if a list is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          list :todo
+          list :todo
+        end
+      end
+    end
+
+    should "raise if a set is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          set :friends
+          set :friends
+        end
+      end
+    end
+
+    should "raise if a collection is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          list :toys
+          set :toys
+        end
+      end
+    end
+
+    should "raise if a index is redefined" do
+      assert_raise Ohm::Model::RedefinitionError do
+        class RedefinedModel < Ohm::Model
+          attribute :color
+          index :color
+          index :color
+        end
+      end
+    end
+  end
+
   context "Finding an event" do
     setup do
       Ohm.redis.sadd("Event:all", 1)

data/test/redis_test.rb

@@ -16,7 +16,7 @@ end
 class RedisTest < Test::Unit::TestCase
   setup do
     @legacy ||= begin
-                  Ohm.redis.info[:redis_version] <= "1.02"
+                  Ohm.redis.info["redis_version"] <= "1.02"
                 end
   end
 
@@ -387,7 +387,7 @@ class RedisTest < Test::Unit::TestCase
     end
 
     should "provide info" do
-      [:last_save_time, :redis_version, :total_connections_received, :connected_clients, :total_commands_processed, :connected_slaves, :uptime_in_seconds, :used_memory, :uptime_in_days, :changes_since_last_save].each do |x|
+      %w(last_save_time redis_version total_connections_received connected_clients total_commands_processed connected_slaves uptime_in_seconds used_memory uptime_in_days changes_since_last_save).each do |x|
         assert @r.info.keys.include?(x)
       end
     end

metadata

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