redis_orm 0.5 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+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
+
 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

data/Manifest

@@ -26,4 +26,5 @@ 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

data/README.md

@@ -27,6 +27,15 @@ class User < RedisOrm::Base
 end
 ```
 
+## 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:
+
+```ruby
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+```
+
 ## Defining a model and specifing properties
 
 To specify properties for your model you should use the following syntax:
@@ -61,7 +70,7 @@ Following options are available in property declaration:
 
 ## Searching records by the value
 
-Usually it's done via declaring an index and using dynamic finders later. For example:
+Usually it's done via declaring an index and using *:conditions* hash or dynamic finders. For example:
 
 ```ruby
 class User < RedisOrm::Base
@@ -71,15 +80,21 @@ class User < RedisOrm::Base
 end
 
 User.create :name => "germaninthetown"
+
+# via dynamic finders:
 User.find_by_name "germaninthetown" # => found 1 record
 User.find_all_by_name "germaninthetown" # => array with 1 record
+
+# via *:conditions* hash:
+User.find(:all, :conditions => {:name => "germaninthetown"}) # => array with 1 record
+User.all(:conditions => {:name => "germaninthetown"}) # => array with 1 record
 ```
 
-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.
+Dynamic finders work mostly the way they work 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. So you should make an initial analysis of model and determine properties that should be searchable.
 
 ## Options for #find/#all
 
-To extract all or part of the associated records you could use 4 options for now:
+To extract all or part of the associated records you could use 4 options:
 
 * :limit
 
@@ -87,20 +102,20 @@ To extract all or part of the associated records you could use 4 options for now
 
 * :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 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).
+  Hash where keys must be equal to the existing 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 << Photo.create(:image_type => "image/png", :image => "boobs.png")
+@album.photos << Photo.create(:image_type => "image/jpeg", :image => "facepalm.jpg")
 
 @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 => 2, :offset => 0) # [...]
 @album.photos.all(:limit => 1, :offset => 1, :conditions => {:image_type => "image/png"})
 @album.photos.find(:all, :order => "asc")
 
@@ -110,14 +125,50 @@ 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
+Photo.find(:first, :conditions => {:image => "boobs.png"}) # => [...]
+```
+
+## Using UUID instead of numeric id
+
+You could use universally unique identifiers (UUIDs) instead of a monotone increasing sequence of numbers as id/primary key for your models. 
+
+Example of UUID: b57525b09a69012e8fbe001d61192f09. 
+
+To enable UUIDs you should invoke *use_uuid_as_id* class method:
+
+```ruby
+class User < RedisOrm::Base
+  use_uuid_as_id
+  
+  property :name, String
+
+  property :created_at, Time
+end
+```
+
+[UUID](https://rubygems.org/gems/uuid) gem is installed as a dependency. 
+
+An excerpt from https://github.com/assaf/uuid :
+
+UUID (universally unique identifier) are guaranteed to be unique across time and space. 
+
+A UUID is 128 bit long, and consists of a 60-bit time value, a 16-bit sequence number and a 48-bit node identifier. 
+
+Note: when using a forking server (Unicorn, Resque, Pipemaster, etc) you don’t want your forked processes using the same sequence number. Make sure to increment the sequence number each time a worker forks.
+
+For example, in config/unicorn.rb:
+
+```ruby
+after_fork do |server, worker|
+  UUID.generator.next_sequence
+end
 ```
 
 ## Indices
 
-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.
+Indices are used in a different way then they are used in relational databases. In redis_orm 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):
+You could add index to any attribute of the model (index also could be compound):
 
 ```ruby
 class User < RedisOrm::Base
@@ -129,13 +180,13 @@ class User < RedisOrm::Base
 end
 ```
 
-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:
+With index defined for the property (or properties) the id of the saved object is stored in the sorted set with special name, 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"
 user.save
 
-# 2 redis keys are created "user:first_name:Robert" and "user:first_name:Robert:last_name:Pirsig" so we could search things like this:
+# 2 redis keys are created "user:first_name:Robert" and "user:first_name:Robert:last_name:Pirsig" so we could search records like this:
 
 User.find_by_first_name("Robert")                             # => user
 User.find_all_by_first_name("Robert")                         # => [user]
