dm-redis-adapter 0.2.1 → 0.2.2

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

@@ -127,7 +127,7 @@ module DataMapper
               properties_to_set << property.name << attributes[property]
             end
           end
-          
+
           hash_key = "#{resource.model.to_s.downcase}:#{resource.key.join}"
           properties_to_del.each {|prop| @redis.hdel(hash_key, prop) }
           @redis.hmset(hash_key, *properties_to_set) unless properties_to_set.empty?
@@ -157,16 +157,16 @@ module DataMapper
             keys << {"#{redis_key_for(query.model)}" => k, "#{o.subject.name}" => o.value}
           end
         end
-        
-        if query.order || query.limit
+
+        if keys.empty? && (query.order || query.limit)
           params = {}
           params[:limit] = [query.offset, query.limit] if query.limit
-          
+
           if query.order
             order = query.order.first
             params[:order] = order.operator.to_s
           end
-          
+
           @redis.sort(key_set_for(query.model), params).each do |val|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end

data/spec/dm_redis_validations_spec.rb

@@ -20,7 +20,7 @@ describe DataMapper::Adapters::RedisAdapter do
       property :id,      Serial
       property :flavor,  String, :index => true
     end
-    
+
     Crumblecake.create(:flavor => "snozzbler")
     Crumblecake.new(:flavor => "snozzbler").valid?.should be_false
   end
@@ -65,15 +65,15 @@ describe DataMapper::Adapters::RedisAdapter do
     u.save
     u.reload.name.should == nil
   end
-  
+
   it "should store Date fields" do
     class Post
       include DataMapper::Resource
-      
+
       property :id,        Serial
       property :posted_at, Date
     end
-    
+
     Post.create :posted_at => Date.today
     Post.first.posted_at.should be_a(Date)
   end
@@ -92,9 +92,22 @@ describe DataMapper::Adapters::RedisAdapter do
     GangMember.first.should == joey
     GangMember.last.should == bobby
   end
-  
+
+  it "should pull up the first pirate that matches the nickname" do
+    class Blackguard
+      include DataMapper::Resource
+
+      property :id,       Serial
+      property :nickname, String, :index => true
+    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
+
   after(:all) do
     redis = Redis.new(:db => 15)
     redis.flushdb
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dan Herrera
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -07:00
+date: 2010-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
+  name: dm-core
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-types
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +48,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
+  name: dm-types
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: redis
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,8 +64,8 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  type: :runtime
-  version_requirements: *id003
+  name: redis
+  requirement: *id003
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -88,7 +88,7 @@ has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
 
-post_install_message: "\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n                       (!!)   U P G R A D I N G    (!!)\n\n                        WAAAAAAAAAAAAAAAAAAAAAAAIT!\n               Earlier versions of dm-redis-adapter\n                use a different method of storing properties\n                  which means that this version of dm-redis-adapter\n                    won't read them properly.\n\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n  "
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: