linkage 0.0.2 → 0.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 -06:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &7134200 !ruby/object:Gem::Requirement
+  requirement: &13934860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7134200
+  version_requirements: *13934860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7128660 !ruby/object:Gem::Requirement
+  requirement: &13932740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7128660
+  version_requirements: *13932740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &7140220 !ruby/object:Gem::Requirement
+  requirement: &13929520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *7140220
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &7137480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *7137480
+  version_requirements: *13929520
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &7145460 !ruby/object:Gem::Requirement
+  requirement: &13266740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +55,10 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *7145460
+  version_requirements: *13266740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &7153760 !ruby/object:Gem::Requirement
+  requirement: &13265420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7153760
+  version_requirements: *13265420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &7165200 !ruby/object:Gem::Requirement
+  requirement: &13264380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7165200
+  version_requirements: *13264380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7162960 !ruby/object:Gem::Requirement
+  requirement: &13262200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7162960
+  version_requirements: *13262200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7161840 !ruby/object:Gem::Requirement
+  requirement: &13276680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7161840
+  version_requirements: *13276680
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &7176680 !ruby/object:Gem::Requirement
+  requirement: &14225280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7176680
+  version_requirements: *14225280
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &7175420 !ruby/object:Gem::Requirement
+  requirement: &14222420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7175420
+  version_requirements: *14222420
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &7171460 !ruby/object:Gem::Requirement
+  requirement: &14220220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +132,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7171460
+  version_requirements: *14220220
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &7170260 !ruby/object:Gem::Requirement
+  requirement: &14218900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14218900
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: &14217760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14217760
+- !ruby/object:Gem::Dependency
+  name: guard-yard
+  requirement: &14230100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7170260
+  version_requirements: *14230100
 description: Wraps Sequel to perform record linkage between one or two datasets
 email: jeremy.f.stephens@vanderbilt.edu
 executables: []
@@ -175,12 +187,13 @@ files:
 - lib/linkage/configuration.rb
 - lib/linkage/data.rb
 - lib/linkage/dataset.rb
-- lib/linkage/expectation.rb
 - lib/linkage/field.rb
+- lib/linkage/field_set.rb
 - lib/linkage/function.rb
 - lib/linkage/functions/trim.rb
 - lib/linkage/group.rb
 - lib/linkage/import_buffer.rb
+- lib/linkage/result_set.rb
 - lib/linkage/runner.rb
 - lib/linkage/runner/single_threaded.rb
 - lib/linkage/utils.rb
@@ -189,6 +202,7 @@ files:
 - test/config.yml
 - test/helper.rb
 - test/integration/test_cross_linkage.rb
+- test/integration/test_dataset.rb
 - test/integration/test_dual_linkage.rb
 - test/integration/test_self_linkage.rb
 - test/unit/functions/test_trim.rb
@@ -196,14 +210,16 @@ files:
 - test/unit/test_configuration.rb
 - test/unit/test_data.rb
 - test/unit/test_dataset.rb
-- test/unit/test_expectation.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_result_set.rb
 - test/unit/test_runner.rb
 - test/unit/test_utils.rb
+has_rdoc: true
 homepage: http://github.com/coupler/linkage
 licenses:
 - MIT
@@ -219,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3999364823081997349
+      hash: 3554989941562530888
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: Sequel-based record linkage

data/lib/linkage/expectation.rb

@@ -1,138 +0,0 @@
-module Linkage
-  class Expectation
-    VALID_OPERATORS = [:==, :>, :<, :>=, :<=, :'!=']
-
-    def self.get(type)
-      TYPES[type]
-    end
-
-    attr_reader :operator, :field_1, :field_2
-
-    # @param [Symbol] operator Currently, only :==
-    # @param [Linkage::Field, Linkage::Function, Object] field_1
-    # @param [Linkage::Field, Linkage::Function, Object] field_2
-    # @param [Symbol] force_kind Manually set type of expectation (useful for
-    #   a filter between two fields)
-    def initialize(operator, field_1, field_2, force_kind = nil)
-      if !((field_1.kind_of?(Data) && !field_1.static?) || (field_2.kind_of?(Data) && !field_2.static?))
-        raise ArgumentError, "You must have at least one data source (Linkage::Field or Linkage::Function)"
-      end
-
-      if !VALID_OPERATORS.include?(operator)
-        raise ArgumentError, "Invalid operator: #{operator.inspect}"
-      end
-
-      @operator = operator
-      @field_1 = field_1
-      @field_2 = field_2
-      @kind = force_kind
-
-      if kind == :filter
-        if @field_1.is_a?(Field)
-          @filter_field = @field_1
-          @filter_value = @field_2
-        else
-          @filter_field = @field_2
-          @filter_value = @field_1
-        end
-      elsif @operator != :==
-        raise ArgumentError, "Inequality operators are not allowed for non-filter expectations"
-      end
-    end
-
-    def ==(other)
-      if other.is_a?(Expectation)
-        @operator == other.operator && @field_1 == other.field_1 &&
-          @field_2 == other.field_2
-      else
-        super
-      end
-    end
-
-    # @return [Symbol] :self, :dual, :cross, or :filter
-    def kind
-      @kind ||=
-        if !(@field_1.is_a?(Data) && !@field_1.static? && @field_2.is_a?(Data) && !@field_2.static?)
-          :filter
-        elsif @field_1 == @field_2
-          :self
-        elsif @field_1.dataset == @field_2.dataset
-          :cross
-        else
-          :dual
-        end
-    end
-
-    # @return [Symbol] name of the merged field type
-    def name
-      merged_field.name
-    end
-
-    # @return [Linkage::Field] result of Field#merge between the two fields
-    def merged_field
-      @merged_field ||= @field_1.merge(@field_2)
-    end
-
-    # @return [Boolean] Whether or not this expectation involves a field in
-    #   the given dataset (Only useful for :filter expressions)
-    def applies_to?(dataset)
-      if kind == :filter
-        @filter_field.belongs_to?(dataset)
-      else
-        @field_1.belongs_to?(dataset) || @field_2.belongs_to?(dataset)
-      end
-    end
-
-    # Apply changes to a dataset based on the expectation, such as calling
-    # {Dataset#add_order}, {Dataset#add_select}, and {Dataset#add_filter}
-    # with the appropriate arguments.
-    def apply_to(dataset)
-      case kind
-      when :filter
-        if @filter_field.belongs_to?(dataset)
-          dataset.add_filter(@filter_field, @operator, @filter_value)
-        end
-      else
-        as =
-          if kind == :self
-            @field_1.is_a?(Function) ? @field_1.name : nil
-          else
-            name != @field_1.name ? name : nil
-          end
-
-        if @field_1.belongs_to?(dataset)
-          dataset.add_order(@field_1)
-          dataset.add_select(@field_1, as)
-        end
-        if @field_2.belongs_to?(dataset)
-          dataset.add_order(@field_2)
-          dataset.add_select(@field_2, as)
-        end
-      end
-    end
-  end
-
-  class MustExpectation < Expectation
-  end
-
-  class MustNotExpectation < Expectation
-    OPERATOR_OPPOSITES = {
-      :==   => :'!=',
-      :'!=' => :==,
-      :>    => :<=,
-      :<=   => :>,
-      :<    => :>=,
-      :>=   => :<
-    }
-
-    # Same as Expectation, except it negates the operator.
-    def initialize(operator, field_1, field_2, force_kind = nil)
-      super(OPERATOR_OPPOSITES[operator], field_1, field_2, force_kind)
-    end
-  end
-
-  Expectation::TYPES = {
-    :must => MustExpectation,
-    :must_not => MustNotExpectation
-  }
-end