redis_orm 0.5.1 → 0.8

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

metadata

@@ -1,72 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: '0.8'
 platform: ruby
 authors:
 - Dmitrii Samoilov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000 +03:00
-default_executable: 
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &87829630 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
-  version_requirements: *87829630
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &87829290 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
-  version_requirements: *87829290
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &87828950 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 4.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *87828950
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &87828600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *87828600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &87828250 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
-  version_requirements: *87828250
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: ORM for Redis (advanced key-value storage) with ActiveRecord API
 email: germaninthetown@gmail.com
 executables: []
@@ -75,6 +116,9 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
+- TODO
+- lib/rails/generators/redis_orm/model/model_generator.rb
+- lib/rails/generators/redis_orm/model/templates/model.rb.erb
 - lib/redis_orm.rb
 - lib/redis_orm/active_model_behavior.rb
 - lib/redis_orm/associations/belongs_to.rb
@@ -83,12 +127,14 @@ 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
-- Manifest
 - README.md
-- Rakefile
+- TODO
+- lib/rails/generators/redis_orm/model/model_generator.rb
+- lib/rails/generators/redis_orm/model/templates/model.rb.erb
 - lib/redis_orm.rb
 - lib/redis_orm/active_model_behavior.rb
 - lib/redis_orm/associations/belongs_to.rb
@@ -97,67 +143,34 @@ files:
 - 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
-has_rdoc: true
+- lib/redis_orm/utils.rb
 homepage: https://github.com/german/redis_orm
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Redis_orm
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements: []
-rubyforge_project: redis_orm
-rubygems_version: 1.6.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: ORM for Redis (advanced key-value storage) with ActiveRecord API
-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
+test_files: []

data/Manifest

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

data/Rakefile

@@ -1,33 +0,0 @@
-require 'psych'
-require 'rubygems'
-require 'rake'
-#=begin
-require 'echoe'
-
-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", "uuid >=2.3.2"]
-  p.development_dependencies   = ["rspec >=2.5.0"]
-end
-#=end
-
-#require 'rake/testtask'
-#$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
-
-=begin
-desc 'Test the redis_orm gem.'
-Rake::TestTask.new(:test) do |t|
-  #t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-=end
-
-task :test do |t|
-  Dir['test/**/*_test.rb'].each do |file|
-    puts `ruby -I./lib #{file}`
-  end
-end

data/redis_orm.gemspec

@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{redis_orm}
-  s.version = "0.5.1"
-
-  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.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.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"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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/association_indices_test.rb

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