dm-redis-adapter 0.5.3 → 0.6.0

data/README.textile

@@ -8,8 +8,13 @@ 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. Upgrading
+
+Please note that as of version 0.5.3 of the gem, the key names that are used for storage have changed and break compatibility with previous versions!
+
 h1. Changelog
 
+* v0.5.3  Support for inheritance via sfeu and ujifgc, this version *breaks compatibility* with previous versions of the gem
 * v0.4.0  Support for dm-core v1.1.0
 * v0.3.0  Updates to support ruby 1.9.2 (thanks arbarlow!)
 * v0.2.1  Fixes to sorting
@@ -21,9 +26,9 @@ h1. Install
 
 Prerequisites:
 * Redis:
-** <a href="http://code.google.com/p/redis/">Redis, v2.2 series</a>
+** <a href="http://code.google.com/p/redis/">Redis, >= v2.2 series</a>
 
-Install the dm-redis adapter:
+Install the dm-redis-adapter:
 <pre>
   <code>
     > gem install dm-redis-adapter
@@ -98,4 +103,5 @@ h1. Badass contributors
 * <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
 * <a href="http://github.com/jof">Jonathan Lassoff (jof)</a> Fixes to support textual keys
+* <a href="http://github.com/sfeu">Sebastian Feuerstack (sfeu)</a> Fixes to support inheritance
 

data/lib/dm-redis-adapter.rb

@@ -1 +1 @@
-require 'dm-redis-adapter/adapter'
+require 'dm-redis-adapter/adapter'

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

@@ -1,7 +1,6 @@
 require 'redis/connection/hiredis'
 require 'redis'
 require 'base64'
-require 'dm-core'
 
 module DataMapper
   module Adapters
@@ -92,12 +91,11 @@ module DataMapper
       #
       # @api semipublic
       def delete(collection)
-        storage_name = collection.query.model.storage_name
         collection.each do |record|
-          @redis.del("#{storage_name}:#{record[redis_key_for(collection.query.model)]}")
+          @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)])
           record.model.properties.select {|p| p.index}.each do |p|
-            @redis.srem("#{storage_name}:#{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
@@ -114,6 +112,7 @@ module DataMapper
       def update_attributes(resources)
         storage_name = resources.first.model.storage_name
         resources.each do |resource|
+
           model = resource.model
           attributes = resource.dirty_attributes
 
@@ -124,6 +123,7 @@ module DataMapper
           properties_to_set = []
           properties_to_del = []
 
+
           fields = model.properties(self.name).select {|property| attributes.key?(property)}
           fields.each do |property|
             value = attributes[property]
@@ -171,29 +171,14 @@ module DataMapper
         keys
       end
 
-      ##
-      # Find records that match have a matching value
-      #
-      # @param [DataMapper::Query] query
-      #   The query used to locate the resources to be deleted.
-      #
-      # @param [DataMapper::Operation] the operation for the query
-      #
-      # @api private
-      def perform_query(query, operand)
-        storage_name = query.model.storage_name
-
-        matched_records = []
-        #p 'query: ' + query.inspect
-        #p 'operand: ' + operand.inspect
-
+      def find_subject_and_value(query, operand)
         if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
           subject = operand.first.subject
           value = operand.first.value
         elsif operand.subject.is_a?(DataMapper::Associations::ManyToOne::Relationship)
           subject = operand.subject.child_key.first
           value = if operand.is_a?(DataMapper::Query::Conditions::InclusionComparison)
-            operand.value.map{|v|v[operand.subject.parent_key.first.name]}
+            operand.value.map{|v| v[operand.subject.parent_key.first.name]}
           else
             operand.value[operand.subject.parent_key.first.name]
           end
@@ -206,46 +191,76 @@ module DataMapper
           subject = subject.child_key.first
         end
 
-        #p 'subject: ' + subject.inspect
-        #p 'value: ' + value.inspect
+        return subject, value
+      end
+
+      ##
+      # Find records that match have a matching value
+      #
+      # @param [DataMapper::Query] query
+      #   The query used to locate the resources to be deleted.
+      #
+      # @param [DataMapper::Operation] the operation for the query
+      #
+      # @api private
+      def perform_query(query, operand)
+        storage_name = query.model.storage_name
+        matched_records = []
+        subject, value = find_subject_and_value(query, operand)
 
-        if query.model.key.include?(subject)
-          if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
-            @redis.smembers(key_set_for(query.model)).each do |key|
-              if operand.matches?(subject.typecast(key))
-                matched_records << {redis_key_for(query.model) => key}
+        case operand
+          when DataMapper::Query::Conditions::NotOperation
+            if query.model.key.include?(subject)
+              @redis.smembers(key_set_for(query.model)).each do |key|
+                if operand.matches?(subject.typecast(key))
+                  matched_records << {redis_key_for(query.model) => key}
+                end
               end
+            else
+              search_all_resources(query, operand, subject, matched_records)
             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}
+          when DataMapper::Query::Conditions::InclusionComparison
+            if query.model.key.include?(subject)
+              value.each do |val|
+                if @redis.sismember(key_set_for(query.model), val)
+                  matched_records << {redis_key_for(query.model) => val}
+                end
               end
-            end
-          elsif @redis.sismember(key_set_for(query.model), value)
-            matched_records << {redis_key_for(query.model) => value}
-          end
-        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, "#{subject.name}" => val}
+            elsif subject.respond_to?(:index) && subject.index
+              value.each do |val|
+                find_indexed_matches(subject, val).each do |k|
+                  matched_records << {redis_key_for(query.model) => k, "#{subject.name}" => val}
+                end
               end
+            else
+              search_all_resources(query, operand, subject, matched_records)
             end
-          else
-            find_indexed_matches(subject, value).each do |k|
-              matched_records << {redis_key_for(query.model) => k, "#{subject.name}" => value}
+          when DataMapper::Query::Conditions::EqualToComparison
+            if query.model.key.include?(subject)
+              if @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
             end
+          else # worst case here, loop through all members, typecast and match
+            search_all_resources(query, operand, subject, matched_records)
           end
-        else # worst case, loop through each record and match
-          @redis.smembers(key_set_for(query.model)).each do |key|
-            if operand.matches?(subject.typecast(@redis.hget("#{storage_name}:#{key}", subject.name)))
-              matched_records << {redis_key_for(query.model) => key}
-            end
+        matched_records
+      end
+
+      ##
+      # Searches through each key :(
+      #
+      # @api private
+      def search_all_resources(query, operand, subject, matched_records)
+        @redis.smembers(key_set_for(query.model)).each do |key|
+          if operand.matches?(subject.typecast(@redis.hget("#{subject.model.storage_name}:#{key}", subject.name)))
+            matched_records << {redis_key_for(query.model) => key}
           end
         end
-        matched_records
       end
 
       ##

data/spec/dm_redis_finding_spec.rb

@@ -38,11 +38,10 @@ describe DataMapper::Adapters::RedisAdapter do
       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_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

data/spec/self_referential_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe DataMapper::Adapters::RedisAdapter do
+  before(:all) do
+    @adapter = DataMapper.setup(:default, {
+      :adapter  => "redis",
+      :db => 15
+    })
+  end
+
+  after(:all) do
+    Redis.new(:db => 15).flushdb
+  end
+
+  describe "referential assosciations" do
+    it "should allow the assosciation to go both ways" do
+      class User
+        class Link
+          include DataMapper::Resource
+
+          # the person who is doing the following
+          belongs_to :follower, 'User', :key => true
+
+          # the person who is being followed
+          belongs_to :followed, 'User', :key => true
+        end
+
+        include DataMapper::Resource
+
+        property :id,                   Serial
+        property :full_name,            String,   :length => 255, :required => true
+        property :email,                String,   :length => 320, :required => true
+
+        has n, :links_to_followed_users, 'User::Link', :child_key => [:follower_id]
+        has n, :links_to_followers, 'User::Link', :child_key => [:followed_id]
+        has n, :followed_users, User, :through => :links_to_followed_users, :via => :followed
+        has n, :followers, User, :through => :links_to_followers, :via => :follower
+      end
+
+      DataMapper.finalize
+
+      user1 = User.create(:email => "joe@example.com", :full_name => "joe")
+      user2 = User.create(:email => "bob@example.com", :full_name => "bob")
+
+      user1.followed_users << user2
+      user1.save
+      #user2.links_to_followers.count.should == 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 -08:00
-default_executable: 
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70343134239820 !ruby/object:Gem::Requirement
+  requirement: &70281536321700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343134239820
+  version_requirements: *70281536321700
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &70343134210860 !ruby/object:Gem::Requirement
+  requirement: &70281536319260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343134210860
+  version_requirements: *70281536319260
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70343134209560 !ruby/object:Gem::Requirement
+  requirement: &70281536311280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343134209560
+  version_requirements: *70281536311280
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70343134205940 !ruby/object:Gem::Requirement
+  requirement: &70281536305900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70343134205940
+  version_requirements: *70281536305900
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -74,9 +73,9 @@ files:
 - spec/dm_redis_inheritenance_spec.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
+- spec/self_referential_spec.rb
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb
-has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
 post_install_message: 
@@ -92,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4147115164932724252
+      hash: 3387811137579107358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: DataMapper adapter for the Redis key-value database
@@ -111,5 +110,6 @@ test_files:
 - spec/dm_redis_inheritenance_spec.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
+- spec/self_referential_spec.rb
 - spec/spec_helper.rb
 - spec/textual_keys_spec.rb