redis_storage 0.2.5 → 0.2.6

data/lib/redis_storage.rb

@@ -30,7 +30,7 @@ module RedisStorage
     end
 
     def self.random
-      i = $db.srandmember("#{db_key}:persisted")
+      i = $db.srandmember(persisted_key)
       find_by_id(i) unless i.nil?
     end
     def self.find(params=nil)
@@ -41,12 +41,13 @@ module RedisStorage
       end
     end
     def self.find_by_id(entry_id)
+      return nil if entry_id.nil?
       r = $db.get("#{db_key}:#{entry_id}")
       new(JSON.parse(r)) unless r.nil?
     end
 
     def self.all
-      keys = $db.smembers("#{db_key}:persisted").map do |i|
+      keys = $db.smembers(persisted_key).map do |i|
         "#{db_key}:#{i}"
       end
 
@@ -59,6 +60,15 @@ module RedisStorage
       end
     end
 
+    def self.count
+      $db.scard(persisted_key)
+    end
+    def self.first
+      find_by_id $db.smembers(persisted_key).sort.first
+    end
+    def self.last
+      find_by_id $db.smembers(persisted_key).sort.last
+    end
     def serializable_hash
       self.class.attrs.inject({:id => @id}) do |a,key|
         a[key] = send(key)
@@ -77,12 +87,12 @@ module RedisStorage
     end
     def save
       unless persisted?
-        @id = $db.incr("#{db_key}:nextid")
+        @id = $db.incr(self.class.next_id_key)
       end
       if valid?
         $db.multi do
-          $db.set db_key, serializable_hash.to_json
-          $db.sadd "#{self.class.db_key}:persisted", id
+          $db.set db_key, to_json
+          $db.sadd self.class.persisted_key, id
         end
         @id
       else
@@ -97,7 +107,7 @@ module RedisStorage
       if persisted?
         $db.multi do
           $db.del db_key
-          $db.srem "#{self.class.db_key}:persisted", id
+          $db.srem self.class.persisted_key, id
         end
         true
       else
@@ -109,7 +119,7 @@ module RedisStorage
       if id.nil?
         false
       else
-        $db.sismember("#{self.class.db_key}:persisted", id)
+        $db.sismember(self.class.persisted_key, id)
       end
     end
 
@@ -119,6 +129,9 @@ module RedisStorage
     def db_key
       "#{self.class.db_key}:#{self.id}"
     end
+    def self.persisted_key
+      "#{db_key}:persisted"
+    end
 
     def initialize(params={})
       @id = nil
@@ -127,5 +140,9 @@ module RedisStorage
         send("#{key}=", value)
       end
     end
+    private
+    def self.next_id_key
+      "#{db_key}:next_id"
+    end
   end
 end

data/lib/redis_storage/version.rb

@@ -1,3 +1,3 @@
 module RedisStorage
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/redis_storage.gemspec

@@ -10,16 +10,14 @@ Gem::Specification.new do |s|
   s.email       = ["dev@eger-andreas.de"]
   s.homepage    = "https://github.com/sch1zo/redis_storage"
   s.summary     = %q{A simple Redis ORM for Rails}
-  s.description = %q{Provides a databackend for a Redis in Rails, will also provide a Rails 3 Generator}
+  s.description = %q{Provides a data backend for a Redis in Rails, will also provide a Rails 3 Generator}
 
-  s.add_dependency 'redis'
+  s.add_dependency 'redis', '>= 2.2.0'
   s.add_dependency 'json'
   s.add_dependency 'activemodel', '>= 3.0.0'
 
   s.add_development_dependency 'rspec', '>= 2.0.0'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'autotest'
-  s.add_development_dependency 'redis'
+  s.add_development_dependency 'mocha', '>= 0.9.10'
   s.add_development_dependency 'rails', '>= 3.0.0'
 
   s.rubyforge_project = "redis_storage"

data/spec/model_spec.rb

@@ -90,6 +90,21 @@ describe RedisStorage::Model do
           end
         end
       end
+      context '#count' do
+        it 'should return the count of the persited model instances' do
+          MockModel.count.should eq(MockModel.all.size)
+        end
+      end
+      context '#first' do
+        it 'should return the instance with the oldest - smallest id' do
+          MockModel.first.id.should eq(1)
+        end
+      end
+      context '#last' do
+        it 'should return the instance with the newest - highest id' do
+          MockModel.last.id.should eq(4)
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_storage
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-26 00:00:00.000000000Z
+date: 2011-06-27 00:00:00.000000000 +02:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &44131200 !ruby/object:Gem::Requirement
+  requirement: &193730080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *44131200
+  version_requirements: *193730080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &44130780 !ruby/object:Gem::Requirement
+  requirement: &193729660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *44130780
+  version_requirements: *193729660
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &44130280 !ruby/object:Gem::Requirement
+  requirement: &193729120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *44130280
+  version_requirements: *193729120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &44129780 !ruby/object:Gem::Requirement
+  requirement: &193728620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,43 +55,21 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *44129780
+  version_requirements: *193728620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &44129400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *44129400
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: &44128940 !ruby/object:Gem::Requirement
+  requirement: &193728160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *44128940
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: &44128520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *44128520
+  version_requirements: *193728160
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &44128020 !ruby/object:Gem::Requirement
+  requirement: &193727700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,8 +77,8 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *44128020
-description: Provides a databackend for a Redis in Rails, will also provide a Rails
+  version_requirements: *193727700
+description: Provides a data backend for a Redis in Rails, will also provide a Rails
   3 Generator
 email:
 - dev@eger-andreas.de
@@ -123,6 +102,7 @@ files:
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - test/generator_test.rb
+has_rdoc: true
 homepage: https://github.com/sch1zo/redis_storage
 licenses: []
 post_install_message: 
@@ -143,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: redis_storage
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple Redis ORM for Rails