redis_storage 0.3.0 → 0.4.0

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p125
+1.9.3-p194

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 group :development, :test do
   gem 'guard-rspec'
-  gem 'pry'
-  gem 'pry-nav'
+  #gem 'pry'
+  #gem 'pry-nav'
 end

data/lib/redis_storage.rb

@@ -57,7 +57,7 @@ module RedisStorage
       if key == :id
         load "#{db_key}:#{value}"
       elsif indizies.include? key
-        load($db.get("#{db_key}:#{key}:#{value.hash}"))
+        load_many $db.smembers("#{db_key}:#{key}:#{value.hash}")
       else
         nil
       end
@@ -66,13 +66,7 @@ module RedisStorage
     def self.all
       keys = $db.smembers(persisted_key)
 
-      if keys.empty?
-        []
-      else
-        $db.mget(*keys).inject([]) do |a,json|
-          a << new(JSON.parse(json))
-        end
-      end
+      load_many keys
     end
 
     def self.count
@@ -110,7 +104,7 @@ module RedisStorage
           $db.set db_key, to_json
           $db.sadd self.class.persisted_key, db_key
           indizies.each do |key|
-            $db.set "#{self.class.db_key}:#{key}:#{send(key).hash}", db_key
+            $db.sadd "#{self.class.db_key}:#{key}:#{send(key).hash}", db_key
           end
         end
         @id
@@ -128,7 +122,7 @@ module RedisStorage
           $db.del db_key
           $db.srem self.class.persisted_key, db_key
           indizies.each do |key|
-            $db.del "#{self.class.db_key}:#{key}:#{send(key).hash}"
+            $db.srem "#{self.class.db_key}:#{key}:#{send(key).hash}", db_key
           end
         end
         true
@@ -165,11 +159,22 @@ module RedisStorage
       end
     end
     private
-    def self.load(key)
+    def self.load key
       return nil if key.nil?
       r = $db.get(key)
       new(JSON.parse(r)) unless r.nil?
     end
+    def self.load_many keys
+      if keys.empty?
+        nil
+      elsif keys.count == 1
+        load keys.first
+      else
+        $db.mget(*keys).inject([]) do |a,json|
+          a << new(JSON.parse(json))
+        end
+      end
+    end
     def self.next_id_key
       "#{db_key}:next_id"
     end

data/lib/redis_storage/version.rb

@@ -1,3 +1,3 @@
 module RedisStorage
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/model_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 class MockModel < RedisStorage::Model
-  attribute :body, :title
-  index :title
+  attribute :body, :title, :user_id
+  index :title, :user_id
 end
 
 describe RedisStorage::Model do
   it_should_behave_like "ActiveModel"
   let(:modelhash) do
-    {'body'=>"Lorem Ipsum", 'title' => "some test"}
+    {'body'=>"Lorem Ipsum", 'title' => "some test", 'user_id' => 3}
   end
 
   context 'class' do
@@ -41,10 +41,11 @@ describe RedisStorage::Model do
     end
     context '#find' do
       let(:h) do
-        [ {'body' =>"Lorem Ipsum", 'title' => "first test"},
-          {'body' =>"Dolor Sit", 'title' => "second test"},
-          {'body' =>"Amet consetetur", 'title' => "third test"},
-          {'body' =>"sadipscing elitr", 'title' => "forth test"}]
+        [ {'body' =>"Lorem Ipsum", 'title' => "first test", 'user_id' => 1},
+          {'body' =>"Dolor Sit", 'title' => "second test", 'user_id' => 2},
+          {'body' =>"Amet consetetur", 'title' => "third test", 'user_id' => 3},
+          {'body' =>"sadipscing elitr", 'title' => "forth test", 'user_id' => 2},
+          {'body' =>"Vivamus fermentum", 'title' => "fifth test", 'user_id' => 3}]
       end
       before(:each) do
         h.each do |e|
@@ -64,7 +65,7 @@ describe RedisStorage::Model do
           MockModel.expects(:load)
           MockModel.find_by(:id,3)
         end
-        1.upto(4) do |i|
+        1.upto(5) do |i|
           it "should find record #{i} by id, load it and create a new instance" do
             record = MockModel.find_by :id, i
             record.id.should == i
@@ -91,16 +92,26 @@ describe RedisStorage::Model do
           n = MockModel.find_by :title, t
           n.should be_nil
         end
+        context "nonunique" do
+          it "should give the object directly if only a single one availabe" do
+            m = MockModel.find_by :user_id, 1
+            m.body.should == h[0]['body']
+          end
+          it "should deliver a array of objects of multiple one in db" do
+            m = MockModel.find_by :user_id, 2
+            m.should have(2).things
+          end
+        end
       end
       context '#all' do
         it 'should return an empty array if there are no entries' do
           MockRedis.any_instance.stubs(:smembers => [])
           records = MockModel.all
-          records.should eq([])
+          records.should be_nil
         end
         it 'should return all entries' do
           records = MockModel.all
-          records.size.should eq(4)
+          records.should have(h.count).things
         end
         it 'should return an Array with all entries' do
           records = MockModel.all
@@ -123,7 +134,7 @@ describe RedisStorage::Model do
       end
       context '#last' do
         it 'should return the instance with the newest - highest id' do
-          MockModel.last.id.should eq(4)
+          MockModel.last.id.should eq(h.count)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_storage
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &108020580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *108020580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &108036480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *108036480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &108032540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *108032540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &108088580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *108088580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &108087020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *108087020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: mock_redis
-  requirement: &108086340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *108086340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &108085660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *108085660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &108084680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *108084680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Provides a data backend for a Redis in Rails, will also provide a Rails
   3 Generator
 email:
@@ -139,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3658108810072488555
+      hash: 2046715117829460915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,10 +188,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3658108810072488555
+      hash: 2046715117829460915
 requirements: []
 rubyforge_project: redis_storage
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple Redis ORM for Rails