linkage 0.0.4 → 0.0.5

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 gem "sequel"
 
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "test-unit", "2.3.2"
+  gem "bundler"
+  gem "jeweler"
+  gem "test-unit"
   gem "mocha"
   gem "sqlite3"
   gem "yard"

data/Gemfile.lock

@@ -2,10 +2,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     blockenspiel (0.4.3)
-    coderay (0.9.8)
+    coderay (1.0.5)
     ffi (1.0.11)
     git (1.2.5)
-    guard (1.0.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-test (0.4.3)
@@ -14,43 +14,42 @@ GEM
     guard-yard (1.0.2)
       guard (>= 0.2.2)
       yard (>= 0.7.0)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.6.6)
     metaclass (0.0.1)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
-    mocha (0.10.3)
+    method_source (0.7.1)
+    mocha (0.10.5)
       metaclass (~> 0.0.1)
     mysql2 (0.3.11)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
     rdiscount (1.6.8)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sequel (3.31.0)
-    sexp_processor (3.0.10)
-    slop (2.1.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    sequel (3.33.0)
+    slop (2.4.4)
     sqlite3 (1.3.5)
-    test-unit (2.3.2)
+    test-unit (2.4.8)
     thor (0.14.6)
-    versionomy (0.4.1)
-      blockenspiel (>= 0.4.1)
-    yard (0.7.4)
+    versionomy (0.4.2)
+      blockenspiel (>= 0.4.3)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   guard-test
   guard-yard
-  jeweler (~> 1.6.4)
+  jeweler
   mocha
   mysql2
   pry
@@ -58,6 +57,6 @@ DEPENDENCIES
   rdiscount
   sequel
   sqlite3
-  test-unit (= 2.3.2)
+  test-unit
   versionomy
   yard

data/Guardfile

@@ -9,3 +9,5 @@ end
 guard 'yard' do
   watch(%r{lib/[^.].*\.rb$})
 end
+
+notification :notifysend, :u => :normal

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/linkage/configuration.rb

@@ -81,8 +81,8 @@ module Linkage
               raise "Wonky filter"
             end
 
-            arg1 = target.data.to_expr
-            arg2 = other.is_a?(DataWrapper) ? other.data.to_expr : other
+            arg1 = target.to_expr(@side)
+            arg2 = other.is_a?(DataWrapper) ? other.to_expr(@side) : other
             @filter_expr =
               case @operator
               when :==
@@ -116,7 +116,7 @@ module Linkage
             raise "Wonky expectation"
           end
 
-          expr = target.data.to_expr
+          expr = target.to_expr(side)
           aliased_expr = expr
           if expr != merged_field.name
             aliased_expr = expr.as(merged_field.name)
@@ -169,6 +169,10 @@ module Linkage
         def data
           @dataset.field_set[@name]
         end
+
+        def to_expr(side = nil)
+          data.to_expr
+        end
       end
 
       class FunctionWrapper < DataWrapper
@@ -193,6 +197,11 @@ module Linkage
           @data ||= @klass.new(*@args.collect { |arg| arg.kind_of?(DataWrapper) ? arg.data : arg })
         end
 
+        def to_expr(side)
+          dataset = side == :lhs ? @dsl.lhs : @dsl.rhs
+          data.to_expr(dataset.dataset.adapter_scheme)
+        end
+
         def name
           data.name
         end
@@ -222,6 +231,8 @@ module Linkage
       end
 
       class DatasetWrapper
+        attr_reader :dataset
+
         def initialize(dsl, side, dataset)
           @dsl = dsl
           @dataset = dataset

data/lib/linkage/data.rb

@@ -28,7 +28,7 @@ module Linkage
       raise NotImplementedError
     end
 
-    def to_expr
+    def to_expr(adapter = nil)
       raise NotImplementedError
     end
 
@@ -54,6 +54,9 @@ module Linkage
         # 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

data/lib/linkage/field.rb

@@ -70,7 +70,7 @@ module Linkage
       @ruby_type
     end
 
-    def to_expr
+    def to_expr(adapter = nil)
       @name
     end
 

data/lib/linkage/field_set.rb

@@ -12,5 +12,19 @@ module Linkage
         end
       end
     end
+
+    def has_key?(key)
+      !fetch_key(key).nil?
+    end
+
+    def fetch_key(key)
+      string_key = key.to_s
+      keys.detect { |k| k.to_s.casecmp(string_key) == 0 }
+    end
+
+    def [](key)
+      k = fetch_key(key)
+      k ? super(k) : nil
+    end
   end
 end

data/lib/linkage/function.rb

@@ -62,7 +62,7 @@ module Linkage
     end
 
     # @return [Sequel::SQL::Function]
-    def to_expr
+    def to_expr(adapter = nil)
       self.class.function_name.to_sym.sql_function(*@values)
     end
 
@@ -81,7 +81,7 @@ module Linkage
           @names << arg.name
           @static &&= arg.static?
           type = arg.ruby_type[:type]
-          value = arg.is_a?(Field) ? arg.name : arg.to_expr
+          value = arg.to_expr
         else
           @names << arg.to_s.gsub(/\W/, "")
           type = arg.class

data/lib/linkage/functions/strftime.rb

@@ -0,0 +1,32 @@
+module Linkage
+  module Functions
+    class Strftime < Function
+      def self.function_name
+        "strftime"
+      end
+
+      def self.parameters
+        [[Date, Time, DateTime], [String]]
+      end
+
+      def ruby_type
+        # TODO: string length needed
+        {:type => String}
+      end
+
+      def to_expr(adapter = nil)
+        case adapter
+        when :mysql, :mysql2
+          :date_format.sql_function(*@values)
+        when :sqlite
+          :strftime.sql_function(@values[1], @values[0])
+        when :postgres
+          :to_char.sql_function(*@values)
+        else
+          :strftime.sql_function(@values[0], @values[1])
+        end
+      end
+    end
+    Function.register(Strftime)
+  end
+end

data/linkage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linkage"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-30"
   s.description = "Performs record linkage between one or two datasets, using Sequel on the backend"
   s.email = "jeremy.f.stephens@vanderbilt.edu"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/linkage/field.rb",
     "lib/linkage/field_set.rb",
     "lib/linkage/function.rb",
+    "lib/linkage/functions/strftime.rb",
     "lib/linkage/functions/trim.rb",
     "lib/linkage/group.rb",
     "lib/linkage/import_buffer.rb",
@@ -47,7 +48,9 @@ Gem::Specification.new do |s|
     "test/integration/test_cross_linkage.rb",
     "test/integration/test_dataset.rb",
     "test/integration/test_dual_linkage.rb",
+    "test/integration/test_functions.rb",
     "test/integration/test_self_linkage.rb",
+    "test/unit/functions/test_strftime.rb",
     "test/unit/functions/test_trim.rb",
     "test/unit/runner/test_single_threaded.rb",
     "test/unit/test_configuration.rb",
@@ -66,7 +69,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coupler/linkage"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.3.9.4"
+  s.rubygems_version = "1.8.18"
   s.summary = "Record linkage library"
 
   if s.respond_to? :specification_version then
@@ -74,9 +77,9 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<test-unit>, ["= 2.3.2"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -89,9 +92,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<guard-yard>, [">= 0"])
     else
       s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<test-unit>, ["= 2.3.2"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -105,9 +108,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<test-unit>, ["= 2.3.2"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/test/integration/test_functions.rb

@@ -0,0 +1,65 @@
+require 'helper'
+
+module IntegrationTests
+  class TestFunctions < Test::Unit::TestCase
+    def setup
+      @tmpdir = Dir.mktmpdir('linkage')
+      @tmpuri = "sqlite://" + File.join(@tmpdir, "foo")
+    end
+
+    def database(options = {}, &block)
+      Sequel.connect(@tmpuri, options, &block)
+    end
+
+    def teardown
+      FileUtils.remove_entry_secure(@tmpdir)
+    end
+
+    test "match functions" do
+      # insert the test data
+      database do |db|
+        db.create_table(:foo) { primary_key(:id); String(:bar) }
+        db[:foo].import([:id, :bar],
+          Array.new(100) { |i| [i, "bar%s" % (" " * (i % 10))] })
+      end
+
+      ds = Linkage::Dataset.new(@tmpuri, "foo", :single_threaded => true)
+      tmpuri = @tmpuri
+      conf = ds.link_with(ds) do
+        trim(lhs[:bar]).must == trim(rhs[:bar])
+        save_results_in(tmpuri)
+      end
+      assert_equal :self, conf.linkage_type
+      runner = Linkage::SingleThreadedRunner.new(conf)
+      runner.execute
+
+      database do |db|
+        assert_equal 1, db[:groups].count
+      end
+    end
+
+    test "strftime in sqlite" do
+      logger = Logger.new(STDERR)
+      database(:logger => logger) do |db|
+        db.create_table(:foo) { primary_key(:id); Date(:foo_date) }
+        db.create_table(:bar) { primary_key(:id); String(:bar_string) }
+        db[:foo].insert({:id => 1, :foo_date => Date.today})
+        db[:bar].insert({:id => 1, :bar_string => Date.today.strftime("%Y-%m-%d")})
+      end
+
+      ds_1 = Linkage::Dataset.new(@tmpuri, "foo", :single_threaded => true, :logger => logger)
+      ds_2 = Linkage::Dataset.new(@tmpuri, "bar", :single_threaded => true, :logger => logger)
+      tmpuri = @tmpuri
+      conf = ds_1.link_with(ds_2) do
+        strftime(lhs[:foo_date], "%Y-%m-%d").must == rhs[:bar_string]
+        save_results_in(tmpuri, :logger => logger)
+      end
+      runner = Linkage::SingleThreadedRunner.new(conf)
+      runner.execute
+
+      database do |db|
+        assert_equal 1, db[:groups].count
+      end
+    end
+  end
+end

data/test/integration/test_self_linkage.rb

@@ -218,28 +218,5 @@ module IntegrationTests
         end
       end
     end
-
-    test "match functions" do
-      # insert the test data
-      database do |db|
-        db.create_table(:foo) { primary_key(:id); String(:bar) }
-        db[:foo].import([:id, :bar],
-          Array.new(100) { |i| [i, "bar%s" % (" " * (i % 10))] })
-      end
-
-      ds = Linkage::Dataset.new(@tmpuri, "foo", :single_threaded => true)
-      tmpuri = @tmpuri
-      conf = ds.link_with(ds) do
-        trim(lhs[:bar]).must == trim(rhs[:bar])
-        save_results_in(tmpuri)
-      end
-      assert_equal :self, conf.linkage_type
-      runner = Linkage::SingleThreadedRunner.new(conf)
-      runner.execute
-
-      database do |db|
-        assert_equal 1, db[:groups].count
-      end
-    end
   end
 end

data/test/unit/functions/test_strftime.rb

@@ -0,0 +1,56 @@
+require 'helper'
+
+class UnitTests::TestStrftime < Test::Unit::TestCase
+  def self.const_missing(name)
+    if Linkage::Functions.const_defined?(name)
+      Linkage::Functions.const_get(name)
+    else
+      super
+    end
+  end
+
+  test "subclass of Function" do
+    assert_equal Linkage::Function, Linkage::Functions::Strftime.superclass
+  end
+
+  test "ruby_type" do
+    expected = {:type => String}
+    format = "%Y-%m-%d"
+    assert_equal(expected, Linkage::Functions::Strftime.new(Time.now, format).ruby_type)
+    field = stub_field('field 1', :name => :bar, :ruby_type => {:type => Time})
+    assert_equal(expected, Linkage::Functions::Strftime.new(field, format).ruby_type)
+    func = new_function('foo', {:type => Time, :opts => {:junk => '123'}})
+    assert_equal(expected, Linkage::Functions::Strftime.new(func.new, format).ruby_type)
+  end
+
+  test "parameters" do
+    assert_equal [[Date, Time, DateTime], [String]], Linkage::Functions::Strftime.parameters
+  end
+
+  test "name" do
+    assert_equal "strftime", Linkage::Functions::Strftime.function_name
+  end
+
+  test "registers itself" do
+    assert_equal Linkage::Function["strftime"], Linkage::Functions::Strftime
+  end
+
+  test "to_expr for sqlite" do
+    args = [Time.now, "%Y-%m-%d"]
+    func = Strftime.new(*args)
+    assert_equal :strftime.sql_function(args[1], args[0]), func.to_expr(:sqlite)
+  end
+
+  test "to_expr for mysql" do
+    args = [Time.now, "%Y-%m-%d"]
+    func = Strftime.new(*args)
+    assert_equal :date_format.sql_function(*args), func.to_expr(:mysql)
+    assert_equal :date_format.sql_function(*args), func.to_expr(:mysql2)
+  end
+
+  test "to_expr for postgresql" do
+    args = [Time.now, "%Y-%m-%d"]
+    func = Strftime.new(*args)
+    assert_equal :to_char.sql_function(*args), func.to_expr(:postgres)
+  end
+end

data/test/unit/test_configuration.rb

@@ -128,10 +128,10 @@ class UnitTests::TestConfiguration < Test::Unit::TestCase
   end
 
   test "dynamic database function" do
-    dataset_1 = stub('dataset')
+    dataset_1 = stub('dataset', :adapter_scheme => :sqlite)
     field_1 = stub('field 1')
     dataset_1.stubs(:field_set).returns({:foo => field_1})
-    dataset_2 = stub('dataset')
+    dataset_2 = stub('dataset', :adapter_scheme => :mysql2)
     field_2 = stub('field 2', :to_expr => :foo)
     dataset_2.stubs(:field_set).returns({:foo => field_2})
 
@@ -157,10 +157,10 @@ class UnitTests::TestConfiguration < Test::Unit::TestCase
   end
 
   test "static database function" do
-    dataset_1 = stub('dataset')
+    dataset_1 = stub('dataset', :adapter_scheme => :sqlite)
     field_1 = stub('field 1', :to_expr => :foo)
     dataset_1.stubs(:field_set).returns({:foo => field_1})
-    dataset_2 = stub('dataset')
+    dataset_2 = stub('dataset', :adapter_scheme => :mysql)
     field_2 = stub('field 2')
     dataset_2.stubs(:field_set).returns({:foo => field_2})
 
@@ -196,4 +196,19 @@ class UnitTests::TestConfiguration < Test::Unit::TestCase
     Linkage::ResultSet.expects(:new).with(c).returns(result_set)
     assert_equal result_set, c.result_set
   end
+
+  test "case insensitive field names" do
+    field_1 = stub('field_1', :to_expr => :foo)
+    field_2 = stub('field_2', :to_expr => :bar)
+    field_set = {:foo => field_1, :bar => :field_2}
+    field_set.expects(:has_key?).with(:Foo).returns(true)
+    field_set.expects(:has_key?).with(:baR).returns(true)
+    dataset = stub('dataset', :field_set => field_set)
+    c = Linkage::Configuration.new(dataset, dataset)
+    assert_nothing_raised do
+      c.configure do
+        lhs[:Foo].must == rhs[:baR]
+      end
+    end
+  end
 end

data/test/unit/test_data.rb

@@ -392,4 +392,10 @@ class UnitTests::TestData < Test::Unit::TestCase
     result_data = data_2.merge(data_1, 'foo')
     assert_equal :foo, result_data.name
   end
+
+  test "merge a string field and a date field" do
+    data_1 = new_data(:foo, {:type => String})
+    data_2 = new_data(:foo, {:type => Date})
+    assert_raises { data_1.merge(data_2).ruby_type }
+  end
 end

data/test/unit/test_field.rb

@@ -42,4 +42,9 @@ class UnitTests::TestField < Test::Unit::TestCase
     field = Linkage::Field.new(:id, {:allow_null=>true, :default=>nil, :primary_key=>true, :db_type=>"integer", :type=>:integer, :ruby_default=>nil})
     assert_equal :id, field.to_expr
   end
+
+  test "to_expr ignores adapter argument" do
+    field = Linkage::Field.new(:id, {:allow_null=>true, :default=>nil, :primary_key=>true, :db_type=>"integer", :type=>:integer, :ruby_default=>nil})
+    assert_equal :id, field.to_expr(:foo)
+  end
 end

data/test/unit/test_field_set.rb

@@ -28,4 +28,19 @@ class UnitTests::TestFieldSet < Test::Unit::TestCase
     assert_equal field_2, fs[:first_name]
     assert_equal field_3, fs[:last_name]
   end
+
+  test "case-insensitive names" do
+    field_1 = stub('id field')
+    field_2 = stub('first_name field')
+    field_3 = stub('last_name field')
+    Linkage::Field.stubs(:new).with(:id, @schema[:id]).returns(field_1)
+    Linkage::Field.stubs(:new).with(:first_name, @schema[:first_name]).returns(field_2)
+    Linkage::Field.stubs(:new).with(:last_name, @schema[:last_name]).returns(field_3)
+
+    fs = Linkage::FieldSet.new(@schema)
+    assert_equal field_1, fs.primary_key
+    assert_equal field_1, fs[:Id]
+    assert_equal field_2, fs[:fIrst_name]
+    assert_equal field_3, fs[:laSt_name]
+  end
 end

data/test/unit/test_function.rb

@@ -55,7 +55,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
 
   test "function with field" do
     klass = new_function('foo', {:type => String})
-    field = stub_field('field', :name => :bar, :ruby_type => {:type => String})
+    field = stub_field('field', :name => :bar, :to_expr => :bar, :ruby_type => {:type => String})
     f = klass.new(field)
     assert_equal :foo_bar, f.name
     assert_equal :foo.sql_function(:bar), f.to_expr
@@ -66,7 +66,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
     klass_1 = new_function('foo', {:type => String})
     klass_2 = new_function('bar', {:type => String})
 
-    field = stub_field('field', :name => :baz, :ruby_type => {:type => String})
+    field = stub_field('field', :name => :baz, :to_expr => :baz, :ruby_type => {:type => String})
     func_1 = klass_1.new(field)
     assert_equal :foo_baz, func_1.name
     assert !func_1.static?
@@ -100,7 +100,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
     assert_equal :foo_123, func_1.name
     assert func_1.static?
 
-    field = stub_field('field', :name => :quux, :ruby_type => {:type => String})
+    field = stub_field('field', :name => :quux, :to_expr => :quux, :ruby_type => {:type => String})
     func_2 = klass_2.new(field)
     assert_equal :bar_quux, func_2.name
     assert !func_2.static?
@@ -113,8 +113,8 @@ class UnitTests::TestFunction < Test::Unit::TestCase
 
   test "function with multiple fields" do
     klass = new_function('foo', {:type => String})
-    field_1 = stub_field('field', :name => :bar, :ruby_type => {:type => String})
-    field_2 = stub_field('field', :name => :baz, :ruby_type => {:type => String})
+    field_1 = stub_field('field', :name => :bar, :to_expr => :bar, :ruby_type => {:type => String})
+    field_2 = stub_field('field', :name => :baz, :to_expr => :baz, :ruby_type => {:type => String})
     func = klass.new(field_1, field_2)
     assert_equal :foo_bar_baz, func.name
     assert_equal :foo.sql_function(:bar, :baz), func.to_expr
@@ -123,7 +123,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
 
   test "function with multiple mixed arguments" do
     klass = new_function('foo', {:type => String})
-    field = stub_field('field', :name => :bar, :ruby_type => {:type => String})
+    field = stub_field('field', :name => :bar, :to_expr => :bar, :ruby_type => {:type => String})
     f = klass.new(field, 123, 'abc')
     assert_equal :foo_bar_123_abc, f.name
     assert_equal :foo.sql_function(:bar, 123, 'abc'), f.to_expr
@@ -138,7 +138,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
   test "valid parameters" do
     func = new_function('foo', {:type => String}, [[String]])
     assert_equal :foo.sql_function("foo"), func.new("foo").to_expr
-    field = stub_field('field', :name => :bar, :ruby_type => {:type => String})
+    field = stub_field('field', :name => :bar, :to_expr => :bar, :ruby_type => {:type => String})
     assert_equal :foo.sql_function(:bar), func.new(field).to_expr
     assert_equal :foo.sql_function(:foo.sql_function("hey")), func.new(func.new("hey")).to_expr
   end
@@ -148,7 +148,7 @@ class UnitTests::TestFunction < Test::Unit::TestCase
     assert_raises(TypeError) do
       func.new(123)
     end
-    field = stub_field('field', :name => :bar, :ruby_type => {:type => Integer})
+    field = stub_field('field', :name => :bar, :to_expr => :bar, :ruby_type => {:type => Integer})
     assert_raises(TypeError) do
       func.new(field)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkage
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 -05:00
-default_executable: 
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &6839080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,43 +21,63 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6839080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6837220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6837220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6848560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6848560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &6843960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6843960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &7697360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7697360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &7735360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7735360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7747140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7747140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7744260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7744260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &7756060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7756060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &7754660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7754660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &7752840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7752840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &7749720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7749720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &7764320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7764320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &7760020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +229,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7760020
+  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
   the backend
 email: jeremy.f.stephens@vanderbilt.edu
@@ -191,6 +260,7 @@ files:
 - lib/linkage/field.rb
 - lib/linkage/field_set.rb
 - lib/linkage/function.rb
+- lib/linkage/functions/strftime.rb
 - lib/linkage/functions/trim.rb
 - lib/linkage/group.rb
 - lib/linkage/import_buffer.rb
@@ -205,7 +275,9 @@ files:
 - test/integration/test_cross_linkage.rb
 - test/integration/test_dataset.rb
 - test/integration/test_dual_linkage.rb
+- test/integration/test_functions.rb
 - test/integration/test_self_linkage.rb
+- test/unit/functions/test_strftime.rb
 - test/unit/functions/test_trim.rb
 - test/unit/runner/test_single_threaded.rb
 - test/unit/test_configuration.rb
@@ -220,7 +292,6 @@ files:
 - 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
@@ -236,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3920524836542711484
+      hash: -1705215583013388953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.3.9.4
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Record linkage library