bpl_enrich 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ccce9a084733f7f9fb63c6a26dba0c74818829
-  data.tar.gz: e33886a42dcf60f031932f22181cfd82fcb0fa78
+  metadata.gz: f724458c14578154f1ec766c46a67d25b2df49c2
+  data.tar.gz: 3b922f75a5646e7e856aa6746c493a7b8982f67b
 SHA512:
-  metadata.gz: be415afcc29ca30c9fa7dab438b5a7949dccc22586ae82ad14783c637063e59a14f4da59470454facfcfc3d000cf9c5117ae8e001da9c139a5d598a64e538e5e
-  data.tar.gz: ae47de03455d706e6578967f9bb79564911c550e8fc7aa3b77079f28d0b99d62397e94b86d9beb63e11320328760cc7fb05c90803f17755382d29df8f23ac641
+  metadata.gz: 124289eebef362c4332d5e7fdd57baff97c87f125a81a9374ef1f26826debabd15afe62b234c91487b5e944ea1a128e2b47112c14bff6aaff7c5fdee9ffcebfa
+  data.tar.gz: 906c244fe8a40ed92add65908ad2fe390723858738fe1ef83e23bafb953677c427d1be1db99c974c3cdb4e95ebc3542e2723e867a58d549cb085faaccecb44d0

data/lib/bpl_enrich/dates.rb

@@ -52,7 +52,7 @@ module BplEnrich
       # weed out obvious bad dates before processing
       if (value.match(/([Pp]re|[Pp]ost|[Bb]efore|[Aa]fter|[Uu]nknown|[Uu]ndated|n\.d\.)/)) ||
           (value.match(/\d\d\d\d-\z/)) || # 1975-
-          (value.match(/\d\d-\d\d\/\d\d/)) || # 1975-09-09/10
+          (value.match(/\d\d-\d\d\/\d\d/) && !value.match(/\d\d-\d\d\/\d\d\d\d/)) || # 1975-09-09/10 but not 1975-09/1975-10
           (value.match(/\d*\(\d*\)/)) ||  # 1975(1976)
           (value.scan(/\d\d\d\d/).length > 2) || # 1861/1869/1915
           (value.scan(/([Ee]arly|[Ll]ate|[Mm]id|[Ww]inter|[Ss]pring|[Ss]ummer|[Ff]all)/).length > 1) ||
@@ -91,7 +91,10 @@ module BplEnrich
             # convert weird span indicators ('or','and','||'), remove extraneous text
             value = value.gsub(/(or|and|\|\|)/,'-').gsub(/[A-Za-z\?\s]/,'')
 
-            if value.match(/\A[12][\d]{3}-[01][\d]-[12][\d]{3}-[01][\d]\z/) # 1895-05-1898-01
+            if value.match(/\A[12][\d]{3}-[01][\d]-[0123][\d][\/-][12][\d]{3}-[01][\d]-[0123][\d]\z/) #1939-04-22/1941-11-30 or 1939-04-22-1941-11-30
+              date_data_range_start = value[0..9]
+              date_data_range_end = value[-10..-1]
+            elsif value.match(/\A[12][\d]{3}-[01][\d][\/-][12][\d]{3}-[01][\d]\z/)  # 1895-05-1898-01 or 1895-05/1898-01
               date_data_range_start = value[0..6]
               date_data_range_end = value[-7..-1]
             elsif value.match(/\A[12][\d]{3}\/[12][\d]{3}\z/) # 1987/1988

data/lib/bpl_enrich/version.rb

@@ -1,3 +1,3 @@
 module BplEnrich
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/dates_test.rb

@@ -6,80 +6,92 @@ class DatesTest < ActiveSupport::TestCase
     #Month dates
     result = BplEnrich::Dates.standardize('April 1983')
     assert_equal '1983-04', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
 
     result = BplEnrich::Dates.standardize('April 7, 1983')
     assert_equal '1983-04-07', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
 
     result = BplEnrich::Dates.standardize('April 7.1983 (Easter)')
     assert_equal '1983-04-07', result[:single_date]
-    assert_equal nil, result[:date_range]
+    assert_nil result[:date_range]
     assert_equal 'April 7.1983 (Easter)', result[:date_note]
 
     result = BplEnrich::Dates.standardize('1983.April.7 (Easter)')
     assert_equal '1983-04-07', result[:single_date]
-    assert_equal nil, result[:date_range]
+    assert_nil result[:date_range]
     assert_equal '1983.April.7 (Easter)', result[:date_note]
 
     result = BplEnrich::Dates.standardize('between April 2014 and May 2014')
-    assert_equal nil, result[:single_date]
+    assert_nil result[:single_date]
     assert_equal '2014-04', result[:date_range][:start]
     assert_equal '2014-05', result[:date_range][:end]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_note]
 
     result = BplEnrich::Dates.standardize('2000-06')
     assert_equal '2000-06', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
 
     result = BplEnrich::Dates.standardize('17 June 1962')
     assert_equal '1962-06-17', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
 
     result = BplEnrich::Dates.standardize('1860/10-1862/04')
-    assert_equal nil, result[:single_date]
+    assert_nil result[:single_date]
     assert_equal '1860-10', result[:date_range][:start]
     assert_equal '1862-04', result[:date_range][:end]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_note]
 
 
     result = BplEnrich::Dates.standardize('[11-12-1928?]')
     assert_equal '1928-11-12', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
     assert_equal 'questionable', result[:date_qualifier]
 
     result = BplEnrich::Dates.standardize('Circa 2000')
     assert_equal '2000', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
     assert_equal 'approximate', result[:date_qualifier]
-    assert_equal nil, result[:date_note]
 
     result = BplEnrich::Dates.standardize('1995-01-00')
     assert_equal '1995-01', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
-    assert_equal nil, result[:date_qualifier]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
+    assert_nil result[:date_qualifier]
 
     result = BplEnrich::Dates.standardize('1996-00-00')
     assert_equal '1996', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
-    assert_equal nil, result[:date_qualifier]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
+    assert_nil result[:date_qualifier]
 
     result = BplEnrich::Dates.standardize('1997-00')
     assert_equal '1997', result[:single_date]
-    assert_equal nil, result[:date_range]
-    assert_equal nil, result[:date_note]
-    assert_equal nil, result[:date_qualifier]
-    assert_equal nil, result[:date_note]
+    assert_nil result[:date_range]
+    assert_nil result[:date_note]
+    assert_nil result[:date_qualifier]
+
+    # Example 1 from Woods Hole Scientific Community
+    result = BplEnrich::Dates.standardize('1939-04-22/1941-11-30')
+    assert_nil result[:single_date]
+    assert_equal '1939-04-22', result[:date_range][:start]
+    assert_equal '1941-11-30', result[:date_range][:end]
+    assert_nil result[:date_qualifier]
+    assert_nil result[:date_note]
+
+    # Example 2 from Woods Hole Scientific Community... FIXME: Potentially just 1933?
+    result = BplEnrich::Dates.standardize('1933-01-01/1933-12-31')
+    assert_nil result[:single_date]
+    assert_equal '1933-01-01', result[:date_range][:start]
+    assert_equal '1933-12-31', result[:date_range][:end]
+    assert_nil result[:date_qualifier]
+    assert_nil result[:date_note]
   end
 
 

data/test/dummy/log/test.log

@@ -238,3 +238,63 @@ AuthoritiesTest: test_parse_name_for_role
 AuthoritiesTest: test_parse_role
 --------------------------------
    (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------
+AuthoritiesTest: test_parse_language
+------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------
+AuthoritiesTest: test_parse_name_for_role
+-----------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+AuthoritiesTest: test_parse_role
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------
+BplEnrichTest: test_strip_value
+-------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+LCSHTest: test_lcsh_standardizer
+--------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+DatesTest: test_date_standardizer
+---------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------
+AuthoritiesTest: test_parse_language
+------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------
+AuthoritiesTest: test_parse_name_for_role
+-----------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+AuthoritiesTest: test_parse_role
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------
+BplEnrichTest: test_strip_value
+-------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------
+LCSHTest: test_lcsh_standardizer
+--------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------
+DatesTest: test_date_standardizer
+---------------------------------
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bpl_enrich
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Boston Public Library
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails