redis_orm 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+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
+* properly destroy dependent records
+* delete polymorphic records properly along with their backlinks
+
 v0.4.1 [23-06-2011]
 * fixed clitical bug: records after #destroy still available (added test for it)
 * added simple atomicity test

data/Rakefile

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

data/lib/redis_orm/redis_orm.rb

@@ -75,7 +75,7 @@ module RedisOrm
           elsif Float == class_name
             value = value.to_f
           elsif RedisOrm::Boolean == class_name
-            value = (value == "false" ? false : true)
+            value = ((value == "false" || value == false) ? false : true)
           end
           value
         end
@@ -166,7 +166,7 @@ module RedisOrm
           raise NotIndexFound if !index
           
           prepared_index = construct_prepared_index(index, options[:conditions])
-          
+
           records = []          
 
           if index[:options][:unique]            
@@ -177,7 +177,7 @@ module RedisOrm
             records += model_name.to_s.camelize.constantize.find(ids)
           end          
           records
-        else         
+        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
@@ -200,16 +200,16 @@ module RedisOrm
           case first = args.shift
             when :all
               options = args.last
-              return nil if !options.is_a?(Hash)
+              options = {} if !options.is_a?(Hash)
               all(options)
             when :first
               options = args.last
-              return nil if !options.is_a?(Hash)
+              options = {} if !options.is_a?(Hash)
               all(options.merge({:limit => 1}))[0]
             when :last
               options = args.last
-              return nil if !options.is_a?(Hash)
-              reversed = options[:order] == 'asc' ? 'desc' : 'asc'
+              options = {} if !options.is_a?(Hash)
+              reversed = options[:order] == 'desc' ? 'asc' : 'desc'
               all(options.merge({:limit => 1, :order => reversed}))[0]
             else
               id = first
@@ -402,7 +402,7 @@ module RedisOrm
 
       @@properties[model_name].each do |prop|
         prop_value = self.send(prop[:name].to_sym)
-
+        
         if prop_value.nil? && !prop[:options][:default].nil?
           prop_value = prop[:options][:default]
           # set instance variable in order to properly save indexes here
@@ -479,9 +479,16 @@ module RedisOrm
             when :belongs_to
               foreign_model = assoc[:foreign_model].to_s
               foreign_model_name = assoc[:options][:as] ? assoc[:options][:as] : assoc[:foreign_model]
-              records << self.send(foreign_model_name)
-
-              $redis.del "#{model_name}:#{@id}:#{assoc[:foreign_model]}"
+              if assoc[:options][:polymorphic]
+                records << self.send(foreign_model_name)
+                # get real foreign_model's name in order to delete backlinks properly
+                foreign_model = $redis.get("#{model_name}:#{id}:#{foreign_model_name}_type")
+                $redis.del("#{model_name}:#{id}:#{foreign_model_name}_type")
+                $redis.del("#{model_name}:#{id}:#{foreign_model_name}_id")
+              else
+                records << self.send(foreign_model_name)
+                $redis.del "#{model_name}:#{@id}:#{assoc[:foreign_model]}"
+              end
             when :has_one
               foreign_model = assoc[:foreign_model].to_s
               foreign_model_name = assoc[:options][:as] ? assoc[:options][:as] : assoc[:foreign_model]
@@ -520,8 +527,10 @@ module RedisOrm
           end
 
           if assoc[:options][:dependent] == :destroy
-            records.each do |r|
-              r.destroy
+            if !records.compact.empty?
+              records.compact.each do |r|
+                r.destroy
+              end
             end
           end
         end

data/redis_orm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_orm}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   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-22}
+  s.date = %q{2011-06-25}
   s.description = %q{ORM for Redis advanced key-value storage}
   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}]

data/test/options_test.rb

@@ -17,6 +17,12 @@ class Photo < RedisOrm::Base
   property :image, String
   property :image_type, String
   
+  property :checked, RedisOrm::Boolean, :default => false
+  index :checked
+  
+  property :inverted, RedisOrm::Boolean, :default => true
+  index :inverted
+  
   index :image
   index [:image, :image_type]
   
@@ -40,13 +46,13 @@ describe "test options" do
     @album.should be
     @album.title.should == "my 1st album"
 
-    @photo1 = Photo.new :image => "facepalm.jpg", :image_type => "jpg"
+    @photo1 = Photo.new :image => "facepalm.jpg", :image_type => "jpg", :checked => true
     @photo1.save
     @photo1.should be
     @photo1.image.should == "facepalm.jpg"
     @photo1.image_type.should == "jpg"
 
-    @photo2 = Photo.new :image => "boobs.png", :image_type => "png"
+    @photo2 = Photo.new :image => "boobs.png", :image_type => "png", :inverted => false
     @photo2.save
     @photo2.should be
     @photo2.image.should == "boobs.png"
@@ -70,6 +76,10 @@ describe "test options" do
 
     @album.photos.find(:all, :limit => 1, :offset => 1).size.should == 1
     
+    Photo.find(:all).size.should == 2
+    Photo.find(:first).id.should == @photo1.id
+    Photo.find(:last).id.should == @photo2.id
+    
     Photo.find(:all, :conditions => {:image => "facepalm.jpg"}).size.should == 1
     Photo.find(:all, :conditions => {:image => "boobs.png"}).size.should == 1
 
@@ -89,6 +99,38 @@ describe "test options" do
     Photo.find(: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"
+
+    @photo1.inverted.should == true 
+    @photo2.inverted.should == false
+        
+    $redis.zrange("photo:inverted:true", 0, -1).should include(@photo1.id.to_s)
+    $redis.zrange("photo:inverted:false", 0, -1).should include(@photo2.id.to_s)
+    
+    $redis.hgetall("photo:#{@photo1.id}")["checked"].should == "true"
+    $redis.hgetall("photo:#{@photo2.id}")["checked"].should == "false"
+    
+    @photo1.checked.should == true
+    @photo2.checked.should == false
+    
+    $redis.zrange("photo:checked:true", 0, -1).should include(@photo1.id.to_s)
+    $redis.zrange("photo:checked:false", 0, -1).should include(@photo2.id.to_s)
+  end
+
+  it "should search on bool values properly" do
+    Photo.find(:all, :conditions => {:checked => true}).size.should == 1
+    Photo.find(:all, :conditions => {:checked => true}).first.id.should == @photo1.id
+    Photo.find(:all, :conditions => {:checked => false}).size.should == 1
+    Photo.find(:all, :conditions => {:checked => false}).first.id.should == @photo2.id
+    
+    Photo.find(:all, :conditions => {:inverted => true}).size.should == 1
+    Photo.find(:all, :conditions => {:inverted => true}).first.id.should == @photo1.id
+    Photo.find(:all, :conditions => {:inverted => false}).size.should == 1
+    Photo.find(:all, :conditions => {:inverted => false}).first.id.should == @photo2.id
+  end
+
   it "should return correct array when :order option is provided" do
     Photo.all(:order => "asc").map{|p| p.id}.should == [@photo1.id, @photo2.id]
     Photo.all(:order => "desc").map{|p| p.id}.should == [@photo2.id, @photo1.id]

data/test/polymorphic_test.rb

@@ -85,4 +85,20 @@ describe "check polymorphic property" do
     City.first.people[0].id.should == person.id
     Country.first.people.count.should == 0
   end
+  
+  it "should delete records properly" do
+    country = Country.create :name => "Ukraine"
+    person = Person.create :name => "german"
+    person.location = country
+    
+    Person.first.location.id.should == country.id
+    Country.first.people.count.should == 1
+    Country.first.people[0].id.should == person.id
+    
+    person.destroy
+    Person.count.should == 0
+    $redis.hgetall("user:#{person.id}").should == {}
+    $redis.zrank("user:ids", person.id).should == nil
+    Country.first.people.count.should == 0
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-22 00:00:00.000000000Z
+date: 2011-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &79232740 !ruby/object:Gem::Requirement
+  requirement: &82547900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *79232740
+  version_requirements: *82547900
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &79232430 !ruby/object:Gem::Requirement
+  requirement: &82547630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *79232430
+  version_requirements: *82547630
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &79232120 !ruby/object:Gem::Requirement
+  requirement: &82547320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *79232120
+  version_requirements: *82547320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79231810 !ruby/object:Gem::Requirement
+  requirement: &82547020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *79231810
+  version_requirements: *82547020
 description: ORM for Redis advanced key-value storage
 email: germaninthetown@gmail.com
 executables: []