redis-model-extension 0.4.0 → 0.4.1

data/Gemfile

@@ -4,19 +4,20 @@ gem "redis"
 gem "i18n"
 gem "activesupport"
 gem "activemodel"
+gem "hashr"
 
 group :development do
   gem "shoulda", ">= 0"
   gem 'shoulda-context'
   gem 'mocha'
-  gem "simplecov", "~> 0.6.4"
+  gem "simplecov"
   gem "rake"
   gem "rack"
   gem "sdoc" # sdoc -N .
   gem "bundler"
-  gem "jeweler", "~> 1.8.3"
-  gem "turn", "~> 0.8.2"
+  gem "jeweler"
+  gem "turn"
   gem "minitest"
-  gem "ansi", "~> 1.2.5"
+  gem "ansi" 
 end
 

data/README.markdown

@@ -55,6 +55,14 @@ RedisModelExtension::Database.redis_config(:host => "127.0.0.1", :port => 6379,
 Your class needs to include RedisModel and there is your testing configuration:
 ([old initialization - still working :)](https://github.com/ondrejbartas/redis-model-extension/wiki/Old-initialization))
 
+Lots of aditional informations can be found in [WIKI](https://github.com/ondrejbartas/redis-model-extension/wiki) or directly:
+
+* [Auto-increment IDs](https://github.com/ondrejbartas/redis-model-extension/wiki/Auto-increment-IDs)
+* [Validations](https://github.com/ondrejbartas/redis-model-extension/wiki/Validations)
+* [Aliases](https://github.com/ondrejbartas/redis-model-extension/wiki/Aliases)
+* [Update multiple attributes](https://github.com/ondrejbartas/redis-model-extension/wiki/Update-multiple-attributes)
+* [Before After Hooks](https://github.com/ondrejbartas/redis-model-extension/wiki/Before-After-Hooks)
+ 
 ``` ruby
 class TestRedisModel
   include RedisModelExtension
@@ -93,27 +101,39 @@ end
 
 foo = TestRedisModel.new()
 
+# you can set/get values
+foo.field3
+#=> "Default string" #getting default value
+foo.field3 = "bar"
+#=> "bar"
+foo.field3
+#=> "bar"
+
+#you can get all attributes by calling
+foo.to_args
+#or to JSON
+foo.to_json
+
+#you can update more attributes at once
+foo.update(:field1 => 234, :field3 => "bar")
+
 # you can validate your object
 
-if foo.valid?
-  foo.save #save object
-else
+foo.valid?
+#=> true | false -> depending on validations
+
+#You can save
+unless foo.save #save returns instance -> valid save | false -> some errors
   puts foo.errors #you can get nice errors what is wrong
 end
 
-# custom errors in initialize etc.
-#class declaration
-def initialize args = {}
-  error << "My custom error"
-  super args
+# you can use create
+bar = TestRedisModel.create field1: 123
+# but don't forget to ask for errors
+if (bar = TestRedisModel.create field1: 123).errors.any?
+  puts bar.errors
 end
-#then valid? will produce false and when asked instance.errors you will get array with your errors
-
-
-#you can update more attributes at once
-foo.update(:field1 => 234, :field3 => "bar")
-
-# !!! if you try to save invalid object you will get ArgumentError exception !!!
+# this will return if there was validation error before creation
 
 # after save you can find and get object find_by_alias
 
@@ -132,17 +152,37 @@ TestRedisModel.exists?(:field3 => "foo", :field4=> true)
 
 #you can try to find by alias - alias needs to be uniq 
 #use alias only for uniq combination of keys
-TestRedisModel.find_by_alias(:token, :field4=> true) 
-
+TestRedisModel.find_by_alias :token, :field4=> true
+# or by generated method:
+TestRedisModel.find_by_token :field4=> true
+# if nothing exists
+#=> nil
+# if there is saved something
+#=> [<TestRedisModel: ...>, <TestRedisModel: ...>, ...]
 ```
 
-Now you can easily access all attributes from TestRedisModel by `foo.integer` or exists? `foo.integer?` or set value by `foo.integer = 1234` 
-
-You can initialize model by `foo = TestRedisModel.new(:field1 => 123, :field3 => "bar")` and then access it same as above.
-
-Saving is easy too: `foo.save` -> It will raise exception if :required attributes aren't filled. Error message says what is missing.
-
 
+## Change log
+
+* 0.4.1 
+ * Fixed bugs in intialization
+ * Changed aliases to use key - array instead of key - value (enable find by category...) WIKI: [Aliases](https://github.com/ondrejbartas/redis-model-extension/wiki/Aliases)
+ * Add better readme and filled [WIKI](https://github.com/ondrejbartas/redis-model-extension/wiki)
+* 0.4.0 
+ * Redesigned initialization method from: [old one](https://github.com/ondrejbartas/redis-model-extension/wiki/Old-initialization) to: [new one](https://github.com/ondrejbartas/redis-model-extension/wiki/New-initialization)
+ * Added [Before After Hooks](https://github.com/ondrejbartas/redis-model-extension/wiki/Before-After-Hooks)
+ * Added [Auto-increment IDs](https://github.com/ondrejbartas/redis-model-extension/wiki/Auto-increment-IDs)
+ * Added dynamic aliases
+ * Added [Active Model Validations](https://github.com/ondrejbartas/redis-model-extension/wiki/Validations)
+ * REFACTORED whole structure of redis model (similar methods moved to separate modules)
+ * Set default to save nil values to redis
+* 0.3.8
+ * Allow to don't save nil values into redis
+* 0.3.7
+ * Fix dependencies
+* 0.3.6
+ * Fix problem with working in Forks
+* for older look at [Commit messages](https://github.com/ondrejbartas/redis-model-extension/commits/master)
 
 ## Contributing to redis-model-extension
  

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/example/benchmark.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'pp'
+require 'benchmark'
+require 'redis-model-extension'
+COUNT = (ENV['COUNT'] || 10000).to_i
+
+RedisModelExtension::Database.redis = Redis.new db: 15
+RedisModelExtension::Database.redis.flushdb
+
+class Movie
+  include RedisModelExtension
+  redis_field :name,     :string
+  redis_field :director, :string
+  redis_field :length,   :integer
+  redis_field :object,   :hash
+end
+
+puts "Beginning the benchmark script", "", '='*80
+sleep 5
+
+
+puts "Saving #{COUNT} records into a Redis database..."
+
+elapsed = Benchmark.realtime do
+  (1..COUNT).map do |i|
+    m = Movie.create name: "Move name #{i}", length: Random.rand(100..200), director: "Director #{i}", hash: { ttesting: "benchmark", and_more: {foo: :bar}}
+    pp m.errors.to_a if m.errors.any?
+  end
+end
+
+puts "Duration: #{elapsed} seconds, rate: #{COUNT.to_f/elapsed} docs/sec",
+     '-'*80
+
+puts "Finding all movies..."
+elapsed = Benchmark.realtime do
+  pp Movie.find().size
+end
+puts "Duration: #{elapsed} seconds, rate: #{COUNT.to_f/elapsed} docs/sec",
+     '-'*80
+
+puts "_"*80,"="*80
+puts "ONLY REDIS"
+puts "Saving #{COUNT} records into a Redis database..."
+
+elapsed = Benchmark.realtime do
+  (1..COUNT).map do |i|
+    RedisModelExtension::Database.redis.hmset "movie:key:#{i}", "name","Move name #{i}", "length",Random.rand(100..200), "director", "Director #{i}", "hash", { ttesting: "benchmark", and_more: {foo: :bar}}.to_json
+  end
+end
+
+puts "Duration: #{elapsed} seconds, rate: #{COUNT.to_f/elapsed} docs/sec",
+     '-'*80
+
+puts "Finding all movies..."
+elapsed = Benchmark.realtime do
+  RedisModelExtension::Database.redis.keys("movie:key:*").each do |key|
+    RedisModelExtension::Database.redis.hgetall(key)
+  end
+end
+puts "Duration: #{elapsed} seconds, rate: #{COUNT.to_f/elapsed} docs/sec",
+     '-'*80
+
+
+puts "Finding #{COUNT} movies one by one..."

data/lib/redis-model-extension.rb

@@ -3,6 +3,7 @@ require 'pp'
 require 'yaml'
 require 'json'
 require 'redis'
+require 'hashr'
 require 'active_model'
 require 'active_support'
 require 'active_support/inflector'
@@ -10,48 +11,46 @@ require 'active_support/inflector/inflections'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'string_to_bool'
 require 'database'
 
 module RedisModelExtension
   extend ActiveSupport::Concern
+
   #include all needed modules directly into main class
-  def self.included(base) 
-    base.class_eval do
-      extend ClassInitialize
-      extend ClassOldInitialize
-      extend ClassConfig
-      extend ClassGetFind
-      extend ClassRedisKey  
-      extend ClassCreate
-      extend ClassValidations
-      extend ClassAutoincrementId
+  included do
+    extend ClassInitialize
+    extend ClassOldInitialize
+    extend ClassConfig
+    extend ClassGetFind
+    extend ClassRedisKey
+    extend ClassCreate
+    extend ClassValidations
+    extend ClassAutoincrementId
 
-      include Initialize
-      include ActiveModelIntegration
-      include Attributes
-      include AutoincrementId
-      include RedisKey
-      include StoreKeys
-      include Config
-      include SaveDestroy
-      include Validations
-      include ValueTransform
-    end
+    include Initialize
+    include ActiveModelIntegration
+    include Attributes
+    include AutoincrementId
+    include RedisKey
+    include StoreKeys
+    include Config
+    include SaveDestroy
+    include Validations
+    include ValueTransform
   end
 
   module ActiveModelIntegration
-    def self.included(base)
-      base.class_eval do
-        include ActiveModel::AttributeMethods
-        include ActiveModel::Validations
-        include ActiveModel::Naming
-        include ActiveModel::Conversion
+    extend ActiveSupport::Concern
+
+    included do
+      include ActiveModel::AttributeMethods
+      include ActiveModel::Validations
+      include ActiveModel::Naming
+      include ActiveModel::Conversion
 
-        extend  ActiveModel::Callbacks
-        define_model_callbacks :save, :destroy, :create
-      end
+      extend  ActiveModel::Callbacks
+      define_model_callbacks :save, :destroy, :create
     end
   end
 

data/lib/redis-model-extension/attributes.rb

@@ -31,7 +31,7 @@ module RedisModelExtension
 
     # set value into instance variable
     def value_set name, value
-      instance_variable_set(:"@#{name}", value)
+      instance_variable_set(:"@#{name}", value_parse(value, redis_fields_defaults_config[name]))
     end
 
   end

data/lib/redis-model-extension/get_find.rb

@@ -24,14 +24,12 @@ module RedisModelExtension
 
       out = []
       klass = self.name.constantize
-      
+      search_key = klass.generate_key(args)
       #is key specified directly? -> no needs of looking for other keys! -> faster
-      if klass.valid_key?(args)
-        if klass.exists?(args)
-          out << klass.new_by_key(klass.generate_key(args)) 
-        end
+      unless search_key =~ /\*/
+        out << klass.new_by_key(search_key) if klass.exists?(args)
       else
-        RedisModelExtension::Database.redis.keys(klass.generate_key(args)).each do |key|
+        RedisModelExtension::Database.redis.keys(search_key).each do |key|
           out << klass.new_by_key(key) 
         end
       end
@@ -49,15 +47,16 @@ module RedisModelExtension
 
       out = []
       klass = self.name.constantize
+      search_key = klass.generate_alias_key(alias_name, args)
       #is key specified directly? -> no needs of looking for other keys! -> faster
-      if klass.valid_alias_key?(alias_name, args)
-        out << klass.get_by_alias(alias_name, args) if klass.alias_exists?(alias_name, args)
+      unless search_key =~ /\*/
+        out = klass.get_by_alias(alias_name, args) if klass.alias_exists?(alias_name, args)
       else
-        RedisModelExtension::Database.redis.keys(klass.generate_alias_key(alias_name, args)).each do |key|
+        RedisModelExtension::Database.redis.keys(search_key).each do |key|
           out << klass.get_by_alias_key(key)
         end
       end
-      out
+      out.flatten
     end
 
     ######################################
@@ -96,8 +95,11 @@ module RedisModelExtension
 
       klass = self.name.constantize
       if klass.valid_alias_key?(alias_name, args) && klass.alias_exists?(alias_name, args)
-        key = RedisModelExtension::Database.redis.get(klass.generate_alias_key(alias_name, args))
-        return klass.new_by_key(key) if RedisModelExtension::Database.redis.exists(key)
+        out = []
+        RedisModelExtension::Database.redis.smembers(klass.generate_alias_key(alias_name, args)).each do |key|
+          out << klass.new_by_key(key) if RedisModelExtension::Database.redis.exists(key)
+        end
+        return out
       end
       nil
     end    
@@ -121,22 +123,24 @@ module RedisModelExtension
     def get_by_alias_key(alias_key)
       klass = self.name.constantize
       if RedisModelExtension::Database.redis.exists(alias_key)
-        key = RedisModelExtension::Database.redis.get(alias_key)
-        return klass.new_by_key(key) if RedisModelExtension::Database.redis.exists(key)
+        out = []
+        RedisModelExtension::Database.redis.smembers(alias_key).each do |key|
+          out << klass.new_by_key(key) if RedisModelExtension::Database.redis.exists(key)
+        end
+        return out
       end
       nil
     end 
 
-
     ######################################
     #  CREATE NEW OBJECT BY HASH VALUES
     ######################################
         
     # read all data from redis and create new instance (used for Find & Get method)
     def new_by_key(key)
-      args = HashWithIndifferentAccess.new(RedisModelExtension::Database.redis.hgetall(key))
+      args = RedisModelExtension::Database.redis.hgetall(key).symbolize_keys
 
-      new_instance = self.name.constantize.new(args)
+      new_instance = new(args)
       new_instance.store_keys
 
       return new_instance

data/lib/redis-model-extension/initialize.rb

@@ -36,16 +36,10 @@ module RedisModelExtension
       define_method "#{name}?" do 
         value_get(name) && !value_get(name).blank? ? true : false
       end
-
-      # default saving nil values to redis
-      redis_save_fields_with_nil true
-
-      #set default key to autoincrement id
-      set_redis_autoincrement_key
     end
 
     def set_redis_autoincrement_key
-      @redis_key_config = [:id]
+      @redis_key_config ||= [:id]
 
       # get value
       define_method :id do
@@ -64,12 +58,9 @@ module RedisModelExtension
       private :id= #set it as private
 
       redis_fields_config[:id] = :autoincrement
-
     end
 
     def remove_redis_autoincrement_key
-
-      puts "#{self.name} : remove"
       # remove get value
       remove_method :id
 
@@ -155,6 +146,12 @@ module RedisModelExtension
   end
 
   module Initialize
+    extend ActiveSupport::Concern
+
+    included do
+      redis_save_fields_with_nil true
+      set_redis_autoincrement_key
+    end
 
     # initialize instance    
     def initialize(args={})
@@ -176,4 +173,4 @@ module RedisModelExtension
     end
 
   end
-end
+end

data/lib/redis-model-extension/old_initialize.rb

@@ -38,6 +38,8 @@ module RedisModelExtension
     def initialize_redis_model_methods conf
       puts "WARNING: This initilization method is deprecated and will be removed in future! \n Please read documentation how to change your model to use new initialization methods"
 
+      remove_redis_autoincrement_key
+
       @conf = {:reject_nil_values => true}.merge(conf)
       #take all fields and make methods for them
       conf[:fields].each do |name, action|

data/lib/redis-model-extension/save_destroy.rb

@@ -16,9 +16,10 @@ module RedisModelExtension
 
     # save method - save all attributes (fields) and create aliases
     def save
-      # can be saved into redis?
-      if valid?
-        perform = lambda do
+      perform = lambda do
+        # can be saved into redis?
+        if valid?
+
           #autoicrement id
           self.send("id=", increment_id) if redis_key_config.include?(:id) && !self.id?
 
@@ -36,23 +37,25 @@ module RedisModelExtension
           #perform save to redis hash
           RedisModelExtension::Database.redis.hmset(generated_key, *args.inject([]){ |arr,kv| arr + [kv[0], value_to_redis(kv[0], kv[1])]})
           
-          #destroy aliases
+          # destroy aliases
           destroy_aliases!
           create_aliases
 
           #after save make sure instance remember old key to know if it needs to be ranamed
           store_keys
         end
+      end
 
-        run_callbacks :save do
-          unless exists?
-            run_callbacks :create do
-              perform.()
-            end
-          else
+      run_callbacks :save do
+        unless exists?
+          run_callbacks :create do
             perform.()
           end
+        else
+          perform.()
         end
+      end
+      unless errors.any?
         return self
       else
         return false
@@ -63,7 +66,7 @@ module RedisModelExtension
     def create_aliases
       main_key = redis_key
       redis_alias_config.each do |alias_name, fields|
-        RedisModelExtension::Database.redis.set(redis_alias_key(alias_name), main_key) if valid_alias_key? alias_name
+        RedisModelExtension::Database.redis.sadd(redis_alias_key(alias_name), main_key) if valid_alias_key? alias_name
       end
     end
 
@@ -95,7 +98,9 @@ module RedisModelExtension
       #do it only if it is existing object!
       if redis_old_keys[:aliases].size > 0
         redis_old_keys[:aliases].each do |alias_key|
-          RedisModelExtension::Database.redis.del alias_key
+          RedisModelExtension::Database.redis.srem alias_key, redis_old_keys[:key]
+          #delete alias with 0 keys
+          RedisModelExtension::Database.redis.del(alias_key) if RedisModelExtension::Database.redis.scard(alias_key).to_i == 0
         end
       end
     end

data/lib/redis-model-extension/value_transform.rb

@@ -40,7 +40,7 @@ module RedisModelExtension
       when :bool then value.to_s.to_bool
       when :symbol then value.to_s.to_sym
       when :array then value.is_a?(String) ? JSON.parse(value) : value
-      when :hash then value.is_a?(String) ? JSON.parse(value) : value
+      when :hash then value.is_a?(String) ? Hashr.new(JSON.parse(value)) : Hashr.new(value)
       when :time then value.is_a?(String) ? Time.parse(value) : value
       when :date then value.is_a?(String) ? Date.parse(value) : value
       else value

data/redis-model-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redis-model-extension"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2012-08-13"
+  s.date = "2012-08-30"
   s.description = "It provides functions as find, find_by_alias, get, exists?, validate, save etc."
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "config/redis_config.yml.example",
     "config/redis_setup.conf",
+    "example/benchmark.rb",
     "lib/database.rb",
     "lib/redis-model-extension.rb",
     "lib/redis-model-extension/attributes.rb",
@@ -73,53 +74,56 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<activemodel>, [">= 0"])
+      s.add_runtime_dependency(%q<hashr>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.6.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rack>, [">= 0"])
       s.add_development_dependency(%q<sdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<turn>, ["~> 0.8.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<ansi>, ["~> 1.2.5"])
+      s.add_development_dependency(%q<ansi>, [">= 0"])
     else
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<hashr>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<sdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<turn>, ["~> 0.8.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<ansi>, ["~> 1.2.5"])
+      s.add_dependency(%q<ansi>, [">= 0"])
     end
   else
     s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<hashr>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<sdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<turn>, ["~> 0.8.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<ansi>, ["~> 1.2.5"])
+    s.add_dependency(%q<ansi>, [">= 0"])
   end
 end
 

data/test/models.rb

@@ -81,3 +81,18 @@ class WithCallbacks
   def before_create_method
   end
 end
+
+class NilTestOldRedisModel
+  REDIS_MODEL_CONF = {
+    :fields => {
+    :integer => :to_i,
+    :string => :to_s,
+  },
+  :required => [:string],
+  :redis_key => [:string],
+  :redis_aliases => {},
+  :reject_nil_values => false
+  }
+  include RedisModel
+  initialize_redis_model_methods REDIS_MODEL_CONF
+end

data/test/redis_model_old/test_redis_model_old_config.rb

@@ -5,7 +5,7 @@ class RedisModelOldConfigTest < Test::Unit::TestCase
     setup do
       RedisModelExtension::Database.redis.flushdb
 
-      @args = {"integer" => 12345, :string => "foo", :symbol => :bar, :boolean => true, :array => [1,2,3], :hash => {"foo"=>"bar", "test" => 2}}
+      @args = {"integer" => 12345, :string => "foo", :symbol => :bar, :boolean => true, :array => [1,2,3], :hash => {:foo=>"bar", :test => 2}}
       @test_model = TestOldRedisModel.new(@args)
       @test_model_partial = TestOldRedisModel.new(:integer => 12345, :string => "foo")
     end 
@@ -28,7 +28,7 @@ class RedisModelOldConfigTest < Test::Unit::TestCase
         assert_equal @test_model.symbol, :bar
         assert_equal @test_model.boolean, true
         assert_equal @test_model.array, [1,2,3]
-        assert_equal @test_model.hash, {"foo"=>"bar", "test" => 2}
+        assert_equal @test_model.hash, {:foo=>"bar", :test => 2}
       end
       
       should "return valid exists?" do
@@ -150,7 +150,7 @@ class RedisModelOldConfigTest < Test::Unit::TestCase
             
       context "alias" do
         should "be getted by alias" do
-          @getted_model = TestOldRedisModel.get_by_alias(:token ,@args)
+          @getted_model = TestOldRedisModel.get_by_alias(:token ,@args).first
           assert_equal @getted_model.integer, @test_model.integer
           assert_equal @getted_model.string, @test_model.string
           assert_equal @getted_model.symbol, @test_model.symbol
@@ -158,30 +158,16 @@ class RedisModelOldConfigTest < Test::Unit::TestCase
         end
         
         should "be getted after change in alias" do
-          getted_model = TestOldRedisModel.get_by_alias(:token ,@args)
+          getted_model = TestOldRedisModel.get_by_alias(:token ,@args).first
           getted_model.symbol = "Test_token"
           getted_model.save
-          assert_equal getted_model.integer, TestOldRedisModel.get_by_alias(:token ,:symbol => "Test_token").integer
+          assert_equal getted_model.integer, TestOldRedisModel.get_by_alias(:token ,:symbol => "Test_token").first.integer
         end
       end
     end
     
     context "without rejected nil values on save" do
       setup do
-        class NilTestOldRedisModel
-          REDIS_MODEL_CONF = {
-             :fields => { 
-               :integer => :to_i,
-               :string => :to_s,
-              }, 
-              :required => [:string],
-              :redis_key => [:string],
-              :redis_aliases => {},
-              :reject_nil_values => false
-           }
-           include RedisModel
-           initialize_redis_model_methods REDIS_MODEL_CONF
-        end
         @args = {integer: 100, string: "test"}
         @nil_test_model = NilTestOldRedisModel.new(@args)
       end
@@ -215,4 +201,4 @@ class RedisModelOldConfigTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/redis_model_parts/test_attributes.rb

@@ -10,7 +10,7 @@ class AttributesTest < Test::Unit::TestCase
         :symbol => :bar, 
         :boolean => true, 
         :array => [1,2,3], 
-        :hash => {"foo"=>"bar", "test" => 2}, 
+        :hash => {:foo=>"bar", :test => 2}, 
         :time => @time, 
         :date => Date.today,
         :float => 12.32,
@@ -30,5 +30,13 @@ class AttributesTest < Test::Unit::TestCase
       assert_same_elements @test_model.to_json.split(","), @args.to_json.split(",")
     end
 
+    should "should access hash by []" do
+      assert_equal @test_model.hash[:foo], "bar"
+    end
+
+    should "should access hash by hashr" do
+      assert_equal @test_model.hash.foo, "bar"
+    end
+
   end
 end

data/test/redis_model_parts/test_dynamic_alias.rb

@@ -72,10 +72,9 @@ class DynamicAliasTest < Test::Unit::TestCase
       end
 
       should "destroy!" do
-        pp RedisModelExtension::Database.redis.keys("*")
         @dynamic_alias.destroy!
         assert_equal @dynamic_alias.exists?, false, "Should not exists"
-        assert_equal DynamicAlias.exists?(@args.merge(:id => @dynamic_alias.id)), false, "Should not exist by class method"
+        assert_equal DynamicAlias.exists?(@args.merge(:name => @dynamic_alias.name)), false, "Should not exist by class method"
       end
     
     end
@@ -88,15 +87,19 @@ class DynamicAliasTest < Test::Unit::TestCase
       end
 
       should "be getted by dynamic alias" do
-        @getted_model = DynamicAlias.get_by_alias(:items_with_name, @args)
-        assert_not_nil @getted_model, "Should return model"
+        @getted_models = DynamicAlias.get_by_alias(:items_with_name, @args)
+        assert_not_nil @getted_models, "Should return array"
+        assert_equal @getted_models.size, 1, "Should return [] with 1 instance"
+        @getted_model = @getted_models.first
         assert_equal @getted_model.name, @dynamic_alias.name
         assert_same_elements @getted_model.items.to_json.split(","), @dynamic_alias.items.to_json.split(",")
       end
 
       should "be getted by get_by_name_of_alias" do
-        @getted_model = DynamicAlias.get_by_items_with_name(@args)
-        assert_not_nil @getted_model, "Should return model"
+        @getted_models = DynamicAlias.get_by_items_with_name(@args)
+        assert_not_nil @getted_models, "Should return array"
+        assert_equal @getted_models.size, 1, "Should return [] with 1 instance"
+        @getted_model = @getted_models.first
         assert_equal @getted_model.name, @dynamic_alias.name
         assert_same_elements @getted_model.items.to_json.split(","), @dynamic_alias.items.to_json.split(",")
       end
@@ -134,14 +137,14 @@ class DynamicAliasTest < Test::Unit::TestCase
       end
     
       should "be getted after change in alias" do
-        @getted_model = DynamicAlias.get_by_alias(:items_with_name ,@args)
+        @getted_model = DynamicAlias.get_by_alias(:items_with_name ,@args).first
         assert_not_nil @getted_model, "Should return model"
         @getted_model.items[:bar] = "Test_bar"
         @getted_model.save
-
-        assert_equal DynamicAlias.get_by_alias(:items_with_name ,@getted_model.to_arg).name, @getted_model.name
+        assert_equal DynamicAlias.get_by_alias(:items_with_name ,@getted_model.to_arg).first.name, @getted_model.name
+        assert_nil DynamicAlias.get_by_alias(:items_with_name ,@args), "Should not be found by old alias"
       end
     end
 
   end
-end
+end

data/test/redis_model_parts/test_get_find.rb

@@ -58,13 +58,23 @@ class GetFindTest < Test::Unit::TestCase
       end
 
       should "be getted by alias" do
-        @getted_model = TestRedisModel.get_by_alias(:token, @args)
+        @getted_model = TestRedisModel.get_by_alias(:token, @args).first
         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 "and have more than one instances in one alias" do
+        test_model2 = TestRedisModel.new(@args.merge(string: "test2"))
+        test_model2.save
+        test_model3 = TestRedisModel.new(@args.merge(string: "test3"))
+        test_model3.save
+        assert_equal TestRedisModel.get_by_alias(:token, @args).size, 3, "Should have 3 instances under 1 alias (find)"
+        assert_equal TestRedisModel.find_by_alias(:token, @args).size, 3, "Should have 3 instances under 1 alias (get)"
+        assert_same_elements TestRedisModel.find_by_alias(:token, @args).collect{|t| t.string }, ["foo", "test2", "test3"]
+      end
+
       should "be find by alias" do
         @getted_models = TestRedisModel.find_by_alias(:token, :symbol => :bar)
         assert_equal @getted_models.size, 1, "Should be only one with alias" 
@@ -100,10 +110,12 @@ class GetFindTest < Test::Unit::TestCase
       end
     
       should "be getted after change in alias" do
-        getted_model = TestRedisModel.get_by_alias(:token ,@args)
+        getted_models = TestRedisModel.get_by_alias(:token ,@args)
+        assert_equal getted_models.size, 1, "Should return array of objects"
+        getted_model = getted_models.first
         getted_model.symbol = "Test_token"
         getted_model.save
-        assert_equal getted_model.integer, TestRedisModel.get_by_alias(:token ,:symbol => "Test_token").integer
+        assert_equal getted_model.integer, TestRedisModel.get_by_alias(:token ,:symbol => "Test_token").first.integer
       end
     end
 

data/test/redis_model_parts/test_redis_key.rb

@@ -24,6 +24,17 @@ class RedisKeyTest < Test::Unit::TestCase
       assert_equal TestRedisModel.generate_key(@args.merge({:string => nil})), "#{TestRedisModel.to_s.underscore}:key:*"
     end  
 
+		should "generate right search key even if the order is random" do
+			class Article
+				include RedisModelExtension
+				redis_field :aid, :integer
+				redis_key  :aid
+				redis_field :owner_id, :string
+			end
+
+			assert_equal 'redis_key_test/article:key:2', Article.generate_key(aid: 2)
+		end
+
          
     should "generate right key" do
       assert_equal @test_model.redis_key, "#{TestRedisModel.to_s.underscore}:key:foo"
@@ -116,4 +127,4 @@ class RedisKeyTest < Test::Unit::TestCase
 
     end
   end
-end
+end

data/test/redis_model_parts/test_variable_types.rb

@@ -35,7 +35,7 @@ class VariableTypesTest < Test::Unit::TestCase
       assert_equal @test_model.symbol, :bar
       assert_equal @test_model.boolean, true
       assert_equal @test_model.array, [1,2,3]
-      assert_equal @test_model.hash, {"foo"=>"bar", "test" => 2}
+      assert_equal @test_model.hash, {:foo=>"bar", :test => 2}
       assert_equal @test_model.time, @time
       assert_equal @test_model.date, Date.today
       assert_equal @test_model.float, 12.43
@@ -73,7 +73,7 @@ class VariableTypesTest < Test::Unit::TestCase
       @test_model.symbol = :foo
       @test_model.boolean = false
       @test_model.array = [4,5,6]
-      @test_model.hash = {"bar" => "foo"}
+      @test_model.hash = {:bar => "foo"}
       @test_model.time = @time-100
       @test_model.date = Date.today-10
       @test_model.float = 25.43
@@ -82,7 +82,7 @@ class VariableTypesTest < Test::Unit::TestCase
       assert_equal @test_model.symbol, :foo
       assert_equal @test_model.boolean, false
       assert_equal @test_model.array, [4,5,6]
-      assert_equal @test_model.hash, {"bar" => "foo"}
+      assert_equal @test_model.hash, {:bar => "foo"}
       assert_equal @test_model.time, @time-100
       assert_equal @test_model.date, Date.today-10
       assert_equal @test_model.float, 25.43

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-model-extension
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70174569560300 !ruby/object:Gem::Requirement
+  requirement: &70323131409560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174569560300
+  version_requirements: *70323131409560
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70174569559800 !ruby/object:Gem::Requirement
+  requirement: &70323131409020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174569559800
+  version_requirements: *70323131409020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70174569552680 !ruby/object:Gem::Requirement
+  requirement: &70323131408240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174569552680
+  version_requirements: *70323131408240
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70174569552000 !ruby/object:Gem::Requirement
+  requirement: &70323131407640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174569552000
+  version_requirements: *70323131407640
+- !ruby/object:Gem::Dependency
+  name: hashr
+  requirement: &70323131407100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70323131407100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70174569551340 !ruby/object:Gem::Requirement
+  requirement: &70323131406320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569551340
+  version_requirements: *70323131406320
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70174569550640 !ruby/object:Gem::Requirement
+  requirement: &70323131405480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569550640
+  version_requirements: *70323131405480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70174569548520 !ruby/object:Gem::Requirement
+  requirement: &70323131404320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569548520
+  version_requirements: *70323131404320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70174569547740 !ruby/object:Gem::Requirement
+  requirement: &70323131403740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569547740
+  version_requirements: *70323131403740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174569547120 !ruby/object:Gem::Requirement
+  requirement: &70323131402900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569547120
+  version_requirements: *70323131402900
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70174569546140 !ruby/object:Gem::Requirement
+  requirement: &70323131402080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569546140
+  version_requirements: *70323131402080
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70174569545300 !ruby/object:Gem::Requirement
+  requirement: &70323131671260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569545300
+  version_requirements: *70323131671260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174569541400 !ruby/object:Gem::Requirement
+  requirement: &70323131670560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,32 +153,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569541400
+  version_requirements: *70323131670560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174569540420 !ruby/object:Gem::Requirement
+  requirement: &70323131669940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569540420
+  version_requirements: *70323131669940
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70174569539040 !ruby/object:Gem::Requirement
+  requirement: &70323131669400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569539040
+  version_requirements: *70323131669400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70174569537700 !ruby/object:Gem::Requirement
+  requirement: &70323131668760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,18 +186,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569537700
+  version_requirements: *70323131668760
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70174569536400 !ruby/object:Gem::Requirement
+  requirement: &70323131668020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174569536400
+  version_requirements: *70323131668020
 description: It provides functions as find, find_by_alias, get, exists?, validate,
   save etc.
 email: ondrej@bartas.cz
@@ -204,6 +215,7 @@ files:
 - VERSION
 - config/redis_config.yml.example
 - config/redis_setup.conf
+- example/benchmark.rb
 - lib/database.rb
 - lib/redis-model-extension.rb
 - lib/redis-model-extension/attributes.rb
@@ -252,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1205580068854408278
+      hash: 4312848391343916827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: