dm-redis-adapter 0.2.3 → 0.3.0

data/README.textile

@@ -14,6 +14,7 @@ h1. Upgrading
 
 h1. Changelog
 
+* v0.3.0  Updates to support ruby 1.9.2 (thanks arbarlow!)
 * v0.2.1  Fixes to sorting
 * v0.1.1  Update to redis-rb v2.0.0
 * v0.1    Update to store records as redis hash values
@@ -25,7 +26,7 @@ Prerequisites:
 * Redis:
 ** <a href="http://code.google.com/p/redis/">Redis, v2.0.x RC series</a>
 * Gems:
-** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v1.0.0
+** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v1.0.2
 
 Install the dm-redis adapter:
 <pre>
@@ -97,4 +98,6 @@ h1. Badass contributors
 * <a href="http://github.com/aeden">Anthony Eden (aeden)</a> Gem cleanup, update to jeweler
 * <a href="http://github.com/sr">Simon Roset (sr)</a> Fixes for edge dm-core
 * <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/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
+

data/Rakefile

@@ -26,8 +26,8 @@ begin
     gemspec.homepage = HOMEPAGE
     gemspec.description = SUMMARY
     gemspec.authors = AUTHORS
-    gemspec.add_dependency "dm-core", ">= 1.0.0"
-    gemspec.add_dependency "dm-types", ">= 1.0.0"
+    gemspec.add_dependency "dm-core", ">= 1.0.2"
+    gemspec.add_dependency "dm-types", ">= 1.0.2"
     gemspec.add_dependency "redis", ">= 2.0.3"
     gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
     gemspec.has_rdoc = false

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

@@ -51,7 +51,8 @@ module DataMapper
             record[name] = [Integer, Date].include?(property.primitive) ? property.typecast( value ) : value
           end
         end
-        records = query.filter_records(records)
+        records = query.match_records(records)
+        records = query.sort_records(records)
         records
       end
 
@@ -87,10 +88,11 @@ module DataMapper
       #
       # @api semipublic
       def delete(collection)
-        records_for(collection.query).each do |record|
+        collection.count.times do |x|
+          record = collection[x]
           @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)])
-          collection.query.model.properties.select {|p| p.index}.each do |p|
+          record.model.properties.select {|p| p.index}.each do |p|
             @redis.srem("#{collection.query.model.to_s.downcase}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
           end
         end
@@ -111,7 +113,7 @@ module DataMapper
           attributes = resource.dirty_attributes
 
           resource.model.properties.select {|p| p.index}.each do |property|
-            @redis.sadd("#{resource.model.to_s.downcase}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key)
+            @redis.sadd("#{resource.model.to_s.downcase}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key.first.to_s)
           end
 
           properties_to_set = []
@@ -212,7 +214,7 @@ module DataMapper
       #   Array of id's of all members matching the query
       # @api private
       def find_matches(query, operand)
-        @redis.smembers("#{query.model.to_s.downcase}:#{operand.subject.name}:#{encode(operand.value)}")
+        @redis.smembers("#{query.model.to_s.downcase}:#{operand.subject.name}:#{encode(operand.value.to_s)}")
       end
 
       ##

data/spec/dm_redis_validations_spec.rb

@@ -32,7 +32,7 @@ describe DataMapper::Adapters::RedisAdapter do
 
         property :id,     Serial
         property :name,   String
-        property :env,    DataMapper::Property::Json, :default => lambda { {} }
+        property :env,    DataMapper::Property::Json, :default => {}
       end
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Dan Herrera
@@ -15,57 +14,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2011-03-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: dm-core
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
-  name: dm-core
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        - 2
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
-  name: dm-types
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+        - 2
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: redis
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 0
         - 3
         version: 2.0.3
-  name: redis
-  requirement: *id003
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -111,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -599772013771505698
       segments: 
       - 0
       version: "0"
@@ -120,7 +116,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"