odba 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d7feacfaca66cd9d136d8a6b1d0d35e0a26c046
+  data.tar.gz: 540b6e0e36cfbff7206bb7d84aafd7677c2852b0
+SHA512:
+  metadata.gz: 9038775f0f5c6f3402f258c5032c5ea5e3d64cae9f96cbde6de5a541c3a7721580e084050d6b1d6984168c259741485b47a0f3a7d6415b6ddb2da23594de1ace
+  data.tar.gz: 3e8711cf9e9ccc07d073bbf56f98afd1300e636cfdac25b294b1a7cae0c1c37593f38308be88045cc26ef69048a89d284714a5b47acf7454c8942a5cc2845f6a

data/.gitignore

@@ -0,0 +1,4 @@
+.bundle/
+vendor/
+coverage/
+pkg/

data/.travis.yml

@@ -0,0 +1,25 @@
+language: ruby
+cache: bundler
+sudo: false
+before_install:
+  - gem install bundler
+
+install:
+  - bundle install --without debugger
+
+script:
+  - bundle exec ruby test/suite.rb
+
+notifications:
+  email:
+  - ngiger@ywesee.com
+rvm:
+  - ruby-head
+  - 2.2.3
+  - 2.1.7
+  - 2.0.0
+  - 1.9.3
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - 1.8.7

data/Gemfile

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec
+
+group 'test' do
+  gem 'flexmock', "~> 1.3.0"
+  gem 'test-unit'
+  gem 'minitest'
+end
+
+group 'debugger' do
+  gem 'pry'
+  gem 'pry-nav'
+  gem 'pry-rescue'
+  gem 'pry-stack_explorer'
+  gem 'pry-doc'
+end

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.1 / 24.06.2014
+
+* 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

data/Manifest.txt

@@ -0,0 +1,38 @@
+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

data/Rakefile

@@ -1,30 +1,30 @@
-# -*- ruby -*-
+#!/usr/bin/env ruby
+# encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'odba/version'
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
-require 'rubygems'
-require 'hoe'
+# dependencies are now declared in odba.gemspec
 
-Hoe.plugin :git
-
-# Hoe.plugin :compiler
-# Hoe.plugin :cucumberfeatures
-# Hoe.plugin :gem_prelude_sucks
-# Hoe.plugin :inline
-# Hoe.plugin :inline
-# Hoe.plugin :manifest
-# Hoe.plugin :newgem
-# Hoe.plugin :racc
-# Hoe.plugin :rubyforge
-# Hoe.plugin :rubyforge
-# Hoe.plugin :website
-
-Hoe.spec 'odba' do
-  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
-  # you'll never have to touch them again!
-  # (delete this comment too, of course)
+desc 'Offer a gem task like hoe'
+task :gem => :build do
+  Rake::Task[:build].invoke
+end
 
-developer('Masaomi Hatakeyama, Zeno R.R. Davatz', 'mhatakeyama@ywesee.com, zdavatz@ywesee.com')
+desc "Run tests"
+task :default => :test
 
-  # self.rubyforge_name = 'odbax' # if different than 'odba'
+desc 'Run odba with all commonly used combinations'
+task :test do
+  log_file = 'suite.log'
+  res = system("bash -c 'set -o pipefail && bundle exec ruby test/suite.rb 2>&1 | tee #{log_file}'")
+  puts "Running test/suite.rb returned #{res.inspect}. Output was redirected to #{log_file}"
+  exit 1 unless res
 end
 
+require 'rake/clean'
+CLEAN.include FileList['pkg/*.gem']
+
 # vim: syntax=ruby

data/lib/odba.rb

@@ -9,7 +9,3 @@ require 'odba/cache_entry'
 require 'odba/odba_error'
 require 'odba/index'
 require 'odba/odba'
-
-class Odba
-    VERSION = '1.1.0'
-end

data/lib/odba/cache.rb

@@ -36,6 +36,7 @@ module ODBA
       @loading_stats = {}
       @peers = []
       @file_lock = false
+      @debug ||= false
 		end
 		# Returns all objects designated by _bulk_fetch_ids_ and registers 
 		# _odba_caller_ for each of them. Objects which are not yet loaded are loaded

data/lib/odba/cache_entry.rb

@@ -45,6 +45,7 @@ module ODBA
       odba_id && ODBA.cache.include?(odba_id) && ODBA.cache.fetch(odba_id)
     end
 		def odba_add_reference(object)
+      return unless object.respond_to?(:odba_id)
       @cache_entry_mutex.synchronize do
         @accessed_by.store(object.object_id, object.odba_id)
       end

data/lib/odba/version.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+class Odba
+    VERSION = '1.1.1'
+end

data/odba.gemspec

@@ -0,0 +1,29 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'odba/version'
+
+Gem::Specification.new do |spec|
+  spec.name        = "odba"
+  spec.version     = Odba::VERSION
+  spec.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz"
+  spec.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com"
+  spec.description = "Object Database Access"
+  spec.summary     = "Ruby Software for ODDB.org Memory Management"
+  spec.homepage    = "https://github.com/zdavatz/odba"
+  spec.license       = "GPL-v2"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+#  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'ydbi','>=0.5.0'
+  spec.add_dependency 'dbd-pg', '0.3.9'
+  
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "minitest" if /^1\./.match(RUBY_VERSION)
+end
+

data/test/suite.rb

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 # suite.rb -- oddb -- 20.11.2002 -- hwyss@ywesee.com 
 
 $: << File.expand_path(File.dirname(__FILE__))
+require 'minitest'
+require 'simplecov'
+SimpleCov.start
 
 Dir.foreach(File.dirname(__FILE__)) { |file|
 	require file if /^test_.*\.rb$/o.match(file)

data/test/test_array.rb

@@ -4,28 +4,35 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'
 require 'odba/odba'
 
 module ODBA
-  class TestArray < Test::Unit::TestCase
+  class TestArray < Minitest::Test
     include FlexMock::TestCase
-    class ODBAContainer
+    class ODBAContainerInArrayInArray
      include ODBA::Persistable
      attr_accessor	:non_replaceable, :replaceable, :array, :odba_id
     end
-    class Container
+    class ContainerInArray
       attr_accessor :content
     end
     def setup
       @array = Array.new
       ODBA.storage = flexmock("storage")
-      ODBA.marshaller = flexmock("marshaller")
+      ODBA.marshaller = flexmock("marshaller_array")
       ODBA.cache = flexmock("cache")
     end
+    def teardown
+      ODBA.storage = nil
+      ODBA.marshaller = nil
+      ODBA.cache = nil
+      load = File.expand_path(File.join(File.dirname(__FILE__), '../lib/odba/storage.rb'))
+      super
+    end
     def test_odba_cut_connection
       remove_obj = Object
       remove_obj.extend(ODBA::Persistable)
@@ -36,8 +43,8 @@ module ODBA
       assert_equal(0, array.odba_cut_connection(remove_obj).size)
     end
     def test_odba_unsaved_neighbors_array
-      rep1 = ODBAContainer.new
-      rep2 = ODBAContainer.new
+      rep1 = ODBAContainerInArrayInArray.new
+      rep2 = ODBAContainerInArrayInArray.new
       @array.push(rep1)
       @array.push(rep2)
       result = @array.odba_unsaved_neighbors(1)
@@ -85,18 +92,18 @@ module ODBA
       assert_equal(reloaded, modified)
     end
     def test_odba_target_ids
-      o = ODBAContainer.new
+      o = ODBAContainerInArrayInArray.new
       o.odba_id = 1
-      p = ODBAContainer.new
+      p = ODBAContainerInArrayInArray.new
       p.odba_id = 2
-      q = ODBAContainer.new
+      q = ODBAContainerInArrayInArray.new
       q.odba_id = 3
       @array.push(p, q)
       @array.instance_variable_set('@foo', o)
       assert_equal([1,2,3], @array.odba_target_ids)
     end
     def test_stubize
-      item = ODBAContainer.new
+      item = ODBAContainerInArrayInArray.new
       @array.push(item)
       @array.odba_stubize(item)
       first = @array.first

data/test/test_cache.rb

@@ -5,7 +5,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'flexmock'
 require 'odba/cache'
 require 'odba/cache_entry'
@@ -24,9 +24,9 @@ module ODBA
 		attr_writer :indices
 		public :load_object
 	end
-	class TestCache < Test::Unit::TestCase
+	class TestCache < Minitest::Test
     include FlexMock::TestCase
-		class ODBAContainer
+		class ODBAContainerInCache
 		 include ODBA::Persistable
 		 attr_accessor	:odba_connection, :odba_id
 		end
@@ -345,9 +345,7 @@ module ODBA
 				[[2, foo]]
 			}
 			prepare_bulk_restore([foo])
-			assert_nothing_raised {
-				@cache.prefetch
-			}
+			@cache.prefetch
 		end
 		def test_fill_index
 			foo = flexmock("foo")
@@ -448,9 +446,9 @@ module ODBA
 			}
 		end
 		def test_delete
-			delete_item = ODBAContainer.new
+			delete_item = ODBAContainerInCache.new
 			delete_item.odba_id = 1
-			origin_obj = ODBAContainer.new
+			origin_obj = ODBAContainerInCache.new
 			origin_obj.odba_id = 2
 			origin_obj.odba_connection = delete_item
 			@cache.fetched.store(1, delete_item)
@@ -656,7 +654,7 @@ module ODBA
         .times(1).and_return(o1)
       @marshal.should_receive(:load).with('dump2')\
         .times(1).and_return(o2)
-      assert_equal([o1, o2], @cache.extent(ODBAContainer, clr))
+      assert_equal([o1, o2], @cache.extent(ODBAContainerInCache, clr))
     end
     def test_fetch_collection
       obj = flexmock('Object')

data/test/test_cache_entry.rb

@@ -4,7 +4,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'flexmock'
 require 'odba/cache_entry'
 require 'odba/odba'
@@ -14,7 +14,7 @@ module ODBA
 	class CacheEntry
 		attr_accessor :accessed_by
 	end
-	class TestCacheEntry < Test::Unit::TestCase
+	class TestCacheEntry < Minitest::Test
     include FlexMock::TestCase
 		def setup
 			@mock = flexmock
@@ -26,6 +26,9 @@ module ODBA
       ODBA.cache.should_receive(:retire_age).and_return(0.9)
       ODBA.cache.should_receive(:destroy_age).and_return(0.9)
 		end
+    def teardown
+      super
+    end
 		def test_retire_check
 			@mock.should_receive(:odba_unsaved?).and_return { false }
 			@mock.should_receive(:odba_unsaved?).and_return { false }

data/test/test_connection_pool.rb

@@ -3,17 +3,17 @@
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'flexmock'
 require 'odba/connection_pool'
 ## connection_pool requires 'dbi', which unshifts the site_ruby dir
 #  to the first position in $LOAD_PATH ( == $: ). As a result, files are
 #  loaded from site_ruby if they are installed there, and thus ignored
 #  by rcov. Workaround:
-$:.shift
+# $:.shift
 
 module ODBA
-  class TestConnectionPool < Test::Unit::TestCase
+  class TestConnectionPool < Minitest::Test
     include FlexMock::TestCase
     def test_survive_error
       flexstub(DBI).should_receive(:connect).times(10).and_return { 
@@ -28,7 +28,7 @@ module ODBA
           ## after the first error is raised, ConnectionPool reconnects.
         }
       }
-      assert_nothing_raised { pool.execute('statement') }
+      pool.execute('statement')
     end
     def test_multiple_errors__give_up
       flexstub(DBI).should_receive(:connect).times(20).and_return { 
@@ -71,7 +71,7 @@ module ODBA
         conn
       }
       pool = ConnectionPool.new()
-      assert_nothing_raised { pool.disconnect }
+      pool.disconnect
     end
   end
 end

data/test/test_drbwrapper.rb

@@ -3,12 +3,12 @@
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'odba/drbwrapper'
 require 'flexmock'
 
 module ODBA
-  class TestDRbWrapper < Test::Unit::TestCase
+  class TestDRbWrapper < Minitest::Test
     include FlexMock::TestCase
     def test_include
       obj = FlexMock.new
@@ -52,7 +52,7 @@ module ODBA
       }
     end
   end
-  class TestDRbIdConv < Test::Unit::TestCase
+  class TestDRbIdConv < Minitest::Test
     include FlexMock::TestCase
     def setup
       ODBA.cache = flexmock('cache')