dm-redis-adapter 0.0.7 → 0.0.8

data/README.textile

@@ -48,6 +48,39 @@ Setup your adapter, define your models and properties:
 
 Now you can use redis in a ORM style, and take advantage of all of the amazing things that DataMapper offers.
 
+If you want to do finds on specific String fields, add an index:
+
+<pre>
+  <code>
+    class Coffee
+      include DataMapper::Resource
+      
+      property :id,            Serial
+      property :description,   String, :index => true
+    end
+    
+    Coffee.create(:description => "Notes of crude oil and sulphur")
+    Coffee.first(:description => "Notes of crude oil and sulphur") # will now work
+  </code>
+</pre>
+
+Validations on unique fields are now supported through indices and dm-validations:
+
+<pre>
+  <code>
+    class Crumblecake
+      include DataMapper::Resource
+      validates_is_unique :flavor
+
+      property :id,      Serial
+      property :flavor,  String, :index => true
+    end
+    
+    Crumblecake.create(:flavor => "snozzbler")
+    Crumblecake.new(:flavor => "snozzbler").valid? # false (of course!  Who ever heard of a snozzbler crumblecake?)
+  </code>
+</pre>
+
 h1. Badass contributors
 
 * <a href="http://github.com/aeden">Anthony Eden (aeden)</a> Gem cleanup, update to jeweler

data/lib/dm_redis.rb

@@ -1,9 +1,8 @@
 require 'redis'
+require "base64"
 
 module DataMapper
   module Adapters
-    Extlib::Inflection.word 'redis'
-
     class RedisAdapter < AbstractAdapter
       ##
       # Used by DataMapper to put records into the redis data-store: "INSERT" in SQL-speak.
@@ -18,9 +17,8 @@ module DataMapper
       def create(resources)
         resources.each do |resource|
           initialize_serial(resource, @redis.incr("#{resource.model.to_s.downcase}:#{redis_key_for(resource.model)}:serial"))
-          @redis.set_add("#{resource.model.to_s.downcase}:#{redis_key_for(resource.model)}:all", resource.key)
+          @redis.set_add(key_set_for(resource.model), resource.key)
         end
-
         update_attributes(resources)
       end
 
@@ -63,9 +61,9 @@ module DataMapper
       # @api semipublic
       def update(attributes, collection)
         attributes = attributes_as_fields(attributes)
-
+        
         records_to_update = records_for(collection.query)
-        records_to_update.each { |r| r.update(attributes) }
+        records_to_update.each {|r| r.update(attributes)}
         update_attributes(collection)
       end
 
@@ -81,14 +79,17 @@ module DataMapper
       #
       # @api semipublic
       def delete(collection)
-        collection.query.filter_records(records_for(collection.query)).each do |record|
+        records_for(collection.query).each do |record|
           collection.query.model.properties.each do |p|
             @redis.delete("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}:#{p.name}")
           end
-          @redis.set_delete("#{collection.query.model.to_s.downcase}:#{redis_key_for(collection.query.model)}:all", record[redis_key_for(collection.query.model)])
+          @redis.set_delete(key_set_for(collection.query.model), record[redis_key_for(collection.query.model)])
+          collection.query.model.properties.select {|p| p.index}.each do |p|
+            @redis.set_delete("#{collection.query.model.to_s.downcase}:#{p.name}:#{encode(record[p.name])}", record[redis_key_for(collection.query.model)])
+          end
         end
       end
-
+      
       private
 
       ##
@@ -97,9 +98,8 @@ module DataMapper
       # @param [DataMapper::Model] model
       #   The query used to locate the resources to be deleted.
       #
-      # @return [Array]
-      #   An Array of Hashes containing the key-value pairs for
-      #   each record
+      # @return [String]
+      #   A string representation of the string key for this model
       #
       # @api private
       def redis_key_for(model)
@@ -107,15 +107,19 @@ module DataMapper
       end
 
       ##
-      # Saves each key value pair to the redis data store
+      # Saves each resource to the redis data store
       #
-      # @param [Array] resources
-      #   An array of resources to save
+      # @param [Array] Resources
+      #   An array of resource to save
       #
       # @api private
       def update_attributes(resources)
         resources.each do |resource|
-          resource.attributes.each do |property, value|
+          resource.model.properties.select {|p| p.index}.each do |property|
+            @redis.set_add("#{resource.model.to_s.downcase}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key)
+          end
+          
+          resource.attributes(:field).each do |property, value|
             next if resource.key.include?(property)
             @redis["#{resource.model.to_s.downcase}:#{resource.key}:#{property}"] = value unless value.nil?
           end
@@ -134,21 +138,30 @@ module DataMapper
       # @api private
       def records_for(query)
         keys = []
-        query.conditions.operands.select {|o| o.is_a?(DataMapper::Query::Conditions::EqualToComparison) && query.model.key.include?(o.subject)}.each do |o|
-          if @redis.set_member?("#{query.model.to_s.downcase}:#{redis_key_for(query.model)}:all", o.value)
-            keys << {"#{redis_key_for(query.model)}" => o.value}
+        
+        query.conditions.operands.select {|o| o.is_a?(DataMapper::Query::Conditions::EqualToComparison)}.each do |o|
+          if query.model.key.include?(o.subject)
+            if @redis.set_member?(key_set_for(query.model), o.value)
+              keys << {"#{redis_key_for(query.model)}" => o.value}
+            end
+            return keys
           end
+          find_matches(query, o).each do |k|
+            keys << {"#{redis_key_for(query.model)}" => k, "#{o.subject.name}" => o.value}
+          end
+          return keys
         end
 
         if query.limit
-          @redis.sort("#{query.model.to_s.downcase}:#{redis_key_for(query.model)}:all", :limit => [query.offset, query.limit]).each do |val|
+          @redis.sort(key_set_for(query.model), :limit => [query.offset, query.limit]).each do |val|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end
+          return keys
         end
 
         # Keys are empty, fall back and load all the values for this model
         if keys.empty?
-          @redis.set_members("#{query.model.to_s.downcase}:#{redis_key_for(query.model)}:all").each do |val|
+          @redis.set_members(key_set_for(query.model)).each do |val|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end
         end
@@ -156,6 +169,36 @@ module DataMapper
         keys
       end
 
+      ##
+      # Return the key string for the set that contains all keys for a particular resource
+      # 
+      # @return String
+      #   The string key for the :all set
+      # @api private
+      def key_set_for(model)
+        "#{model.to_s.downcase}:#{redis_key_for(model)}:all"
+      end
+
+      ##
+      # Find a matching entry for a query
+      # 
+      # @return [Array]
+      #   Array of id's of all members matching the query
+      # @api private
+      def find_matches(query, operand)
+        @redis.set_members("#{query.model.to_s.downcase}:#{operand.subject.name}:#{encode(operand.value)}")
+      end
+
+      ##
+      # Base64 encode a value as a string key for an index
+      # 
+      # @return String
+      #   Base64 representation of a value
+      # @api private
+      def encode(value)
+        Base64.encode64(value.to_s).gsub("\n", "")
+      end
+      
       ##
       # Make a new instance of the adapter. The @redis ivar is the 'data-store'
       # for this adapter.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Dan Herrera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency