dm-redis-adapter 0.0.11 → 0.2.1

data/README.textile

@@ -2,23 +2,30 @@ 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 and consistent hashing on the client side.
+Redis is a very fast key-value store with some interesting data structures added.  You can have a key that is a SET, LIST, STRING or HASH 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.
 
+h1. Upgrading
+
+> v0.1 is not compatible with data created with previous versions!  The new storage schema is designed to be more VM friendly.  I won't be releasing a gem version of v0.1 until a stable version of redis that includes hash support has been released.
+
 h1. Changelog
 
+* v0.2.1  Fixes to sorting
+* v0.1.1  Update to redis-rb v2.0.0
+* v0.1    Update to store records as redis hash values
 * v0.0.11 Updates to support newer versions of the redis client, support for JSON datatypes
 
 h1. Install
 
 Prerequisites:
 * Redis:
-** <a href="http://code.google.com/p/redis/">Redis, v1.3.8</a>
+** <a href="http://code.google.com/p/redis/">Redis, v2.0.x RC series</a>
 * Gems:
-** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v0.10.2
+** <a href="http://github.com/datamapper/dm-core/">dm-core</a> v1.0.0
 
 Install the dm-redis adapter:
 <pre>
@@ -89,5 +96,5 @@ 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/cehoffman">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps 
-* <a href="http://github.com/bpo">brian p o'rourke (bpo)</a> Updates for newer versions of redis client and DM JSON type support
+* <a href="http://github.com/cehoffman">Chris Hoffman (cehoffman)</a> Fixes for Ruby 1.9, bundler for development deps, fixes for sorting
+* <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

data/Rakefile

@@ -26,13 +26,13 @@ begin
     gemspec.homepage = HOMEPAGE
     gemspec.description = SUMMARY
     gemspec.authors = AUTHORS
-    gemspec.add_dependency "dm-core", ">= 0.10.2"
-    gemspec.add_dependency "dm-types", ">= 0.10.2"
-    gemspec.add_dependency "redis"
+    gemspec.add_dependency "dm-core", ">= 1.0.0"
+    gemspec.add_dependency "dm-types", ">= 1.0.0"
+    gemspec.add_dependency "redis", ">= 2.0.3"
     gemspec.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{lib,spec}/**/*")
-    gemspec.has_rdoc = true
+    gemspec.has_rdoc = false
     gemspec.extra_rdoc_files = ["MIT-LICENSE"]
-  end
+    end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/lib/{dm_redis.rb → dm-redis-adapter/adapter.rb}

@@ -36,18 +36,19 @@ module DataMapper
       # @api semipublic
       def read(query)
         records = records_for(query).each do |record|
+          record_data = @redis.hgetall( "#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}" )
+
           query.fields.each do |property|
             next if query.model.key.include?(property)
 
+            name = property.name.to_s
+            value = record_data[name]
+
             # Integers are stored as Strings in Redis. If there's a
             # string coming out that should be an integer, convert it
             # now. All other typecasting is handled by datamapper
             # separately.
-            if property.primitive == Integer
-              record[property.name.to_s] = property.typecast(@redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"])
-            else
-              record[property.name.to_s] = @redis["#{query.model.to_s.downcase}:#{record[redis_key_for(query.model)]}:#{property.name}"]
-            end
+            record[name] = [Integer, Date].include?(property.primitive) ? property.typecast( value ) : value
           end
         end
         records = query.match_records(records)
@@ -88,9 +89,7 @@ module DataMapper
       # @api semipublic
       def delete(collection)
         records_for(collection.query).each do |record|
-          collection.query.model.properties.each do |p|
-            @redis.del("#{collection.query.model.to_s.downcase}:#{record[redis_key_for(collection.query.model)]}:#{p.name}")
-          end
+          @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)])
           collection.query.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)])
@@ -116,11 +115,22 @@ module DataMapper
             @redis.sadd("#{resource.model.to_s.downcase}:#{property.name}:#{encode(resource[property.name.to_s])}", resource.key)
           end
 
-          model.properties(self.name).each do |property|
-            next unless attributes.key?(property)
+          properties_to_set = []
+          properties_to_del = []
+
+          fields = model.properties(self.name).select {|property| attributes.key?(property) }
+          fields.each do |property|
             value = attributes[property]
-            @redis["#{resource.model.to_s.downcase}:#{resource.key.join}:#{property.name}"] = value unless value.nil?
+            if value.nil?
+              properties_to_del << property.name
+            else
+              properties_to_set << property.name << attributes[property]
+            end
           end
+          
+          hash_key = "#{resource.model.to_s.downcase}:#{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
       end
 
@@ -147,9 +157,17 @@ module DataMapper
             keys << {"#{redis_key_for(query.model)}" => k, "#{o.subject.name}" => o.value}
           end
         end
-
-        if query.limit
-          @redis.sort(key_set_for(query.model), :limit => [query.offset, query.limit]).each do |val|
+        
+        if query.order || query.limit
+          params = {}
+          params[:limit] = [query.offset, query.limit] if query.limit
+          
+          if query.order
+            order = query.order.first
+            params[:order] = order.operator.to_s
+          end
+          
+          @redis.sort(key_set_for(query.model), params).each do |val|
             keys << {"#{redis_key_for(query.model)}" => val.to_i}
           end
         end

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

