whoahbot-dm-redis-adapter 0.0.4 → 0.0.5

data/README.textile

@@ -2,29 +2,26 @@ h1. dm-redis-adapter
 
 This is a <a href="http://datamapper.org">DataMapper</a> adapter for the <a href="http://github.com/antirez/redis/">Redis</a> key-value database.
 
-Redis is a very fast key-value store with some interesting data structures added.  You can have a key that is a SET, LIST, or a STRING that is binary safe.  Data structures like SET and LIST allow for even more interesting things.  Redis is a fabulous and fast engine for data structures, and you can read more about it here: <a href="http://code.google.com/p/redis/">redis</a>.  Redis is also a persistent data store, and can be used in large-scale environments with master-slave replication.
+Redis is a very fast key-value store with some interesting data structures added.  You can have a key that is a SET, LIST, or a STRING that is binary safe.  Data structures like SET and LIST allow for even more interesting things.  Redis is a fabulous and fast engine for data structures, and you can read more about it here: <a href="http://code.google.com/p/redis/">redis</a>.  Redis is also a persistent data store, and can be used in large-scale environments with master-slave replication and consistent hashing on the client side.
 
 <a href="http://datamapper.org">DataMapper</a> is a brilliant ORM that is based on the <a href="http://www.martinfowler.com/eaaCatalog/identityMap.html">IdentityMap</a> pattern.  Usage of DataMapper resembles that of ActiveRecord, the popular ORM bundled with Ruby on Rails, but with some very important differences.  A quote from the DM wiki: "One row in the database should equal one object reference. Pretty simple idea. Pretty profound impact."  Having an identity map allows for very efficient queries to the database, as well as interesting forms of lazy loading of attributes or associations.
 
-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.
+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. Install
 
 Prerequisites:
 * Redis:
-** <a href="http://code.google.com/p/redis/">Redis, v0.100</a>
+** <a href="http://code.google.com/p/redis/">Redis, v1.0</a>
 * Gems:
-** <a href="http://code.google.com/p/redis/">redis (0.0.3.4)</a>
 ** <a href="http://github.com/datamapper/extlib">extlib</a>, dependency for dm-core
-** <a href="http://github.com/datamapper/dm-core/tree/next">dm-core</a> next branch
-
-I installed the redis gem from the redis .tgz file like so:
+** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v0.10
 
+Install the dm-redis adapter:
 <pre>
   <code>
-    > tar -xvzf redis-0.100.tar.gz
-    > cd redis-0.100/client-libraries/ruby
-    > sudo rake install
+    > gem sources -a http://gems.github.com
+    > sudo gem install whoahbot-dm-redis-adapter
   </code>
 </pre>
 
@@ -34,8 +31,9 @@ Setup your adapter, define your models and properties:
 
 <pre>
   <code>
+    require 'rubygems'
     require 'dm-core'
-    require 'dm_redis_adapter'
+    require 'dm_redis'
     
     DataMapper.setup(:default, {:adapter  => "redis"})
     
@@ -50,4 +48,9 @@ Setup your adapter, define your models and properties:
   </code>
 </pre>
 
-Now you can use redis in a ORM style, and take advantage of all of the amazing things that DataMapper offers.
+Now you can use redis in a ORM style, and take advantage of all of the amazing things that DataMapper offers.
+
+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

data/Rakefile

@@ -1,56 +1,37 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
-require 'date'
 require 'spec/rake/spectask'
 
 GEM = 'dm-redis-adapter'
 GEM_NAME = 'dm-redis-adapter'
