ohm 0.0.14 → 0.0.15

data/lib/ohm.rb

@@ -6,7 +6,7 @@ module Ohm
 
   # Provides access to the Redis database. This is shared accross all models and instances.
   def redis
-    Thread.current[:redis]
+    Thread.current[:redis] ||= Ohm::Redis.new(*options)
   end
 
   def redis=(connection)
@@ -23,7 +23,12 @@ module Ohm
   # @example Connect to a database in port 6380.
   #   Ohm.connect(:port => 6380)
   def connect(*options)
-    self.redis = Ohm::Redis.new(*options)
+    self.redis = nil
+    @options = options
+  end
+
+  def options
+    @options
   end
 
   # Clear the database.
@@ -36,7 +41,7 @@ module Ohm
     args.join(":")
   end
 
-  module_function :key, :connect, :flush, :redis, :redis=
+  module_function :key, :connect, :flush, :redis, :redis=, :options
 
   module Attributes
     class Collection
@@ -97,6 +102,11 @@ module Ohm
         to_ary == other
       end
 
+      # @return [true, false] Returns whether or not the collection is empty.
+      def empty?
+        size.zero?
+      end
+
     private
 
       def instantiate(raw)
@@ -119,18 +129,35 @@ module Ohm
     #   event.participants.all #=> ["Albert", "Benoit"]
     class List < Collection
 
-      # @param value [#to_s] Pushes value to the list.
+      # @param value [#to_s] Pushes value to the tail of the list.
       def << value
         db.rpush(key, value)
       end
 
-      def empty?
-        db.llen(key).zero?
+      # @return [String] Return and remove the last element of the list.
+      def pop
+        db.rpop(key)
+      end
+
+      # @return [String] Return and remove the first element of the list.
+      def shift
+        db.lpop(key)
       end
 
+      # @param value [#to_s] Pushes value to the head of the list.
+      def unshift(value)
+        db.lpush(key, value)
+      end
+
+      # @return [Array] Elements of the list.
       def raw
         db.list(key)
       end
+
+      # @return [Integer] Returns the number of elements in the list.
+      def size
+        db.llen(key)
+      end
     end
 
     # Represents a Redis set.
@@ -165,10 +192,6 @@ module Ohm
         db.srem(key, value)
       end
 
-      def empty?
-        db.scard(key).zero?
-      end
-
       def include?(value)
         db.sismember(key, value)
       end
@@ -176,6 +199,11 @@ module Ohm
       def raw
         db.smembers(key)
       end
+
+      # @return [Integer] Returns the number of elements in the set.
+      def size
+        db.scard(key)
+      end
     end
   end
 

data/test/connection_test.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class ConnectionTest < Test::Unit::TestCase
+  setup do
+    @options = Ohm.options
+  end
+
+  test "connects lazily" do
+    assert_nothing_raised do
+      Ohm.connect(:port => 1234567)
+    end
+
+    assert_raises(Errno::ECONNREFUSED) do
+      Ohm.redis.get "foo"
+    end
+  end
+
+  test "provides a separate connection for each thread" do
+    assert Ohm.redis == Ohm.redis
+
+    conn1, conn2 = nil
+
+    threads = []
+
+    threads << Thread.new do
+      conn1 = Ohm.redis
+    end
+    
+    threads << Thread.new do
+      conn2 = Ohm.redis
+    end
+
+    threads.each { |t| t.join }
+
+    assert (conn1 != conn2)
+  end
+
+  teardown do
+    Ohm.connect(*@options)
+  end
+end

data/test/model_test.rb

@@ -255,6 +255,14 @@ class TestRedis < Test::Unit::TestCase
 
       assert_equal [@person.id.to_s], @event.attendees.raw
     end
+
+    should "return the size of the set" do
+      @event.create
+      @event.attendees << "1"
+      @event.attendees << "2"
+      @event.attendees << "3"
+      assert_equal 3, @event.attendees.size
+    end
   end
 
   context "Attributes of type List" do
@@ -294,6 +302,37 @@ class TestRedis < Test::Unit::TestCase
         i += 1
       end
     end
+
+    should "return the size of the list" do
+      @post.comments << "1"
+      @post.comments << "2"
+      @post.comments << "3"
+      assert_equal 3, @post.comments.size
+    end
+
+    should "return the last element with pop" do
+      @post.comments << "1"
+      @post.comments << "2"
+      assert_equal "2", @post.comments.pop
+      assert_equal "1", @post.comments.pop
+      assert @post.comments.empty?
+    end
+
+    should "return the first element with shift" do
+      @post.comments << "1"
+      @post.comments << "2"
+      assert_equal "1", @post.comments.shift
+      assert_equal "2", @post.comments.shift
+      assert @post.comments.empty?
+    end
+
+    should "push to the head of the list with unshift" do
+      @post.comments.unshift "1"
+      @post.comments.unshift "2"
+      assert_equal "1", @post.comments.pop
+      assert_equal "2", @post.comments.pop
+      assert @post.comments.empty?
+    end
   end
 
   context "Applying arbitrary transformations" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -03:00
+date: 2009-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - Rakefile
 - test/all_tests.rb
 - test/benchmarks.rb
+- test/connection_test.rb
 - test/db/dump.rdb
 - test/db/redis.pid
 - test/errors_test.rb