ohm 0.0.33 → 0.0.34

data/Rakefile

@@ -1,3 +1,29 @@
-task :default do
-  exec "thor ohm:test"
+require "rake/testtask"
+
+REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
+REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+
+task :default => :run
+
+desc "Run tests and manage server start/stop"
+task :run => [:start, :test, :stop]
+
+desc "Start the Redis server"
+task :start do
+  unless File.exists?(REDIS_PID)
+    system "redis-server #{REDIS_CNF}"
+  end
+end
+
+desc "Stop the Redis server"
+task :stop do
+  if File.exists?(REDIS_PID)
+    system "kill #{File.read(REDIS_PID)}"
+    system "rm #{REDIS_PID}"
+  end
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'test/**/*_test.rb'
 end

data/Thorfile

@@ -17,25 +17,4 @@ class Ohm < Thor
   def deploy
     system "rsync -az doc/* ohm.keyvalue.org:deploys/ohm.keyvalue.org/"
   end
-
-  desc "test", "Run all tests"
-  def test
-    invoke "ohm:redis:start"
-
-    Dir["test/**/*_test.rb"].each do |file|
-      load file
-    end
-  end
-
-  class Redis < Thor
-    desc "start", "Start Redis server"
-    def start
-      %x{dtach -n /tmp/ohm.dtach redis-server test/test.conf}
-    end
-
-    desc "attach", "Attach to Redis server"
-    def attach
-      %x{dtach -a /tmp/ohm.dtach}
-    end
-  end
 end

data/lib/ohm/key.rb

@@ -16,6 +16,10 @@ module Ohm
       @namespace = namespace
     end
 
+    def sub_keys
+      parts.map {|k| k.glue == ":" ? k : k.volatile }
+    end
+
     def append(*parts)
       @parts += parts
       self

data/lib/ohm/redis.rb

@@ -53,7 +53,7 @@ module Ohm
 
     PROCESSOR_IDENTITY = lambda { |reply| reply }
     PROCESSOR_CONVERT_TO_BOOL = lambda { |reply| reply == 0 ? false : reply }
-    PROCESSOR_SPLIT_KEYS = lambda { |reply| reply.split(" ") }
+    PROCESSOR_SPLIT_KEYS = lambda { |reply| reply.respond_to?(:split) ? reply.split(" ") : reply }
     PROCESSOR_INFO = lambda { |reply| Hash[*(reply.lines.map { |l| l.chomp.split(":", 2) }.flatten)] }
 
     REPLY_PROCESSOR = {

data/lib/ohm.rb

@@ -8,6 +8,7 @@ require File.join(File.dirname(__FILE__), "ohm", "key")
 require File.join(File.dirname(__FILE__), "ohm", "collection")
 
 module Ohm
+  VERSION = "0.0.34"
 
   # Provides access to the Redis database. This is shared accross all models and instances.
   def redis
@@ -195,7 +196,7 @@ module Ohm
       # Apply a redis operation on a collection of sets.
       def apply(operation, hash, glue)
         target = key.volatile.group(glue).append(*keys(hash))
-        model.db.send(operation, target, *target.parts)
+        model.db.send(operation, target, *target.sub_keys)
         Set.new(target, model)
       end
 
@@ -215,6 +216,22 @@ module Ohm
     class List < Collection
       Raw = Ohm::List
 
+      def shift
+        if id = raw.shift
+          model[id]
+        end
+      end
+
+      def pop
+        if id = raw.pop
+          model[id]
+        end
+      end
+
+      def unshift(model)
+        raw.unshift(model.id)
+      end
+
       def inspect
         "#<List (#{model}): #{all.inspect}>"
       end

data/test/indices_test.rb

@@ -33,7 +33,7 @@ class IndicesTest < Test::Unit::TestCase
 
   context "A model with an indexed attribute" do
     setup do
-      @user1 = User.create(:email => "foo", :activation_code => "bar")
+      @user1 = User.create(:email => "foo", :activation_code => "bar", :update => "baz")
       @user2 = User.create(:email => "bar")
       @user3 = User.create(:email => "baz qux")
     end
@@ -48,8 +48,8 @@ class IndicesTest < Test::Unit::TestCase
       assert_equal "~:IndicesTest::User:email:Zm9v+IndicesTest::User:activation_code:",
         User.find(:email => "foo").find(:activation_code => "").key.to_s
 
-      assert_equal "~:IndicesTest::User:email:Zm9v+IndicesTest::User:activation_code:+IndicesTest::User:working_days:",
-        User.find(:email => "foo").find(:activation_code => "").find(:working_days => "").key.to_s
+      assert_equal "~:~:IndicesTest::User:email:Zm9v+IndicesTest::User:activation_code:YmFy+IndicesTest::User:update:YmF6",
+        result = User.find(:email => "foo").find(:activation_code => "bar").find(:update => "baz").key.to_s
     end
 
     should "use a special namespace for set operations" do
@@ -58,6 +58,10 @@ class IndicesTest < Test::Unit::TestCase
       assert Ohm.redis.keys("~:*").size > 0
     end
 
+    should "allow multiple chained finds" do
+      assert_equal 1, User.find(:email => "foo").find(:activation_code => "bar").find(:update => "baz").size
+    end
+
     should "raise if the field is not indexed" do
       assert_raises(Ohm::Model::IndexNotFound) do
         User.find(:sandunga => "foo")

data/test/model_test.rb

@@ -450,6 +450,8 @@ class TestRedis < Test::Unit::TestCase
 
   context "Attributes of type List" do
     setup do
+      Ohm.flush
+
       @post = Post.new
       @post.body = "Hello world!"
       @post.create
@@ -551,6 +553,19 @@ class TestRedis < Test::Unit::TestCase
       assert  @post.related.include?(another_post)
       assert !@post.related.include?(Post.create)
     end
+
+    should "unshift models" do
+      @post.related.unshift(Post.create(:body => "Hello"))
+      @post.related.unshift(Post.create(:body => "Goodbye"))
+
+      assert_equal ["3", "2"], @post.related.raw
+
+      assert_equal "3", @post.related.shift.id
+
+      assert_equal "2", @post.related.pop.id
+
+      assert_nil @post.related.pop
+    end
   end
 
   context "Applying arbitrary transformations" do

data/test/test.conf

@@ -2,11 +2,7 @@ dir ./test/db
 pidfile ./redis.pid
 port 6381
 timeout 300
-
-save 900 10000
-
 loglevel debug
-
 logfile stdout
-
 databases 16
+daemonize yes

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.33
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 34
+  version: 0.0.34
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -03:00
+date: 2010-04-03 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -60,18 +65,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: ohm
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.