redis_orm 0.5.1 → 0.6

data/CHANGELOG

@@ -1,3 +1,12 @@
+v0.6 [12-09-2011]
+* added equality operator for object, #to_s method for inspecting objects, #find! which could throw RecordNotFound error
+* added self.descendants class method which returns all inherited from RedisOrm::Base classes
+* introduced :sortable option (in property declaration and #find conditions hash) - rudimentary ability to sort records by any property (not just by default 'created_at')
+* now handling models withing modules definitions (test for this in associations_test.rb)
+* properly handling :as parameter in options for has_many/belongs_to self-references
+* binding related models while creating model instance (like this: Article.create(:comment => comment))
+* bunch of small fixes, updated tests and README.md
+
 v0.5.1 [27-07-2011]
 * added support of uuid as an id/primary key
 * added documentation on uuid support and connection to the redis server

data/Manifest

@@ -11,6 +11,7 @@ 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
+lib/redis_orm/utils.rb
 redis_orm.gemspec
 test/association_indices_test.rb
 test/associations_test.rb
@@ -23,6 +24,7 @@ test/exceptions_test.rb
 test/has_one_has_many_test.rb
 test/indices_test.rb
 test/options_test.rb
+test/order_test.rb
 test/polymorphic_test.rb
 test/redis.conf
 test/test_helper.rb

data/README.md

@@ -27,6 +27,18 @@ class User < RedisOrm::Base
 end
 ```
 
+## Installing redis_orm
+
+gem install redis_orm
+
+or 
+
+git clone git://github.com/german/redis_orm.git
+
+cd redis_orm
+
+bundle install
+
 ## Setting up a connection to the redis server
 
 If you are using Rails you should initialize redis and set up global $redis variable in *config/initializers/redis.rb* file:
@@ -68,6 +80,10 @@ Following options are available in property declaration:
 
     The default value of the attribute when it's getting saved w/o any.
 
+*  **:sortable**
+
+    if *true* is specified then you could sort records by this property later
+
 ## Searching records by the value
 
 Usually it's done via declaring an index and using *:conditions* hash or dynamic finders. For example:
@@ -102,7 +118,11 @@ To extract all or part of the associated records you could use 4 options:
 
 * :order
 
-  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.
+  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 order by different property you should:
+  
+  1. specify *:sortable => true* as option in property declaration
+  
+  2. specify the property by which you wish to order *:order => [:name, :desc]* or *:order => [:name]* (:asc order is default)
   
 * :conditions
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 #=begin
 require 'echoe'
 
-Echoe.new('redis_orm', '0.5.1') do |p|
+Echoe.new('redis_orm', '0.6') 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"
@@ -26,8 +26,13 @@ Rake::TestTask.new(:test) do |t|
 end
 =end
 
+#require 'rspec/core/rake_task'
 task :test do |t|
   Dir['test/**/*_test.rb'].each do |file|
     puts `ruby -I./lib #{file}`
   end
 end
+#task :default => :test
+#RSpec::Core::RakeTask.new(:spec) do |t|
+#  t.pattern = 'test/**/*_test.rb'
+#end

data/lib/redis_orm.rb

@@ -13,6 +13,8 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'associ
 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')
 
+require File.join(File.dirname(File.expand_path(__FILE__)), 'redis_orm', 'utils')
+
 class String
   def i18n_key
     self.to_s.tableize

data/lib/redis_orm/active_model_behavior.rb

@@ -1,14 +1,12 @@
 module ActiveModelBehavior 
   module ClassMethods
     def model_name
-      #@_model_name ||= ActiveModel::Name.new(self).to_s.downcase
       @_model_name ||= ActiveModel::Name.new(self).to_s.tableize.singularize
     end
   end
 
   module InstanceMethods
     def model_name
-      #@_model_name ||= ActiveModel::Name.new(self.class).to_s.downcase
       @_model_name ||= ActiveModel::Name.new(self.class).to_s.tableize.singularize
     end
   end

data/lib/redis_orm/associations/belongs_to.rb

@@ -14,20 +14,22 @@ module RedisOrm
         class_associations = class_variable_get(:"@@associations")
         class_variable_get(:"@@associations")[model_name] << {:type => :belongs_to, :foreign_model => foreign_model, :options => options}
 
-        foreign_model_name = if options[:as]
-          options[:as].to_sym
-        else
-          foreign_model.to_sym
-        end
-
-        define_method foreign_model_name.to_sym do
+        foreign_model_name = options[:as] ? options[:as].to_sym : foreign_model.to_sym
+        
+        define_method foreign_model_name do
           if options[:polymorphic]
             model_type = $redis.get("#{model_name}:#{id}:#{foreign_model_name}_type")
             if model_type
               model_type.to_s.camelize.constantize.find($redis.get "#{model_name}:#{@id}:#{foreign_model_name}_id")
             end
           else
-            foreign_model.to_s.camelize.constantize.find($redis.get "#{model_name}:#{@id}:#{foreign_model_name}")
+            # find model even if it's in some module
+            full_model_scope = RedisOrm::Base.descendants.detect{|desc| desc.to_s.split('::').include?(foreign_model.to_s.camelize) }
+            if full_model_scope
+              full_model_scope.find($redis.get "#{model_name}:#{@id}:#{foreign_model_name}")
+            else
+              foreign_model.to_s.camelize.constantize.find($redis.get "#{model_name}:#{@id}:#{foreign_model_name}")
+            end
           end
         end
 
@@ -36,6 +38,8 @@ module RedisOrm
         define_method "#{foreign_model_name}=" do |assoc_with_record|
           # we need to store this to clear old association later
           old_assoc = self.send(foreign_model_name)
+          # find model even if it's in some module
+          full_model_scope = RedisOrm::Base.descendants.detect{|desc| desc.to_s.split('::').include?(foreign_model.to_s.camelize) }
           
           if options[:polymorphic]
             $redis.set("#{model_name}:#{id}:#{foreign_model_name}_type", assoc_with_record.model_name)
@@ -43,7 +47,7 @@ module RedisOrm
           else
             if assoc_with_record.nil?
               $redis.del("#{model_name}:#{id}:#{foreign_model_name}")
-            elsif assoc_with_record.model_name == foreign_model.to_s
+            elsif [foreign_model.to_s, full_model_scope.model_name].include?(assoc_with_record.model_name)
               $redis.set("#{model_name}:#{id}:#{foreign_model_name}", assoc_with_record.id)
             else
               raise TypeMismatchError

data/lib/redis_orm/associations/has_many.rb

@@ -8,11 +8,7 @@ module RedisOrm
         class_associations = class_variable_get(:"@@associations")
         class_associations[model_name] << {:type => :has_many, :foreign_models => foreign_models, :options => options}
 
-        foreign_models_name = if options[:as]
-          options[:as].to_sym
-        else
-          foreign_models.to_sym
-        end
+        foreign_models_name = options[:as] ? options[:as].to_sym : foreign_models.to_sym
 
         define_method foreign_models_name.to_sym do
           Associations::HasManyProxy.new(model_name, id, foreign_models, options)
@@ -51,17 +47,20 @@ module RedisOrm
               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
-              # check whether *record* object has *has_many* declaration and TODO it states *self.model_name* in plural
-              if class_associations[record.model_name].detect{|h| h[:type] == :has_many && h[:foreign_models] == model_name.pluralize.to_sym} #&& !$redis.zrank("#{record.model_name}:#{record.id}:#{model_name.pluralize}", id)#record.model_name.to_s.camelize.constantize.find(id).nil?
-                $redis.zadd("#{record.model_name}:#{record.id}:#{model_name.pluralize}", Time.now.to_f, id)
-              # check whether *record* object has *has_one* declaration and TODO it states *self.model_name*
-              elsif record.get_associations.detect{|h| [:has_one, :belongs_to].include?(h[:type]) && h[:foreign_model] == model_name.to_sym}
-                # overwrite assoc anyway so we don't need to check record.send(model_name.to_sym).nil? here
-                $redis.set("#{record.model_name}:#{record.id}:#{model_name}", id)
-              end
+            # article.comments = [comment1, comment2] 
+            # iterate through the array of comments and create backlink
+            # check whether *record* object has *has_many* declaration and it states *self.model_name* in plural
+            if assoc = class_associations[record.model_name].detect{|h| h[:type] == :has_many && h[:foreign_models] == model_name.pluralize.to_sym} #&& !$redis.zrank("#{record.model_name}:#{record.id}:#{model_name.pluralize}", id)#record.model_name.to_s.camelize.constantize.find(id).nil?
+              assoc_foreign_models_name = assoc[:options][:as] ? assoc[:options][:as] : model_name.pluralize
+              key = "#{record.model_name}:#{record.id}:#{assoc_foreign_models_name}"
+              $redis.zadd(key, Time.now.to_f, id) if !$redis.zrank(key, id)
+            end
+              
+            # check whether *record* object has *has_one* declaration and it states *self.model_name*
+            if assoc = record.get_associations.detect{|h| [:has_one, :belongs_to].include?(h[:type]) && h[:foreign_model] == model_name.to_sym}
+              foreign_model_name = assoc[:options][:as] ? assoc[:options][:as] : model_name
+              # overwrite assoc anyway so we don't need to check record.send(model_name.to_sym).nil? here
+              $redis.set("#{record.model_name}:#{record.id}:#{foreign_model_name}", id)
             end
           end
         end

data/lib/redis_orm/associations/has_many_proxy.rb

@@ -82,7 +82,7 @@ module RedisOrm
           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)
