redis_orm 0.4.2 → 0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5 [02-07-2011]
+* added support of *:conditions* hash in *:options* hash for has_many association in #find/#all methods
+* made keys order-independent in *:conditions* hash
+
 v0.4.2 [25-06-2011]
 * fixed bug with wrong saving of :default value/index for boolean type, fixed bug with #find(:all), #find(:first), #find(:last) function calls, added test for it
 * added simple test to ensure correct search on boolean properties

data/Manifest

@@ -7,10 +7,12 @@ 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_helper.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/association_indices_test.rb
 test/associations_test.rb
 test/atomicity_test.rb
 test/basic_functionality_test.rb

data/README.md

@@ -79,7 +79,7 @@ Dynamic finders work mostly the way they do in ActiveRecord. The only difference
 
 ## 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):
+To extract all or part of the associated records you could use 4 options for now:
 
 * :limit
 
@@ -98,14 +98,16 @@ To extract all or part of the associated records you could use 3 options for now
 @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 => 0, :offset => 0) # => []
+@album.photos.all(:limit => 1, :offset => 0).size # => 1
 @album.photos.all(:limit => 2, :offset => 0)
+@album.photos.all(:limit => 1, :offset => 1, :conditions => {:image_type => "image/png"})
 @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.all(:order => "desc", :offset => 10, :conditions => {:image_type => "image/jpeg"})
 
 Photo.find(:all, :conditions => {:image => "facepalm.jpg"}) # => [...]
 Photo.find(:first, :conditions => {:image => "boobs.png"}) # => @photo1