@@ -0,0 +1,14 @@
+require 'dm-redis-adapter'
+require 'dm-core/spec/setup'
+
+module DataMapper
+  module Spec
+    module Adapters
+
+      class RedisAdapter < Adapter
+      end
+
+      use RedisAdapter
+    end
+  end
+end

data/lib/dm-redis-adapter.rb

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

data/spec/dm_redis_spec.rb

@@ -1,7 +1,11 @@
-require File.expand_path("../spec_helper", __FILE__)
-require 'redis'
+require 'spec_helper'
 
-require 'dm-core/spec/adapter_shared_spec'
+require 'dm-core'
+require 'dm-core/spec/shared/adapter_spec'
+require 'dm-redis-adapter/spec/setup'
+
+ENV['ADAPTER']          = 'redis'
+ENV['ADAPTER_SUPPORTS'] = 'all'
 
 describe DataMapper::Adapters::RedisAdapter do
   before(:all) do
@@ -9,12 +13,13 @@ describe DataMapper::Adapters::RedisAdapter do
       :adapter  => "redis",
       :db => 15
     })
+    @repository = DataMapper.repository(@adapter.name)
   end
 
+  it_should_behave_like 'An Adapter'
+  
   after(:all) do
     redis = Redis.new(:db => 15)
     redis.flushdb
   end
-
-  it_should_behave_like 'An Adapter'
-end
+end

data/spec/dm_redis_validations_spec.rb

@@ -1,22 +1,21 @@
 require File.expand_path("../spec_helper", __FILE__)
-require 'redis'
-require 'rubygems'
 require 'dm-validations'
 require 'dm-types'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis.rb'))
+require 'logger'
 
 describe DataMapper::Adapters::RedisAdapter do
   before(:all) do
     @adapter = DataMapper.setup(:default, {
       :adapter  => "redis",
-      :db => 15
+      :db => 15,
+      # :logger => Logger.new(STDOUT)
     })
   end
 
   it "should validate unique entries that are indexed" do
     class Crumblecake
       include DataMapper::Resource
-      validates_is_unique :flavor
+      validates_uniqueness_of :flavor
 
       property :id,      Serial
       property :flavor,  String, :index => true
@@ -33,7 +32,7 @@ describe DataMapper::Adapters::RedisAdapter do
 
         property :id,     Serial
         property :name,   String
-        property :env,    DataMapper::Types::Json, :default => lambda { {} }
+        property :env,    DataMapper::Property::Json, :default => lambda { {} }
       end
     end
 
@@ -52,8 +51,50 @@ describe DataMapper::Adapters::RedisAdapter do
     end
   end
 
+  it "should allow me to delete properties" do
+    class User
+      include DataMapper::Resource
+
+      property :id,   Serial
+      property :name, String
+    end
+
+    u = User.create :name => "bpo"
+    u.reload.name.should == "bpo"
+    u.name = nil
+    u.save
+    u.reload.name.should == nil
+  end
+  
+  it "should store Date fields" do
+    class Post
+      include DataMapper::Resource
+      
+      property :id,        Serial
+      property :posted_at, Date
+    end
+    
+    Post.create :posted_at => Date.today
+    Post.first.posted_at.should be_a(Date)
+  end
+
+  it "should get the first and last model inserted" do
+    class GangMember
+      include DataMapper::Resource
+
+      property :id,       Serial
+      property :nickname, String
+    end
+
+    joey = GangMember.create(:nickname => "Joey 'two-times'")
+    bobby = GangMember.create(:nickname => "Bobby 'three-fingers'")
+
+    GangMember.first.should == joey
+    GangMember.last.should == bobby
+  end
+  
   after(:all) do
     redis = Redis.new(:db => 15)
     redis.flushdb
   end
-end
+end

data/spec/spec_helper.rb

@@ -8,6 +8,4 @@ rescue LoadError
   Bundler.setup
 end
 
-require 'dm-core'
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/dm_redis'))
+require 'dm-core'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-redis-adapter
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 11
-  version: 0.0.11
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Dan Herrera
@@ -14,47 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -07:00
+date: 2010-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 10
-        - 2
-        version: 0.10.2
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 10
-        - 2
-        version: 0.10.2
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 3
+        version: 2.0.3
   type: :runtime
   version_requirements: *id003
 description: DataMapper adapter for the Redis key-value database
@@ -69,7 +78,9 @@ files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- lib/dm_redis.rb
+- lib/dm-redis-adapter.rb
+- lib/dm-redis-adapter/adapter.rb
+- lib/dm-redis-adapter/spec/setup.rb
 - spec/dm_redis_spec.rb
 - spec/dm_redis_validations_spec.rb
 - spec/spec_helper.rb
@@ -77,29 +88,33 @@ has_rdoc: true
 homepage: http://github.com/whoahbot/dm-redis-adapter
 licenses: []
 
-post_install_message: 
+post_install_message: "\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n                       (!!)   U P G R A D I N G    (!!)\n\n                        WAAAAAAAAAAAAAAAAAAAAAAAIT!\n               Earlier versions of dm-redis-adapter\n                use a different method of storing properties\n                  which means that this version of dm-redis-adapter\n                    won't read them properly.\n\n  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataMapper adapter for the Redis key-value database