-GEM_VERSION = '0.0.4'
 AUTHORS = ['Dan Herrera']
 EMAIL = "whoahbot@gmail.com"
 HOMEPAGE = "http://github.com/whoahbot/dm-redis-adapter"
 SUMMARY = "DataMapper adapter for the Redis key-value database"
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["MIT-LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.authors = AUTHORS
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency "rspec"
-  s.add_dependency "dm-core", "0.10.0"
-  s.add_dependency "redis",   "0.0.3.4"
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = GEM
+    gemspec.summary = SUMMARY
+    gemspec.email = EMAIL
+    gemspec.homepage = HOMEPAGE
+    gemspec.description = SUMMARY
+    gemspec.authors = AUTHORS
+    gemspec.add_dependency "dm-core", "0.10.0"
+    gemspec.add_dependency "ezmobius-redis"
+    gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
+    gemspec.has_rdoc = true
+    gemspec.extra_rdoc_files = ["MIT-LICENSE"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+
 task :default => :spec
 
 desc "Run specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = %w(-fs --color)
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
 end

data/lib/{dm_redis_adapter.rb → dm_redis.rb}

@@ -3,7 +3,7 @@ require 'redis'
 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.
@@ -17,14 +17,13 @@ module DataMapper
       # @api semipublic
       def create(resources)
         resources.each do |resource|
-          # model.each {|c| c.to_s}.join(":")
-          initialize_identity_field(resource, @redis.incr("#{resource.model.to_s.downcase}:#{redis_key_for(resource.model)}:serial"))
+          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)
         end
-        
+
         update_attributes(resources)
       end
-      
+
       ##
       # Looks up one record or a collection of records from the data-store:
       # "SELECT" in SQL.
@@ -40,7 +39,7 @@ module DataMapper
       def read(query)
         records = records_for(query).each do |record|
           query.fields.each do |property|
-            next if query.model.key.include?(property.name)
+            next if query.model.key.include?(property)
             record[property.name.to_s] = property.typecast(@redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"])
           end
         end
@@ -50,7 +49,7 @@ module DataMapper
         records = query.sort_records(records)
         records
       end
-      
+
       ##
       # Used by DataMapper to update the attributes on existing records in the redis
       # data-store: "UPDATE" in SQL-speak. It takes a hash of the attributes
@@ -65,12 +64,12 @@ 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)
       end
-      
+
       ##
       # Destroys all the records matching the given query. "DELETE" in SQL.
       #
@@ -90,9 +89,9 @@ module DataMapper
           @redis.set_delete("#{collection.query.model.to_s.downcase}:#{redis_key_for(collection.query.model)}:all", record[redis_key_for(collection.query.model)])
         end
       end
-      
+
       private
-      
+
       ##
       # Creates a string representation for the keys in a given model
       #
@@ -107,7 +106,7 @@ module DataMapper
       def redis_key_for(model)
         model.key.collect {|k| k.name}.join(":")
       end
-      
+
       ##
       # Saves each key value pair to the redis data store
       #
@@ -123,7 +122,7 @@ module DataMapper
           end
         end
       end
-      
+
       ##
       # Retrieves records for a particular model.
       #
@@ -136,25 +135,25 @@ 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.property)}.each do |o|
+        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}
           end
         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|
         #     keys << {"#{redis_key_for(query.model)}" => val.to_i}
         #   end
         # 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|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end
         end
-        
+
         keys
       end
 
@@ -174,7 +173,7 @@ module DataMapper
         @redis = Redis.new(@options)
       end
     end # class RedisAdapter
-    
+
     const_added(:RedisAdapter)
   end # module Adapters
-end # module DataMapper
+end # module DataMapper

data/spec/{dm_redis_adapter_spec.rb → dm_redis_spec.rb}

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis_adapter'))
 require 'redis'
 
 require 'dm-core/spec/adapter_shared_spec'
@@ -11,11 +10,11 @@ describe DataMapper::Adapters::RedisAdapter do
       :db => 15
     })
   end
-  
+
   after(:all) do
     redis = Redis.new(:db => 15)
-    redis.flushdb
+    redis.flush_db
   end
-  
+
   it_should_behave_like 'An Adapter'
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'dm-core'
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis_adapter'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis'))

metadata

@@ -1,27 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: whoahbot-dm-redis-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dan Herrera
-autorequire: dm-redis-adapter
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
   type: :runtime
@@ -33,14 +23,14 @@ dependencies:
         version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: ezmobius-redis
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.3.4
+        version: "0"
     version: 
 description: DataMapper adapter for the Redis key-value database
 email: whoahbot@gmail.com
@@ -54,14 +44,15 @@ files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- lib/dm_redis_adapter.rb
-- spec/dm_redis_adapter_spec.rb
+- lib/dm_redis.rb
+- spec/dm_redis_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
+licenses: 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -79,9 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: DataMapper adapter for the Redis key-value database
-test_files: []
-
+test_files: 
+- spec/dm_redis_spec.rb
+- spec/spec_helper.rb