redis_orm 0.6.1 → 0.6.2

data/test/test_helper.rb

@@ -2,6 +2,10 @@ require 'rspec'
 require 'rspec/autorun'
 require File.dirname(File.expand_path(__FILE__)) + '/../lib/redis_orm.rb'
 
+Dir.glob(['test/classes/*.rb', 'test/modules/*.rb']).each do |klassfile|
+  require File.dirname(File.expand_path(__FILE__)) + '/../' + klassfile
+end
+
 RSpec.configure do |config|  
   config.before(:all) do
     path_to_conf = File.dirname(File.expand_path(__FILE__)) + "/redis.conf"

data/test/uuid_as_id_test.rb

@@ -1,42 +1,10 @@
 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
+    UuidUser.count.should == 0
 
-    user = User.new :name => "german"
+    user = UuidUser.new :name => "german"
     user.save
 
     user.should be
@@ -47,14 +15,14 @@ describe "check basic functionality" do
     
     user.name.should == "german"
 
-    User.count.should == 1
-    User.first.name.should == "german"
+    UuidUser.count.should == 1
+    UuidUser.first.name.should == "german"
   end
 
   it "should test different ways to update a record" do
-    User.count.should == 0
+    UuidUser.count.should == 0
 
-    user = User.new :name => "german"
+    user = UuidUser.new :name => "german"
     user.should be
     user.save
 
@@ -63,70 +31,70 @@ describe "check basic functionality" do
     user.name = "nobody"
     user.save
 
-    User.count.should == 1
-    User.first.name.should == "nobody"
+    UuidUser.count.should == 1
+    UuidUser.first.name.should == "nobody"
 
-    u = User.first
+    u = UuidUser.first
     u.should be
     u.id.should_not == 1
     u.id.length.should == 32
     u.update_attribute :name, "root"
-    User.first.name.should == "root"
+    UuidUser.first.name.should == "root"
 
-    u = User.first
+    u = UuidUser.first
     u.should be
     u.update_attributes :name => "german"
-    User.first.name.should == "german"
+    UuidUser.first.name.should == "german"
   end
 
   it "test_deletion" do
-    User.count.should == 0
+    UuidUser.count.should == 0
 
-    user = User.new :name => "german"
+    user = UuidUser.new :name => "german"
     user.save
     user.should be
 
     user.name.should == "german"
 
-    User.count.should == 1
+    UuidUser.count.should == 1
     id = user.id
     
     user.destroy
-    User.count.should == 0
+    UuidUser.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
+    UuidUser.count.should == 0
+    UuidUser.first.should == nil
+    UuidUser.last.should == nil
 
-    user1 = User.new :name => "german"
+    user1 = UuidUser.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 = UuidUser.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
+    UuidUser.count.should == 2
 
-    User.first.should be
-    User.last.should be
+    UuidUser.first.should be
+    UuidUser.last.should be
 
-    User.first.id.should == user1.id
-    User.last.id.should  == user2.id
+    UuidUser.first.id.should == user1.id
+    UuidUser.last.id.should  == user2.id
   end
 
   it "should return values with correct classes" do
-    user = User.new
+    user = UuidUser.new
     user.name = "german"
     user.age = 26
     user.wage = 124.34
@@ -135,7 +103,7 @@ describe "check basic functionality" do
 
     user.should be
 
-    u = User.first
+    u = UuidUser.first
 
     u.created_at.class.should == Time
     u.modified_at.class.should == Time
@@ -152,11 +120,11 @@ describe "check basic functionality" do
   end
 
   it "should return correct saved defaults" do
-    DefaultUser.count.should == 0
-    DefaultUser.create
-    DefaultUser.count.should == 1
+    UuidDefaultUser.count.should == 0
+    UuidDefaultUser.create
+    UuidDefaultUser.count.should == 1
 
-    u = DefaultUser.first
+    u = UuidDefaultUser.first
 
     u.created_at.class.should == Time
     u.modified_at.class.should == Time
@@ -173,11 +141,11 @@ describe "check basic functionality" do
     u.id.should_not == 1
     u.id.length.should == 32
     
-    du = DefaultUser.new
+    du = UuidDefaultUser.new
     du.name = "germaninthetown"
     du.save
     
-    du_saved = DefaultUser.last
+    du_saved = UuidDefaultUser.last
     du_saved.name.should == "germaninthetown"
     du_saved.admin.should == false
     du.id.should_not == 2
@@ -186,7 +154,7 @@ describe "check basic functionality" do
   end
   
   it "should expand timestamps declaration properly" do
-    t = TimeStamp.new
+    t = UuidTimeStamp.new
     t.save
     
     t.created_at.should be
@@ -197,9 +165,9 @@ describe "check basic functionality" do
   
   # 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 = UuidUser.create :name => "german", :age => 26, :wage => 10.0, :male => true
+    friend1 = UuidUser.create :name => "friend1", :age => 26, :wage => 7.0, :male => true
+    friend2 = UuidUser.create :name => "friend2", :age => 25, :wage => 5.0, :male => true
 
     me.friends << [friend1, friend2]
 

data/test/validations_test.rb

@@ -1,13 +1,5 @@
 require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
-class Photo < RedisOrm::Base
-  property :image, String
-  
-  validates_presence_of :image
-  validates_length_of :image, :in => 7..32
-  validates_format_of :image, :with => /\w*\.(gif|jpe?g|png)/
-end
-
 describe "check associations" do
   it "should validate presence if image in photo" do
     p = Photo.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17352020 !ruby/object:Gem::Requirement
+  requirement: &11707440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17352020
+  version_requirements: *11707440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &17367880 !ruby/object:Gem::Requirement
+  requirement: &11706780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17367880
+  version_requirements: *11706780
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &17367380 !ruby/object:Gem::Requirement
+  requirement: &11706160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *17367380
+  version_requirements: *11706160
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &17366880 !ruby/object:Gem::Requirement
+  requirement: &11705440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *17366880
+  version_requirements: *11705440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17366380 !ruby/object:Gem::Requirement
+  requirement: &11704820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *17366380
+  version_requirements: *11704820
 description: ORM for Redis (advanced key-value storage) with ActiveRecord API
 email: germaninthetown@gmail.com
 executables: []
@@ -74,6 +74,7 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
+- TODO
 - lib/redis_orm.rb
 - lib/redis_orm/active_model_behavior.rb
 - lib/redis_orm/associations/belongs_to.rb
@@ -90,6 +91,7 @@ files:
 - Manifest
 - README.md
 - Rakefile
+- TODO
 - benchmarks/sortable_benchmark.rb
 - lib/redis_orm.rb
 - lib/redis_orm/active_model_behavior.rb
@@ -107,10 +109,41 @@ files:
 - test/basic_functionality_test.rb
 - test/callbacks_test.rb
 - test/changes_array_test.rb
+- test/classes/album.rb
+- test/classes/article.rb
+- test/classes/book.rb
+- test/classes/catalog_item.rb
+- test/classes/category.rb
+- test/classes/city.rb
+- test/classes/comment.rb
+- test/classes/country.rb
+- test/classes/custom_user.rb
+- test/classes/cutout.rb
+- test/classes/cutout_aggregator.rb
+- test/classes/default_user.rb
+- test/classes/dynamic_finder_user.rb
+- test/classes/empty_person.rb
+- test/classes/giftcard.rb
+- test/classes/jigsaw.rb
+- test/classes/location.rb
+- test/classes/message.rb
+- test/classes/note.rb
+- test/classes/omni_user.rb
+- test/classes/person.rb
+- test/classes/photo.rb
+- test/classes/profile.rb
+- test/classes/sortable_user.rb
+- test/classes/timestamp.rb
+- test/classes/user.rb
+- test/classes/uuid_default_user.rb
+- test/classes/uuid_timestamp.rb
+- test/classes/uuid_user.rb
 - test/dynamic_finders_test.rb
 - test/exceptions_test.rb
 - test/has_one_has_many_test.rb
 - test/indices_test.rb
+- test/modules/belongs_to_model_within_module.rb
+- test/modules/has_many_model_within_module.rb
 - test/options_test.rb
 - test/polymorphic_test.rb
 - test/redis.conf