caruby-core 1.5.5 → 2.1.1

data/lib/caruby/version.rb

@@ -1,3 +1,3 @@
 module CaRuby
-  VERSION = "1.5.5"
+  VERSION = "2.1.1"
 end

data/test/lib/caruby/database/cache_test.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../helper'
+require 'test/unit'
+require 'caruby/database/cache'
+
+class CacheTest < Test::Unit::TestCase
+  def test_add
+    cache = CaRuby::Cache.new { |item| item.identifier }
+    a = Item.new(:a)
+    assert_nil(cache[a], "Value mistakenly cached")
+    cache.add(a)
+    assert_equal(a, cache[a], "Cached value not found")
+    b = Item.new(:a)
+    assert_equal(a, cache[b], "Cached equivalent not found")
+    assert_equal(a, cache.add(b), "Cached add replaced existing entry")
+    cache.add!(b)
+    assert_equal(b, cache.add(b), "Cached add! did not replace existing entry")
+  end
+  
+  def test_add!
+    cache = CaRuby::Cache.new { |item| item.identifier }
+    a = Item.new(:a)
+    cache.add(a)
+    b = Item.new(:a)
+    cache.add!(b)
+    assert_equal(b, cache.add(b), "Cached add! did not replace existing entry")
+  end
+  
+  def test_clear
+    cache = CaRuby::Cache.new { |item| item.identifier }
+    a = Item.new(:a)
+    cache.add(a)
+    cache.clear
+    assert_nil(cache[a], "Cache not cleared")
+  end
+  
+  def test_sticky
+    cache = CaRuby::Cache.new { |item| item.identifier }
+    cache.sticky << Item
+    a = Item.new(:a)
+    cache.add(a)
+    cache.clear
+    assert_same(a, cache[a], "Cache sticky entries mistakenly cleared")
+  end
+  
+  private
+  
+  class Item
+    attr_reader :identifier
+    
+    def initialize(id)
+      @identifier = id
+    end
+  end
+end

data/test/lib/caruby/{util → helpers}/controlled_value_test.rb

@@ -1,8 +1,6 @@
-$:.unshift 'lib'
-
-require "test/unit"
-
-require 'caruby/util/controlled_value'
+require File.dirname(__FILE__) + '/../../helper'
+require 'test/unit'
+require 'caruby/helpers/controlled_value'
 require 'set'
 
 class ControlledValueTest < Test::Unit::TestCase

data/test/lib/caruby/{util → helpers}/person_test.rb

@@ -1,16 +1,14 @@
-$:.unshift 'lib'
-$:.unshift '../caruby/lib'
-
+require File.dirname(__FILE__) + '/../../helper'
 require "test/unit"
-require 'caruby/util/person'
+require 'caruby/helpers/person'
 
 class PersonTest < Test::Unit::TestCase
   def test_middle_but_no_first
-    assert_raises(ValidationError) { || CaRuby::Person::Name.new('Longfellow', nil, 'Wadsworth').validate }
+    assert_raises(Jinx::ValidationError) { || CaRuby::Person::Name.new('Longfellow', nil, 'Wadsworth').validate }
   end
 
   def test_empty_middle_and_no_first
-    assert_raises(ValidationError) { || CaRuby::Person::Name.new(nil, '').validate }
+    assert_raises(Jinx::ValidationError) { || CaRuby::Person::Name.new(nil, '').validate }
   end
 
   def test_substitute_nil_for_empty

