remodel-h 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/remodel/entity.rb

@@ -30,18 +30,22 @@ module Remodel
 
     def reload
       raise EntityNotSaved unless @key
-      initialize(@context, self.class.parse(self.class.fetch(@context, @key)), @key)
-      instance_variables.each do |var|
-        remove_instance_variable(var) if var =~ /^@association_/
+      attributes = self.class.parse(self.class.fetch(@context, @key))
+      initialize(@context, attributes, @key)
+      self.class.associations.each do |name|
+        var = "@#{name}".to_sym
+        remove_instance_variable(var) if instance_variable_defined? var
       end
       self
     end
 
     def delete
       raise EntityNotSaved unless @key
-      Remodel.redis.hdel(@context, @key)
-      instance_variables.each do |var|
-        Remodel.redis.hdel(@context, var.to_s.sub('@association', @key)) if var =~ /^@association_/
+      Remodel.redis.pipelined do
+        Remodel.redis.hdel(@context, @key)
+        self.class.associations.each do |name|
+          Remodel.redis.hdel(@context, "#{@key}_#{name}")
+        end
       end
     end
 
@@ -87,7 +91,8 @@ module Remodel
     end
 
     def self.has_many(name, options)
-      var = "@association_#{name}".to_sym
+      associations.push(name)
+      var = "@#{name}".to_sym
 
       define_method(name) do
         if instance_variable_defined? var
@@ -100,7 +105,8 @@ module Remodel
     end
 
     def self.has_one(name, options)
-      var = "@association_#{name}".to_sym
+      associations.push(name)
+      var = "@#{name}".to_sym
 
       define_method(name) do
         if instance_variable_defined? var
@@ -200,6 +206,10 @@ module Remodel
       @mapper ||= {}
     end
 
+    def self.associations
+      @associations ||= []
+    end
+
   end
 
 end

data/remodel-h.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remodel-h}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Lossen"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-11}
   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

@@ -16,7 +16,7 @@ class TestEntity < Test::Unit::TestCase
       bar = Bar.new('cx')
       assert_equal 123, bar.d
     end
-    
+
     should "be returned for properties that are nil" do
       bar = Bar.new('cx', :d => 'cool')
       bar.d = nil
@@ -27,12 +27,12 @@ class TestEntity < Test::Unit::TestCase
       bar = Bar.new('cx', :d => 'cool')
       assert_equal 'cool', bar.d
     end
-    
+
     should "not be stored" do
       bar = Bar.create('cx')
       assert !(/123/ =~ redis.hget('cx', bar.key))
     end
-    
+
     should "be returned by as_json" do
       bar = Bar.new('cx')
       assert_equal 123, bar.as_json[:d]
@@ -50,7 +50,7 @@ class TestEntity < Test::Unit::TestCase
       foo = Foo.new('cx', :z => 3)
       assert foo.instance_eval { !@attributes.key? :z }
     end
-    
+
     should "not set the key" do
       foo = Foo.new('cx', :x => 23)
       assert_equal nil, foo.key
@@ -61,7 +61,7 @@ class TestEntity < Test::Unit::TestCase
       assert_equal nil, foo.id
     end
   end
-  
+
   context "create" do
     setup do
       redis.flushdb

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Tim Lossen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: redis-monitor.rb
 dependencies: []