dm-redis-adapter 0.5.0 → 0.5.1

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

@@ -183,10 +183,14 @@ module DataMapper
           value = operand.first.value
         elsif operand.subject.is_a?(DataMapper::Associations::ManyToOne::Relationship)
           subject = operand.subject.child_key.first
-          value = operand.value[operand.subject.parent_key.first.name]
+          value = if operand.is_a?(DataMapper::Query::Conditions::InclusionComparison)
+            operand.value.map{|v|v[operand.subject.parent_key.first.name]}
+          else
+            operand.value[operand.subject.parent_key.first.name]
+          end
         else
           subject = operand.subject
-          value =  operand.value
+          value = operand.value
         end
 
         if subject.is_a?(DataMapper::Associations::ManyToOne::Relationship)
@@ -200,12 +204,27 @@ module DataMapper
                 matched_records << {redis_key_for(query.model) => key}
               end
             end
+          elsif operand.is_a?(DataMapper::Query::Conditions::InclusionComparison)
+            value.each do |val|
+              if @redis.sismember(key_set_for(query.model), val)
+                matched_records << {redis_key_for(query.model) => val}
+              end
+            end
           elsif @redis.sismember(key_set_for(query.model), value)
             matched_records << {redis_key_for(query.model) => value}
           end
-        elsif subject.index
-          find_indexed_matches(subject, value).each do |k|
-            matched_records << {redis_key_for(query.model) => k.to_i, "#{subject.name}" => value}
+        elsif subject.respond_to?( :index ) && subject.index
+          if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
+          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}
+              end
+            end
+          else
+            find_indexed_matches(subject, value).each do |k|
+              matched_records << {redis_key_for(query.model) => k.to_i, "#{subject.name}" => value}
+            end
           end
         else # worst case, loop through each record and match
           @redis.smembers(key_set_for(query.model)).each do |key|

data/spec/dm_redis_finding_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe DataMapper::Adapters::RedisAdapter do
+  before(:all) do
+    @adapter = DataMapper.setup(:default, {
+      :adapter  => "redis",
+      :db => 15
+    })
+    @redis = Redis.new(:db => 15)
+  end
+
+  describe "finding records tests" do
+    before(:all) do
+      @redis.flushdb
+      class Page
+        include DataMapper::Resource
+
+        property :id,   Serial
+
+        has n, :children, 'Page', :child_key => :parent_id
+        belongs_to :parent, 'Page', :required => false
+      end
+      DataMapper.finalize
+
+      @a = Page.create
+      @b = Page.create :parent => @a
+      @c = Page.create :parent => @a
+      @d = Page.create :parent => @c
+    end
+
+    it 'should find Page.all :parent_id => @a.id' do
+      found = Page.all :parent_id => @a.id
+      found.should == [@b,@c]
+    end
+
+    it 'should find Page.all :id.not => @a.id' do
+      found = Page.all :id.not => @a.id
+      found.should == [@b,@c,@d]
+    end
+
+    # it fails
+    #it 'should find Page.all :parent_id.not => @a.id' do
+    #  found = Page.all :parent_id.not => @a.id
+    #  found.should == [@a,@d]
+    #end
+
+    it 'should find Page.all :parent => @a' do
+      found = Page.all :parent => @a
+      found.should == [@b,@c]
+    end
+
+    it 'should find Page.all :id => [@a.id]' do
+      found = Page.all :id => [@a.id]
+      found.should == [@a]
+    end
+
+    it 'should find Page.all :id => [@a.id, @c.id]' do
+      found = Page.all :id => [@a.id, @c.id]
+      found.should == [@a,@c]
+    end
+
+    it 'should find Page.all :parent_id => [@a.id, @c.id]' do
+      found = Page.all :parent_id => [@a.id, @c.id]
+      found.should == [@b,@c,@d]
+    end
+
+    it 'should find Page.all :parent => [@a,@c]' do
+      found = Page.all :parent => [@a,@c]
+      found.should == [@b,@c,@d]
+    end
+
+    # it fails
+    #it 'should be able to map Page.all.map{ |@a| @a.parent }' do
+    #  mapped = Page.all.map{ |a| a.parent }
+    #  mapped.should == [nil, @a, @a, @c]
+    #end
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Dan Herrera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 -08:00
+date: 2011-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/dm-redis-adapter/adapter.rb
 - lib/dm-redis-adapter/spec/setup.rb
 - 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
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2716290058136044164
+      hash: 82707661945259695
       segments: 
       - 0
       version: "0"
@@ -130,6 +131,7 @@ specification_version: 3
 summary: DataMapper adapter for the Redis key-value database
 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