data/test/lib/caruby/helpers/properties_test.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../../helper'
+require "test/unit"
+require 'caruby/helpers/properties'
+
+class PropertiesTest < Test::Unit::TestCase
+  FIXTURES = File.dirname(__FILE__) + '/../../../fixtures/caruby/util/properties'
+  INPUT_FILE = File.join(FIXTURES, 'properties.yaml')
+  MERGE_FILE = File.join(FIXTURES, 'merge_properties.yaml')
+  MERGE_PROPERTIES = ['short', 'nested']
+
+  def setup
+    @props = CaRuby::Properties.new(INPUT_FILE, :merge => MERGE_PROPERTIES)
+  end
+
+  def test_short_name
+    assert_equal('short', @props['short'], 'Short property incorrect')
+  end
+
+  def test_dotted_name
+    assert_equal('dot', @props['dot.property'], 'Dotted property incorrect')
+  end
+
+  def test_symbol
+    assert_equal('short', @props[:short], 'Symbol key lookup incorrect')
+  end
+
+  def test_nested
+    assert_not_nil(@props['nested'], 'Nested property not found')
+    assert_equal('A', @props['nested']['a'], 'Nested property value incorrect')
+    assert_equal('B', @props['nested']['b'], 'Nested property value incorrect')
+    assert_not_nil(@props['nested']['deep'], 'Nested deep property not found')
+    assert_equal('U', @props['nested']['deep']['u'], 'Nested deep property value incorrect')
+  end
+end

data/test/lib/caruby/{util → helpers}/roman_test.rb

@@ -1,7 +1,6 @@
-$:.unshift 'lib'
-
+require File.dirname(__FILE__) + '/../../helper'
 require "test/unit"
-require 'caruby/util/roman'
+require 'caruby/helpers/roman'
 
 class RomanTest < Test::Unit::TestCase
   def test_to_arabic

data/test/lib/caruby/{util → helpers}/version_test.rb

@@ -1,7 +1,6 @@
-$:.unshift 'lib'
-
+require File.dirname(__FILE__) + '/../../helper'
 require "test/unit"
-require 'caruby/util/version'
+require 'caruby/helpers/version'
 
 class VersionTest < Test::Unit::TestCase
   def test_major

data/test/lib/helper.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:test, :development)
+require 'jinx/helpers/log'
+
+# Open the logger.
+Jinx::Log.instance.open(File.dirname(__FILE__) + '/../results/log/caruby.log', :shift_age => 10, :shift_size => 1048576, :debug => true)

metadata

@@ -1,94 +1,107 @@
 --- !ruby/object:Gem::Specification 
 name: caruby-core
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 5
-  version: 1.5.5
+  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors: 
-- OHSU
+  - OHSU
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 -07:00
+date: 2012-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dbi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dbd-jdbc
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: uom
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-description: "    caRuby is a JRuby facade for interaction with caBIG applications.\n"
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rdbi
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: jinx
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.1.1
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: jinx-json
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.1.1
+    type: :runtime
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: jinx-migrate
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.1.1
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "2.6"
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: yard
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id008
+description: Ruby facade for caBIG applications.. See caruby.rubyforge.org for more information.
 email: caruby.org@gmail.com
 executables: []
 