@@ -164,7 +215,7 @@ 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
+# here besides usual indices for each comment, 2 association indices are created so #find with *:conditions* on comments should work
 
 article.comments.find(:all, :conditions => {:moderated => true})
 article.comments.find(:all, :conditions => {:moderated => false})
@@ -174,11 +225,11 @@ 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.
+  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 and *Time.now.to_f* as a score.
   
 *  **: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.
+  If true is specified then property values are saved downcased (and then are transformed to downcase form when searching). Works for compound indices too.
   
 ## Associations
 
@@ -372,7 +423,7 @@ For more examples please check test/associations_test.rb and test/polymorphic_te
 
 ## Validation
 
-RedisOrm includes ActiveModel::Validations. So all well-known functions are already in. An example from test/validations_test.rb:
+RedisOrm includes ActiveModel::Validations. So all well-known validation callbacks are already in. An excerpt from test/validations_test.rb:
 
 ```ruby
 class Photo < RedisOrm::Base
@@ -417,7 +468,7 @@ end
 
 When saving object standard ActiveModel's #valid? method is invoked at first. Then appropriate callbacks are run. Then new Hash in Redis is created with keys/values equal to the properties/values of the saving object. 
 
-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.
+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. Then record's indices are created/updated.
 
 ## Dirty
 
@@ -425,11 +476,11 @@ Redis_orm also provides dirty methods to check whether the property has changed
 
 ## File attachment management with paperclip and redis
 
-I wrote [3 simple steps](http://def-end.com/post/6669884103/file-attachment-management-with-paperclip-and-redis) you should follow to manage your file attachments with redis and paperclip.
+[3 simple steps](http://def-end.com/post/6669884103/file-attachment-management-with-paperclip-and-redis) you should follow to manage your file attachments with redis and paperclip.
 
 ## Tests
 
-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):
+Though I'm a big fan of the Test::Unit all tests are based on RSpec. And the only reason I use RSpec is possibility to define *before(:all)* and *after(:all)* hooks. So I could spawn/kill redis-server's process (from test_helper.rb):
 
 ```ruby
 RSpec.configure do |config|

data/Rakefile

@@ -4,12 +4,12 @@ require 'rake'
 #=begin
 require 'echoe'
 
-Echoe.new('redis_orm', '0.5') do |p|
+Echoe.new('redis_orm', '0.5.1') 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"
-  p.dependencies   = ["activesupport >=3.0.0", "activemodel >=3.0.0", "redis >=2.2.0"]
+  p.dependencies   = ["activesupport >=3.0.0", "activemodel >=3.0.0", "redis >=2.2.0", "uuid >=2.3.2"]
   p.development_dependencies   = ["rspec >=2.5.0"]
 end
 #=end

data/lib/redis_orm.rb

@@ -2,6 +2,7 @@
 
 require 'active_model'
 require 'redis'
+require 'uuid'
 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')

data/lib/redis_orm/redis_orm.rb

@@ -41,8 +41,9 @@ module RedisOrm
     @@properties = Hash.new{|h,k| h[k] = []}
     @@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] = {}}    
-
+    @@callbacks = Hash.new{|h,k| h[k] = {}}
+    @@use_uuid_as_id = {}
+    
     class << self
 
       def inherited(from)
@@ -116,6 +117,11 @@ module RedisOrm
         end
       end
       
+      def use_uuid_as_id
+        @@use_uuid_as_id[model_name] = true
+        @@uuid = UUID.new
+      end
+      
       def count
         $redis.zcard("#{model_name}:ids").to_i
       end
@@ -321,8 +327,10 @@ module RedisOrm
     
     def initialize(attributes = {}, id = nil, persisted = false)
       @persisted = persisted
-      
-      instance_variable_set(:"@id", id.to_i) if id
+
+      id = @@use_uuid_as_id[model_name] ? id : id.to_i
+
+      instance_variable_set(:"@id", id) if id
 
       # when object is created with empty attribute set @#{prop[:name]}_changes array properly
       @@properties[model_name].each do |prop|
@@ -349,6 +357,14 @@ module RedisOrm
       @persisted
     end
 
+    def get_next_id
+      if @@use_uuid_as_id[model_name]
+        @@uuid.generate(:compact)
+      else
+        $redis.incr("#{model_name}:id")
+      end
+    end
+    
     def save
       return false if !valid?
 
@@ -428,10 +444,9 @@ module RedisOrm
           self.send(callback)
         end
  
-        @id = $redis.incr("#{model_name}:id")
+        @id = get_next_id
         $redis.zadd "#{model_name}:ids", Time.now.to_f, @id
         @persisted = true
-
         self.created_at = Time.now if respond_to? :created_at
       end
 
@@ -463,7 +478,7 @@ module RedisOrm
       end
 
       # save new indices in order to sort by finders
-      # city:name:Харьков => 1
+      # city:name:Chicago => 1
       @@indices[model_name].each do |index|
         prepared_index = construct_prepared_index(index) # instance method not class one!
 

data/redis_orm.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis_orm}
-  s.version = "0.5"
+  s.version = "0.5.1"
 
   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-07-01}
+  s.authors = ["Dmitrii Samoilov"]
+  s.date = %q{2011-07-27}
   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_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.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.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.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.8.5}
+  s.rubygems_version = %q{1.6.2}
   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}]
+  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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -26,17 +26,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<redis>, [">= 2.2.0"])
+      s.add_runtime_dependency(%q<uuid>, [">= 2.3.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_dependency(%q<redis>, [">= 2.2.0"])
+      s.add_dependency(%q<uuid>, [">= 2.3.2"])
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     s.add_dependency(%q<redis>, [">= 2.2.0"])
+    s.add_dependency(%q<uuid>, [">= 2.3.2"])
     s.add_dependency(%q<rspec>, [">= 2.5.0"])
   end
 end

data/test/atomicity_test.rb

@@ -6,6 +6,7 @@ class Article < RedisOrm::Base
 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
@@ -14,6 +15,7 @@ describe "check atomicity" do
     
     50.times do |i|
       @threads << Thread.new(i) do
+        sleep(0.2)
         @article.update_attribute :karma, (@article.karma + 1)
       end
     end
@@ -22,4 +24,41 @@ describe "check atomicity" do
     
     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
+      end
+    end
+    
+    threads.each{|thread| thread.join}
+    Article.count.should == 0
+  end
+=begin
+  it "should properly increment/decrement property's value" do
+    article = Article.create :title => "article #1", :karma => 10
+    threads = []
+    
+    10.times do
+      threads << Thread.new{ article.update_attribute(:karma, (article.karma + 2)) }
+    end
+    
+    15.times do
+      threads << Thread.new{ article.update_attribute(:karma, (article.karma - 1)) }
+    end
+    
+    threads.each{|thread| thread.join}
+    article.karma.should == 15
+  end
+=end
 end

data/test/uuid_as_id_test.rb

@@ -0,0 +1,210 @@
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
+
+class User < RedisOrm::Base
+  use_uuid_as_id
+  
+  property :name, String
+  property :age, Integer
+  property :wage, Float
+  property :male, RedisOrm::Boolean
+
+  property :created_at, Time
+  property :modified_at, Time
+  
+  has_many :users, :as => :friends
+end
+
+class DefaultUser < RedisOrm::Base
+  use_uuid_as_id
+  
+  property :name, String, :default => "german"
+  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
+
+class TimeStamp < RedisOrm::Base
+  use_uuid_as_id
+  timestamps
+end
+
+describe "check basic functionality" do
+  it "test_simple_creation" do
+    User.count.should == 0
+
+    user = User.new :name => "german"
+    user.save
+
+    user.should be
+    user.id.should be
+    
+    user.id.should_not == 1
+    user.id.length.should == 32 # b57525b09a69012e8fbe001d61192f09 for example
+    
+    user.name.should == "german"
+
+    User.count.should == 1
+    User.first.name.should == "german"
+  end
+
+  it "should test different ways to update a record" do
+    User.count.should == 0
+
+    user = User.new :name => "german"
+    user.should be
+    user.save
+
+    user.name.should == "german"
+
+    user.name = "nobody"
+    user.save
+
+    User.count.should == 1
+    User.first.name.should == "nobody"
+
+    u = User.first
+    u.should be
+    u.id.should_not == 1
+    u.id.length.should == 32
+    u.update_attribute :name, "root"
+    User.first.name.should == "root"
+
+    u = User.first
+    u.should be
+    u.update_attributes :name => "german"
+    User.first.name.should == "german"
+  end
+
+  it "test_deletion" do
+    User.count.should == 0
+
+    user = User.new :name => "german"
+    user.save
+    user.should be
+
+    user.name.should == "german"
+
+    User.count.should == 1
+    id = user.id
+    
+    user.destroy
+    User.count.should == 0
+    $redis.zrank("user:ids", id).should == nil
+    $redis.hgetall("user:#{id}").should == {}
+  end
+
+  it "should return first and last objects" do
+    User.count.should == 0
+    User.first.should == nil
+    User.last.should == nil
+
+    user1 = User.new :name => "german"
+    user1.save
+    user1.should be
+    user1.name.should == "german"
+    user1.id.should_not == 1
+    user1.id.length.should == 32 # b57525b09a69012e8fbe001d61192f09 for example
+    
+    user2 = User.new :name => "nobody"
+    user2.save
+    user2.should be
+    user2.name.should == "nobody"
+    user2.id.should_not == 2
+    user2.id.length.should == 32
+    
+    User.count.should == 2
+
+    User.first.should be
+    User.last.should be
+
+    User.first.id.should == user1.id
+    User.last.id.should  == user2.id
+  end
+
+  it "should return values with correct classes" do
+    user = User.new
+    user.name = "german"
+    user.age = 26
+    user.wage = 124.34
+    user.male = true
+    user.save
+
+    user.should be
+
+    u = User.first
+
+    u.created_at.class.should == Time
+    u.modified_at.class.should == Time
+    u.wage.class.should == Float
+    u.male.class.to_s.should match(/TrueClass|FalseClass/)
+    u.age.class.to_s.should match(/Integer|Fixnum/)
+    u.id.should_not == 1
+    u.id.length.should == 32
+    
+    u.name.should == "german"
+    u.wage.should == 124.34
+    u.age.should  == 26
+    u.male.should == true
+  end
+
+  it "should return correct saved defaults" do
+    DefaultUser.count.should == 0
+    DefaultUser.create
+    DefaultUser.count.should == 1
+
+    u = DefaultUser.first
+
+    u.created_at.class.should == Time
+    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
+    u.id.should_not == 1
+    u.id.length.should == 32
+    
+    du = DefaultUser.new
+    du.name = "germaninthetown"
+    du.save
+    
+    du_saved = DefaultUser.last
+    du_saved.name.should == "germaninthetown"
+    du_saved.admin.should == false
+    du.id.should_not == 2
+    du.id.should_not == u.id
+    du.id.length.should == 32
+  end
+  
+  it "should expand timestamps declaration properly" do
+    t = TimeStamp.new
+    t.save
+    
+    t.created_at.should be
+    t.modified_at.should be
+    t.created_at.day.should == Time.now.day
+    t.modified_at.day.should == Time.now.day
+  end
+  
+  # from associations_test.rb
+  it "should maintain correct self referencing link" do
+    me = User.create :name => "german", :age => 26, :wage => 10.0, :male => true
+    friend1 = User.create :name => "friend1", :age => 26, :wage => 7.0, :male => true
+    friend2 = User.create :name => "friend2", :age => 25, :wage => 5.0, :male => true
+
+    me.friends << [friend1, friend2]
+
+    me.friends.count.should == 2
+    friend1.friends.count.should == 0
+    friend2.friends.count.should == 0
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000Z
+date: 2011-07-27 00:00:00.000000000 +03:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &84648260 !ruby/object:Gem::Requirement
+  requirement: &87829630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84648260
+  version_requirements: *87829630
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &84647900 !ruby/object:Gem::Requirement
+  requirement: &87829290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84647900
+  version_requirements: *87829290
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &84647510 !ruby/object:Gem::Requirement
+  requirement: &87828950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,21 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84647510
+  version_requirements: *87828950
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &87828600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *87828600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84647120 !ruby/object:Gem::Requirement
+  requirement: &87828250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +66,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *84647120
+  version_requirements: *87828250
 description: ORM for Redis (advanced key-value storage) with ActiveRecord API
 email: germaninthetown@gmail.com
 executables: []
@@ -100,7 +112,9 @@ files:
 - test/polymorphic_test.rb
 - test/redis.conf
 - test/test_helper.rb
+- test/uuid_as_id_test.rb
 - test/validations_test.rb
+has_rdoc: true
 homepage: https://github.com/german/redis_orm
 licenses: []
 post_install_message: 
@@ -127,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: redis_orm
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ORM for Redis (advanced key-value storage) with ActiveRecord API
@@ -138,6 +152,7 @@ test_files:
 - 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