+            index = @foreign_models.to_s.singularize.camelize.constantize.find_indices(properties, :first => true)
 
             raise NotIndexFound if !index
 

data/lib/redis_orm/redis_orm.rb

@@ -20,6 +20,9 @@ module RedisOrm
   class NotIndexFound < StandardError
   end
 
+  class RecordNotFound < StandardError
+  end
+  
   class TypeMismatchError < StandardError
   end
 
@@ -29,7 +32,7 @@ module RedisOrm
   class Base
     include ActiveModel::Validations
     include ActiveModelBehavior
-    
+    include Utils
     include Associations::HasManyHelper
     
     extend Associations::BelongsTo
@@ -39,10 +42,11 @@ module RedisOrm
     attr_accessor :persisted
 
     @@properties = Hash.new{|h,k| h[k] = []}
-    @@indices = Hash.new{|h,k| h[k] = []} # compound indices are available too   
+    @@indices = Hash.new{|h,k| h[k] = []} # compound indices are available too
     @@associations = Hash.new{|h,k| h[k] = []}
     @@callbacks = Hash.new{|h,k| h[k] = {}}
     @@use_uuid_as_id = {}
+    @@descendants = []
     
     class << self
 
@@ -50,8 +54,14 @@ module RedisOrm
         [:after_save, :before_save, :after_create, :before_create, :after_destroy, :before_destroy].each do |callback_name|
           @@callbacks[from.model_name][callback_name] = []
         end
+        
+        @@descendants << from
       end
-     
+      
+      def descendants
+        @@descendants
+      end
+      
       # *options* currently supports
       #   *unique* Boolean
       #   *case_insensitive* Boolean
@@ -126,20 +136,29 @@ module RedisOrm
         $redis.zcard("#{model_name}:ids").to_i
       end
 
-      def first
-        id = $redis.zrangebyscore("#{model_name}:ids", 0, Time.now.to_f, :limit => [0, 1])
-        id.empty? ? nil : find(id[0])
+      def first(options = {})
+        if options.empty?
+          id = $redis.zrangebyscore("#{model_name}:ids", 0, Time.now.to_f, :limit => [0, 1])
+          id.empty? ? nil : find(id[0])
+        else
+          find(:first, options)
+        end
       end
 
-      def last
-        id = $redis.zrevrangebyscore("#{model_name}:ids", Time.now.to_f, 0, :limit => [0, 1])
-        id.empty? ? nil : find(id[0])
+      def last(options = {})
+        if options.empty?
+          id = $redis.zrevrangebyscore("#{model_name}:ids", Time.now.to_f, 0, :limit => [0, 1])
+          id.empty? ? nil : find(id[0])
+        else
+          find(:last, options)
+        end
       end
-
-      def find_index(properties)
+      
+      def find_indices(properties, options = {})
         properties.map!{|p| p.to_sym}
-
-        @@indices[model_name].detect do |models_index|
+        method = options[:first] ? :detect : :select
+        
+        @@indices[model_name].send(method) do |models_index|
           if models_index[:name].is_a?(Array) && models_index[:name].size == properties.size
             # check the elements not taking into account their order
             (models_index[:name] & properties).size == properties.size
@@ -168,6 +187,7 @@ module RedisOrm
         prepared_index
       end
       
+      # TODO refactor this messy function
       def all(options = {})
         limit = if options[:limit] && options[:offset]
           [options[:offset].to_i, options[:limit].to_i]
@@ -175,29 +195,49 @@ module RedisOrm
           [0, options[:limit].to_i]
         end
         
-        if options[:conditions] && options[:conditions].is_a?(Hash)
+        order_max_limit = Time.now.to_f
+        ids_key = "#{model_name}:ids"
+        index = nil
+
+        prepared_index = if !options[:conditions].blank? && options[:conditions].is_a?(Hash)
           properties = options[:conditions].collect{|key, value| key}
-          index = find_index(properties)
+          index = find_indices(properties, :first => true)
           
           raise NotIndexFound if !index
-          
-          prepared_index = construct_prepared_index(index, options[:conditions])
 
-          records = []          
+          construct_prepared_index(index, options[:conditions])
+        else
+          if options[:order] && options[:order].is_a?(Array)
+            model_name
+          else
+            ids_key
+          end
+        end
 
-          if index[:options][:unique]            
-            id = $redis.get prepared_index
-            records << model_name.to_s.camelize.constantize.find(id)
+        # if not array => created_at native order (in which ids were pushed to "#{model_name}:ids" set by default)
+        direction = if !options[:order].blank?
+          if options[:order].is_a?(Array)
+            # for String values max limit for search key could be 1.0, but for Numeric values there's actually no limit
+            order_max_limit = 100_000_000_000
+            ids_key = "#{prepared_index}:#{options[:order].first}_ids"
+            options[:order].size == 2 ? options[:order].last : 'asc'
           else
-            ids = $redis.zrangebyscore(prepared_index, 0, Time.now.to_f)
-            records += model_name.to_s.camelize.constantize.find(ids)
-          end          
-          records
+            ids_key = prepared_index
+            options[:order]
+          end
+        else
+          ids_key = prepared_index
+          'asc'
+        end
+
+        if index && index[:options][:unique]
+          id = $redis.get prepared_index
+          model_name.to_s.camelize.constantize.find(id)
         else
-          if options[:order].to_s == 'desc'
-            $redis.zrevrangebyscore("#{model_name}:ids", Time.now.to_f, 0, :limit => limit).compact.collect{|id| find(id)}
+          if direction.to_s == 'desc'
+            $redis.zrevrangebyscore(ids_key, order_max_limit, 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)}
+            $redis.zrangebyscore(ids_key, 0, order_max_limit, :limit => limit).compact.collect{|id| find(id)}
           end
         end
       end
@@ -235,6 +275,15 @@ module RedisOrm
         end        
       end
 
+      def find!(*args)
+        result = find(*args)
+        if result.nil?
+          raise RecordNotFound
+        else
+          result
+        end
+      end
+      
       def after_save(callback)        
         @@callbacks[model_name][:after_save] << callback
       end
@@ -262,9 +311,19 @@ module RedisOrm
       def create(options = {})
         obj = new(options, nil, false)
         obj.save
+
+        # make possible binding related models while creating class instance
+        options.each do |k, v|
+          if @@associations[model_name].detect{|h| h[:foreign_model] == k || h[:options][:as] == k}
+            obj.send("#{k}=", v)
+          end
+        end
+
         obj
       end      
       
+      alias :create! :create
+      
       # dynamic finders
       def method_missing(method_name, *args, &block)
         if method_name =~ /^find_(all_)?by_(\w*)/
@@ -276,7 +335,7 @@ module RedisOrm
             properties.each_with_index do |prop, i| 
               properties_hash.merge!({prop.to_sym => args[i]})
             end
-            find_index(properties)
+            find_indices(properties, :first => true)
           end
 
           raise NotIndexFound if !index
@@ -314,7 +373,7 @@ module RedisOrm
     def to_a
       [self]
     end
-
+    
     # is called from RedisOrm::Associations::HasMany to save backlinks to saved records
     def get_associations
       @@associations[self.model_name]
@@ -328,6 +387,7 @@ module RedisOrm
     def initialize(attributes = {}, id = nil, persisted = false)
       @persisted = persisted
 
+      # if this model uses uuid then id is a string otherwise it should be casted to Integer class
       id = @@use_uuid_as_id[model_name] ? id : id.to_i
 
       instance_variable_set(:"@id", id) if id
@@ -353,6 +413,31 @@ module RedisOrm
       @id
     end
 
+    alias :to_key :id
+    
+    def to_s
+      inspected = "<#{model_name.capitalize} id: #{@id}, "
+      inspected += @@properties[model_name].inject([]) do |sum, prop|
+        property_value = instance_variable_get(:"@#{prop[:name]}")
+        property_value = '"' + property_value.to_s + '"' if prop[:class].eql?("String")
+        property_value = 'nil' if property_value.nil?
+        sum << "#{prop[:name]}: " + property_value.to_s
+      end.join(', ')
+      inspected += ">"
+      inspected
+    end
+    
+    def ==(other)
+      raise "this object could be comparable only with object of the same class" if other.class != self.class
+      same = true
+      @@properties[model_name].each do |prop|
+        self_var = instance_variable_get(:"@#{prop[:name]}")
+        same = false if other.send(prop[:name]).to_s != self_var.to_s
+      end
+      same = false if self.id != other.id
+      same
+    end
+    
     def persisted?
       @persisted
     end
@@ -380,6 +465,14 @@ module RedisOrm
           prev_prop_value = instance_variable_get(:"@#{prop[:name]}_changes").first
           prop_value = instance_variable_get(:"@#{prop[:name]}")
 
+          if prop[:options][:sortable]
+            $redis.zrem "#{model_name}:#{prop[:name]}_ids", @id
+            # remove id from every indexed property
+            @@indices[model_name].each do |index|
+              $redis.zrem "#{construct_prepared_index(index)}:#{prop[:name]}_ids", @id
+            end
+          end
+
           indices = @@indices[model_name].inject([]) do |sum, models_index|
             if models_index[:name].is_a?(Array)
               if models_index[:name].include?(prop[:name])
@@ -475,6 +568,23 @@ module RedisOrm
         if prop_changes && prop_changes.size > 2
           instance_variable_set :"@#{prop[:name]}_changes", [prop_changes.last]
         end
+        
+        # if some property need to be sortable add id of the record to the appropriate sorted set
+        if prop[:options][:sortable]
+          property_value = instance_variable_get(:"@#{prop[:name]}")
+          score = case prop[:class]
+            when "Integer"; property_value.to_f
+            when "Float"; property_value.to_f
+            when "String"; calculate_key_for_zset(property_value)
+            when "RedisOrm::Boolean"; (property_value == true ? 1.0 : 0.0)
+            when "Time"; property_value.to_f
+          end
+          $redis.zadd "#{model_name}:#{prop[:name]}_ids", score, @id
+          # add to every indexed property
+          @@indices[model_name].each do |index|
+            $redis.zadd "#{construct_prepared_index(index)}:#{prop[:name]}_ids", score, @id
+          end
+        end
       end
 
       # save new indices in order to sort by finders
@@ -531,13 +641,16 @@ module RedisOrm
       if !@@associations[model_name].empty?
         @@associations[model_name].each do |assoc|        
           if :belongs_to == assoc[:type]
-            if !self.send(assoc[:foreign_model]).nil?
+            # if assoc has :as option
+            foreign_model_name = assoc[:options][:as] ? assoc[:options][:as].to_sym : assoc[:foreign_model].to_sym
+            
+            if !self.send(foreign_model_name).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}:*"
+                  $redis.keys "#{foreign_model_name}:#{self.send(foreign_model_name).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])}"]
+                  ["#{foreign_model_name}:#{self.send(foreign_model_name).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)

data/lib/redis_orm/utils.rb

@@ -0,0 +1,12 @@
+module RedisOrm
+  module Utils
+    def calculate_key_for_zset(string)
+      return 0.0 if string.nil?
+      sum = ""      
+      string.codepoints.each do |codepoint|
+        sum += ("%05i" % codepoint.to_s) # 5 because 65536 => 2 bytes UTF-8
+      end
+      "0.#{sum}".to_f
+    end
+  end
+end

data/redis_orm.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_orm}
-  s.version = "0.5.1"
+  s.version = "0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitrii Samoilov"]
-  s.date = %q{2011-07-27}
+  s.date = %q{2011-09-12}
   s.description = %q{ORM for Redis (advanced key-value storage) with ActiveRecord API}
   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_helper.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_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", "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/test_helper.rb", "test/uuid_as_id_test.rb", "test/validations_test.rb"]