@@ -97,156 +110,90 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/caruby/active_support/core_ext/string/inflections.rb
-- lib/caruby/active_support/core_ext/string.rb
-- lib/caruby/active_support/inflections.rb
-- lib/caruby/active_support/inflector.rb
-- lib/caruby/active_support/README.txt
-- lib/caruby/cli/application.rb
-- lib/caruby/cli/command.rb
-- lib/caruby/csv/csv_mapper.rb
-- lib/caruby/csv/csvio.rb
-- lib/caruby/database/fetched_matcher.rb
-- lib/caruby/database/lazy_loader.rb
-- lib/caruby/database/persistable.rb
-- lib/caruby/database/persistence_service.rb
-- lib/caruby/database/persistifier.rb
-- lib/caruby/database/reader.rb
-- lib/caruby/database/saved_matcher.rb
-- lib/caruby/database/search_template_builder.rb
-- lib/caruby/database/sql_executor.rb
-- lib/caruby/database/store_template_builder.rb
-- lib/caruby/database/writer.rb
-- lib/caruby/database.rb
-- lib/caruby/domain/attribute.rb
-- lib/caruby/domain/attributes.rb
-- lib/caruby/domain/dependency.rb
-- lib/caruby/domain/id_alias.rb
-- lib/caruby/domain/importer.rb
-- lib/caruby/domain/introspection.rb
-- lib/caruby/domain/inverse.rb
-- lib/caruby/domain/inversible.rb
-- lib/caruby/domain/java_attribute.rb
-- lib/caruby/domain/merge.rb
-- lib/caruby/domain/metadata.rb
-- lib/caruby/domain/mixin.rb
-- lib/caruby/domain/properties.rb
-- lib/caruby/domain/reference_visitor.rb
-- lib/caruby/domain/uniquify.rb
-- lib/caruby/domain.rb
-- lib/caruby/import/java.rb
-- lib/caruby/json/deserializer.rb
-- lib/caruby/json/serializer.rb
-- lib/caruby/migration/migratable.rb
-- lib/caruby/migration/migrator.rb
-- lib/caruby/migration/resource_module.rb
-- lib/caruby/migration/uniquify.rb
-- lib/caruby/resource.rb
-- lib/caruby/util/attribute_path.rb
-- lib/caruby/util/cache.rb
-- lib/caruby/util/class.rb
-- lib/caruby/util/collection.rb
-- lib/caruby/util/controlled_value.rb
-- lib/caruby/util/coordinate.rb
-- lib/caruby/util/domain_extent.rb
-- lib/caruby/util/file_separator.rb
-- lib/caruby/util/inflector.rb
-- lib/caruby/util/log.rb
-- lib/caruby/util/math.rb
-- lib/caruby/util/merge.rb
-- lib/caruby/util/module.rb
-- lib/caruby/util/options.rb
-- lib/caruby/util/partial_order.rb
-- lib/caruby/util/person.rb
-- lib/caruby/util/pretty_print.rb
-- lib/caruby/util/properties.rb
-- lib/caruby/util/roman.rb
-- lib/caruby/util/stopwatch.rb
-- lib/caruby/util/topological_sync_enumerator.rb
-- lib/caruby/util/transitive_closure.rb
-- lib/caruby/util/tree.rb
-- lib/caruby/util/trie.rb
-- lib/caruby/util/uniquifier.rb
-- lib/caruby/util/validation.rb
-- lib/caruby/util/version.rb
-- lib/caruby/util/visitor.rb
-- lib/caruby/util/weak_hash.rb
-- lib/caruby/version.rb
-- lib/caruby.rb
-- test/lib/caruby/csv/csv_mapper_test.rb
-- test/lib/caruby/csv/csvio_test.rb
-- test/lib/caruby/database/persistable_test.rb
-- test/lib/caruby/domain/domain_test.rb
-- test/lib/caruby/domain/inversible_test.rb
-- test/lib/caruby/domain/reference_visitor_test.rb
-- test/lib/caruby/import/java_test.rb
-- test/lib/caruby/import/mixed_case_test.rb
-- test/lib/caruby/migration/test_case.rb
-- test/lib/caruby/test_case.rb
-- test/lib/caruby/util/cache_test.rb
-- test/lib/caruby/util/class_test.rb
-- test/lib/caruby/util/collection_test.rb
-- test/lib/caruby/util/command_test.rb
-- test/lib/caruby/util/controlled_value_test.rb
-- test/lib/caruby/util/domain_extent_test.rb
-- test/lib/caruby/util/file_separator_test.rb
-- test/lib/caruby/util/inflector_test.rb
-- test/lib/caruby/util/lazy_hash_test.rb
-- test/lib/caruby/util/merge_test.rb
-- test/lib/caruby/util/module_test.rb
-- test/lib/caruby/util/options_test.rb
-- test/lib/caruby/util/partial_order_test.rb
-- test/lib/caruby/util/person_test.rb
-- test/lib/caruby/util/pretty_print_test.rb
-- test/lib/caruby/util/properties_test.rb
-- test/lib/caruby/util/roman_test.rb
-- test/lib/caruby/util/stopwatch_test.rb
-- test/lib/caruby/util/topological_sync_enumerator_test.rb
-- test/lib/caruby/util/transitive_closure_test.rb
-- test/lib/caruby/util/tree_test.rb
-- test/lib/caruby/util/trie_test.rb
-- test/lib/caruby/util/version_test.rb
-- test/lib/caruby/util/visitor_test.rb
-- test/lib/caruby/util/weak_hash_test.rb
-- test/lib/examples/clinical_trials/migration/migration_test.rb
-- test/lib/examples/clinical_trials/migration/test_case.rb
-- History.md
-- LEGAL
-- LICENSE
-- README.md
+  - lib/caruby.rb
+  - lib/caruby/caruby-src.tar.gz
+  - lib/caruby/database.rb
+  - lib/caruby/metadata.rb
+  - lib/caruby/resource.rb
+  - lib/caruby/version.rb
+  - lib/caruby/active_support/inflections.rb
+  - lib/caruby/active_support/inflector.rb
+  - lib/caruby/active_support/README.txt
+  - lib/caruby/active_support/core_ext/string.rb
+  - lib/caruby/active_support/core_ext/string/inflections.rb
+  - lib/caruby/database/application_service.rb
+  - lib/caruby/database/cache.rb
+  - lib/caruby/database/fetched_matcher.rb
+  - lib/caruby/database/lazy_loader.rb
+  - lib/caruby/database/operation.rb
+  - lib/caruby/database/persistable.rb
+  - lib/caruby/database/persistence_service.rb
+  - lib/caruby/database/persistifier.rb
+  - lib/caruby/database/reader.rb
+  - lib/caruby/database/reader_template_builder.rb
+  - lib/caruby/database/saved_matcher.rb
+  - lib/caruby/database/sql_executor.rb
+  - lib/caruby/database/writer.rb
+  - lib/caruby/database/writer_template_builder.rb
+  - lib/caruby/helpers/controlled_value.rb
+  - lib/caruby/helpers/coordinate.rb
+  - lib/caruby/helpers/person.rb
+  - lib/caruby/helpers/properties.rb
+  - lib/caruby/helpers/roman.rb
+  - lib/caruby/helpers/version.rb
+  - lib/caruby/json/deserializer.rb
+  - lib/caruby/json/serializer.rb
+  - lib/caruby/metadata/java_property.rb
+  - lib/caruby/metadata/propertied.rb
+  - lib/caruby/metadata/property.rb
+  - lib/caruby/metadata/property_characteristics.rb
+  - lib/caruby/migration/migratable.rb
+  - lib/caruby/rdbi/driver/jdbc.rb
+  - History.md
+  - LEGAL
+  - LICENSE
+  - README.md
+  - Gemfile
+  - test/lib/helper.rb
+  - test/lib/caruby/database/cache_test.rb
+  - test/lib/caruby/helpers/controlled_value_test.rb
+  - test/lib/caruby/helpers/person_test.rb
+  - test/lib/caruby/helpers/properties_test.rb
+  - test/lib/caruby/helpers/roman_test.rb
+  - test/lib/caruby/helpers/version_test.rb
 has_rdoc: yard
 homepage: http://caruby.rubyforge.org
 licenses: 
-- MIT
+  - MIT
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: caruby
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Ruby facade for caBIG applications.
-test_files: []
-
+test_files: 
+  - test/lib/helper.rb
+  - test/lib/caruby/database/cache_test.rb
+  - test/lib/caruby/helpers/controlled_value_test.rb
+  - test/lib/caruby/helpers/person_test.rb
+  - test/lib/caruby/helpers/properties_test.rb
+  - test/lib/caruby/helpers/roman_test.rb
+  - test/lib/caruby/helpers/version_test.rb