dm-redis-adapter 0.5.2 → 0.5.3

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

@@ -1,6 +1,7 @@
 require 'redis/connection/hiredis'
 require 'redis'
 require 'base64'
+require 'dm-core'
 
 module DataMapper
   module Adapters
@@ -16,8 +17,9 @@ module DataMapper
       #
       # @api semipublic
       def create(resources)
+        storage_name = resources.first.model.storage_name
         resources.each do |resource|
-          initialize_serial(resource, @redis.incr("#{resource.model.to_s.downcase}:#{redis_key_for(resource.model)}:serial"))
+          initialize_serial(resource, @redis.incr("#{storage_name}:#{redis_key_for(resource.model)}:serial"))
           @redis.sadd(key_set_for(resource.model), resource.key.join)
         end
         update_attributes(resources)
@@ -36,9 +38,10 @@ module DataMapper
       #
       # @api semipublic
       def read(query)
+        storage_name = query.model.storage_name
         records = records_for(query)
         records.each do |record|
-          record_data = @redis.hgetall("#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}")
+          record_data = @redis.hgetall("#{storage_name}:#{record[redis_key_for(query.model)]}")
 
           query.fields.each do |property|
             next if query.model.key.include?(property)
@@ -89,11 +92,12 @@ module DataMapper
       #
       # @api semipublic
       def delete(collection)
+        storage_name = collection.query.model.storage_name
         collection.each do |record|
-          @redis.del("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}")
+          @redis.del("#{storage_name}:#{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("#{collection.query.model.to_s.downcase}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
+            @redis.srem("#{storage_name}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
           end
         end
       end
@@ -108,12 +112,13 @@ module DataMapper
       #
       # @api private
       def update_attributes(resources)
+        storage_name = resources.first.model.storage_name
         resources.each do |resource|
           model = resource.model
           attributes = resource.dirty_attributes
 
           resource.model.properties.select {|p| p.index}.each do |property|
-            @redis.sadd("#{resource.model.to_s.downcase}:#{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.first.to_s)
           end
 
           properties_to_set = []
@@ -129,7 +134,7 @@ module DataMapper
             end
           end
 
-          hash_key = "#{resource.model.to_s.downcase}:#{resource.key.join}"
+          hash_key = "#{storage_name}:#{resource.key.join}"
           properties_to_del.each {|prop| @redis.hdel(hash_key, prop) }
           @redis.hmset(hash_key, *properties_to_set) unless properties_to_set.empty?
         end
@@ -176,7 +181,11 @@ module DataMapper
       #
       # @api private
       def perform_query(query, operand)
+        storage_name = query.model.storage_name
+
         matched_records = []
+        #p 'query: ' + query.inspect
+        #p 'operand: ' + operand.inspect
 
         if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
           subject = operand.first.subject
@@ -197,6 +206,9 @@ module DataMapper
           subject = subject.child_key.first
         end
 
+        #p 'subject: ' + subject.inspect
+        #p 'value: ' + value.inspect
+
         if query.model.key.include?(subject)
           if operand.is_a?(DataMapper::Query::Conditions::NotOperation)
             @redis.smembers(key_set_for(query.model)).each do |key|
@@ -228,7 +240,7 @@ module DataMapper
           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("#{query.model.to_s.downcase}:#{key}", subject.name)))
+            if operand.matches?(subject.typecast(@redis.hget("#{storage_name}:#{key}", subject.name)))
               matched_records << {redis_key_for(query.model) => key}
             end
           end
@@ -257,7 +269,7 @@ module DataMapper
       #   The string key for the :all set
       # @api private
       def key_set_for(model)
-        "#{model.to_s.downcase}:#{redis_key_for(model)}:all"
+        "#{model.storage_name}:#{redis_key_for(model)}:all"
       end
 
       ##
@@ -267,7 +279,7 @@ module DataMapper
       #   Array of id's of all members for an indexed field
       # @api private
       def find_indexed_matches(subject, value)
-        @redis.smembers("#{subject.model.to_s.downcase}:#{subject.name}:#{encode(value)}").map {|id| id.to_i}
+        @redis.smembers("#{subject.model.storage_name}:#{subject.name}:#{encode(value)}").map {|id| id.to_i}
       end
 
       ##

data/spec/dm_redis_associations_spec.rb

@@ -6,6 +6,8 @@ describe DataMapper::Adapters::RedisAdapter do
       :adapter  => "redis",
       :db => 15
     })
+     @redis = Redis.new(:db => 15)
+    @redis.flushdb
   end
 
   it "should allow has n :through" do

data/spec/dm_redis_inheritenance_spec.rb

@@ -0,0 +1,71 @@
+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
+  describe 'Inheritance' do
+
+    before :all do
+      module MINT
+      class Person
+        include DataMapper::Resource
+
+        property :name, String
+        property :job,  String,        :length => 1..255
+        property :classtype, Discriminator
+        property :id, Serial
+      end
+
+      class Male   < Person; end
+      class Father < Male;   end
+      class Son    < Male;   end
+
+      class Woman    < Person; end
+      class Mother   < Woman;  end
+      class Daughter < Woman;  end
+      end
+      DataMapper.finalize
+
+    end
+
+    it 'should select all women, mothers, and daughters based on Woman query' do
+
+       w = MINT::Woman.create(:name => "woman")
+      m = MINT::Mother.create(:name => "mother")
+      d = MINT::Daughter.create(:name => "daughter")
+
+      r = MINT::Woman.all
+      r.to_set.should == [w,m,d].to_set
+      r.size.should == [w,m,d].size
+    end
+
+    it 'should select all women, mothers, and daughters based on Person query' do
+      w = MINT::Woman.create(:name => "woman")
+      m = MINT::Mother.create(:name => "mother")
+      d = MINT::Daughter.create(:name => "daughter")
+      p = MINT::Person.all
+      p.to_set.should == [w,m,d].to_set
+      p.size.should == [w,m,d].size
+    end
+
+    it 'should select all mothers' do
+      w = MINT::Woman.create(:name => "woman")
+      m = MINT::Mother.create(:name => "mother")
+      d = MINT::Daughter.create(:name => "daughter")
+
+      mo = MINT::Mother.all
+      mo.to_set.should == [m].to_set
+      mo.size.should == [m].size
+    end
+
+  end
+  after(:each) do
+    @redis.flushdb
+  end
+end

data/spec/dm_redis_spec.rb

@@ -26,17 +26,17 @@ describe DataMapper::Adapters::RedisAdapter do
 
     it "should save the id of the resource in a set" do
       h = Hooloovoo.create
-      @redis.smembers("hooloovoo:id:all").should == [h.id.to_s]
+      @redis.smembers("hooloovoos:id:all").should == [h.id.to_s]
     end
 
     it "should save indexed fields in a set by Base64 encoding the value" do
       h = Hooloovoo.create(:shade => '336699')
-      @redis.smembers("hooloovoo:shade:MzM2Njk5").should == [h.id.to_s]
+      @redis.smembers("hooloovoos:shade:MzM2Njk5").should == [h.id.to_s]
     end
 
     it "should create a hash of properties for the resource" do
       h = Hooloovoo.create(:iq => '4069')
-      @redis.hmget("hooloovoo:#{h.id}", 'iq').should == ['4069']
+      @redis.hmget("hooloovoos:#{h.id}", 'iq').should == ['4069']
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 -08:00
+date: 2012-02-08 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70176713790760 !ruby/object:Gem::Requirement
+  requirement: &70343134239820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70176713790760
+  version_requirements: *70343134239820
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &70176713790280 !ruby/object:Gem::Requirement
+  requirement: &70343134210860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70176713790280
+  version_requirements: *70343134210860
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70176713789800 !ruby/object:Gem::Requirement
+  requirement: &70343134209560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70176713789800
+  version_requirements: *70343134209560
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70176713789320 !ruby/object:Gem::Requirement
+  requirement: &70343134205940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70176713789320
+  version_requirements: *70343134205940
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -71,6 +71,7 @@ files:
 - lib/dm-redis-adapter/spec/setup.rb
 - spec/dm_redis_associations_spec.rb
 - spec/dm_redis_finding_spec.rb
+- spec/dm_redis_inheritenance_spec.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb
@@ -89,6 +90,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4147115164932724252
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,6 +108,7 @@ 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_inheritenance_spec.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb