dm-redis-adapter 0.0.9 → 0.0.10

data/README.textile

@@ -32,16 +32,16 @@ Setup your adapter, define your models and properties:
     require 'rubygems'
     require 'dm-core'
     require 'dm_redis'
-    
+
     DataMapper.setup(:default, {:adapter  => "redis"})
-    
+
     class Cafe
       include DataMapper::Resource
-      
+
       property :id,     Serial
       property :name,   Text
     end
-    
+
     Cafe.create(:name => "Whoahbot's Caffienitorium")
   </code>
 </pre>
@@ -54,11 +54,11 @@ If you want to do finds on specific String fields, add an index:
   <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>
@@ -75,7 +75,7 @@ Validations on unique fields are now supported through indices and dm-validation
       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>
@@ -84,4 +84,5 @@ Validations on unique fields are now supported through indices and dm-validation
 h1. Badass contributors
 
 * <a href="http://github.com/aeden">Anthony Eden (aeden)</a> Gem cleanup, update to jeweler
-* <a href="http://github.com/sr">Simon Roset (sr)</a> Fixes for edge dm-core
+* <a href="http://github.com/sr">Simon Roset (sr)</a> Fixes for edge dm-core
+* <a href="http://github.com/">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps 

data/Rakefile

@@ -1,4 +1,13 @@
-require 'rubygems'
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 require 'spec/rake/spectask'
 
 GEM = 'dm-redis-adapter'

data/lib/dm_redis.rb

@@ -17,7 +17,7 @@ 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(key_set_for(resource.model), resource.key)
+          @redis.set_add(key_set_for(resource.model), resource.key.join)
         end
         update_attributes(resources)
       end
@@ -61,7 +61,7 @@ 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)}
         update_attributes(collection)
@@ -89,7 +89,7 @@ module DataMapper
           end
         end
       end
-      
+
       private
 
       ##
@@ -104,10 +104,10 @@ module DataMapper
           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?
+            @redis["#{resource.model.to_s.downcase}:#{resource.key.join}:#{property}"] = value unless value.nil?
           end
         end
       end
@@ -124,7 +124,7 @@ module DataMapper
       # @api private
       def records_for(query)
         keys = []
-        
+
         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)
@@ -151,7 +151,7 @@ module DataMapper
 
         keys
       end
-      
+
       ##
       # Creates a string representation for the keys in a given model
       #
@@ -168,7 +168,7 @@ module DataMapper
 
       ##
       # 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
@@ -178,7 +178,7 @@ module DataMapper
 
       ##
       # Find a matching entry for a query
-      # 
+      #
       # @return [Array]
       #   Array of id's of all members matching the query
       # @api private
@@ -188,14 +188,14 @@ module DataMapper
 
       ##
       # 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.

data/spec/dm_redis_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("../spec_helper", __FILE__)
 require 'redis'
 
 require 'dm-core/spec/adapter_shared_spec'

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
-require 'rubygems'
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 require 'dm-core'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis'))

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Dan Herrera
@@ -14,24 +19,30 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
 executables: []
@@ -60,18 +71,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: DataMapper adapter for the Redis key-value database