redis-objects-model 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: bundle exec rake spec

data/README.md

@@ -1,5 +1,7 @@
 # redis-objects-model
 
+[![Build Status](https://travis-ci.org/kepstin/redis-objects-model.png)](https://travis-ci.org/kepstin/redis-objects-model)
+
 The simplest possible Model to use with redis-objects.
 
 The minimum requirement for a class to be usable as a model with

data/lib/redis-objects-model.rb

@@ -19,7 +19,11 @@ class Redis
     class Model
       include Redis::Objects
 
-      counter :last_id, :global => true
+      ##
+      # The name of the redis counter which will be used to allocate keys.
+      def redis_objects_model_next_id
+        "#{self.class.redis_prefix}:next_id"
+      end
 
       ##
       # Create an instance of the model.
@@ -41,7 +45,7 @@ class Redis
       # In other words, accessing the id attribute is basically equivalent to
       # persisting the object.
       def id
-        @id || @id = last_id.increment
+        @id || @id = self.redis.incr(self.redis_objects_model_next_id)
       end
 
       #########################################################################

data/lib/redis-objects-model/version.rb

@@ -1,7 +1,7 @@
 class Redis
   module Objects
     class Model
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/spec/redis-objects-model_spec.rb

@@ -1,43 +1,61 @@
 require 'fakeredis'
 require 'redis-objects-model'
 
+class MyModel < Redis::Objects::Model
+end
+
 describe 'redis-objects-model' do
+  it 'should derive key from subclass name' do
+    model = MyModel.new
+    model.redis_objects_model_next_id.should == 'my_model:next_id'
+  end
+
   it 'should not be persisted by default' do
-    model = Redis::Objects::Model.new
+    model = MyModel.new
     model.should be_new_record
     model.should_not be_persisted
   end
 
   it 'should be persisted after assigning an id' do
-    model = Redis::Objects::Model.new
+    model = MyModel.new
     model.id.should > 0
     model.should_not be_new_record
     model.should be_persisted
   end
 
   it 'should return the same id with multiple calls' do
-    model = Redis::Objects::Model.new
+    model = MyModel.new
     id_1 = model.id
     id_2 = model.id
     id_1.should == id_2
   end
 
   it 'should not create multiple models with the same id' do
-    model_1 = Redis::Objects::Model.new
-    model_2 = Redis::Objects::Model.new
+    model_1 = MyModel.new
+    model_2 = MyModel.new
     model_1.id.should_not == model_2.id
   end
 
   it 'should allow being created with an assigned id' do
     id = Random.rand(1..100000)
-    model = Redis::Objects::Model.new id
+    model = MyModel.new id
     model.should be_persisted
     model.id.should == id
   end
 
   it 'should be persisted immediately when called with create' do
-    model = Redis::Objects::Model.create
+    model = MyModel.create
     model.should be_persisted
     model.id.should > 0
   end
+
+  it 'should not allow models to interfere with id allocation' do
+    class OtherModel < Redis::Objects::Model
+    end
+
+    model = MyModel.create
+    other_model = OtherModel.create
+
+    other_model.id.should == 1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects-model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-objects
-  requirement: &7909780 !ruby/object:Gem::Requirement
+  requirement: &6999180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *7909780
+  version_requirements: *6999180
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &7908780 !ruby/object:Gem::Requirement
+  requirement: &6998020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *7908780
+  version_requirements: *6998020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7908060 !ruby/object:Gem::Requirement
+  requirement: &6995320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 10.0.0
   type: :development
   prerelease: false
-  version_requirements: *7908060
+  version_requirements: *6995320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7907180 !ruby/object:Gem::Requirement
+  requirement: &7012980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *7907180
+  version_requirements: *7012980
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
-  requirement: &7906040 !ruby/object:Gem::Requirement
+  requirement: &7012140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *7906040
+  version_requirements: *7012140
 description: The simplest possible model for redis-objects
 email:
 - calvin.walton@kepstin.ca
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 866709580333850131
+      hash: -1175797921501167157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 866709580333850131
+      hash: -1175797921501167157
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11