+  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_helper.rb", "lib/redis_orm/associations/has_many_proxy.rb", "lib/redis_orm/associations/has_one.rb", "lib/redis_orm/redis_orm.rb", "lib/redis_orm/utils.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_helper.rb", "lib/redis_orm/associations/has_many_proxy.rb", "lib/redis_orm/associations/has_one.rb", "lib/redis_orm/redis_orm.rb", "lib/redis_orm/utils.rb", "redis_orm.gemspec", "test/association_indices_test.rb", "test/associations_test.rb", "test/atomicity_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/order_test.rb", "test/polymorphic_test.rb", "test/redis.conf", "test/test_helper.rb", "test/uuid_as_id_test.rb", "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.rubyforge_project = %q{redis_orm}
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{ORM for Redis (advanced key-value storage) with ActiveRecord API}
-  s.test_files = ["test/options_test.rb", "test/dynamic_finders_test.rb", "test/associations_test.rb", "test/validations_test.rb", "test/test_helper.rb", "test/polymorphic_test.rb", "test/uuid_as_id_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", "test/callbacks_test.rb", "test/basic_functionality_test.rb"]
+  s.test_files = ["test/options_test.rb", "test/dynamic_finders_test.rb", "test/associations_test.rb", "test/validations_test.rb", "test/test_helper.rb", "test/polymorphic_test.rb", "test/uuid_as_id_test.rb", "test/atomicity_test.rb", "test/exceptions_test.rb", "test/association_indices_test.rb", "test/has_one_has_many_test.rb", "test/order_test.rb", "test/indices_test.rb", "test/changes_array_test.rb", "test/callbacks_test.rb", "test/basic_functionality_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/associations_test.rb

@@ -10,6 +10,27 @@ class Comment < RedisOrm::Base
   property :body, String
     
   belongs_to :article
+  has_many :comments, :as => :replies
+  belongs_to :comment, :as => :reply_to
+end
+
+module BelongsToModelWithinModule
+  class Reply < RedisOrm::Base
+    property :body, String, :default => "test"
+    belongs_to :article, :as => :essay
+  end
+end
+
+module HasManyModelWithinModule
+  class SpecialComment < RedisOrm::Base
+    property :body, String, :default => "test"
+    belongs_to :brochure, :as => :book
+  end
+
+  class Brochure < RedisOrm::Base
+    property :title, String
+    has_many :special_comments
+  end
 end
 
 class Profile < RedisOrm::Base
@@ -205,9 +226,9 @@ describe "check associations" do
     @article.categories << [@cat1, @cat2]
 
     @cat1.articles.count.should == 1
-    @cat1.articles[0].id.should == @article.id
+    @cat1.articles[0].should == @article
     @cat2.articles.count.should == 1
-    @cat2.articles[0].id.should == @article.id
+    @cat2.articles[0].should == @article
 
     @article.categories.size.should == 2
     @article.categories.count.should == 2
@@ -218,10 +239,10 @@ describe "check associations" do
     @article.categories.map{|c| c.id}.include?(@cat3.id).should be
 
     @cat1.articles.count.should == 1
-    @cat1.articles[0].id.should == @article.id
+    @cat1.articles[0].should == @article
 
     @cat3.articles.count.should == 1
-    @cat3.articles[0].id.should == @article.id
+    @cat3.articles[0].should == @article
 
     @cat2.articles.count.should == 0
 
@@ -303,4 +324,30 @@ describe "check associations" do
     rf.replay_to.should be
     rf.replay_to.id.should == Message.first.id
   end
+
+  it "should find associations within modules" do    
+    BelongsToModelWithinModule::Reply.count.should == 0
+    essay = Article.create :title => "Red is cluster"
+    BelongsToModelWithinModule::Reply.create :essay => essay
+    BelongsToModelWithinModule::Reply.count.should == 1
+    reply = BelongsToModelWithinModule::Reply.last
+    reply.essay.should == essay
+    
+    HasManyModelWithinModule::SpecialComment.count.should == 0
+    book = HasManyModelWithinModule::Brochure.create :title => "Red is unstable"
+    HasManyModelWithinModule::SpecialComment.create :book => book
+    HasManyModelWithinModule::Brochure.count.should == 1
+    HasManyModelWithinModule::SpecialComment.count.should == 1
+  end
+
+  it "should properly handle self-referencing model both belongs_to and has_many/has_one associations" do
+    comment1 = Comment.create :body => "comment1"
+    comment11 = Comment.create :body => "comment1.1"
+    comment12 = Comment.create :body => "comment1.2"
+    
+    comment1.replies = [comment11, comment12]
+    comment1.replies.count.should == 2
+    comment11.reply_to.should == comment1
+    comment12.reply_to.should == comment1
+  end
 end

data/test/atomicity_test.rb

@@ -1,50 +1,30 @@
 require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 class Article < RedisOrm::Base
+  use_uuid_as_id
+  
   property :title, String
   property :karma, Integer
 end
 
 describe "check atomicity" do
-=begin
   it "should properly increment property's value" do
-    @article = Article.new :title => "Simple test atomicity with multiple threads", :karma => 1
-    @article.save
+    article = Article.new :title => "Simple test atomicity with multiple threads", :karma => 1
+    article.save
     
-    @threads = []
-    
-    50.times do |i|
-      @threads << Thread.new(i) do
-        sleep(0.2)
-        @article.update_attribute :karma, (@article.karma + 1)
-      end
-    end
-    
-    @threads.each{|thread| thread.join}
-    
-    Article.first.karma.should == 51
-  end
-=end
-  it "should properly increment property's value" do
     threads = []
     
     50.times do |i|
-      id = i
       threads << Thread.new(i) do
-        if id % 2 == 0
-          art = Article.create :title => "article ##{id}", :karma => id
-          puts "article.last.id - #{art.id}, article.last.karma - #{art.karma}"
-        else
-          puts "id - #{id}, (id / 2) + 1 - #{(id / 2) + 1}"
-          Article.find((id / 2) + 1).destroy
-        end
+        article.update_attribute :karma, (article.karma + 1)
       end
     end
     
     threads.each{|thread| thread.join}
-    Article.count.should == 0
+    
+    Article.first.karma.should == 51
   end
-=begin
+
   it "should properly increment/decrement property's value" do
     article = Article.create :title => "article #1", :karma => 10
     threads = []
@@ -60,5 +40,4 @@ describe "check atomicity" do
     threads.each{|thread| thread.join}
     article.karma.should == 15
   end
-=end
 end

data/test/basic_functionality_test.rb

@@ -25,7 +25,23 @@ class TimeStamp < RedisOrm::Base
   timestamps
 end
 
+class Person;end
+
 describe "check basic functionality" do
+  it "should have 3 models in descendants" do
+    RedisOrm::Base.descendants.should include(User, DefaultUser, TimeStamp)
+    RedisOrm::Base.descendants.should_not include(Person)
+  end
+  
+  it "should return the same user" do
+    user = User.new :name => "german"
+    user.save
+    User.first.should == user
+    
+    user.name = "Anderson"
+    User.first.should_not == user
+  end
+  
   it "test_simple_creation" do
     User.count.should == 0
 

data/test/exceptions_test.rb

@@ -41,5 +41,10 @@ describe "exceptions test" do
 
     # RedisOrm::TypeMismatchError
     lambda { user.profile = jigsaw }.should raise_error
-  end   
+  end
+  
+  it "should raise an exception if there is no such record in the storage" do
+    User.find(12).should == nil
+    lambda{ User.find! 12 }.should raise_error(RedisOrm::RecordNotFound)
+  end
 end

data/test/options_test.rb

@@ -59,6 +59,17 @@ describe "test options" do
     @photo2.image_type.should == "png"
   end
 
+  it "should behave like expected for #find and #find! methods (nb exceptions with #find! are tested in exceptions_test.rb file)" do
+    Album.find(@album.id).should == @album
+    Album.find!(@album.id).should == @album
+    
+    Album.find(:first).should == @album
+    Album.find!(:first).should == @album
+    
+    Album.find(:all, :limit => 1).size.should == 1
+    Album.find!(:all, :limit => 1).size.should == 1
+  end
+  
   it "should return correct array when :limit and :offset options are provided" do
     @album.photos.count.should == 0
 
@@ -99,6 +110,14 @@ describe "test options" do
     Photo.find(:last, :conditions => {:image => "boobs.png", :image_type => "png"}).id.should == @photo2.id
   end
 
+  it "should accept options for #first and #last methods" do
+    Photo.first(:conditions => {:image => "facepalm.jpg"}).id.should == @photo1.id
+    Photo.first(:conditions => {:image => "boobs.png"}).id.should == @photo2.id
+    
+    Photo.last(:conditions => {:image => "facepalm.jpg", :image_type => "jpg"}).id.should == @photo1.id
+    Photo.last(:conditions => {:image => "boobs.png", :image_type => "png"}).id.should == @photo2.id
+  end
+  
   it "should correctly save boolean values" do
     $redis.hgetall("photo:#{@photo1.id}")["inverted"].should == "true"
     $redis.hgetall("photo:#{@photo2.id}")["inverted"].should == "false"

data/test/order_test.rb

@@ -0,0 +1,69 @@
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
+
+class User < RedisOrm::Base
+  property :name, String, :sortable => true
+  property :age, Integer, :sortable => true
+  property :wage, Float, :sortable => true
+  
+  property :address, String
+  
+  index :name
+  index :age
+end
+
+describe "test options" do
+  before(:each) do
+    @dan     = User.create :name => "Daniel",   :age => 26, :wage => 40000.0,   :address => "Bellevue"
+    @abe     = User.create :name => "Abe",      :age => 30, :wage => 100000.0,  :address => "Bellevue"
+    @michael = User.create :name => "Michael",  :age => 25, :wage => 60000.0,   :address => "Bellevue"
+    @todd    = User.create :name => "Todd",     :age => 22, :wage => 30000.0,   :address => "Bellevue"
+  end
+  
+  it "should return records in specified order" do
+    $redis.zcard("user:name_ids").to_i.should == User.count
+    $redis.zcard("user:age_ids").to_i.should == User.count
+    $redis.zcard("user:wage_ids").to_i.should == User.count
+    
+    User.find(:all, :order => [:name, :asc]).should == [@abe, @dan, @michael, @todd]
+    User.find(:all, :order => [:name, :desc]).should == [@todd, @michael, @dan, @abe]
+    
+    User.find(:all, :order => [:age, :asc]).should == [@todd, @michael, @dan, @abe]
+    User.find(:all, :order => [:age, :desc]).should == [@abe, @dan, @michael, @todd]
+    
+    User.find(:all, :order => [:wage, :asc]).should == [@todd, @dan, @michael, @abe]
+    User.find(:all, :order => [:wage, :desc]).should == [@abe, @michael, @dan, @todd]
+  end
+
+  it "should return records which met specified conditions in specified order" do
+    @abe2    = User.create :name => "Abe",      :age => 12, :wage => 10.0,      :address => "Santa Fe"
+    
+    # :asc should be default value for property in :order clause
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:wage]).should == [@abe2, @abe]
+    
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:wage, :desc]).should == [@abe, @abe2]
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:wage, :asc]).should == [@abe2, @abe]
+    
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:age, :desc]).should == [@abe, @abe2]
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:age, :asc]).should == [@abe2, @abe]
+    
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:wage, :desc]).should == [@abe, @abe2]
+    User.find(:all, :conditions => {:name => "Abe"}, :order => [:wage, :asc]).should == [@abe2, @abe]
+  end
+  
+  it "should update keys after the persisted object was edited and sort properly" do
+    @abe.update_attributes :name => "Zed", :age => 12, :wage => 10.0, :address => "Santa Fe"
+
+    $redis.zcard("user:name_ids").to_i.should == User.count
+    $redis.zcard("user:age_ids").to_i.should == User.count
+    $redis.zcard("user:wage_ids").to_i.should == User.count
+
+    User.find(:all, :order => [:name, :asc]).should == [@dan, @michael, @todd, @abe]
+    User.find(:all, :order => [:name, :desc]).should == [@abe, @todd, @michael, @dan]
+        
+    User.find(:all, :order => [:age, :asc]).should == [@abe, @todd, @michael, @dan]
+    User.find(:all, :order => [:age, :desc]).should == [@dan, @michael, @todd, @abe]
+    
+    User.find(:all, :order => [:wage, :asc]).should == [@abe, @todd, @dan, @michael]
+    User.find(:all, :order => [:wage, :desc]).should == [@michael, @dan, @todd, @abe]
+  end
+end

