timetwister 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fa574a2f0c2978b64b08db23b61cc6805f35ea2f9e94036e90ad010425d425
-  data.tar.gz: 10aee7dcc195da3eb77108113ed67d9eea87641782ae00216c3509adabf94a2e
+  metadata.gz: fc36713ba664a945f35f2174a7047646118b90e40ba78edede43e8a4efe891f8
+  data.tar.gz: b6861861782dae33194e0e4d601d316f6246b14baacb73e0b4ebe31f7007c007
 SHA512:
-  metadata.gz: 519d4485a0472394c83a3473d1d5720f2a6d7e6427d4411abb3643d971bc19e199b0ca9f38a0d9bb53aaaaa4b24430eb131e0455fd7a61edf87c67e43b7f41b4
-  data.tar.gz: 383890f74d7b161718b5b8e7e8c445e6847740bda00e46439c40ac2ae5e89b8dca75128816d963be23747dfe4a19613cac8da9031c13c854fa91916fa030d3d4
+  metadata.gz: 7880c0927a7a48d0cba0ac9dc52058fa3def90b986201d553fc0df9f288c7bd72c0fb2e71731892733db6ff138f1630a8edc6264fa4819106dabc7ef6fe181b7
+  data.tar.gz: b8d5517e5e2ae6c0457a1335f192e87d5b3b04623b6c04f499d7f98ec880bebb7bef0724fcbafb2ea3d4bd9745410bca5e216973bff95ba5ee8d8fa16daa14e4

data/.github/workflows/ruby.yml

@@ -19,15 +19,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/lib/timetwister/parser.rb

@@ -56,7 +56,17 @@ class Parser
 					if c[:proc]
 						# clone string to avoid changing it via in-place methods used in Procs
 						work_string = @string.clone
-						c[:proc].call(work_string, c[:arg])
+
+						# using a begin/rescue to catch dates that Date.parse errors on
+						begin
+							c[:proc].call(work_string, c[:arg])
+
+						# ArgumentError for pre-2.7.0 DateTime errors,
+						# Date::Error for 2.7.0 and later
+						rescue ArgumentError || Date::Error
+							@dates = { :original_string => @string, :index_dates => [], :keydate => nil, :keydate_z => nil, :date_start => nil, :date_end => nil,
+									:date_start_full => nil, :date_end_full => nil, :inclusive_range => nil, :certainty => nil }
+						end
 					end
 					break
 				end

data/lib/timetwister/version.rb

@@ -1,3 +1,3 @@
 module Timetwister
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/dates_spec.rb

@@ -46,7 +46,6 @@ describe Timetwister do
 	end
 
 	it "parses ranges of full dates" do
-
 		forms = ["July 4 1776 - March 1 1789", "4 July 1776 - 1 March 1789", "1776 July 4 - 1789 March 1", "1776 4 July - 1789 1 March", "1776 4 July to 1789 1 March"]
 		forms.each do |f|
 			date = Timetwister.parse(f)
@@ -572,6 +571,62 @@ describe Timetwister do
 		end
 	end
 
+	it "DOES NOT parse nonexistent dates" do
+		date = Timetwister.parse('1776 September 31')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+
+		date = Timetwister.parse('1776-11-31')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+
+		date = Timetwister.parse('1776-11-00')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+
+		date = Timetwister.parse('1776 whatever 31')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+
+		date = Timetwister.parse('1776 sometime 72 - december 42 1999')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+
+		date = Timetwister.parse('just absolute garbage')
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:date_start_full]).to eq(nil)
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:date_end_full]).to eq(nil)
+		expect(date[0][:inclusive_range]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([])
+		expect(date[0][:test_data]).to eq(nil)
+	end
+
 	it "parses lists of years" do
 		date = Timetwister.parse("1776, 1789, 1812")
 		expect(date[0][:date_start]).to eq("1776")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetwister
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Duryee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler