ohm 0.1.4 → 0.1.5

data/lib/ohm.rb

@@ -1715,6 +1715,7 @@ module Ohm
     #
     # @see file:README.html#connecting Ohm.connect options documentation.
     def self.connect(options = {})
+      Ohm.threaded[self] = nil
       @options = options
     end
 
@@ -1805,11 +1806,7 @@ module Ohm
     def self.db
       return Ohm.redis unless defined?(@options)
 
-      Redis.connect(@options)
-    end
-
-    def self.db=(connection)
-      Ohm.threaded[self] = connection
+      Ohm.threaded[self] ||= Redis.connect(@options)
     end
 
     # Allows you to do key manipulations scoped solely to your class.

data/lib/ohm/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Ohm
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/connection_test.rb

@@ -43,3 +43,59 @@ test "supports connecting by URL" do
     assert Errno::ECONNREFUSED == e.class
   end
 end
+
+test "Model.db is the same as Ohm.redis by default" do
+  class U < Ohm::Model
+  end
+
+  assert_equal U.db.object_id, Ohm.redis.object_id
+end
+
+test "provides a unique Model.db connection in one thread" do
+  class U < Ohm::Model
+  end
+
+  U.connect(db: 9876)
+
+  r1 = U.db
+  r2 = U.db
+
+  assert_equal r1.object_id, r2.object_id
+end
+
+test "provides distinct Model.db connections per thread" do
+  class U < Ohm::Model
+  end
+
+  U.connect(db: 9876)
+
+  r1 = nil
+  r2 = nil
+
+  Thread.new { r1 = U.db }.join
+  Thread.new { r2 = U.db }.join
+
+  assert r1.object_id != r2.object_id
+end
+
+test "busts threaded cache when doing Model.connect" do
+  class U < Ohm::Model
+  end
+
+  U.connect(db: 9876)
+  r1 = U.db
+
+  U.connect(db: 9876)
+  r2 = U.db
+
+  assert r1.object_id != r2.object_id
+end
+
+test "disallows the non-thread safe writing of Model.db" do
+  class U < Ohm::Model
+  end
+
+  assert_raise NoMethodError do
+    U.db = Redis.connect
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &2156327100 !ruby/object:Gem::Requirement
+  requirement: &70360766634860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156327100
+  version_requirements: *70360766634860
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2156326460 !ruby/object:Gem::Requirement
+  requirement: &70360766633980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *2156326460
+  version_requirements: *70360766633980
 - !ruby/object:Gem::Dependency
   name: batch
-  requirement: &2156325940 !ruby/object:Gem::Requirement
+  requirement: &70360766633360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2156325940
+  version_requirements: *70360766633360
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.