linkage 0.0.8 → 0.1.0.pre

metadata

@@ -1,62 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: linkage
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.1.0.pre
 platform: ruby
 authors:
 - Jeremy Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel-collation
+  name: hashery
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashery
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Performs record linkage between one or two datasets, using Sequel on
@@ -70,146 +175,134 @@ files:
 - .document
 - .gitignore
 - .vimrc
+- .yardopts
 - Gemfile
-- Gemfile.lock
+- Gemfile-java
 - Guardfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
+- TODO
 - VERSION
 - lib/linkage.rb
 - lib/linkage/comparator.rb
-- lib/linkage/comparators/binary.rb
 - lib/linkage/comparators/compare.rb
+- lib/linkage/comparators/strcompare.rb
 - lib/linkage/comparators/within.rb
 - lib/linkage/configuration.rb
-- lib/linkage/data.rb
 - lib/linkage/dataset.rb
-- lib/linkage/decollation.rb
-- lib/linkage/expectation.rb
-- lib/linkage/expectations/exhaustive.rb
-- lib/linkage/expectations/simple.rb
+- lib/linkage/exceptions.rb
 - lib/linkage/field.rb
 - lib/linkage/field_set.rb
-- lib/linkage/function.rb
-- lib/linkage/functions/binary.rb
-- lib/linkage/functions/cast.rb
-- lib/linkage/functions/length.rb
-- lib/linkage/functions/strftime.rb
-- lib/linkage/functions/trim.rb
-- lib/linkage/group.rb
 - lib/linkage/import_buffer.rb
-- lib/linkage/meta_object.rb
+- lib/linkage/match_recorder.rb
+- lib/linkage/match_set.rb
+- lib/linkage/match_sets/csv.rb
+- lib/linkage/match_sets/database.rb
+- lib/linkage/matcher.rb
 - lib/linkage/result_set.rb
+- lib/linkage/result_sets/csv.rb
+- lib/linkage/result_sets/database.rb
 - lib/linkage/runner.rb
-- lib/linkage/runner/single_threaded.rb
-- lib/linkage/utils.rb
+- lib/linkage/score_recorder.rb
+- lib/linkage/score_set.rb
+- lib/linkage/score_sets/csv.rb
+- lib/linkage/score_sets/database.rb
 - lib/linkage/version.rb
-- lib/linkage/warnings.rb
 - linkage.gemspec
+- linkage.gemspec-java
 - test/config.yml
 - test/helper.rb
-- test/integration/test_collation.rb
-- test/integration/test_configuration.rb
 - test/integration/test_cross_linkage.rb
-- test/integration/test_dataset.rb
+- test/integration/test_database_result_set.rb
 - test/integration/test_dual_linkage.rb
-- test/integration/test_functions.rb
-- test/integration/test_result_set.rb
-- test/integration/test_scoring.rb
 - test/integration/test_self_linkage.rb
 - test/integration/test_within_comparator.rb
 - test/unit/comparators/test_compare.rb
+- test/unit/comparators/test_strcompare.rb
 - test/unit/comparators/test_within.rb
-- test/unit/expectations/test_exhaustive.rb
-- test/unit/expectations/test_simple.rb
-- test/unit/functions/test_binary.rb
-- test/unit/functions/test_cast.rb
-- test/unit/functions/test_length.rb
-- test/unit/functions/test_strftime.rb
-- test/unit/functions/test_trim.rb
-- test/unit/runner/test_single_threaded.rb
+- test/unit/match_sets/test_csv.rb
+- test/unit/match_sets/test_database.rb
+- test/unit/result_sets/test_csv.rb
+- test/unit/result_sets/test_database.rb
+- test/unit/score_sets/test_csv.rb
+- test/unit/score_sets/test_database.rb
 - test/unit/test_comparator.rb
+- test/unit/test_comparators.rb
 - test/unit/test_configuration.rb
-- test/unit/test_data.rb
 - test/unit/test_dataset.rb
-- test/unit/test_decollation.rb
 - test/unit/test_field.rb
 - test/unit/test_field_set.rb
-- test/unit/test_function.rb
-- test/unit/test_group.rb
 - test/unit/test_import_buffer.rb
 - test/unit/test_linkage.rb
-- test/unit/test_meta_object.rb
+- test/unit/test_match_recorder.rb
+- test/unit/test_match_set.rb
+- test/unit/test_match_sets.rb
+- test/unit/test_matcher.rb
 - test/unit/test_result_set.rb
+- test/unit/test_result_sets.rb
 - test/unit/test_runner.rb
-- test/unit/test_utils.rb
+- test/unit/test_runners.rb
+- test/unit/test_score_recorder.rb
+- test/unit/test_score_set.rb
+- test/unit/test_score_sets.rb
 homepage: http://github.com/coupler/linkage
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1649246308926950627
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1649246308926950627
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Record linkage library
 test_files:
 - test/config.yml
 - test/helper.rb
-- test/integration/test_collation.rb
-- test/integration/test_configuration.rb
 - test/integration/test_cross_linkage.rb
-- test/integration/test_dataset.rb
+- test/integration/test_database_result_set.rb
 - test/integration/test_dual_linkage.rb
-- test/integration/test_functions.rb
-- test/integration/test_result_set.rb
-- test/integration/test_scoring.rb
 - test/integration/test_self_linkage.rb
 - test/integration/test_within_comparator.rb
 - test/unit/comparators/test_compare.rb
+- test/unit/comparators/test_strcompare.rb
 - test/unit/comparators/test_within.rb
-- test/unit/expectations/test_exhaustive.rb
-- test/unit/expectations/test_simple.rb
-- test/unit/functions/test_binary.rb
-- test/unit/functions/test_cast.rb
-- test/unit/functions/test_length.rb
-- test/unit/functions/test_strftime.rb
-- test/unit/functions/test_trim.rb
-- test/unit/runner/test_single_threaded.rb
+- test/unit/match_sets/test_csv.rb
+- test/unit/match_sets/test_database.rb
+- test/unit/result_sets/test_csv.rb
+- test/unit/result_sets/test_database.rb
+- test/unit/score_sets/test_csv.rb
+- test/unit/score_sets/test_database.rb
 - test/unit/test_comparator.rb
+- test/unit/test_comparators.rb
 - test/unit/test_configuration.rb
-- test/unit/test_data.rb
 - test/unit/test_dataset.rb
-- test/unit/test_decollation.rb
 - test/unit/test_field.rb
 - test/unit/test_field_set.rb
-- test/unit/test_function.rb
-- test/unit/test_group.rb
 - test/unit/test_import_buffer.rb
 - test/unit/test_linkage.rb
-- test/unit/test_meta_object.rb
+- test/unit/test_match_recorder.rb
+- test/unit/test_match_set.rb
+- test/unit/test_match_sets.rb
+- test/unit/test_matcher.rb
 - test/unit/test_result_set.rb
+- test/unit/test_result_sets.rb
 - test/unit/test_runner.rb
-- test/unit/test_utils.rb
+- test/unit/test_runners.rb
+- test/unit/test_score_recorder.rb
+- test/unit/test_score_set.rb
+- test/unit/test_score_sets.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    linkage (0.0.8)
-      hashery
-      sequel
-      sequel-collation
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    blockenspiel (0.4.5)
-    coderay (1.0.8)
-    columnize (0.3.6)
-    debugger (1.3.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.7)
-    ffi (1.3.1)
-    ffi (1.3.1-java)
-    guard (1.6.2)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
-      thor (>= 0.14.6)
-    guard-test (0.7.0)
-      guard (>= 1.1)
-      test-unit (~> 2.2)
-    guard-yard (2.0.1)
-      guard (>= 1.1.0)
-      yard (>= 0.7.0)
-    hashery (2.1.0)
-    jdbc-mysql (5.1.22.1)
-    jdbc-sqlite3 (3.7.2.1)
-    listen (0.7.2)
-    lumberjack (1.0.2)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mocha (0.13.2)
-      metaclass (~> 0.0.1)
-    mysql2 (0.3.11)
-    pry (0.9.11.4)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry (0.9.11.4-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.0.3)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rdiscount (2.0.7)
-    sequel (3.44.0)
-    sequel-collation (0.1.0)
-      sequel
-    slop (3.4.3)
-    spoon (0.0.1)
-    sqlite3 (1.3.7)
-    terminal-table (1.4.5)
-    test-unit (2.5.4)
-    thor (0.17.0)
-    versionomy (0.4.4)
-      blockenspiel (>= 0.4.5)
-    yard (0.8.4.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler
-  debugger
-  guard-test
-  guard-yard
-  jdbc-mysql
-  jdbc-sqlite3
-  linkage!
-  mocha
-  mysql2
-  rake
-  rb-inotify (~> 0.8.8)
-  rdiscount
-  sqlite3
-  test-unit
-  versionomy
-  yard

data/lib/linkage/comparators/binary.rb

@@ -1,12 +0,0 @@
-module Linkage
-  module Comparators
-    # @abstract Convenient abstract class for comparators that only return
-    #   true/false values (0 or 1).
-    class Binary < Comparator
-      @@score_range = 0..1
-      def self.score_range
-        @@score_range
-      end
-    end
-  end
-end

data/lib/linkage/data.rb

@@ -1,175 +0,0 @@
-module Linkage
-  # Superclass to {Field} and {Function}.
-  #
-  # @abstract
-  class Data
-    # A "tree" used to find compatible types.
-    TYPE_CONVERSION_TREE = {
-      TrueClass => [Integer],
-      Integer => [Bignum, Float],
-      Bignum => [BigDecimal],
-      Float => [BigDecimal],
-      BigDecimal => [String],
-      String => nil,
-      DateTime => nil,
-      Date => nil,
-      Time => nil,
-      File => nil
-    }
-
-    # @!attribute [r] name
-    #   @return [Symbol] This object's name
-    attr_reader :name
-
-    # @!attribute [r] dataset
-    #   @return [Linkage::Dataset, nil] This object's dataset, or nil
-    attr_reader :dataset
-
-    def initialize(name)
-      @name = name
-    end
-
-    def ruby_type
-      raise NotImplementedError
-    end
-
-    def to_expr
-      raise NotImplementedError
-    end
-
-    def collation
-      nil
-    end
-
-    def database_type
-      ds = dataset
-      ds ? ds.database_type : nil
-    end
-
-    def static?
-      raise NotImplementedError
-    end
-
-    # Create a merge field that can hold data from two data sources. If the
-    # fields have different types, the resulting type is determined via a
-    # type-conversion tree.
-    #
-    # @param [Linkage::Data] other
-    # @return [Linkage::MergeField]
-    def merge(other, new_name = nil)
-      schema_1 = self.ruby_type
-      db_type_1 = self.database_type
-      schema_2 = other.ruby_type
-      db_type_2 = other.database_type
-      if schema_1 == schema_2 && db_type_1 == db_type_2
-        result = schema_1
-      else
-        type_1 = schema_1[:type]
-        opts_1 = schema_1[:opts] || {}
-        type_2 = schema_2[:type]
-        opts_2 = schema_2[:opts] || {}
-        result_type = type_1
-        result_opts = schema_1[:opts] ? schema_1[:opts].dup : {}
-
-        # type
-        if type_1 != type_2
-          result_type = first_common_type(type_1, type_2)
-          if result_type.nil?
-            raise "Can't merge #{type_1} (#{name}) with #{type_2} (#{other.name})"
-          end
-        end
-
-        # text
-        if opts_1[:text] != opts_2[:text]
-          # This can only be of type String.
-          result_opts[:text] = true
-          result_opts.delete(:size)
-        end
-
-        # size
-        if !result_opts[:text] && opts_1[:size] != opts_2[:size]
-          types = [type_1, type_2].uniq
-          if types.length == 1 && types[0] == BigDecimal
-            # Two decimals
-            if opts_1.has_key?(:size) && opts_2.has_key?(:size)
-              s_1 = opts_1[:size]
-              s_2 = opts_2[:size]
-              result_opts[:size] = [ s_1[0] > s_2[0] ? s_1[0] : s_2[0] ]
-
-              if s_1[1] && s_2[1]
-                result_opts[:size][1] = s_1[1] > s_2[1] ? s_1[1] : s_2[1]
-              else
-                result_opts[:size][1] = s_1[1] ? s_1[1] : s_2[1]
-              end
-            else
-              result_opts[:size] = opts_1.has_key?(:size) ? opts_1[:size] : opts_2[:size]
-            end
-          elsif types.include?(String) && types.include?(BigDecimal)
-            # Add one to the precision of the BigDecimal (for the dot)
-            if opts_1.has_key?(:size) && opts_2.has_key?(:size)
-              s_1 = opts_1[:size].is_a?(Array) ? opts_1[:size][0] + 1 : opts_1[:size]
-              s_2 = opts_2[:size].is_a?(Array) ? opts_2[:size][0] + 1 : opts_2[:size]
-              result_opts[:size] = s_1 > s_2 ? s_1 : s_2
-            elsif opts_1.has_key?(:size)
-              result_opts[:size] = opts_1[:size].is_a?(Array) ? opts_1[:size][0] + 1 : opts_1[:size]
-            elsif opts_2.has_key?(:size)
-              result_opts[:size] = opts_2[:size].is_a?(Array) ? opts_2[:size][0] + 1 : opts_2[:size]
-            end
-          else
-            # Treat as two strings
-            if opts_1.has_key?(:size) && opts_2.has_key?(:size)
-              result_opts[:size] = opts_1[:size] > opts_2[:size] ? opts_1[:size] : opts_2[:size]
-            elsif opts_1.has_key?(:size)
-              result_opts[:size] = opts_1[:size]
-            else
-              result_opts[:size] = opts_2[:size]
-            end
-          end
-        end
-
-        # fixed
-        if opts_1[:fixed] != opts_2[:fixed]
-          # This can only be of type String.
-          result_opts[:fixed] = true
-        end
-
-        # collation
-        if opts_1[:collate] != opts_2[:collate] || db_type_1 != db_type_2
-          result_opts.delete(:collate)
-        end
-
-        result = {:type => result_type}
-        result[:opts] = result_opts  unless result_opts.empty?
-      end
-
-      if new_name
-        name = new_name.to_sym
-      else
-        name = self.name == other.name ? self.name : :"#{self.name}_#{other.name}"
-      end
-      MergeField.new(name, result, db_type_1 == db_type_2 ? db_type_1 : nil)
-    end
-
-    private
-
-    def first_common_type(type_1, type_2)
-      types_1 = [type_1] + get_types(type_1)
-      types_2 = [type_2] + get_types(type_2)
-      (types_1 & types_2).first
-    end
-
-    # Get all types that the specified type can be converted to. Order
-    # matters.
-    def get_types(type)
-      result = []
-      types = TYPE_CONVERSION_TREE[type]
-      if types
-        result += types
-        types.each do |t|
-          result |= get_types(t)
-        end
-      end
-      result
-    end
-  end
-end