odba 1.0.1 → 1.0.2

data/History.txt

@@ -1,4 +1,8 @@
-=== 1.0.1 / 08.12.2010
+=== 1.0.2 / 09.12.2011
+
+* Updated cache.rb persitatble.rb 18_19_loading_compatibility.rb to be compatible for both Ruby 1.8 and 1.9
+
+=== 1.0.1 / 08.12.2011
 
 * Added file lock exclusive control to create a new odba_id between processes.
 

data/lib/odba.rb

@@ -11,5 +11,5 @@ require 'odba/index'
 require 'odba/odba'
 
 class Odba
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
 end

data/lib/odba/18_19_loading_compatibility.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+# 18_19_loading_compatibility -- odba -- 09.12.2011 -- mhatakeyama@ywesee.com
 
 require 'date'
 require 'strscan'
@@ -28,17 +30,21 @@ if RUBY_VERSION >= '1.9'
           a.push Marshal.load(dump)
         end
       end
-
       ajd = of = sg = 0
       if a.size == 3
         num, den, sg = a
-        ajd = Rational(num,den)
-        ajd -= 1.to_r/2
+        if den > 0
+          ajd = Rational(num,den)
+          ajd -= 1.to_r/2
+        end
       else
         num, den, of, sg = a
-        ajd = Rational(num,den)
+        if den > 0
+          ajd = Rational(num,den)
+        end
       end
-      new!(ajd, of, sg)
+      ajd += 1.to_r/2
+      jd(ajd)
     end
   end
   class Encoding

data/lib/odba/cache.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# ODBA::Cache -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
+# ODBA::Cache -- odba -- 09.12.2011 -- mhatakeyama@ywesee.com
 # ODBA::Cache -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 require 'singleton'
@@ -97,12 +97,14 @@ module ODBA
       end
       counter = 0
       cutoff = offset + @cleaner_step
-      holder.each_value { |value|
-        counter += 1
-        if(counter > offset && value.odba_old?(retire_time))
-          value.odba_retire && @cleaned += 1
-        end
-        return cutoff if(counter > cutoff)
+      @cache_mutex.synchronize {
+        holder.each_value { |value|
+          counter += 1
+          if(counter > offset && value.odba_old?(retire_time))
+            value.odba_retire && @cleaned += 1
+          end
+          return cutoff if(counter > cutoff)
+        }
       }
       cutoff 
     # every once in a while we'll get a 'hash modified during iteration'-Error.

data/lib/odba/persistable.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-#-- Persistable -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
+# encoding: utf-8
+# ODBA::Persistable -- odba -- 09.12.2011 -- mhatakeyama@ywesee.com
+# ODBA::Persistable -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 class Object # :nodoc: all
 	def odba_id
@@ -325,7 +327,11 @@ module ODBA
 			odba_serializables.each { |name|
 				var = instance_variable_get(name)
 				if(var.is_a?(ODBA::Stub))
-					instance_variable_set(name, var.odba_instance)
+          if RUBY_VERSION > "1.9"
+					  instance_variable_set(name, var)
+          else
+					  instance_variable_set(name, var.odba_instance)
+          end
 				end
 			}
 		end

data/test/test_cache.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+# ODBA::TestCache -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
 
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
@@ -597,32 +599,37 @@ module ODBA
       @storage.should_receive(:store).with(1,'dump1',nil,nil,Object)\
         .times(1).and_return { assert(true) }
       @storage.should_receive(:ensure_object_connections)\
-        .with(1,[2]).times(1).and_return { assert(true) }
+        .with(Integer,Array).times(1).and_return { assert(true) }
 
       ## store o2
-      @storage.should_receive(:restore_collection).with(2)\
+      @storage.should_receive(:restore_collection).with(Integer)\
         .times(1).and_return([])
       @storage.should_receive(:store)\
-        .with(2,'dump2','name2',nil,Object)\
+        .with(Integer,String,'name2',nil,Object)\
         .times(1).and_return { assert(true) }
       @storage.should_receive(:ensure_object_connections)\
-        .with(2,[3]).times(1).and_return { assert(true) }
+        .with(Integer,Array).times(1).and_return { assert(true) }
 
       ## store o3 and raise
-      @storage.should_receive(:restore_collection).with(3)\
+      @storage.should_receive(:restore_collection).with(Integer)\
         .times(1).and_return([])
       ## at this stage 1 and 2 (and 'name2') are stored:
       @storage.should_receive(:store)\
-        .with(3,'dump3',nil,nil,Object)\
+        .with(Integer,String,nil,nil,Object)\
         .times(1).and_return { raise "trigger rollback" }
 
       ## rollback
-      @storage.should_receive(:restore).with(2)\
+      @storage.should_receive(:restore).with(Integer)\
         .times(1).and_return(nil)
       @storage.should_receive(:restore).with(1)\
         .times(1).and_return('dump1')
-      @storage.should_receive(:restore_collection).with(1)\
+      @storage.should_receive(:restore_collection).with(Integer)\
         .times(2).and_return([])
+      dbi = flexmock('dbi', :dbi_args => ['dbi_args'])
+      flexmock(@storage, 
+               :dbi => dbi,
+               :update_max_id => 123
+              )
       @marshal.should_receive(:load).with('dump1')\
         .times(1).and_return(o4)
       @cache.fetched.store(1, ODBA::CacheEntry.new(o1))
@@ -720,6 +727,29 @@ module ODBA
       @cache.instance_variable_set('@deferred_indices', [df1, df2])
       @cache.setup
 			@cache.instance_variable_set('@indices', {})
+    end
+    def test_lock
+      result = ""
+      th = Thread.new do
+        sleep 1
+        @cache.lock('testcase') do
+          result << '123'
+        end
+      end
+      @cache.lock('testcase') do
+        result << '456'
+      end
+      th.join
+      expected = '456123'
+      assert_equal(expected, result)
+    end
+    def test_new_id
+      flexmock(File, :exist? => false)
+      storage = flexmock('storage',
+                         :max_id => 123,
+                         :update_max_id => nil
+                        )
+      assert_equal(124, @cache.new_id('testcase', storage))
     end
 	end
 end

data/test/test_stub.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+# ODBA::TestStub -- odba -- 08.12.2011 -- mhatakeyama@ywesee.com
 
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 $: << File.dirname(__FILE__)
@@ -193,6 +195,7 @@ module ODBA
 			assert_nil(hash[other])
 		end
 		def test_to_yaml
+      flexmock(@cache, :fetch => nil)
 			yaml = ''
 			assert_nothing_raised {
 				yaml = @stub.odba_isolated_stub.to_yaml

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: odba
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency