remodel-h 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/remodel/entity.rb

@@ -15,7 +15,7 @@ module Remodel
     end
 
     def id
-      key && key.split(':').last.to_i
+      key && key.match(/\d+/)[0].to_i
     end
 
     def save
@@ -61,7 +61,7 @@ module Remodel
     end
 
     def self.find(context, key)
-      key = "#{key_prefix}:#{key}" if key.kind_of? Integer
+      key = "#{key_prefix}#{key}" if key.kind_of? Integer
       restore(context, key, fetch(context, key))
     end
 
@@ -92,7 +92,7 @@ module Remodel
           instance_variable_get(var)
         else
           clazz = Class[options[:class]]
-          instance_variable_set(var, HasMany.new(self, clazz, "#{key}:#{name}", options[:reverse]))
+          instance_variable_set(var, HasMany.new(self, clazz, "#{key}_#{name}", options[:reverse]))
         end
       end
     end
@@ -105,7 +105,7 @@ module Remodel
           instance_variable_get(var)
         else
           clazz = Class[options[:class]]
-          value_key = Remodel.redis.hget(self.context, "#{key}:#{name}")
+          value_key = Remodel.redis.hget(self.context, "#{key}_#{name}")
           instance_variable_set(var, clazz.find(self.context, value_key)) if value_key
         end
       end
@@ -118,10 +118,10 @@ module Remodel
       define_method("_#{name}=") do |value|
         if value
           instance_variable_set(var, value)
-          Remodel.redis.hset(self.context, "#{key}:#{name}", value.key)
+          Remodel.redis.hset(self.context, "#{key}_#{name}", value.key)
         else
           remove_instance_variable(var) if instance_variable_defined? var
-          Remodel.redis.hdel(self.context, "#{key}:#{name}")
+          Remodel.redis.hdel(self.context, "#{key}_#{name}")
         end
       end; private "_#{name}="
 
@@ -155,8 +155,8 @@ module Remodel
 
     # Each entity has its own sequence to generate unique ids.
     def next_key
-      id = Remodel.redis.hincrby(@context, "#{self.class.key_prefix}:seq", 1)
-      "#{self.class.key_prefix}:#{id}"
+      id = Remodel.redis.hincrby(@context, "#{self.class.key_prefix}", 1)
+      "#{self.class.key_prefix}#{id}"
     end
 
     # Default key prefix is the first letter of the class name, in lowercase.

data/remodel-h.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remodel-h}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Lossen"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-07-21}
   s.default_executable = %q{redis-monitor.rb}
   s.description = %q{persist your objects to redis hashes.}
   s.email = %q{tim@lossen.de}

data/test/test_entity.rb

@@ -55,9 +55,9 @@ class TestEntity < Test::Unit::TestCase
     end
 
     should "give the entity a key based on the class name" do
-      assert_equal 'f:1', Foo.create('cx').key
-      assert_equal 'b:1', Bar.create('cx').key
-      assert_equal 'b:2', Bar.create('cx').key
+      assert_equal 'f1', Foo.create('cx').key
+      assert_equal 'b1', Bar.create('cx').key
+      assert_equal 'b2', Bar.create('cx').key
     end
 
     should "give the entity an id which is unique per entity class" do
@@ -208,7 +208,7 @@ class TestEntity < Test::Unit::TestCase
   context "#set_key_prefix" do
     should "use the given key prefix" do
       class Custom < Remodel::Entity; set_key_prefix 'my'; end
-      assert_match /^my:\d+$/, Custom.create('cx').key
+      assert_match /^my\d+$/, Custom.create('cx').key
     end
 
     should "ensure that the prefix is letters only" do

data/test/test_many_to_one.rb

@@ -28,7 +28,7 @@ class TestManyToOne < Test::Unit::TestCase
         red_piece = Piece.create('cx', :color => 'red')
         blue_piece = Piece.create('cx', :color => 'blue')
         value = JSON.generate([red_piece.key, blue_piece.key])
-        redis.hset 'cx', "#{puzzle.key}:pieces", value
+        redis.hset 'cx', "#{puzzle.key}_pieces", value
         assert_equal 2, puzzle.pieces.size
         assert_equal Piece, puzzle.pieces[0].class
         assert_equal 'red', puzzle.pieces[0].color
@@ -98,7 +98,7 @@ class TestManyToOne < Test::Unit::TestCase
     should "reset has_many associations" do
       puzzle = Puzzle.create('cx')
       piece = puzzle.pieces.create :color => 'black'
-      redis.hdel 'cx', "#{puzzle.key}:pieces"
+      redis.hdel 'cx', "#{puzzle.key}_pieces"
       puzzle.reload
       assert_equal [], puzzle.pieces
     end

data/test/test_one_to_many.rb

@@ -26,7 +26,7 @@ class TestOneToMany < Test::Unit::TestCase
       should "return the associated entity" do
         puzzle = Puzzle.create('cx', :topic => 'animals')
         piece = Piece.create('cx')
-        redis.hset('cx', "#{piece.key}:puzzle", puzzle.key)
+        redis.hset('cx', "#{piece.key}_puzzle", puzzle.key)
         assert_equal 'animals', piece.puzzle.topic
       end
     end
@@ -40,7 +40,7 @@ class TestOneToMany < Test::Unit::TestCase
         puzzle = Puzzle.create('cx')
         piece = Piece.create('cx')
         piece.puzzle = puzzle
-        assert_equal puzzle.key, redis.hget(puzzle.context, "#{piece.key}:puzzle")
+        assert_equal puzzle.key, redis.hget(puzzle.context, "#{piece.key}_puzzle")
       end
 
       should "add the entity to the reverse association" do
@@ -69,7 +69,7 @@ class TestOneToMany < Test::Unit::TestCase
         piece = Piece.create('cx')
         piece.puzzle = Puzzle.create('cx')
         piece.puzzle = nil
-        assert_nil redis.hget(piece.context, "#{piece.key}:puzzle")
+        assert_nil redis.hget(piece.context, "#{piece.key}_puzzle")
       end
 
       should "remove the entity from the reverse association if set to nil" do
@@ -87,7 +87,7 @@ class TestOneToMany < Test::Unit::TestCase
     should "reset has_one associations" do
       piece = Piece.create('cx', :color => 'black')
       piece.puzzle = Puzzle.create('cx')
-      redis.hdel 'cx', "#{piece.key}:puzzle"
+      redis.hdel 'cx', "#{piece.key}_puzzle"
       piece.reload
       assert_nil piece.puzzle
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remodel-h
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tim Lossen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: redis-monitor.rb
 dependencies: []