data/test/test_helper.rb

@@ -8,7 +8,12 @@ RSpec.configure do |config|
     $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)
+    begin
+      $redis = Redis.new(:host => 'localhost', :path => path_to_socket)
+    rescue => e
+      puts 'Unable to create connection to the redis server: ' + e.message.inspect
+      Process.kill 9, $redis_pid.to_i if $redis_pid
+    end
   end
   
   config.after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000 +03:00
+date: 2011-09-12 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &87829630 !ruby/object:Gem::Requirement
+  requirement: &74101100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *87829630
+  version_requirements: *74101100
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &87829290 !ruby/object:Gem::Requirement
+  requirement: &74100700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *87829290
+  version_requirements: *74100700
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &87828950 !ruby/object:Gem::Requirement
+  requirement: &74100190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *87828950
+  version_requirements: *74100190
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &87828600 !ruby/object:Gem::Requirement
+  requirement: &74099680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *87828600
+  version_requirements: *74099680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &87828250 !ruby/object:Gem::Requirement
+  requirement: &74099250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *87828250
+  version_requirements: *74099250
 description: ORM for Redis (advanced key-value storage) with ActiveRecord API
 email: germaninthetown@gmail.com
 executables: []
@@ -83,6 +83,7 @@ extra_rdoc_files:
 - lib/redis_orm/associations/has_many_proxy.rb
 - lib/redis_orm/associations/has_one.rb
 - lib/redis_orm/redis_orm.rb
+- lib/redis_orm/utils.rb
 files:
 - CHANGELOG
 - LICENSE
@@ -97,6 +98,7 @@ files:
 - lib/redis_orm/associations/has_many_proxy.rb
 - lib/redis_orm/associations/has_one.rb
 - lib/redis_orm/redis_orm.rb
+- lib/redis_orm/utils.rb
 - redis_orm.gemspec
 - test/association_indices_test.rb
 - test/associations_test.rb
@@ -109,6 +111,7 @@ files:
 - test/has_one_has_many_test.rb
 - test/indices_test.rb
 - test/options_test.rb
+- test/order_test.rb
 - test/polymorphic_test.rb
 - test/redis.conf
 - test/test_helper.rb
@@ -157,6 +160,7 @@ test_files:
 - test/exceptions_test.rb
 - test/association_indices_test.rb
 - test/has_one_has_many_test.rb
+- test/order_test.rb
 - test/indices_test.rb
 - test/changes_array_test.rb
 - test/callbacks_test.rb