dm-redis-adapter 0.8.4 → 0.9.0

data/README.textile

@@ -14,6 +14,7 @@ Please note that as of version 0.5.3 of the gem, the key names that are used for
 
 h1. Changelog
 
+* v0.9.0  Fixes for composite keys being indexed (thanks @fringley)
 * v0.8.4  Fixes for composite keys (thanks @krider2010)
 * v0.8.2  Updates to RedisAdapter#initialize to support URI. (thanks @thentenaar)
 * v0.8.1  Dependency updates by @jof to support newer versions of the redis gem.

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

@@ -117,7 +117,7 @@ module DataMapper
           attributes = resource.dirty_attributes
 
           resource.model.properties.select {|p| p.index}.each do |property|
-            @redis.sadd("#{storage_name}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key.first.to_s)
+            @redis.sadd("#{storage_name}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key.join.to_s)
           end
 
           properties_to_set = []
@@ -147,7 +147,7 @@ module DataMapper
 
       def key_query(query)
         matched_records = []
-        value =""
+        value = ""
         storage_name = query.model.storage_name
         query.conditions.operands.each do |operand|
           value += operand.value.to_s if operand.subject.key?
@@ -221,7 +221,7 @@ module DataMapper
       # Find records that match have a matching value
       #
       # @param [DataMapper::Query] query
-      #   The query used to locate the resources to be deleted.
+      #   The query used to locate the resources to be matched.
       #
       # @param [DataMapper::Operation] the operation for the query
       #

data/spec/composite_keys_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe DataMapper::Adapters::RedisAdapter do
+  before(:all) do
+    @adapter = DataMapper.setup(:default, {
+      :adapter  => "redis",
+      :db => 15
+    })
+    @repository = DataMapper.repository(@adapter.name)
+    @redis = Redis.new(:db => 15)
+  end
+
+  after(:each) do
+    @redis.flushdb
+  end
+
+  # A copy of the encode function from adapater as it is private
+  def encode(value)
+    Base64.encode64(value.to_s).gsub("\n", "")
+  end
+
+  describe "composite keys" do
+    before(:all) do
+      class CompositeFun
+        include DataMapper::Resource
+
+        property :other_id,   Integer, :key => true, :required => true, :index => true
+        property :id,         Serial, :key => true
+        property :stuff,      String
+        
+        DataMapper.finalize
+      end
+    end
+
+    it "should be able to create and update an item with a composite key" do
+      c = CompositeFun.new(:other_id => 1)
+      c.save
+      c.update(:stuff => "Random String")  # Without the fix in adapter#key_query this throws an exception
+    end
+    
+    it "should save the composite id of the resource in the :all and indexed sets" do
+      c = CompositeFun.new(:other_id => 1)
+      c.save
+
+      @redis.hgetall("composite_funs:#{c.other_id}#{c.id}").should == {"other_id" => "#{c.id}"}
+      @redis.smembers("composite_funs:other_id:id:all").should == ["#{c.other_id}#{c.id}"]
+
+      # checks that the member set for the other_id index contains the composite key
+      encoded_other_id = encode(c.other_id)
+      @redis.smembers("composite_funs:other_id:#{encoded_other_id}").should == ["#{c.other_id}#{c.id}"]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -216,6 +216,7 @@ files:
 - lib/dm-redis-adapter.rb
 - lib/dm-redis-adapter/adapter.rb
 - lib/dm-redis-adapter/spec/setup.rb
+- spec/composite_keys_spec.rb
 - spec/dm_redis_associations_spec.rb
 - spec/dm_redis_finding_spec.rb
 - spec/dm_redis_inheritenance_spec.rb