dm-redis-adapter 0.4.0 → 0.5.0

data/README.textile

@@ -38,7 +38,7 @@ Setup your adapter, define your models and properties:
   <code>
     require 'rubygems'
     require 'dm-core'
-    require 'dm_redis'
+    require 'dm-redis-adapter'
 
     DataMapper.setup(:default, {:adapter  => "redis"})
 

data/Rakefile

@@ -26,8 +26,8 @@ begin
     gemspec.homepage = HOMEPAGE
     gemspec.description = SUMMARY
     gemspec.authors = AUTHORS
-    gemspec.add_dependency "dm-core", ">= 1.1.0"
-    gemspec.add_dependency "dm-types", ">= 1.1.0"
+    gemspec.add_dependency "dm-core", ">= 1.2.0"
+    gemspec.add_dependency "dm-types", ">= 1.2.0"
     gemspec.add_dependency "hiredis", "~> 0.3.0"
     gemspec.add_dependency "redis", "~> 2.2"
     gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")

data/lib/dm-redis-adapter/adapter.rb

@@ -89,8 +89,7 @@ module DataMapper
       #
       # @api semipublic
       def delete(collection)
-        collection.count.times do |x|
-          record = collection[x]
+        collection.each do |record|
           @redis.del("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}")
           @redis.srem(key_set_for(collection.query.model), record[redis_key_for(collection.query.model)])
           record.model.properties.select {|p| p.index}.each do |p|

data/lib/dm-redis-adapter/spec/setup.rb

@@ -6,6 +6,9 @@ module DataMapper
     module Adapters
 
       class RedisAdapter < Adapter
+        def connection_uri
+          { :adapter  => "redis", :db => 15 }
+        end
       end
 
       use RedisAdapter

data/spec/dm_redis_associations_spec.rb

@@ -38,6 +38,8 @@ describe DataMapper::Adapters::RedisAdapter do
       belongs_to :tag
     end
 
+    DataMapper.finalize
+
     b = Book.create(:name => "Harry Potter")
     t = Tag.create(:name => "fiction")
 

data/spec/dm_redis_spec.rb

@@ -21,6 +21,7 @@ describe DataMapper::Adapters::RedisAdapter do
         property :iq,         Integer
         property :shade,      String, :index => true
       end
+      DataMapper.finalize
     end
 
     it "should save the id of the resource in a set" do

data/spec/dm_redis_validations_spec.rb

@@ -18,6 +18,7 @@ describe DataMapper::Adapters::RedisAdapter do
       property :id,      Serial
       property :flavor,  String, :index => true
     end
+    DataMapper.finalize
 
     Crumblecake.create(:flavor => "snozzbler")
     Crumblecake.new(:flavor => "snozzbler").valid?.should be_false
@@ -32,6 +33,7 @@ describe DataMapper::Adapters::RedisAdapter do
         property :name,   String
         property :env,    DataMapper::Property::Json, :default => {}
       end
+      DataMapper.finalize
     end
 
     it "should be able to store json blocks" do
@@ -56,6 +58,7 @@ describe DataMapper::Adapters::RedisAdapter do
       property :id,   Serial
       property :name, String
     end
+    DataMapper.finalize
 
     u = User.create :name => "bpo"
     u.reload.name.should == "bpo"
@@ -71,6 +74,7 @@ describe DataMapper::Adapters::RedisAdapter do
       property :id,        Serial
       property :posted_at, Date
     end
+    DataMapper.finalize
 
     Post.create :posted_at => Date.today
     Post.first.posted_at.should be_a(Date)
@@ -83,6 +87,7 @@ describe DataMapper::Adapters::RedisAdapter do
       property :id,       Serial
       property :nickname, String
     end
+    DataMapper.finalize
 
     joey = GangMember.create(:nickname => "Joey 'two-times'")
     bobby = GangMember.create(:nickname => "Bobby 'three-fingers'")
@@ -91,31 +96,29 @@ describe DataMapper::Adapters::RedisAdapter do
     GangMember.last.should == bobby
   end
 
-  it "should pull up the first pirate that matches the nickname" do
-    class Blackguard
-      include DataMapper::Resource
+  describe "Finding a record by an indexed value" do
+    before(:each) do
+      class Blackguard
+        include DataMapper::Resource
 
-      property :id,       Serial
-      property :nickname, String, :index => true
+        property :id,       Serial
+        property :nickname, String, :index => true
+      end
+      DataMapper.finalize
     end
 
-    petey = Blackguard.create(:nickname => "Petey 'one-eye' McGraw")
-    james = Blackguard.create(:nickname => "James 'cannon-fingers' Doolittle")
-    Blackguard.first(:nickname => "James 'cannon-fingers' Doolittle").should == james
-  end
-
-  it "should not mark the first pirate as destroyed" do
-    class Blackguard
-      include DataMapper::Resource
-
-      property :id,       Serial
-      property :nickname, String, :index => true
+    it "should pull up the first pirate that matches the nickname" do
+      petey = Blackguard.create(:nickname => "Petey 'one-eye' McGraw")
+      james = Blackguard.create(:nickname => "James 'cannon-fingers' Doolittle")
+      Blackguard.first(:nickname => "James 'cannon-fingers' Doolittle").should == james
     end
 
-    petey = Blackguard.create(:nickname => "Petey 'one-eye' McGraw")
-    james = Blackguard.create(:nickname => "James 'cannon-fingers' Doolittle")
-    Blackguard.get(petey.id).should_not be_destroyed
-    Blackguard.first(:nickname => "James 'cannon-fingers' Doolittle").should_not be_destroyed
+    it "should not mark the first pirate as destroyed" do
+      petey = Blackguard.create(:nickname => "Petey 'one-eye' McGraw")
+      james = Blackguard.create(:nickname => "James 'cannon-fingers' Doolittle")
+      Blackguard.get(petey.id).should_not be_destroyed
+      Blackguard.first(:nickname => "James 'cannon-fingers' Doolittle").should_not be_destroyed
+    end
   end
 
   after(:each) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dan Herrera
@@ -14,12 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -07:00
+date: 2011-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,14 +26,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-types
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,14 +41,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hiredis
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,10 +60,10 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: redis
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,6 +74,7 @@ dependencies:
         - 2
         version: "2.2"
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
@@ -109,6 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2716290058136044164
       segments: 
       - 0
       version: "0"