@@ -141,6 +143,33 @@ User.find_by_first_name_and_last_name("Robert", "Pirsig")     # => user
 User.find_all_by_first_name_and_last_name("Chris", "Pirsig")  # => []
 ```
 
+Indices on associations are also created/deleted/updated when objects with has_many/belongs_to associations are created/deleted/updated (excerpt from association_indices_test.rb):
+
+```ruby
+class Article < RedisOrm::Base
+  property :title, String
+  has_many :comments
+end
+
+class Comment < RedisOrm::Base
+  property :body, String
+  property :moderated, RedisOrm::Boolean, :default => false
+  index :moderated
+  belongs_to :article
+end
+
+article = Article.create :title => "DHH drops OpenID on 37signals"
+comment1 = Comment.create :body => "test"    
+comment2 = Comment.create :body => "test #2", :moderated => true
+
+article.comments << [comment1, comment2]
+
+# here besides usual indices for each comment, 2 association indices are created so #find with *:conditions* on comments just works
+
+article.comments.find(:all, :conditions => {:moderated => true})
+article.comments.find(:all, :conditions => {:moderated => false})
+```
+
 Index definition supports following options:
 
 *  **:unique** Boolean default: false

data/Rakefile

@@ -4,8 +4,8 @@ require 'rake'
 #=begin
 require 'echoe'
 
-Echoe.new('redis_orm', '0.4.2') do |p|
-  p.description    = "ORM for Redis advanced key-value storage"
+Echoe.new('redis_orm', '0.5') do |p|
+  p.description    = "ORM for Redis (advanced key-value storage) with ActiveRecord API"
   p.url            = "https://github.com/german/redis_orm"
   p.author         = "Dmitrii Samoilov"
   p.email          = "germaninthetown@gmail.com"

data/lib/redis_orm.rb

@@ -5,6 +5,9 @@ require 'redis'
 require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'active_model_behavior')
 
 require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associations', 'belongs_to')
+
+require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associations', 'has_many_helper')
+
 require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associations', 'has_many_proxy')
 require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associations', 'has_many')
 require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associations', 'has_one')

data/lib/redis_orm/associations/has_many.rb

@@ -47,6 +47,10 @@ module RedisOrm
             # we use here *foreign_models_name* not *record.model_name.pluralize* because of the :as option
             $redis.zadd("#{model_name}:#{id}:#{foreign_models_name}", Time.now.to_f, record.id)
 
+            record.get_indices.each do |index|
+              save_index_for_associated_record(index, record, [model_name, id, record.model_name.pluralize]) # record.model_name.pluralize => foreign_models_name
+            end
+
             if !options[:as]
               # article.comments = [comment1, comment2] 
               # iterate through the array of comments and create backlink

data/lib/redis_orm/associations/has_many_helper.rb

@@ -0,0 +1,25 @@
+module RedisOrm
+  module Associations
+    module HasManyHelper
+      private
+      def save_index_for_associated_record(index, record, inception)
+        prepared_index = if index[:name].is_a?(Array) # TODO sort alphabetically
+          index[:name].inject(inception) do |sum, index_part|
+            sum += [index_part, record.send(index_part.to_sym)]
+          end.join(':')
+        else
+          inception += [index[:name], record.send(index[:name].to_sym)]
+          inception.join(':')
+        end
+
+        prepared_index.downcase! if index[:options][:case_insensitive]
+
+        if index[:options][:unique]
+          $redis.set(prepared_index, record.id)
+        else
+          $redis.zadd(prepared_index, Time.now.to_f, record.id)
+        end
+      end
+    end
+  end
+end

data/lib/redis_orm/associations/has_many_proxy.rb

@@ -1,6 +1,8 @@
 module RedisOrm
   module Associations
     class HasManyProxy
+      include HasManyHelper
+      
       def initialize(reciever_model_name, reciever_id, foreign_models, options)
         @records = [] #records.to_a
         @reciever_model_name = reciever_model_name
@@ -31,6 +33,10 @@ module RedisOrm
         new_records.to_a.each do |record|
           $redis.zadd(__key__, Time.now.to_f, record.id)          
 
+          record.get_indices.each do |index|
+            save_index_for_associated_record(index, record, [@reciever_model_name, @reciever_id, record.model_name.pluralize]) # record.model_name.pluralize => @foreign_models
+          end
+
           if !@options[:as]
             record_associations = record.get_associations
 
@@ -66,20 +72,42 @@ module RedisOrm
       end
 
       def all(options = {})
-        if options.is_a?(Hash) && (options[:limit] || options[:offset] || options[:order])
+        if options.is_a?(Hash) && (options[:limit] || options[:offset] || options[:order] || options[:conditions])
           limit = if options[:limit] && options[:offset]
             [options[:offset].to_i, options[:limit].to_i]            
           elsif options[:limit]
             [0, options[:limit].to_i]
           end
 
-          record_ids = if options[:order].to_s == 'desc'
-            $redis.zrevrangebyscore(__key__, Time.now.to_f, 0, :limit => limit)
+          prepared_index = if options[:conditions] && options[:conditions].is_a?(Hash)
+            properties = options[:conditions].collect{|key, value| key}
+
+            index = @foreign_models.to_s.singularize.camelize.constantize.find_index(properties)
+
+            raise NotIndexFound if !index
+
+            construct_prepared_index(index, options[:conditions])
           else
-            $redis.zrangebyscore(__key__, 0, Time.now.to_f, :limit => limit)
+            __key__
+          end
+
+          @records = []
+
+          # to DRY things up I use here check for index but *else* branch also imply that the index might have be used
+          # since *prepared_index* vary whether options[:conditions] are present or not
+          if index && index[:options][:unique]
+            id = $redis.get prepared_index
+            @records << @foreign_models.to_s.singularize.camelize.constantize.find(id)
+          else
+            ids = if options[:order].to_s == 'desc'
+              $redis.zrevrangebyscore(prepared_index, Time.now.to_f, 0, :limit => limit)
+            else
+              $redis.zrangebyscore(prepared_index, 0, Time.now.to_f, :limit => limit)
+            end
+            @records += @foreign_models.to_s.singularize.camelize.constantize.find(ids)
           end
           @fetched = true
-          @records = @foreign_models.to_s.singularize.camelize.constantize.find(record_ids)
+          @records
         else
           fetch if !@fetched
           @records
@@ -100,7 +128,7 @@ module RedisOrm
         elsif token == :first
           all(options.merge({:limit => 1}))[0]
         elsif token == :last
-          reversed = options[:order] == 'asc' ? 'desc' : 'asc'
+          reversed = options[:order] == 'desc' ? 'asc' : 'desc'
           all(options.merge({:limit => 1, :order => reversed}))[0]
         end
       end
@@ -124,6 +152,26 @@ module RedisOrm
         def __key__
           @options[:as] ? "#{@reciever_model_name}:#{@reciever_id}:#{@options[:as]}" : "#{@reciever_model_name}:#{@reciever_id}:#{@foreign_models}"
         end
+
+        # "article:1:comments:moderated:true"
+        def construct_prepared_index(index, conditions_hash)
+          prepared_index = [@reciever_model_name, @reciever_id, @foreign_models].join(':')
+          
+          # in order not to depend on order of keys in *:conditions* hash we rather interate over the index itself and find corresponding values in *:conditions* hash
+          if index[:name].is_a?(Array)
+            index[:name].each do |key|
+              # 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} # TODO
+              prepared_index += ":#{key}:#{conditions_hash[key]}"
+            end
+          else
+            prepared_index += ":#{index[:name]}:#{conditions_hash[index[:name]]}"
+          end
+
+          prepared_index.downcase! if index[:options][:case_insensitive]
+
+          prepared_index
+        end
     end
   end
 end

data/lib/redis_orm/redis_orm.rb

@@ -29,7 +29,9 @@ module RedisOrm
   class Base
     include ActiveModel::Validations
     include ActiveModelBehavior
-
+    
+    include Associations::HasManyHelper
+    
     extend Associations::BelongsTo
     extend Associations::HasMany
     extend Associations::HasOne
@@ -51,7 +53,7 @@ module RedisOrm
      
       # *options* currently supports
       #   *unique* Boolean
-      #   *case_insensitive* Boolean TODO 
+      #   *case_insensitive* Boolean
       def index(name, options = {})
         @@indices[model_name] << {:name => name, :options => options}
       end
@@ -129,23 +131,31 @@ module RedisOrm
       end
 
       def find_index(properties)
+        properties.map!{|p| p.to_sym}
+
         @@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}
+            # check the elements not taking into account their order
+            (models_index[:name] & properties).size == properties.size
           elsif !models_index[:name].is_a?(Array) && properties.size == 1
-            models_index[:name] == properties[0].to_sym
+            models_index[:name] == properties[0]
           end
         end
       end
       
-      def construct_prepared_index(index, properties_hash)
+      def construct_prepared_index(index, conditions_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        
+        # in order not to depend on order of keys in *:conditions* hash we rather interate over the index itself and find corresponding values in *:conditions* hash
+        if index[:name].is_a?(Array)
+          index[:name].each do |key|
+            # 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}:#{conditions_hash[key]}"
+          end
+        else
+          prepared_index += ":#{index[:name]}:#{conditions_hash[index[:name]]}"
+        end
               
         prepared_index.downcase! if index[:options][:case_insensitive]
         
@@ -304,6 +314,11 @@ module RedisOrm
       @@associations[self.model_name]
     end
 
+    # is called from RedisOrm::Associations::HasMany to correctly save indices for associated records
+    def get_indices
+      @@indices[self.model_name]
+    end
+    
     def initialize(attributes = {}, id = nil, persisted = false)
       @persisted = persisted
       
@@ -347,6 +362,7 @@ module RedisOrm
           next if ! self.send(:"#{prop[:name]}_changed?")
           
           prev_prop_value = instance_variable_get(:"@#{prop[:name]}_changes").first
+          prop_value = instance_variable_get(:"@#{prop[:name]}")
 
           indices = @@indices[model_name].inject([]) do |sum, models_index|
             if models_index[:name].is_a?(Array)
@@ -378,6 +394,32 @@ module RedisOrm
                 key_to_delete = "#{model_name}:#{prop[:name]}:#{prev_prop_value}"
                 $redis.del key_to_delete
               end
+
+              # also we need to delete associated records *indices*
+              if !@@associations[model_name].empty?
+                @@associations[model_name].each do |assoc|
+                  if :belongs_to == assoc[:type]
+                    if !self.send(assoc[:foreign_model]).nil?
+                      if index[:name].is_a?(Array)
+                        keys_to_delete = if index[:name].index(prop) == 0
+                          $redis.keys "#{assoc[:foreign_model]}:#{self.send(assoc[:foreign_model]).id}:#{model_name.to_s.pluralize}:#{prop[:name]}#{prev_prop_value}*"
+                        else
+                          $redis.keys "#{assoc[:foreign_model]}:#{self.send(assoc[:foreign_model]).id}:#{model_name.to_s.pluralize}:*#{prop[:name]}:#{prev_prop_value}*"
+                        end
+
+                        keys_to_delete.each{|key| $redis.del(key)}
+                      else
+                        beginning_of_the_key = "#{assoc[:foreign_model]}:#{self.send(assoc[:foreign_model]).id}:#{model_name.to_s.pluralize}:#{prop[:name]}:"
+
+                        $redis.del(beginning_of_the_key + prev_prop_value.to_s)
+
+                        index[:options][:unique] ? $redis.set((beginning_of_the_key + prop_value.to_s), @id) : $redis.zadd((beginning_of_the_key + prop_value.to_s), Time.now.to_f, @id)
+                      end
+                    end
+                  end
+                end
+              end # deleting associated records *indices*
+
             end
           end
         end
@@ -406,13 +448,15 @@ module RedisOrm
         if prop_value.nil? && !prop[:options][:default].nil?
           prop_value = prop[:options][:default]
           # set instance variable in order to properly save indexes here
-          self.instance_variable_set(:"@#{prop[:name]}", prop[:options][:default]) 
+          self.instance_variable_set(:"@#{prop[:name]}", prop[:options][:default])
+          instance_variable_set :"@#{prop[:name]}_changes", [prop[:options][:default]]
         end
 
         $redis.hset("#{model_name}:#{id}", prop[:name].to_s, prop_value)
 
         # reducing @#{prop[:name]}_changes array to the last value
         prop_changes = instance_variable_get :"@#{prop[:name]}_changes"
+
         if prop_changes && prop_changes.size > 2
           instance_variable_set :"@#{prop[:name]}_changes", [prop_changes.last]
         end
@@ -468,6 +512,27 @@ module RedisOrm
 
       $redis.zrem "#{model_name}:ids", @id
 
+      # also we need to delete *indices* of associated records
+      if !@@associations[model_name].empty?
+        @@associations[model_name].each do |assoc|        
+          if :belongs_to == assoc[:type]
+            if !self.send(assoc[:foreign_model]).nil?
+              @@indices[model_name].each do |index|
+                keys_to_delete = if index[:name].is_a?(Array)
+                  full_index = index[:name].inject([]){|sum, index_part| sum << index_part}.join(':')
+                  $redis.keys "#{assoc[:foreign_model]}:#{self.send(assoc[:foreign_model]).id}:#{model_name.to_s.pluralize}:#{full_index}:*"
+                else
+                  ["#{assoc[:foreign_model]}:#{self.send(assoc[:foreign_model]).id}:#{model_name.to_s.pluralize}:#{index[:name]}:#{self.send(index[:name])}"]
+                end
+                keys_to_delete.each do |key| 
+                  index[:options][:unique] ? $redis.del(key) : $redis.zrem(key, @id)
+                end
+              end
+            end
+          end
+        end
+      end
+      
       # also we need to delete *links* to associated records
       if !@@associations[model_name].empty?
         @@associations[model_name].each do |assoc|
@@ -515,7 +580,7 @@ module RedisOrm
               if @@associations[foreign_model].detect{|h| h[:type] == :belongs_to && h[:foreign_model] == model_name.to_sym}
                 $redis.del "#{foreign_model}:#{record.id}:#{model_name}"
               end
-              
+
               if @@associations[foreign_model].detect{|h| h[:type] == :has_one && h[:foreign_model] == model_name.to_sym}
                 $redis.del "#{foreign_model}:#{record.id}:#{model_name}"
               end
@@ -534,9 +599,9 @@ module RedisOrm
             end
           end
         end
-      end      
+      end
 
-      # we need to ensure that smembers are correct after removal of the record
+      # remove all associated indices
       @@indices[model_name].each do |index|
         prepared_index = construct_prepared_index(index) # instance method not class one!
 
@@ -546,7 +611,7 @@ module RedisOrm
           $redis.zremrangebyscore(prepared_index, 0, Time.now.to_f)
         end
       end
-      
+
       @@callbacks[model_name][:after_destroy].each do |callback|
         self.send(callback)
       end

data/redis_orm.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_orm}
-  s.version = "0.4.2"
+  s.version = "0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Dmitrii Samoilov}]
-  s.date = %q{2011-06-25}
-  s.description = %q{ORM for Redis advanced key-value storage}
+  s.date = %q{2011-07-01}
+  s.description = %q{ORM for Redis (advanced key-value storage) with ActiveRecord API}
   s.email = %q{germaninthetown@gmail.com}
-  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/atomicity_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.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_helper.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_helper.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/association_indices_test.rb}, %q{test/associations_test.rb}, %q{test/atomicity_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 = [%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.8.5}
-  s.summary = %q{ORM for Redis advanced key-value storage}
-  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/atomicity_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}]
+  s.summary = %q{ORM for Redis (advanced key-value storage) with ActiveRecord API}
+  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/atomicity_test.rb}, %q{test/exceptions_test.rb}, %q{test/association_indices_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/association_indices_test.rb

@@ -0,0 +1,145 @@
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
+
+class Article < RedisOrm::Base
+  property :title, String
+  has_many :comments
+end
+
+class Comment < RedisOrm::Base
+  property :body, String
+  
+  property :moderated, RedisOrm::Boolean, :default => false
+  index :moderated
+  
+  belongs_to :article
+end
+
+class User < RedisOrm::Base
+  property :name, String
+  index :name
+  
+  property :moderator, RedisOrm::Boolean, :default => false
+  property :moderated_area, String, :default => "messages"
+  
+  index :moderator
+  index [:moderator, :moderated_area]
+  
+  has_many :users, :as => :friends
+end
+
+describe "check indices for associations" do
+  before(:each) do
+    @article = Article.new :title => "DHH drops OpenID on 37signals"
+    @article.save
+
+    @article.should be
+    @article.title.should == "DHH drops OpenID on 37signals"
+
+    @comment1 = Comment.new :body => "test"
+    @comment1.save
+    @comment1.should be
+    @comment1.body.should == "test"
+    @comment1.moderated.should == false
+    
+    @comment2 = Comment.new :body => "test #2", :moderated => true
+    @comment2.save
+    @comment2.should be
+    @comment2.body.should == "test #2"
+    @comment2.moderated.should == true
+  end
+
+  it "should properly find associated records (e.g. with :conditions, :order, etc options) '<<' used for association" do
+    @article.comments << [@comment1, @comment2]
+    @article.comments.count.should == 2
+
+    @article.comments.all(:limit => 1).size.should == 1
+    @article.comments.find(:first).should be
+    @article.comments.find(:first).id.should == @comment1.id
+    @article.comments.find(:last).should be
+    @article.comments.find(:last).id.should == @comment2.id
+
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true})[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false})[0].id.should == @comment1.id
+
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1)[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1)[0].id.should == @comment1.id
+
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1, :order => :desc).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1, :order => :asc).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1, :order => :desc)[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1, :order => :asc)[0].id.should == @comment1.id
+
+    @comment1.update_attribute :moderated, true
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 2
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 0
+
+    @comment1.destroy
+    $redis.zrange("article:#{@article.id}:comments:moderated:true", 0, -1).size.should == 1
+    $redis.zrange("article:#{@article.id}:comments:moderated:true", 0, -1)[0].should == @comment2.id.to_s
+    $redis.zrange("article:#{@article.id}:comments:moderated:false", 0, -1).size.should == 0
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 0
+  end
+
+  it "should properly find associated records (e.g. with :conditions, :order, etc options) '=' used for association" do
+    @article.comments = [@comment1, @comment2]
+    @article.comments.count.should == 2
+    
+    @article.comments.all(:limit => 1).size.should == 1
+    @article.comments.find(:first).should be
+    @article.comments.find(:first).id.should == @comment1.id
+    @article.comments.find(:last).should be
+    @article.comments.find(:last).id.should == @comment2.id
+    
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true})[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false})[0].id.should == @comment1.id
+    
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1)[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1)[0].id.should == @comment1.id
+        
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1, :order => :desc).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1, :order => :asc).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => true}, :limit => 1, :order => :desc)[0].id.should == @comment2.id
+    @article.comments.find(:all, :conditions => {:moderated => false}, :limit => 1, :order => :asc)[0].id.should == @comment1.id
+    
+    @comment1.update_attribute :moderated, true
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 2
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 0
+    
+    @comment1.destroy
+    @article.comments.find(:all, :conditions => {:moderated => true}).size.should == 1
+    @article.comments.find(:all, :conditions => {:moderated => false}).size.should == 0
+    $redis.zrange("article:#{@article.id}:comments:moderated:true", 0, -1).size.should == 1
+    $redis.zrange("article:#{@article.id}:comments:moderated:true", 0, -1)[0].should == @comment2.id.to_s
+    $redis.zrange("article:#{@article.id}:comments:moderated:false", 0, -1).size.should == 0
+  end
+
+  it "should check compound indices for associations" do
+    friend1 = User.create :name => "Director", :moderator => true, :moderated_area => "films"
+    friend2 = User.create :name => "Admin", :moderator => true, :moderated_area => "all"
+    friend3 = User.create :name => "Gena", :moderator => false
+    
+    me = User.create :name => "german"
+    
+    me.friends << [friend1, friend2, friend3]
+    
+    me.friends.count.should == 3
+    me.friends.find(:all, :conditions => {:moderator => true}).size.should == 2
+    me.friends.find(:all, :conditions => {:moderator => false}).size.should == 1
+    
+    me.friends.find(:all, :conditions => {:moderator => true, :moderated_area => "films"}).size.should == 1
+    me.friends.find(:all, :conditions => {:moderator => true, :moderated_area => "films"})[0].id.should == friend1.id
+
+    # reverse key's order in :conditions hash
+    me.friends.find(:all, :conditions => {:moderated_area => "all", :moderator => true}).size.should == 1
+    me.friends.find(:all, :conditions => {:moderated_area => "all", :moderator => true})[0].id.should == friend2.id
+  end
+end

data/test/associations_test.rb

@@ -8,6 +8,7 @@ end
 
 class Comment < RedisOrm::Base
   property :body, String
+    
   belongs_to :article
 end
 
@@ -28,7 +29,7 @@ end
 
 class User < RedisOrm::Base
   property :name, String
-  index :name
+  index :name  
   has_many :users, :as => :friends
 end
 
@@ -39,21 +40,18 @@ end
 
 describe "check associations" do
   before(:each) do
-    @article = Article.new
-    @article.title = "DHH drops OpenID on 37signals"
+    @article = Article.new :title => "DHH drops OpenID on 37signals"
     @article.save
 
     @article.should be
     @article.title.should == "DHH drops OpenID on 37signals"
 
-    @comment1 = Comment.new
-    @comment1.body = "test"
+    @comment1 = Comment.new :body => "test"
     @comment1.save
     @comment1.should be
     @comment1.body.should == "test"
 
-    @comment2 = Comment.new
-    @comment2.body = "test #2"
+    @comment2 = Comment.new :body => "test #2"
     @comment2.save
     @comment2.should be
     @comment2.body.should == "test #2"
@@ -111,7 +109,7 @@ describe "check associations" do
     chicago.profiles.count.should == 0
   end
   
-  it "should return array" do
+  it "should return array of records for has_many association" do
     @article.comments << []    
     @article.comments.count.should == 0
     
@@ -177,7 +175,6 @@ describe "check associations" do
     @article.destroy
 
     Article.count.should == 0
-
     Comment.count.should == 2
   end
 

data/test/dynamic_finders_test.rb

@@ -38,7 +38,7 @@ describe "check associations" do
 
     User.find_all_by_first_name_and_last_name('Dmitrii', 'Samoilov').size.should == 1
 
-    lambda{User.find_all_by_last_name_and_first_name('Samoilov', 'Dmitrii')}.should raise_error
+    User.find_all_by_last_name_and_first_name('Samoilov', 'Dmitrii')[0].id.should == user1.id
 
     lambda{User.find_by_first_name_and_cast_name('Dmitrii', 'Samoilov')}.should raise_error
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000Z
+date: 2011-07-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &82547900 !ruby/object:Gem::Requirement
+  requirement: &84648260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82547900
+  version_requirements: *84648260
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &82547630 !ruby/object:Gem::Requirement
+  requirement: &84647900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82547630
+  version_requirements: *84647900
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &82547320 !ruby/object:Gem::Requirement
+  requirement: &84647510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82547320
+  version_requirements: *84647510
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82547020 !ruby/object:Gem::Requirement
+  requirement: &84647120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +54,8 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *82547020
-description: ORM for Redis advanced key-value storage
+  version_requirements: *84647120
+description: ORM for Redis (advanced key-value storage) with ActiveRecord API
 email: germaninthetown@gmail.com
 executables: []
 extensions: []
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - 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_helper.rb
 - lib/redis_orm/associations/has_many_proxy.rb
 - lib/redis_orm/associations/has_one.rb
 - lib/redis_orm/redis_orm.rb
@@ -80,10 +81,12 @@ files:
 - 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_helper.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/association_indices_test.rb
 - test/associations_test.rb
 - test/atomicity_test.rb
 - test/basic_functionality_test.rb
@@ -127,7 +130,7 @@ rubyforge_project: redis_orm
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: ORM for Redis advanced key-value storage
+summary: ORM for Redis (advanced key-value storage) with ActiveRecord API
 test_files:
 - test/options_test.rb
 - test/dynamic_finders_test.rb
@@ -137,6 +140,7 @@ test_files:
 - test/polymorphic_test.rb
 - test/atomicity_test.rb
 - test/exceptions_test.rb
+- test/association_indices_test.rb
 - test/has_one_has_many_test.rb
 - test/indices_test.rb
 - test/changes_array_test.rb