redis_orm 0.3 → 0.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.4 [16-06-2011]
+* added :conditions key to the options hash in #find/#all methods
+* added #{property_name}_changed? instance method
+* fixed self-reference link for has_one association/added test for it
+* added :case_insensitive option to index declaration
+* fixed bug with no output when installed rspec > 2.6
+* added more tests and refactored old ones, updated documentation
+
 v0.3 [06-06-2011]
 * fixed #find functionality both for model itself and for has_many proxy
 * made sure ORM correctly resets associations when nil/[] provided

data/Manifest

@@ -22,4 +22,5 @@ test/indices_test.rb
 test/options_test.rb
 test/polymorphic_test.rb
 test/redis.conf
+test/test_helper.rb
 test/validations_test.rb

data/README.md

@@ -40,7 +40,7 @@ class User < RedisOrm::Base
 end
 ```
 
-Following property types are supported:
+Supported property types:
 
 *  **Integer**
 
@@ -49,12 +49,11 @@ Following property types are supported:
 *  **Float**
 
 *  **RedisOrm::Boolean**
-    there is no Boolean class in Ruby so it's a special class to specify TrueClass or FalseClass objects
+    there is no Boolean class in Ruby so it's a special class to store TrueClass or FalseClass objects
 
 *  **Time**
 
-The value of the 
-Property definition supports following options:
+Following options are available in property declaration:
 
 *  **:default**
 
@@ -62,7 +61,7 @@ Property definition supports following options:
 
 ## Searching records by the value
 
-Usually it's done via specifing an index and using dynamic finders. For example:
+Usually it's done via declaring an index and using dynamic finders later. For example:
 
 ```ruby
 class User < RedisOrm::Base
@@ -76,16 +75,9 @@ User.find_by_name "germaninthetown" # => found 1 record
 User.find_all_by_name "germaninthetown" # => array with 1 record
 ```
 
-Dynamic finders work mostly the way they work in ActiveRecord. The only difference is if you didn't specified index or compaund index on the attributes you are searching on the exception will be raised.
+Dynamic finders work mostly the way they do in ActiveRecord. The only difference is if you didn't specified index or compound index on the attributes you are searching on the exception will be raised.
 
-## Options for #find/#all 
-
-For example we associate 2 photos with the album
-
-```ruby
-@album.photos << @photo2
-@album.photos << @photo1
-```
+## Options for #find/#all
 
 To extract all or part of the associated records you could use 3 options for now (#find is an alias for #all in has_many proxy):
 
@@ -95,21 +87,33 @@ To extract all or part of the associated records you could use 3 options for now
 
 * :order
 
-  Either :desc or :asc (default), since records are stored with Time.now.to_f scores, be default they could be fetched only in that (or reversed) order. To store them in different order you should *zadd* record's id to some other sorted list manually.
+  Either :desc or :asc (default), since records are stored with Time.now.to_f scores, by default they could be fetched only in that (or reversed) order. To store them in different order you should *zadd* record's id to some other sorted list manually.
+  
+* :conditions
+
+  Hash where keys must be equal to some property name (there must be index for this property too).
 
 ```ruby
+# for example we associate 2 photos with the album
+@album.photos << @photo2
+@album.photos << @photo1
+
 @album.photos.all(:limit => 0, :offset => 0).should == []
 @album.photos.all(:limit => 1, :offset => 0).size.should == 1
 @album.photos.all(:limit => 2, :offset => 0)
-@album.photos.find(:order => "asc")
+@album.photos.find(:all, :order => "asc")
 
+Photo.find(:first, :order => "desc")
 Photo.all(:order => "asc", :limit => 5)
 Photo.all(:order => "desc", :limit => 10, :offset => 50)
+
+Photo.find(:all, :conditions => {:image => "facepalm.jpg"}) # => [...]
+Photo.find(:first, :conditions => {:image => "boobs.png"}) # => @photo1
 ```
 
 ## Indices
 
-Indices are used in a different way then they are used in relational databases. 
+Indices are used in a different way then they are used in relational databases. They are used to find record by they value rather then to quick access them.
 
 You could add index to any attribute of the model (it also could be compound):
 
@@ -123,7 +127,7 @@ class User < RedisOrm::Base
 end
 ```
 
