dm-redis-adapter 0.5.1 → 0.5.2

data/README.textile

@@ -49,6 +49,8 @@ Setup your adapter, define your models and properties:
       property :name,   Text
     end
 
+    Cafe.finalize
+
     Cafe.create(:name => "Whoahbot's Caffienitorium")
   </code>
 </pre>
@@ -95,4 +97,5 @@ h1. Badass contributors
 * <a href="http://github.com/cehoffman">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps, fixes for sorting
 * <a href="http://github.com/bpo">brian p o'rourke (bpo)</a> Updates for newer versions of redis client and DM JSON type support, move to hash storage
 * <a href="http://github.com/arbarlow">Alex Barlow (arbarlow)</a> Fixes for ruby 1.9.2
+* <a href="http://github.com/jof">Jonathan Lassoff (jof)</a> Fixes to support textual keys
 

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

@@ -150,7 +150,7 @@ module DataMapper
 
         if query.conditions.nil?
           @redis.smembers(key_set_for(query.model)).each do |key|
-            keys << {redis_key_for(query.model) => key.to_i}
+            keys << {redis_key_for(query.model) => key}
           end
         else
           query.conditions.operands.each do |operand|
@@ -218,18 +218,18 @@ module DataMapper
           elsif operand.is_a?(DataMapper::Query::Conditions::InclusionComparison)
             value.each do |val|
               find_indexed_matches(subject, val).each do |k|
-                matched_records << {redis_key_for(query.model) => k.to_i, "#{subject.name}" => val}
+                matched_records << {redis_key_for(query.model) => k, "#{subject.name}" => val}
               end
             end
           else
             find_indexed_matches(subject, value).each do |k|
-              matched_records << {redis_key_for(query.model) => k.to_i, "#{subject.name}" => value}
+              matched_records << {redis_key_for(query.model) => k, "#{subject.name}" => value}
             end
           end
         else # worst case, loop through each record and match
           @redis.smembers(key_set_for(query.model)).each do |key|
             if operand.matches?(subject.typecast(@redis.hget("#{query.model.to_s.downcase}:#{key}", subject.name)))
-              matched_records << {redis_key_for(query.model) => key.to_i}
+              matched_records << {redis_key_for(query.model) => key}
             end
           end
         end
@@ -267,7 +267,7 @@ module DataMapper
       #   Array of id's of all members for an indexed field
       # @api private
       def find_indexed_matches(subject, value)
-        @redis.smembers("#{subject.model.to_s.downcase}:#{subject.name}:#{encode(value)}")
+        @redis.smembers("#{subject.model.to_s.downcase}:#{subject.name}:#{encode(value)}").map {|id| id.to_i}
       end
 
       ##

data/spec/textual_keys_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe DataMapper::Adapters::RedisAdapter do
+  before(:all) do
+    @adapter = DataMapper.setup(:default, {
+      :adapter  => "redis",
+      :db => 15
+    })
+  end
+
+  after(:all) do
+    Redis.new(:db => 15).flushdb
+  end
+
+  describe "textual keys" do
+    it "should return the key" do
+      class Foo
+        include DataMapper::Resource
+        property :hostname,   Text, :key => true
+        property :ip_address, Text
+      end
+      DataMapper.finalize
+
+      Foo.create(:hostname => "hostname1", :ip_address => '127.0.0.1')
+
+      Foo.first.hostname.should == "hostname1"
+    end
+  end
+end

metadata

@@ -1,90 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-redis-adapter
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dan Herrera
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 -08:00
+date: 2012-02-07 00:00:00.000000000 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70176713790760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70176713790760
+- !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70176713790280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70176713790280
+- !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70176713789800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70176713789800
+- !ruby/object:Gem::Dependency
   name: redis
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70176713789320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *70176713789320
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
-files: 
+files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
@@ -96,42 +74,37 @@ files:
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb
+- spec/textual_keys_spec.rb
 has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 82707661945259695
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper adapter for the Redis key-value database
-test_files: 
+test_files:
 - spec/dm_redis_associations_spec.rb
 - spec/dm_redis_finding_spec.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb
+- spec/textual_keys_spec.rb