redis-model-extension 0.2.6 → 0.2.7

data/VERSION

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

data/lib/redis-model-extension.rb

@@ -13,7 +13,7 @@ require 'database'
 
 module RedisModel
 
-  attr_accessor :args, :error, :old_key, :conf
+  attr_accessor :args, :error, :old_args, :conf
   
   def self.included(base) 
     base.send :extend, ClassMethods         
@@ -50,7 +50,7 @@ module RedisModel
     
     #Generates redis key for storing object
     def generate_key(args = {})
-      out = "#{self.name.to_s.underscore.to_sym}:key:"
+      out = "#{self.name.to_s.underscore.to_sym}:key"
       @conf[:redis_key].each do |key|
         if args.has_key?(key)
           out += ":#{args[key]}"
@@ -115,10 +115,14 @@ module RedisModel
       
       #is key specified directly? -> no needs of looking for other keys! -> faster
       if klass.valid_key?(args)
-        out << klass.new(args.merge(Database.redis.hgetall(klass.generate_key(args))).merge({:old_key => klass.generate_key(args)})) if klass.exists?(args)
+        if klass.exists?(args)
+          data_args = Database.redis.hgetall(klass.generate_key(args))
+          out << klass.new(args.merge(data_args).merge({:old_args => data_args})) 
+        end
       else
         Database.redis.keys(klass.generate_key(args)).each do |key|
-          out << klass.new(args.merge(Database.redis.hgetall(key)).merge({:old_key => key}))
+          data_args = Database.redis.hgetall(key)
+          out << klass.new(args.merge(data_args).merge({:old_args => data_args}))
         end
       end
       out
@@ -145,8 +149,9 @@ module RedisModel
     def get(args = {})
       args.symbolize_keys!
       klass = self.name.constantize
-      if klass.valid_key?(args)
-        klass.new(args.merge(Database.redis.hgetall(klass.generate_key(args))).merge({:old_key => klass.generate_key(args)})) if klass.exists?(args)
+      if klass.valid_key?(args) && klass.exists?(args)
+        data_args = Database.redis.hgetall(klass.generate_key(args))
+        klass.new(args.merge(data_args).merge({:old_args => data_args})) 
       else
         nil
       end
@@ -159,7 +164,8 @@ module RedisModel
       if klass.valid_alias_key?(alias_name, args) && klass.alias_exists?(alias_name, args)
         key = Database.redis.get(klass.generate_alias_key(alias_name, args))
         if Database.redis.exists(key)
-          klass.new(args.merge(Database.redis.hgetall(key)).merge({:old_key => key})) 
+          data_args = Database.redis.hgetall(key)
+          klass.new(args.merge(data_args).merge({:old_args => data_args})) 
         else
           nil
         end
@@ -174,7 +180,7 @@ module RedisModel
       if Database.redis.exists(alias_key)
         key = Database.redis.get(alias_key)
         if Database.redis.exists(key)
-          klass.new(args.merge(Database.redis.hgetall(key)).merge({:old_key => key}))
+          klass.new(args.merge(Database.redis.hgetall(key)).merge({:old_args => key}))
         else
           nil
         end
@@ -189,10 +195,9 @@ module RedisModel
     
     def initialize(args={})
       args.symbolize_keys!
-      #if old_key is specified, don't usi it in args hash
-      if args[:old_key] && args[:old_key].size > 0 
-        self.old_key = args[:old_key] 
-        args.delete(:old_key)
+      #if old_args is specified, don't usi it in args hash
+      if args[:old_args] && args[:old_args].size > 0 
+        self.old_args = args.delete(:old_args).symbolize_keys
       end
       self.args = clear_args(args)
       return self
@@ -254,9 +259,12 @@ module RedisModel
 
     #remove all aliases
     def destroy_aliases!
-      self.class.conf[:redis_aliases].each do |alias_name, fields|
-        if self.class.valid_alias_key?(alias_name, self.args) && self.class.alias_exists?(alias_name, self.args)
-          Database.redis.del(self.class.generate_alias_key(alias_name, self.args)) 
+      #do it only if it is existing object!
+      if self.old_args
+        self.class.conf[:redis_aliases].each do |alias_name, fields|
+          if self.class.valid_alias_key?(alias_name, self.old_args) && self.class.alias_exists?(alias_name, self.old_args)
+            Database.redis.del(self.class.generate_alias_key(alias_name, self.old_args)) 
+          end
         end
       end
     end
@@ -284,14 +292,14 @@ module RedisModel
       if valid?
         #generate key (possibly new)
         generated_key = redis_key
-        Database.redis.rename(self.old_key, generated_key) if self.old_key && generated_key != self.old_key
+        Database.redis.rename(self.class.generate_key(self.old_args), generated_key) if self.old_args && generated_key != self.class.generate_key(self.old_args) && Database.redis.exists(self.class.generate_key(self.old_args))
         Database.redis.hmset(generated_key, *self.args.reject{|k,v| v.nil?}.inject([]){ |arr,kv| arr + [kv[0], kv[1].to_s]})
         
         #destroy aliases
         destroy_aliases!
         create_aliases
         #after save make new_key -> old_key
