dm-redis-adapter 0.7.0 → 0.8.0

data/Gemfile

@@ -7,7 +7,7 @@ gem "redis", ">= 2.2"
 gem "jeweler", ">= 1.4.0"
 gem "rspec", "~> 1.3.0"
 gem "rake", ">= 0.8.7"
-gem "hiredis", "~> 0.3.0"
+gem "hiredis", "~> 0.4.0"
 gem "ruby-debug19"
 # gem "data_objects", ">= 0.10.1"
 # gem "do_postgres", ">= 0.10.1"

data/Rakefile

@@ -28,7 +28,7 @@ begin
     gemspec.authors = AUTHORS
     gemspec.add_dependency "dm-core", ">= 1.2.0"
     gemspec.add_dependency "dm-types", ">= 1.2.0"
-    gemspec.add_dependency "hiredis", "~> 0.3.0"
+    gemspec.add_dependency "hiredis", "~> 0.4.0"
     gemspec.add_dependency "redis", "~> 2.2"
     gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
     gemspec.has_rdoc = false

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

@@ -43,7 +43,7 @@ module DataMapper
           record_data = @redis.hgetall("#{storage_name}:#{record[redis_key_for(query.model)]}")
 
           query.fields.each do |property|
-            next if query.model.key.include?(property)
+            next if query.model.key.include?(property) and query.model.key.size == 1
 
             name = property.name.to_s
             value = record_data[name]
@@ -140,6 +140,27 @@ module DataMapper
         end
       end
 
+      def is_composed_key_based_query?(query)
+        fields_length = query.model.key.size
+        is_key = query.condition_properties.select { |field| field.key? }
+        (fields_length >1 and fields_length == is_key.length)
+      end
+
+      def key_query(query)
+        matched_records = []
+        value =""
+        storage_name = query.model.storage_name
+        query.conditions.operands.each do |operand|
+          value += operand.value  if operand.subject.key?
+        end
+
+        if @redis.sismember(key_set_for(query.model), value)
+          #matched_records <<  @redis.hgetall("#{storage_name}:#{value}")
+          matched_records << {redis_key_for(query.model) => value}
+        end
+        matched_records
+      end
+
       ##
       # Retrieves records for a particular model.
       #
@@ -158,6 +179,8 @@ module DataMapper
             key = key.to_i if key =~ /^\d+$/
             keys << {redis_key_for(query.model) => key}
           end
+        elsif is_composed_key_based_query?(query)
+          keys = key_query(query)
         else
           query.conditions.operands.each do |operand|
             if operand.is_a?(DataMapper::Query::Conditions::OrOperation)
@@ -237,20 +260,19 @@ module DataMapper
               search_all_resources(query, operand, subject, matched_records)
             end
           when DataMapper::Query::Conditions::EqualToComparison
-            if query.model.key.include?(subject)
-              if @redis.sismember(key_set_for(query.model), value)
+            if query.model.key.include?(subject) and @redis.sismember(key_set_for(query.model), value)
                 matched_records << {redis_key_for(query.model) => value}
-              end
+
             elsif subject.respond_to?(:index) && subject.index
               find_indexed_matches(subject, value).each do |k|
                 matched_records << {redis_key_for(query.model) => k, "#{subject.name}" => value}
               end
-            else # worst case here, loop through all members, typecast and match
+            else
               search_all_resources(query, operand, subject, matched_records)
             end
           else # worst case here, loop through all members, typecast and match
             search_all_resources(query, operand, subject, matched_records)
-          end
+        end
         matched_records
       end
 

data/spec/textual_keys_spec.rb

@@ -3,28 +3,54 @@ require 'spec_helper'
 describe DataMapper::Adapters::RedisAdapter do
   before(:all) do
     @adapter = DataMapper.setup(:default, {
-      :adapter  => "redis",
-      :db => 15
+        :adapter  => "redis",
+        :db => 15
     })
+
+    class Foo_1
+            include DataMapper::Resource
+            property :hostname,   Text, :key => true
+            property :ip_address, Text
+    end
+    class Foo
+          include DataMapper::Resource
+          property :key1,   String, :key => true
+          property :key2, String, :key => true
+        end
+          DataMapper.finalize
+
   end
 
-  after(:all) do
+  after(:each) 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"
+      Foo_1.create(:hostname => "hostname1", :ip_address => '127.0.0.1')
+
+      Foo_1.first.hostname.should == "hostname1"
+
+      Foo_1.first(:hostname => "hostname1").ip_address.should == "127.0.0.1"
+    end
+
+    it "should find elements with two natural keys by querying with only one key" do
+
+
+
+      Foo.create(:key1 => "value1", :key2 => 'value2')
+      Foo.first(:key1 => "value1").key2.should == 'value2'
     end
+
+    it "should support direct key-based query with get using two natural keys" do
+
+
+      Foo.create(:key1 => "value1", :key2 => 'value2')
+      Foo.get("value1","value2").key2.should == 'value2'
+    end
+
   end
   
   describe "textual keys" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70229511188280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229511188280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &70229511202200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229511202200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70229511201220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229511201220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70229511199040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70229511199040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables:
@@ -86,24 +106,15 @@ files:
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb
 - Gemfile
-- !binary |-
-  YmluL2F1dG9zcGVj
-- !binary |-
-  YmluL2VkaXRfanNvbi5yYg==
-- !binary |-
-  YmluL2pld2VsZXI=
-- !binary |-
-  YmluL21pbml0YXI=
-- !binary |-
-  YmluL3ByZXR0aWZ5X2pzb24ucmI=
-- !binary |-
-  YmluL3Jha2U=
-- !binary |-
-  YmluL3JkZWJ1Zw==
-- !binary |-
-  YmluL3J1Ynlmb3JnZQ==
-- !binary |-
-  YmluL3NwZWM=
+- bin/autospec
+- bin/edit_json.rb
+- bin/jeweler
+- bin/minitar
+- bin/prettify_json.rb
+- bin/rake
+- bin/rdebug
+- bin/rubyforge
+- bin/spec
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
 post_install_message: 
@@ -117,9 +128,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 141054625361991744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: DataMapper adapter for the Redis key-value database
@@ -141,3 +149,4 @@ test_files:
 - spec/self_referential_spec.rb
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb
+has_rdoc: