odba 1.1.9 → 1.2.1

data/test/test_stub.rb

@@ -1,175 +1,187 @@
 #!/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__)
-require 'minitest/autorun'
-require 'flexmock/test_unit'
-require 'flexmock'
-require 'odba/stub'
-require 'odba/persistable'
-require 'odba/odba'
-require 'yaml'
+require_relative "helper"
+require "odba/stub"
+require "odba/persistable"
+require "odba/odba"
+require "yaml"
 
 module ODBA
-	class Stub
-		attr_accessor :receiver, :odba_class
-	end
-	class TestStub < Minitest::Test
+  class Stub
+    attr_accessor :receiver, :odba_class
+  end
+
+  class TestStub < Test::Unit::TestCase
     include FlexMock::TestCase
-		def setup
-			@odba_container = flexmock("odba_container")
-			@cache = ODBA.cache = flexmock("cache")
-			@receiver = flexmock("receiver")
-			@stub = Stub.new(9, @odba_container, @receiver)
-		end
+    def setup
+      @odba_container = flexmock("odba_container")
+      @cache = ODBA.cache = flexmock("cache")
+      @receiver = flexmock("receiver")
+      @stub = Stub.new(9, @odba_container, @receiver)
+    end
+
     def teardown
       @cache = ODBA.cache = nil
-      super
     end
-		def test_method_missing
-			receiver = flexmock
+
+    def test_method_missing
+      receiver = flexmock
       @cache.should_receive(:fetch).with(9, FlexMock.any).once.and_return(receiver)
       receiver.should_receive(:foo_method).with(3)
       @odba_container.should_receive(:odba_replace_stubs).with(9, FlexMock.any).and_return(@stub)
-			@stub.foo_method(3)
-			receiver.flexmock_verify
-			@odba_container.flexmock_verify
-		end
-		def test_method_missing_receiver_nil
-			@stub.receiver = nil
-			cache = ODBA.cache
-			receiver = flexmock
+      @stub.foo_method(3)
+      receiver.flexmock_verify
+      @odba_container.flexmock_verify
+    end
+
+    def test_method_missing_receiver_nil
+      @stub.receiver = nil
+      cache = ODBA.cache
+      receiver = flexmock
       @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).once.and_return(receiver)
       receiver.should_receive(:foo_method).with(3)
       @odba_container.should_receive(:odba_replace_stubs).with(FlexMock.any, FlexMock.any).and_return(@stub)
-			@stub.foo_method(3)
-			@odba_container.flexmock_verify
-			cache.flexmock_verify
-		end
-		def test_method_missing__odba_class_nil # backward-compatibility
-			@stub.odba_class = nil
-			receiver = flexmock
+      @stub.foo_method(3)
+      @odba_container.flexmock_verify
+      cache.flexmock_verify
+    end
+
+    def test_method_missing__odba_class_nil # backward-compatibility
+      @stub.odba_class = nil
+      receiver = flexmock
       @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).once.and_return(receiver)
       receiver.should_receive(:foo_method).with(3)
       @odba_container.should_receive(:odba_replace_stubs).with(FlexMock.any, FlexMock.any)
-			@stub.foo_method(3)
-			@odba_container.flexmock_verify
-			ODBA.cache.flexmock_verify
-		end
-		def test_odba_receiver
-			@cache.should_receive(:fetch).with(9, @odba_container).and_return('odba_instance')
-			@odba_container.should_receive(:odba_replace_stubs).with(@stub.odba_id, 'odba_instance').and_return(true)
-			@stub.odba_receiver
-		end
-		def test_send_instance_methods
-      receiver = 'odba_instance'
-			@odba_container.should_ignore_missing
+      @stub.foo_method(3)
+      @odba_container.flexmock_verify
+      ODBA.cache.flexmock_verify
+    end
+
+    def test_odba_receiver
+      @cache.should_receive(:fetch).with(9, @odba_container).and_return("odba_instance")
+      @odba_container.should_receive(:odba_replace_stubs).with(@stub.odba_id, "odba_instance").and_return(true)
+      @stub.odba_receiver
+    end
+
+    def test_send_instance_methods
+      receiver = "odba_instance"
+      @odba_container.should_ignore_missing
       @cache.should_receive(:fetch).with(9, FlexMock.any).once.and_return(receiver)
-			@stub.taint
-      skip('Why does this fail')
-			assert_equal(true, receiver.tainted?)
-		end
-		def test_instance_method_not_sent
-			assert_equal(true, @stub.is_a?(Persistable))
-		end
-		def test_send_class
-			receiver = flexmock
+      omit("Why does this fail")
+      @stub.taint
+      assert_equal(true, receiver.tainted?)
+    end
+
+    def test_instance_method_not_sent
+      assert_equal(true, @stub.is_a?(Persistable))
+    end
+
+    def test_send_class
+      flexmock
       @odba_container.should_receive(:odba_replace_stubs).with(FlexMock.any, FlexMock.any)
-			assert_equal(FlexMock, @stub.class)
-		end
-		def test_respond_to
-			receiver = flexmock('receiver')
+      assert_equal(FlexMock, @stub.class)
+    end
+
+    def test_respond_to
+      receiver = flexmock("receiver")
       @odba_container.should_receive(:odba_replace_stubs).with(FlexMock.any, FlexMock.any)
       @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).once.and_return(receiver)
-			receiver.flexmock_verify
-			assert_equal(false, @stub.respond_to?(:odba_replace))
-		end
-		def test_array_methods
-			stub = Stub.new(9, [], [])
+      receiver.flexmock_verify
+      assert_equal(false, @stub.respond_to?(:odba_replace))
+    end
+
+    def test_array_methods
+      stub = Stub.new(9, [], [])
       @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).and_return([])
-			assert_equal([], stub)
-			stub = Stub.new(9, [], [])
-			assert([] == stub)
-			[
-				"&", "+", "-", "<=>", "==",
-				"concat", "equal?", "replace", "|"
-			].each { |method|
-				stub = Stub.new(9, [], [])
-				[].send(method, stub)
-			}
-		end
-		def test_hash_methods
-			stub = Stub.new(9, [], {})
-      @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).times(5).and_return({} )
-			assert_equal({}, stub)
-			stub = Stub.new(9, [], {})
-			assert({} == stub)
-			[
-				"merge", "merge!", "replace",
-			].each { |method|
-				stub = Stub.new(9, [], {})
-				{}.send(method, stub)
-			}
-		end
-		def test_hash__fetch
-			stub = Stub.new(9, [], {})
+      assert_equal([], stub)
+      stub = Stub.new(9, [], [])
+      assert([] == stub)
+      [
+        "&", "+", "-", "<=>", "==",
+        "concat", "equal?", "replace", "|"
+      ].each { |method|
+        stub = Stub.new(9, [], [])
+        [].send(method, stub)
+      }
+    end
+
+    def test_hash_methods
+      stub = Stub.new(9, [], {})
+      @cache.should_receive(:fetch).with(FlexMock.any, FlexMock.any).times(5).and_return({})
+      assert_equal({}, stub)
+      stub = Stub.new(9, [], {})
+      assert({} == stub)
+      [
+        "merge", "merge!", "replace"
+      ].each { |method|
+        stub = Stub.new(9, [], {})
+        {}.send(method, stub)
+      }
+    end
+
+    def test_hash__fetch
+      stub = Stub.new(9, [], {})
       @cache.should_receive(:include?).with(9).and_return(false)
-      @cache.should_receive(:fetch_collection_element).with(9, 'bar').and_return('foo')
-			assert_equal('foo', stub['bar'])
-		end
-		def test_hash__fetch__2
-			stub = Stub.new(9, [], {})
+      @cache.should_receive(:fetch_collection_element).with(9, "bar").and_return("foo")
+      assert_equal("foo", stub["bar"])
+    end
+
+    def test_hash__fetch__2
+      stub = Stub.new(9, [], {})
       @cache.should_receive(:include?).with(9).and_return(false)
-      @cache.should_receive(:fetch_collection_element).with(9, 'bar').and_return(nil)
-      @cache.should_receive(:fetch).with(9, []).and_return({'bar' => 'foo'})
-			assert_equal('foo', stub['bar'])
-		end
-		def test_hash__fetch__already_in_cache
-			stub = Stub.new(9, [], {})
+      @cache.should_receive(:fetch_collection_element).with(9, "bar").and_return(nil)
+      @cache.should_receive(:fetch).with(9, []).and_return({"bar" => "foo"})
+      assert_equal("foo", stub["bar"])
+    end
+
+    def test_hash__fetch__already_in_cache
+      stub = Stub.new(9, [], {})
       @cache.should_receive(:include?).with(9).and_return(true)
-      @cache.should_receive(:fetch).with(9, []).and_return({'bar' => 'foo'})
-			assert_equal('foo', stub['bar'])
-		end
-		def test_hash_key__1
-			stub = Stub.new(9, nil, nil)
-			@cache.should_receive(:fetch).with(9, nil).and_return(@receiver)
-			@cache.should_receive(:fetch).with(9, @odba_container)\
+      @cache.should_receive(:fetch).with(9, []).and_return({"bar" => "foo"})
+      assert_equal("foo", stub["bar"])
+    end
+
+    def test_hash_key__1
+      stub = Stub.new(9, nil, nil)
+      @cache.should_receive(:fetch).with(9, nil).and_return(@receiver)
+      @cache.should_receive(:fetch).with(9, @odba_container)
         .and_return(@receiver)
-			@cache.should_receive(:fetch).with(8, nil).and_return('other')
-			@odba_container.should_ignore_missing
-			hash = {stub => 'success'}
-			assert_equal('success', hash[@stub])
+      @cache.should_receive(:fetch).with(8, nil).and_return("other")
+      @odba_container.should_ignore_missing
+      hash = {stub => "success"}
+      assert_equal("success", hash[@stub])
       other = Stub.new(8, nil, nil)
-			assert_nil(hash[other])
-		end
-		def test_to_yaml
-      skip "Don't know why the stub does not work for Ruby 2.x or later"
-      flexmock(@cache, :fetch => nil)
-			yaml = ''
+      assert_nil(hash[other])
+    end
+
+    def test_to_yaml
+      omit "Don't know why the stub does not work for Ruby 2.x or later"
+      flexmock(@cache, fetch: nil)
       yaml = @stub.odba_isolated_stub.to_yaml
-			loaded = YAML.load(yaml)
+      loaded = YAML.load(yaml)
       assert(loaded.is_a?(Stub), "loading from yaml should return a Stub")
-			assert_equal(9, loaded.odba_id)
-		end
+      assert_equal(9, loaded.odba_id)
+    end
+
     def test_odba_clear_receiver
-      @stub.instance_variable_set('@receiver', flexmock)
+      @stub.instance_variable_set(:@receiver, flexmock)
       @stub.odba_clear_receiver
-      assert_nil(@stub.instance_variable_get('@receiver'))
+      assert_nil(@stub.instance_variable_get(:@receiver))
     end
+
     def test_odba_unsaved
       assert_equal(false, @stub.odba_unsaved?)
     end
-		def test_hash_key__2
+
+    def test_hash_key__2
       receiver = Object.new
       receiver.extend(Persistable)
-      receiver.instance_variable_set('@odba_id', 9)
+      receiver.instance_variable_set(:@odba_id, 9)
       stub = Stub.new(9, nil, nil)
       @cache.should_receive(:fetch).with(9, nil).and_return(receiver)
-			hash = {stub => 'success'}
-			assert_equal('success', hash[stub])
-			assert_equal('success', hash[receiver])
-		end
-	end
+      hash = {stub => "success"}
+      assert_equal("success", hash[stub])
+      assert_equal("success", hash[receiver])
+    end
+  end
 end

metadata

@@ -1,15 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: odba
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.1
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: observer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ydbi
   requirement: !ruby/object:Gem::Requirement
@@ -84,18 +125,18 @@ dependencies:
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +164,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debug_inspector
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,18 +183,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/devenv.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
-- Guide.txt
-- History.txt
+- History.md
 - LICENSE.txt
-- Manifest.txt
 - README.md
 - Rakefile
-- install.rb
+- devenv.lock
+- devenv.nix
+- devenv.yaml
 - lib/odba.rb
-- lib/odba/18_19_loading_compatibility.rb
 - lib/odba/cache.rb
 - lib/odba/cache_entry.rb
 - lib/odba/connection_pool.rb
@@ -174,6 +215,9 @@ files:
 - sql/create_tables.sql
 - sql/object.sql
 - sql/object_connection.sql
+- test/example.rb
+- test/helper.rb
+- test/suite.rb
 - test/test_array.rb
 - test/test_cache.rb
 - test/test_cache_entry.rb
@@ -189,8 +233,8 @@ files:
 homepage: https://github.com/zdavatz/odba
 licenses:
 - GPL-v2
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/zdavatz/odba/blob/master/History.md
 rdoc_options: []
 require_paths:
 - lib
@@ -198,15 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby Software for ODDB.org Memory Management
 test_files: []

data/Guide.txt

@@ -1,36 +0,0 @@
-= odba
-
-ODBA is an unintrusive Object Cache system. It adresses the crosscutting 
-concern of object storage by disconnecting and serializing objects into 
-storage. All disconnected connections are replaced by instances of 
-ODBA::Stub, thus enabling transparent object-loading.
- 
-== ODBA supports
-
- * transparent loading of connected objects
- * index-vectors
- * transactions
- * transparently fetches Hash-Elements without loading the entire Hash
-
-== Example
-include 'odba'
-
- # connect default storage manager to a relational database 
- ODBA.storage.dbi = ODBA::ConnectionPool.new('DBI::pg::database', 'user', 'pw')
- 
-               class Counter 
-                       include ODBA::Persistable
-                       def initialize
-                               @pos = 0
-                       end
-                       def up
-                               @pos += 1
-                               self.odba_store
-                               @pos
-                       end
-                       def down
-                               @pos -= 1
-                               self.odba_store
-                               @pos
-                       end
-               end

data/History.txt

@@ -1,91 +0,0 @@
-=== 1.1.9 / 28.06.2025
-
-* bulk_restore throws OdbaError when stack size > 1000
-
-=== 1.1.8 / 10.03.2021
-
-* Removed fixed dependency to pg (is optional like mysql2)
-
-=== 1.1.7 / 20.01.2021
-
-* Reworked some tests
-* Updated to use Ruby 3.0.0
-* Added github actions
-* Updated to use ydbi 0.5.7
-
-=== 1.1.6 / 23.01.2016
-
-* Updated to use ydbi 0.5.6
-
-=== 1.1.5 / 23.01.2016
-
-* Remove unused parameter dict for update_fulltext_index
-
-=== 1.1.4 / 13.12.2017
-
-* Drop text search dictionaries/configuration before recreating
-* Remove dictionary argument in fulltext search and index_definition
-
-=== 1.1.3 / 12.12.2016
-
-* Avoid errors by always specifying "IF NOT EXISTS" when creating tables and indices
-* Add utility method get_server_version
-* Removed misleading check in generate_dictionary
-
-=== 1.1.2 / 10.05.2016
-
-* requires now 'ydbi' and 'ydbd-pg'
-
-=== 1.1.1 / 10.05.2016
-
-* Made tests pass under Ruby 1.9.3, 2.x
-* Updated to use minitest
-
-=== 1.1.0 / 15.03.2013
-
-* Update dict source file name for multi languages
-
-=== 1.0.9 / 15.03.2013
-
-* Update dictionary to be suitable for new tsearch2
-  - generate_dictionary API is changed.
-  - generate_dictionary needs dict source files(dict, affix, stop)
-    into /usr/share/postgresql/tsearch_data.
-
-=== 1.0.8 / 09.01.2012
-
-* Added exclusive control to update @accessed_by Hash variable in CacheEntry class using mutex (Patinfo-Invoice Error)
-
-=== 1.0.7 / 27.12.2011
-
-* Debugged Hash iteration error during cleaning @fetched and @prefetched objects
-
-=== 1.0.6 / 23.12.2011
-
-* Fix all the elements of odba_potentials and odba_exclude_vars to be Symbols for Ruby 1.9.3
-
-=== 1.0.5 / 20.12.2011
-
-* Added attr_accessor :odba_persistent so we can update doctor addresses on ch.oddb.org
-
-=== 1.0.4 / 12.12.2011
-
-* Fixed file lock process by using @file_lock flag variable to control it in application side
-
-=== 1.0.3 / 09.12.2011
-
-* Debugged ODBA::Cache#next_id
-
-=== 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.
-
-=== 1.0.0 / 20.12.2010
-
-* Add ODBA.cache.index_matches(index_name, substring)
-
-  * this new method returns all search-terms of a given index (identified by index_name) that start with substring.

data/Manifest.txt

@@ -1,38 +0,0 @@
-Guide.txt
-History.txt
-LICENSE.txt
-README.txt
-Rakefile
-install.rb
-lib/odba.rb
-lib/odba/18_19_loading_compatibility.rb
-lib/odba/cache.rb
-lib/odba/cache_entry.rb
-lib/odba/connection_pool.rb
-lib/odba/drbwrapper.rb
-lib/odba/id_server.rb
-lib/odba/index.rb
-lib/odba/index_definition.rb
-lib/odba/marshal.rb
-lib/odba/odba.rb
-lib/odba/odba_error.rb
-lib/odba/persistable.rb
-lib/odba/storage.rb
-lib/odba/stub.rb
-sql/collection.sql
-sql/create_tables.sql
-sql/object.sql
-sql/object_connection.sql
-test/suite.rb
-test/test_array.rb
-test/test_cache.rb
-test/test_cache_entry.rb
-test/test_connection_pool.rb
-test/test_drbwrapper.rb
-test/test_hash.rb
-test/test_id_server.rb
-test/test_index.rb
-test/test_marshal.rb
-test/test_persistable.rb
-test/test_storage.rb
-test/test_stub.rb