-With index defined for the property (or number of properties) the id of the saved object is stored in the special sorted set, so it could be found later. For example with defined User model for the above code:
+With index defined for the property (or properties) the id of the saved object is stored in the special sorted set, so it could be found later by the value. For example with defined User model from the above code:
 
 ```ruby
 user = User.new :first_name => "Robert", :last_name => "Pirsig"
@@ -141,6 +145,12 @@ Index definition supports following options:
 
 *  **:unique** Boolean default: false
 
+  If true is specified then value is stored in ordinary key-value structure with index as the key, otherwise the values are added to sorted set with index as the key.
+  
+*  **:case_insensitive** Boolean default: false
+
+  If true is specified then property values are saved downcased (and then are transformed to downcase form when searching with dynamic finders). Works for compound indices too.
+  
 ## Associations
 
 RedisOrm provides 3 association types:
@@ -236,7 +246,7 @@ cat3.articles # => [article]
 
 Backlinks are automatically created.
 
-### self-referencing association
+### Self-referencing association
 
 ```ruby
 class User < RedisOrm::Base
@@ -256,7 +266,7 @@ friend1.friends # => []
 friend2.friends # => []
 ```
 
-As an exception if *:as* option for the association is provided the backlinks are not established.
+As an exception if *:as* option for the association is provided the backlinks aren't created.
 
 ### Polymorphic associations
 
@@ -297,7 +307,7 @@ All associations supports following options:
 
 * *:as* 
 
-  Symbol could be accessed by provided name
+  Symbol Association could be accessed by provided name
 
 * *:dependent* 
 
@@ -380,13 +390,17 @@ When saving object standard ActiveModel's #valid? method is invoked at first. Th
 
 The object's id is stored in "model_name:ids" sorted set with Time.now.to_f as a score. So records are ordered by created_at time by default.
 
+## Dirty
+
+Redis_orm also provides dirty methods to check whether the property has changed and what are these changes. To check it you could use 2 methods: #property_changed? (returns true or false) and #property_changes (returns array with changed values).
+
 ## Tests
 
-Though I a fan of the Test::Unit all tests are based on RSpec. And the only reason I did it is before(:all) and after(:all) hooks. So I could spawn/kill redis-server's process:
+Though I'm a big fan of the Test::Unit all tests are based on RSpec. And the only reason I did it are *before(:all)* and *after(:all)* hooks. So I could spawn/kill redis-server's process (from test_helper.rb):
 
 ```ruby
-describe "check callbacks" do
-  before(:all) do
+RSpec.configure do |config|
+  config.before(:all) do
     path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
     $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
     sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
@@ -394,24 +408,38 @@ describe "check callbacks" do
     $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
   end
   
-  before(:each) do
+  config.before(:each) do
     $redis.flushall if $redis
   end
 
-  after(:each) do
+  config.after(:each) do
    $redis.flushall if $redis
   end
 
-  after(:all) do
+  config.after(:all) do
     Process.kill 9, $redis_pid.to_i if $redis_pid
   end
-  
-  # it "should ..." do
-  #   ...
-  # end
 end
 ```
 
 To run all tests just invoke *rake test*
 
 Copyright © 2011 Dmitrii Samoilov, released under the MIT license
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -1,9 +1,10 @@
+require 'psych'
 require 'rubygems'
 require 'rake'
-
+#=begin
 require 'echoe'
 
-Echoe.new('redis_orm', '0.3') do |p|
+Echoe.new('redis_orm', '0.4') do |p|
   p.description    = "ORM for Redis advanced key-value storage"
   p.url            = "https://github.com/german/redis_orm"
   p.author         = "Dmitrii Samoilov"
@@ -11,7 +12,7 @@ Echoe.new('redis_orm', '0.3') do |p|
   p.dependencies   = ["activesupport >=3.0.0", "activemodel >=3.0.0", "redis >=2.2.0"]
   p.development_dependencies   = ["rspec >=2.5.0"]
 end
-
+#=end
 
 #require 'rake/testtask'
 #$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')

data/lib/redis_orm/associations/has_one.rb

@@ -33,19 +33,21 @@ module RedisOrm
             raise TypeMismatchError
           end
 
-          if assoc_with_record.nil?
-            # remove old assoc
-            $redis.zrem("#{old_assoc.model_name}:#{old_assoc.id}:#{model_name.to_s.pluralize}", id) if old_assoc
-          else
-            # check whether *assoc_with_record* object has *belongs_to* declaration and TODO it states *self.model_name* and there is no record yet from the *assoc_with_record*'s side (in order not to provoke recursion)
-            if class_associations[assoc_with_record.model_name].detect{|h| [:belongs_to, :has_one].include?(h[:type]) && h[:foreign_model] == model_name.to_sym} && assoc_with_record.send(model_name.to_sym).nil?
-              # old association is being rewritten here automatically so we don't have to worry about it
-              assoc_with_record.send("#{model_name}=", self)
-            elsif class_associations[assoc_with_record.model_name].detect{|h| :has_many == h[:type] && h[:foreign_models] == model_name.to_s.pluralize.to_sym} && !$redis.zrank("#{assoc_with_record.model_name}:#{assoc_with_record.id}:#{model_name.pluralize}", self.id)
+          if !options[:as]
+            if assoc_with_record.nil?
               # remove old assoc
               $redis.zrem("#{old_assoc.model_name}:#{old_assoc.id}:#{model_name.to_s.pluralize}", id) if old_assoc
-              # create/add new ones
-              assoc_with_record.send(model_name.pluralize.to_sym).send(:"<<", self)
+            else
+              # check whether *assoc_with_record* object has *belongs_to* declaration and TODO it states *self.model_name* and there is no record yet from the *assoc_with_record*'s side (in order not to provoke recursion)
+              if class_associations[assoc_with_record.model_name].detect{|h| [:belongs_to, :has_one].include?(h[:type]) && h[:foreign_model] == model_name.to_sym} && assoc_with_record.send(model_name.to_sym).nil?
+                # old association is being rewritten here automatically so we don't have to worry about it
+                assoc_with_record.send("#{model_name}=", self)
+              elsif class_associations[assoc_with_record.model_name].detect{|h| :has_many == h[:type] && h[:foreign_models] == model_name.to_s.pluralize.to_sym} && !$redis.zrank("#{assoc_with_record.model_name}:#{assoc_with_record.id}:#{model_name.pluralize}", self.id)
+                # remove old assoc
+                $redis.zrem("#{old_assoc.model_name}:#{old_assoc.id}:#{model_name.to_s.pluralize}", id) if old_assoc
+                # create/add new ones
+                assoc_with_record.send(model_name.pluralize.to_sym).send(:"<<", self)
+              end
             end
           end
         end

data/lib/redis_orm/redis_orm.rb

@@ -96,6 +96,10 @@ module RedisOrm
         send(:define_method, "#{property_name}_changes".to_sym) do
           instance_variable_get(:"@#{property_name}_changes")
         end
+        
+        send(:define_method, "#{property_name}_changed?".to_sym) do
+          instance_variable_get(:"@#{property_name}_changes").size > 1
+        end
       end
 
       def timestamps
@@ -124,17 +128,61 @@ module RedisOrm
         id.empty? ? nil : find(id[0])
       end
 
+      def find_index(properties)
+        @@indices[model_name].detect do |models_index|
+          if models_index[:name].is_a?(Array) && models_index[:name].size == properties.size
+            models_index[:name] == properties.map{|p| p.to_sym}
+          elsif !models_index[:name].is_a?(Array) && properties.size == 1
+            models_index[:name] == properties[0].to_sym
+          end
+        end
+      end
+      
+      def construct_prepared_index(index, properties_hash)
+        prepared_index = model_name.to_s
+       
+        properties_hash.each do |key, value|
+          # raise if User.find_by_firstname_and_castname => there's no *castname* in User's properties
+          raise ArgumentsMismatch if !@@properties[model_name].detect{|p| p[:name] == key.to_sym}
+          prepared_index += ":#{key}:#{value}"
+        end        
+              
+        prepared_index.downcase! if index[:options][:case_insensitive]
+        
+        prepared_index
+      end
+      
       def all(options = {})
         limit = if options[:limit] && options[:offset]
           [options[:offset].to_i, options[:limit].to_i]
         elsif options[:limit]
           [0, options[:limit].to_i]
         end
-
-        if options[:order].to_s == 'desc'
-          $redis.zrevrangebyscore("#{model_name}:ids", Time.now.to_f, 0, :limit => limit).compact.collect{|id| find(id)}
-        else
-          $redis.zrangebyscore("#{model_name}:ids", 0, Time.now.to_f, :limit => limit).compact.collect{|id| find(id)}
+        
+        if options[:conditions] && options[:conditions].is_a?(Hash)
+          properties = options[:conditions].collect{|key, value| key}
+          index = find_index(properties)
+          
+          raise NotIndexFound if !index
+          
+          prepared_index = construct_prepared_index(index, options[:conditions])
+          
+          records = []          
+
+          if index[:options][:unique]            
+            id = $redis.get prepared_index
+            records << model_name.to_s.camelize.constantize.find(id)
+          else
+            ids = $redis.zrangebyscore(prepared_index, 0, Time.now.to_f)
+            records += model_name.to_s.camelize.constantize.find(ids)
+          end          
+          records
+        else         
+          if options[:order].to_s == 'desc'
+            $redis.zrevrangebyscore("#{model_name}:ids", Time.now.to_f, 0, :limit => limit).compact.collect{|id| find(id)}
+          else
+            $redis.zrangebyscore("#{model_name}:ids", 0, Time.now.to_f, :limit => limit).compact.collect{|id| find(id)}
+          end
         end
       end
 
@@ -199,34 +247,27 @@ module RedisOrm
         obj = new(options, nil, false)
         obj.save
         obj
-      end
-
+      end      
+      
       # dynamic finders
       def method_missing(method_name, *args, &block)
         if method_name =~ /^find_(all_)?by_(\w*)/
-          prepared_index = model_name.to_s
+          
           index = if $2
             properties = $2.split('_and_')
             raise ArgumentsMismatch if properties.size != args.size
-            
-            properties.each_with_index do |prop, i|
-              # raise if User.find_by_firstname_and_castname => there's no *castname* in User's properties
-              raise ArgumentsMismatch if !@@properties[model_name].detect{|p| p[:name] == prop.to_sym}
-              prepared_index += ":#{prop}:#{args[i].to_s}"
-            end
-
-            @@indices[model_name].detect do |models_index|
-              if models_index[:name].is_a?(Array) && models_index[:name].size == properties.size
-                models_index[:name] == properties.map{|p| p.to_sym}
-              elsif !models_index[:name].is_a?(Array) && properties.size == 1
-                models_index[:name] == properties[0].to_sym
-              end
+            properties_hash = {}
+            properties.each_with_index do |prop, i| 
+              properties_hash.merge!({prop.to_sym => args[i]})
             end
+            find_index(properties)
           end
 
           raise NotIndexFound if !index
+          
+          prepared_index = construct_prepared_index(index, properties_hash)
 
-          if method_name =~ /^find_by_(\w*)/                      
+          if method_name =~ /^find_by_(\w*)/
             id = if index[:options][:unique]            
               $redis.get prepared_index
             else
@@ -302,10 +343,10 @@ module RedisOrm
       if persisted? # then there might be old indices
         # check whether there's old indices exists and if yes - delete them
         @@properties[model_name].each do |prop|
-          prop_changes = instance_variable_get :"@#{prop[:name]}_changes" 
-
-          next if prop_changes.size < 2
-          prev_prop_value = prop_changes.first
+          # if there were no changes for current property skip it (indices remains the same)
+          next if ! self.send(:"#{prop[:name]}_changed?")
+          
+          prev_prop_value = instance_variable_get(:"@#{prop[:name]}_changes").first
 
           indices = @@indices[model_name].inject([]) do |sum, models_index|
             if models_index[:name].is_a?(Array)
@@ -380,13 +421,7 @@ module RedisOrm
       # save new indices in order to sort by finders
       # city:name:Харьков => 1
       @@indices[model_name].each do |index|
-        prepared_index = if index[:name].is_a?(Array) # TODO sort alphabetically
-          index[:name].inject([model_name]) do |sum, index_part|
-            sum += [index_part, self.instance_variable_get(:"@#{index_part}").to_s]
-          end.join(':')
-        else
-          [model_name, index[:name], self.instance_variable_get(:"@#{index[:name]}").to_s].join(':')
-        end
+        prepared_index = construct_prepared_index(index) # instance method not class one!
 
         if index[:options][:unique]
           $redis.set(prepared_index, @id)
@@ -494,13 +529,7 @@ module RedisOrm
 
       # we need to ensure that smembers are correct after removal of the record
       @@indices[model_name].each do |index|
-        prepared_index = if index[:name].is_a?(Array) # TODO sort alphabetically
-          index[:name].inject([model_name]) do |sum, index_part|
-            sum += [index_part, self.instance_variable_get(:"@#{index_part}")]
-          end.join(':')          
-        else
-          [model_name, index[:name], self.instance_variable_get(:"@#{index[:name]}")].join(':')
-        end
+        prepared_index = construct_prepared_index(index) # instance method not class one!
 
         if index[:options][:unique]
           $redis.del(prepared_index)
@@ -514,6 +543,21 @@ module RedisOrm
       end
 
       true # if there were no errors just return true, so *if* conditions would work
-    end    
+    end
+    
+    protected
+      def construct_prepared_index(index)
+        prepared_index = if index[:name].is_a?(Array) # TODO sort alphabetically
+          index[:name].inject([model_name]) do |sum, index_part|
+            sum += [index_part, self.instance_variable_get(:"@#{index_part}")]
+          end.join(':')          
+        else
+          [model_name, index[:name], self.instance_variable_get(:"@#{index[:name]}")].join(':')
+        end
+        
+        prepared_index.downcase! if index[:options][:case_insensitive]
+        
+        prepared_index
+      end
   end
 end

data/redis_orm.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_orm}
-  s.version = "0.3"
+  s.version = "0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dmitrii Samoilov"]
-  s.date = %q{2011-06-06}
+  s.authors = [%q{Dmitrii Samoilov}]
+  s.date = %q{2011-06-15}
   s.description = %q{ORM for Redis advanced key-value storage}
   s.email = %q{germaninthetown@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/redis_orm.rb", "lib/redis_orm/active_model_behavior.rb", "lib/redis_orm/associations/belongs_to.rb", "lib/redis_orm/associations/has_many.rb", "lib/redis_orm/associations/has_many_proxy.rb", "lib/redis_orm/associations/has_one.rb", "lib/redis_orm/redis_orm.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "lib/redis_orm.rb", "lib/redis_orm/active_model_behavior.rb", "lib/redis_orm/associations/belongs_to.rb", "lib/redis_orm/associations/has_many.rb", "lib/redis_orm/associations/has_many_proxy.rb", "lib/redis_orm/associations/has_one.rb", "lib/redis_orm/redis_orm.rb", "redis_orm.gemspec", "test/associations_test.rb", "test/basic_functionality_test.rb", "test/callbacks_test.rb", "test/changes_array_test.rb", "test/dynamic_finders_test.rb", "test/exceptions_test.rb", "test/has_one_has_many_test.rb", "test/indices_test.rb", "test/options_test.rb", "test/polymorphic_test.rb", "test/redis.conf", "test/validations_test.rb"]
+  s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README.md}, %q{lib/redis_orm.rb}, %q{lib/redis_orm/active_model_behavior.rb}, %q{lib/redis_orm/associations/belongs_to.rb}, %q{lib/redis_orm/associations/has_many.rb}, %q{lib/redis_orm/associations/has_many_proxy.rb}, %q{lib/redis_orm/associations/has_one.rb}, %q{lib/redis_orm/redis_orm.rb}]
+  s.files = [%q{CHANGELOG}, %q{LICENSE}, %q{Manifest}, %q{README.md}, %q{Rakefile}, %q{lib/redis_orm.rb}, %q{lib/redis_orm/active_model_behavior.rb}, %q{lib/redis_orm/associations/belongs_to.rb}, %q{lib/redis_orm/associations/has_many.rb}, %q{lib/redis_orm/associations/has_many_proxy.rb}, %q{lib/redis_orm/associations/has_one.rb}, %q{lib/redis_orm/redis_orm.rb}, %q{redis_orm.gemspec}, %q{test/associations_test.rb}, %q{test/basic_functionality_test.rb}, %q{test/callbacks_test.rb}, %q{test/changes_array_test.rb}, %q{test/dynamic_finders_test.rb}, %q{test/exceptions_test.rb}, %q{test/has_one_has_many_test.rb}, %q{test/indices_test.rb}, %q{test/options_test.rb}, %q{test/polymorphic_test.rb}, %q{test/redis.conf}, %q{test/test_helper.rb}, %q{test/validations_test.rb}]
   s.homepage = %q{https://github.com/german/redis_orm}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Redis_orm", "--main", "README.md"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Redis_orm}, %q{--main}, %q{README.md}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{redis_orm}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{ORM for Redis advanced key-value storage}
-  s.test_files = ["test/options_test.rb", "test/dynamic_finders_test.rb", "test/associations_test.rb", "test/validations_test.rb", "test/polymorphic_test.rb", "test/exceptions_test.rb", "test/has_one_has_many_test.rb", "test/indices_test.rb", "test/changes_array_test.rb", "test/callbacks_test.rb", "test/basic_functionality_test.rb"]
+  s.test_files = [%q{test/options_test.rb}, %q{test/dynamic_finders_test.rb}, %q{test/associations_test.rb}, %q{test/validations_test.rb}, %q{test/test_helper.rb}, %q{test/polymorphic_test.rb}, %q{test/exceptions_test.rb}, %q{test/has_one_has_many_test.rb}, %q{test/indices_test.rb}, %q{test/changes_array_test.rb}, %q{test/callbacks_test.rb}, %q{test/basic_functionality_test.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/associations_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class Article < RedisOrm::Base
   property :title, String
@@ -33,17 +32,13 @@ class User < RedisOrm::Base
   has_many :users, :as => :friends
 end
 
-describe "check associations" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
+class Message < RedisOrm::Base
+  property :text, String
+  has_one :message, :as => :replay_to
+end
 
+describe "check associations" do
   before(:each) do
-    $redis.flushall if $redis
     @article = Article.new
     @article.title = "DHH drops OpenID on 37signals"
     @article.save
@@ -64,14 +59,6 @@ describe "check associations" do
     @comment2.body.should == "test #2"
   end
 
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do    
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should assign properly from belongs_to side" do
     @comment1.article.should == nil
     @comment1.article = @article
@@ -303,4 +290,20 @@ describe "check associations" do
     me.friends[0].id == friend2.id
     User.count.should == 3
   end
+  
+  it "should create self-referencing link for has_one association" do
+    m = Message.create :text => "it should create self-referencing link for has_one association"
+
+    r = Message.create :text => "replay"
+    
+    r.replay_to = m
+
+    Message.count.should == 2
+    r.replay_to.should be
+    r.replay_to.id.should == m.id
+    
+    rf = Message.last
+    rf.replay_to.should be
+    rf.replay_to.id.should == Message.first.id
+  end
 end

data/test/basic_functionality_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class User < RedisOrm::Base
   property :name, String
@@ -16,7 +15,8 @@ class DefaultUser < RedisOrm::Base
   property :age, Integer, :default => 26
   property :wage, Float, :default => 256.25
   property :male, RedisOrm::Boolean, :default => true
-
+  property :admin, RedisOrm::Boolean, :default => false
+  
   property :created_at, Time
   property :modified_at, Time
 end
@@ -26,26 +26,6 @@ class TimeStamp < RedisOrm::Base
 end
 
 describe "check basic functionality" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "test_simple_creation" do
     User.count.should == 0
 
@@ -160,12 +140,22 @@ describe "check basic functionality" do
     u.modified_at.class.should == Time
     u.wage.class.should == Float
     u.male.class.to_s.should match(/TrueClass|FalseClass/)
+    u.admin.class.to_s.should match(/TrueClass|FalseClass/)
     u.age.class.to_s.should match(/Integer|Fixnum/)
 
     u.name.should == "german"
     u.male.should == true
     u.age.should  == 26
     u.wage.should == 256.25
+    u.admin.should == false
+    
+    du = DefaultUser.new
+    du.name = "germaninthetown"
+    du.save
+    
+    du_saved = DefaultUser.last
+    du_saved.name.should == "germaninthetown"
+    du_saved.admin.should == false
   end
   
   it "should expand timestamps declaration properly" do

data/test/callbacks_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class CutoutAggregator < RedisOrm::Base
   property :modified_at, Time
@@ -72,26 +71,6 @@ class User < RedisOrm::Base
 end
 
 describe "check callbacks" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should fire after_create/after_destroy callbacks" do
     user = User.new :first_name => "Robert", :last_name => "Pirsig"
     user.save

data/test/changes_array_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class User < RedisOrm::Base
   property :name, String
@@ -8,40 +7,25 @@ class User < RedisOrm::Base
 end
 
 describe "check associations" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do    
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should return correct _changes array" do
     user = User.new :name => "german"
-
+    user.name_changed?.should == false
+    
     user.name_changes.should == ["german"]
     user.save
+    
     user.name_changes.should == ["german"]
     user.name = "germaninthetown"
     user.name_changes.should == ["german", "germaninthetown"]
+    user.name_changed?.should == true
     user.save
 
     user = User.first
     user.name.should == "germaninthetown"
+    user.name_changed?.should == false
     user.name_changes.should == ["germaninthetown"]
     user.name = "german"
+    user.name_changed?.should == true
     user.name_changes.should == ["germaninthetown", "german"]
   end
 end

data/test/dynamic_finders_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class User < RedisOrm::Base
   property :first_name, String
@@ -20,26 +19,6 @@ class CustomUser < RedisOrm::Base
 end
 
 describe "check associations" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis    
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do    
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should create and use indexes to implement dynamic finders" do
     user1 = User.new
     user1.first_name = "Dmitrii"

data/test/exceptions_test.rb

@@ -1,58 +1,40 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class User < RedisOrm::Base
   property :name, String
   property :age, Integer
   property :created_at, Time
 
+  index :age
+  
   has_one :profile
 end
 
 class Profile < RedisOrm::Base
   property :title, String
-
   belongs_to :user
 end
 
 class Jigsaw < RedisOrm::Base
   property :title, String
-
   belongs_to :user
 end
 
 describe "exceptions test" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should raise an exception if association is provided with improper class" do
     User.count.should == 0
 
-    user = User.new
-    user.name = "german"
+    user = User.new :name => "german", :age => 26
     user.save
 
     user.should be
     user.name.should == "german"
     User.count.should == 1
 
+    lambda{ User.find :all, :conditions => {:name => "german"} }.should raise_error
+    User.find(:all, :conditions => {:age => 26}).size.should == 1
+    lambda{ User.find :all, :conditions => {:name => "german", :age => 26} }.should raise_error
+    
     jigsaw = Jigsaw.new
     jigsaw.title = "123"
     jigsaw.save

data/test/has_one_has_many_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class Profile < RedisOrm::Base
   property :name, String
@@ -14,26 +13,6 @@ class Location < RedisOrm::Base
 end
 
 describe "check associations" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis    
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should save associations properly" do
     @profile = Profile.new
     @profile.name = "my profile"

data/test/indices_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class User < RedisOrm::Base
   property :first_name, String
@@ -10,27 +9,16 @@ class User < RedisOrm::Base
   index [:first_name, :last_name]
 end
 
-describe "check indices" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
+class OmniUser < RedisOrm::Base
+  property :email, String
+  property :uid, Integer
 
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
+  index :email, :case_insensitive => true
+  index :uid
+  index [:email, :uid], :case_insensitive => true
+end
 
+describe "check indices" do
   it "should change index accordingly to the changes in the model" do
     user = User.new :first_name => "Robert", :last_name => "Pirsig"
     user.save
@@ -73,4 +61,21 @@ describe "check indices" do
     User.find_by_last_name("Robin").id.should == user.id
     User.find_by_first_name_and_last_name("Christofer", "Robin").id.should == user.id    
   end
+  
+  it "should create case insensitive indices too" do
+    ou = OmniUser.new :email => "GERMAN@Ya.ru", :uid => 2718281828
+    ou.save
+    
+    OmniUser.count.should == 1
+    OmniUser.find_by_email("german@ya.ru").should be
+    OmniUser.find_all_by_email("german@ya.ru").count.should == 1
+    
+    OmniUser.find_by_email_and_uid("german@ya.ru", 2718281828).should be
+    OmniUser.find_all_by_email_and_uid("german@ya.ru", 2718281828).count.should == 1
+
+    OmniUser.find_by_email("geRman@yA.rU").should be
+    OmniUser.find_all_by_email_and_uid("GerMan@Ya.ru", 2718281828).count.should == 1
+        
+    OmniUser.find_all_by_email_and_uid("german@ya.ru", 2718281829).count.should == 0
+  end
 end

data/test/options_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class Album < RedisOrm::Base
   property :title, String
@@ -16,6 +15,10 @@ end
 
 class Photo < RedisOrm::Base
   property :image, String
+  property :image_type, String
+  
+  index :image
+  index [:image, :image_type]
   
   belongs_to :album
   belongs_to :user
@@ -29,24 +32,7 @@ class User < RedisOrm::Base
 end
 
 describe "test options" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
   before(:each) do
-    $redis.flushall if $redis
     @album = Album.new
     @album.title = "my 1st album"
     @album.save
@@ -54,17 +40,17 @@ describe "test options" do
     @album.should be
     @album.title.should == "my 1st album"
 
-    @photo1 = Photo.new
-    @photo1.image = "facepalm.jpg"
+    @photo1 = Photo.new :image => "facepalm.jpg", :image_type => "jpg"
     @photo1.save
     @photo1.should be
     @photo1.image.should == "facepalm.jpg"
+    @photo1.image_type.should == "jpg"
 
-    @photo2 = Photo.new
-    @photo2.image = "boobs.jpg"
+    @photo2 = Photo.new :image => "boobs.png", :image_type => "png"
     @photo2.save
     @photo2.should be
-    @photo2.image.should == "boobs.jpg"
+    @photo2.image.should == "boobs.png"
+    @photo2.image_type.should == "png"
   end
 
   it "should return correct array when :limit and :offset options are provided" do
@@ -82,7 +68,25 @@ describe "test options" do
     @album.photos.all(:limit => 1, :offset => 1).size.should == 1 # [@photo2]
     @album.photos.all(:limit => 2, :offset => 2).should == []
 
-    @album.photos.find(:all, :limit => 1, :offset => 1).size.should == 1 
+    @album.photos.find(:all, :limit => 1, :offset => 1).size.should == 1
+    
+    Photo.find(:all, :conditions => {:image => "facepalm.jpg"}).size.should == 1
+    Photo.find(:all, :conditions => {:image => "boobs.png"}).size.should == 1
+
+    Photo.find(:all, :conditions => {:image => "facepalm.jpg", :image_type => "jpg"}).size.should == 1
+    Photo.find(:all, :conditions => {:image => "boobs.png", :image_type => "png"}).size.should == 1
+        
+    Photo.find(:first, :conditions => {:image => "facepalm.jpg"}).id.should == @photo1.id
+    Photo.find(:first, :conditions => {:image => "boobs.png"}).id.should == @photo2.id
+    
+    Photo.find(:first, :conditions => {:image => "facepalm.jpg", :image_type => "jpg"}).id.should == @photo1.id
+    Photo.find(:first, :conditions => {:image => "boobs.png", :image_type => "png"}).id.should == @photo2.id
+    
+    Photo.find(:last, :conditions => {:image => "facepalm.jpg"}).id.should == @photo1.id
+    Photo.find(:last, :conditions => {:image => "boobs.png"}).id.should == @photo2.id
+    
+    Photo.find(:last, :conditions => {:image => "facepalm.jpg", :image_type => "jpg"}).id.should == @photo1.id
+    Photo.find(:last, :conditions => {:image => "boobs.png", :image_type => "png"}).id.should == @photo2.id
   end
 
   it "should return correct array when :order option is provided" do

data/test/polymorphic_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class CatalogItem < RedisOrm::Base
   property :title, String
@@ -41,26 +40,6 @@ class City < RedisOrm::Base
 end
 
 describe "check polymorphic property" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
   it "should provide proper associations and save records correctly for has_one/belongs_to polymorphic" do
     book = Book.new :title => "Permutation City", :author => "Egan Greg", :price => 1529
     book.save

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+require 'rspec'
+require 'rspec/autorun'
+require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+
+RSpec.configure do |config|  
+  config.before(:all) do
+    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
+    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
+    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
+    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
+    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
+  end
+  
+  config.after(:all) do
+    Process.kill 9, $redis_pid.to_i if $redis_pid
+  end
+
+  config.after(:each) do
+   $redis.flushall if $redis
+  end
+
+  config.before(:each) do
+    $redis.flushall if $redis
+  end
+end

data/test/validations_test.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class Photo < RedisOrm::Base
   property :image, String
@@ -10,26 +9,6 @@ class Photo < RedisOrm::Base
 end
 
 describe "check associations" do
-  before(:all) do
-    path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"
-    $redis_pid = spawn 'redis-server ' + path_to_conf, :out => "/dev/null"
-    sleep(0.3) # must be some delay otherwise "Connection refused - Unable to connect to Redis"
-    path_to_socket = File.dirname(File.expand_path(__FILE__)) + "/../redis.sock"
-    $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
-  end
-  
-  after(:all) do
-    Process.kill 9, $redis_pid.to_i if $redis_pid
-  end
-
-  after(:each) do
-   $redis.flushall if $redis
-  end
-
-  before(:each) do
-    $redis.flushall if $redis
-  end
-
   it "should validate presence if image in photo" do
     p = Photo.new
     p.save.should == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-06 00:00:00.000000000 +03:00
-default_executable: 
+date: 2011-06-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &85879940 !ruby/object:Gem::Requirement
+  requirement: &81951070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *85879940
+  version_requirements: *81951070
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &85879580 !ruby/object:Gem::Requirement
+  requirement: &81950820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *85879580
+  version_requirements: *81950820
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &85879180 !ruby/object:Gem::Requirement
+  requirement: &81950570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *85879180
+  version_requirements: *81950570
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85878840 !ruby/object:Gem::Requirement
+  requirement: &81950320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +54,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *85878840
+  version_requirements: *81950320
 description: ORM for Redis advanced key-value storage
 email: germaninthetown@gmail.com
 executables: []
@@ -96,8 +95,8 @@ files:
 - test/options_test.rb
 - test/polymorphic_test.rb
 - test/redis.conf
+- test/test_helper.rb
 - test/validations_test.rb
-has_rdoc: true
 homepage: https://github.com/german/redis_orm
 licenses: []
 post_install_message: 
@@ -124,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: redis_orm
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: ORM for Redis advanced key-value storage
@@ -133,6 +132,7 @@ test_files:
 - test/dynamic_finders_test.rb
 - test/associations_test.rb
 - test/validations_test.rb
+- test/test_helper.rb
 - test/polymorphic_test.rb
 - test/exceptions_test.rb
 - test/has_one_has_many_test.rb