-        self.old_key = generated_key  
+        self.old_args = self.args
         return self
       else
         raise ArgumentError, @error.join(", ")

data/redis-model-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redis-model-extension"
-  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 = ["Ondrej Bartas"]
-  s.date = "2012-03-21"
+  s.date = "2012-04-10"
   s.description = "It provides functions as find, find_by_alias, get, exists?, validate, save etc."
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [

data/test/test_redis-model-extension.rb

@@ -68,12 +68,12 @@ class RedisModelTest < Test::Unit::TestCase
          
     context "redis key" do
       should "generate right key" do
-        assert_equal @test_model.redis_key, "redismodeltest::testredismodel:foo"
-        assert_equal TestRedisModel.generate_key(@args), "redismodeltest::testredismodel:foo"
+        assert_equal @test_model.redis_key, "#{TestRedisModel.to_s.underscore}:key:foo"
+        assert_equal TestRedisModel.generate_key(@args), "#{TestRedisModel.to_s.underscore}:key:foo"
       end  
       should "generate right key alias" do
-        assert_equal @test_model.redis_alias_key(:token), "redismodeltest::testredismodel:token:bar"
-        assert_equal TestRedisModel.generate_alias_key(:token, @args), "redismodeltest::testredismodel:token:bar"
+        assert_equal @test_model.redis_alias_key(:token), "#{TestRedisModel.to_s.underscore}:alias:token:bar"
+        assert_equal TestRedisModel.generate_alias_key(:token, @args), "#{TestRedisModel.to_s.underscore}:alias:token:bar"
       end  
     end
     
@@ -114,13 +114,22 @@ class RedisModelTest < Test::Unit::TestCase
         @getted_model = TestRedisModel.get(@args)
         assert_equal @getted_model.to_arg, @args
       end
-      
-      should "be getted by alias" do
-        @getted_model = TestRedisModel.get_by_alias(:token ,@args)
-        assert_equal @getted_model.integer, @test_model.integer
-        assert_equal @getted_model.string, @test_model.string
-        assert_equal @getted_model.symbol, @test_model.symbol
-        assert_equal @getted_model.boolean, @test_model.boolean
+            
+      context "alias" do
+        should "be getted by alias" do
+          @getted_model = TestRedisModel.get_by_alias(:token ,@args)
+          assert_equal @getted_model.integer, @test_model.integer
+          assert_equal @getted_model.string, @test_model.string
+          assert_equal @getted_model.symbol, @test_model.symbol
+          assert_equal @getted_model.boolean, @test_model.boolean
+        end
+        
+        should "be getted after change in alias" do
+          getted_model = TestRedisModel.get_by_alias(:token ,@args)
+          getted_model.symbol = "Test_token"
+          getted_model.save
+          assert_equal getted_model.integer, TestRedisModel.get_by_alias(:token ,:symbol => "Test_token").integer
+        end
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-model-extension
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70115296231660 !ruby/object:Gem::Requirement
+  requirement: &70193066403260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115296231660
+  version_requirements: *70193066403260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70115296167520 !ruby/object:Gem::Requirement
+  requirement: &70193066402640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115296167520
+  version_requirements: *70193066402640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70115296166380 !ruby/object:Gem::Requirement
+  requirement: &70193066165280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115296166380
+  version_requirements: *70193066165280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115296165300 !ruby/object:Gem::Requirement
+  requirement: &70193066164700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115296165300
+  version_requirements: *70193066164700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70115296164580 !ruby/object:Gem::Requirement
+  requirement: &70193066164040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115296164580
+  version_requirements: *70193066164040
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70115296163920 !ruby/object:Gem::Requirement
+  requirement: &70193066163140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115296163920
+  version_requirements: *70193066163140
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70115296162980 !ruby/object:Gem::Requirement
+  requirement: &70193066161480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115296162980
+  version_requirements: *70193066161480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70115296162080 !ruby/object:Gem::Requirement
+  requirement: &70193066158180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70115296162080
+  version_requirements: *70193066158180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70115296161500 !ruby/object:Gem::Requirement
+  requirement: &70193066273180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70115296161500
+  version_requirements: *70193066273180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70115296160920 !ruby/object:Gem::Requirement
+  requirement: &70193066271860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70115296160920
+  version_requirements: *70193066271860
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70115296160300 !ruby/object:Gem::Requirement
+  requirement: &70193066270500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70115296160300
+  version_requirements: *70193066270500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70115296176160 !ruby/object:Gem::Requirement
+  requirement: &70193066269660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115296176160
+  version_requirements: *70193066269660
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70115296175540 !ruby/object:Gem::Requirement
+  requirement: &70193066268660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70115296175540
+  version_requirements: *70193066268660
 description: It provides functions as find, find_by_alias, get, exists?, validate,
   save etc.
 email: ondrej@bartas.cz
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2937311985749273754
+      hash: 1802070516679787540
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: