dm-redis-adapter 0.0.10 → 0.0.11

data/README.textile

@@ -8,11 +8,15 @@ Redis is a very fast key-value store with some interesting data structures added
 
 Marrying DataMapper to Redis allows for schema-less models, you can add fields at any time without having to create a migration.  DataMapper also allows us to store non-native Redis types in the db, like Date fields.
 
+h1. Changelog
+
+* v0.0.11 Updates to support newer versions of the redis client, support for JSON datatypes
+
 h1. Install
 
 Prerequisites:
 * Redis:
-** <a href="http://code.google.com/p/redis/">Redis, v1.2.1</a>
+** <a href="http://code.google.com/p/redis/">Redis, v1.3.8</a>
 * Gems:
 ** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v0.10.2
 
@@ -85,4 +89,5 @@ 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/">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps 
+* <a href="http://github.com/cehoffman">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps 
+* <a href="http://github.com/bpo">brian p o'rourke (bpo)</a> Updates for newer versions of redis client and DM JSON type support

data/Rakefile

@@ -26,8 +26,9 @@ begin
     gemspec.homepage = HOMEPAGE
     gemspec.description = SUMMARY
     gemspec.authors = AUTHORS
-    gemspec.add_dependency "dm-core", "0.10.0"
-    gemspec.add_dependency "ezmobius-redis"
+    gemspec.add_dependency "dm-core", ">= 0.10.2"
+    gemspec.add_dependency "dm-types", ">= 0.10.2"
+    gemspec.add_dependency "redis"
     gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
     gemspec.has_rdoc = true
     gemspec.extra_rdoc_files = ["MIT-LICENSE"]
@@ -43,4 +44,4 @@ desc "Run specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = %w(-fs --color)
-end
+end

data/lib/dm_redis.rb

@@ -17,7 +17,7 @@ module DataMapper
       def create(resources)
         resources.each do |resource|
           initialize_serial(resource, @redis.incr("#{resource.model.to_s.downcase}:#{redis_key_for(resource.model)}:serial"))
-          @redis.set_add(key_set_for(resource.model), resource.key.join)
+          @redis.sadd(key_set_for(resource.model), resource.key.join)
         end
         update_attributes(resources)
       end
@@ -38,10 +38,18 @@ module DataMapper
         records = records_for(query).each do |record|
           query.fields.each do |property|
             next if query.model.key.include?(property)
-            record[property.name.to_s] = property.typecast(@redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"])
+
+            # Integers are stored as Strings in Redis. If there's a
+            # string coming out that should be an integer, convert it
+            # now. All other typecasting is handled by datamapper
+            # separately.
+            if property.primitive == Integer
+              record[property.name.to_s] = property.typecast(@redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"])
+            else
+              record[property.name.to_s] = @redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"]
+            end
           end
         end
-
         records = query.match_records(records)
         records = query.sort_records(records)
         records
@@ -81,11 +89,11 @@ module DataMapper
       def delete(collection)
         records_for(collection.query).each do |record|
           collection.query.model.properties.each do |p|
-            @redis.delete("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}:#{p.name}")
+            @redis.del("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}:#{p.name}")
           end
-          @redis.set_delete(key_set_for(collection.query.model), 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|
-            @redis.set_delete("#{collection.query.model.to_s.downcase}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
+            @redis.srem("#{collection.query.model.to_s.downcase}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
           end
         end
       end
@@ -101,13 +109,17 @@ module DataMapper
       # @api private
       def update_attributes(resources)
         resources.each do |resource|
+          model = resource.model
+          attributes = resource.dirty_attributes
+
           resource.model.properties.select {|p| p.index}.each do |property|
-            @redis.set_add("#{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)
           end
 
-          resource.attributes(:field).each do |property, value|
-            next if resource.key.include?(property)
-            @redis["#{resource.model.to_s.downcase}:#{resource.key.join}:#{property}"] = value unless value.nil?
+          model.properties(self.name).each do |property|
+            next unless attributes.key?(property)
+            value = attributes[property]
+            @redis["#{resource.model.to_s.downcase}:#{resource.key.join}:#{property.name}"] = value unless value.nil?
           end
         end
       end
@@ -127,7 +139,7 @@ module DataMapper
 
         query.conditions.operands.select {|o| o.is_a?(DataMapper::Query::Conditions::EqualToComparison)}.each do |o|
           if query.model.key.include?(o.subject)
-            if @redis.set_member?(key_set_for(query.model), o.value)
+            if @redis.sismember(key_set_for(query.model), o.value)
               keys << {"#{redis_key_for(query.model)}" => o.value}
             end
           end
@@ -144,7 +156,7 @@ module DataMapper
 
         # Keys are empty, fall back and load all the values for this model
         if keys.empty?
-          @redis.set_members(key_set_for(query.model)).each do |val|
+          @redis.smembers(key_set_for(query.model)).each do |val|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end
         end
@@ -183,7 +195,7 @@ module DataMapper
       #   Array of id's of all members matching the query
       # @api private
       def find_matches(query, operand)
-        @redis.set_members("#{query.model.to_s.downcase}:#{operand.subject.name}:#{encode(operand.value)}")
+        @redis.smembers("#{query.model.to_s.downcase}:#{operand.subject.name}:#{encode(operand.value)}")
       end
 
       ##

data/spec/dm_redis_spec.rb

@@ -13,7 +13,7 @@ describe DataMapper::Adapters::RedisAdapter do
 
   after(:all) do
     redis = Redis.new(:db => 15)
-    redis.flush_db
+    redis.flushdb
   end
 
   it_should_behave_like 'An Adapter'

data/spec/dm_redis_validations_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path("../spec_helper", __FILE__)
+require 'redis'
+require 'rubygems'
+require 'dm-validations'
+require 'dm-types'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis.rb'))
+
+describe DataMapper::Adapters::RedisAdapter do
+  before(:all) do
+    @adapter = DataMapper.setup(:default, {
+      :adapter  => "redis",
+      :db => 15
+    })
+  end
+
+  it "should validate unique entries that are indexed" do
+    class Crumblecake
+      include DataMapper::Resource
+      validates_is_unique :flavor
+
+      property :id,      Serial
+      property :flavor,  String, :index => true
+    end
+    
+    Crumblecake.create(:flavor => "snozzbler")
+    Crumblecake.new(:flavor => "snozzbler").valid?.should be_false
+  end
+
+  describe "json support" do
+    before(:all) do
+      class Host
+        include DataMapper::Resource
+
+        property :id,     Serial
+        property :name,   String
+        property :env,    DataMapper::Types::Json, :default => lambda { {} }
+      end
+    end
+
+    it "should be able to store json blocks" do
+      h = Host.create( :name => "new_vm", :env => {"foo" => "bar"} )
+
+      h.reload
+      h.env["foo"].should == "bar"
+    end
+
+    it "should be able to update json blocks" do
+      h = Host.create( :name => "new_vm" )
+      h.env = h.env.merge "baz" => "bof"
+      h.save
+      h.reload.env["baz"].should == "bof"
+    end
+  end
+
+  after(:all) do
+    redis = Redis.new(:db => 15)
+    redis.flushdb
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Dan Herrera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -08:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: dm-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,9 +40,23 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -57,6 +71,7 @@ files:
 - Rakefile
 - lib/dm_redis.rb
 - spec/dm_redis_spec.rb
+- spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
@@ -86,8 +101,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper adapter for the Redis key-value database
 test_files: 
 - spec/dm_redis_spec.rb
+- spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb