timetwister 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTMxMjc2YTZiZTdkMjE4YjE2MTk5YzUyNTVkNWM1MzRmMjI4ZGVjNg==
+    YzliZWQ4YjI5MDA3MDZmZGQ2ZTg4MTI0NDhhZWM4M2ZlYTAxYzQzMg==
   data.tar.gz: !binary |-
-    MWNkY2ViNzUxYWE0YzZhNWIxMTY2OWVhNjRiZjI1MDU0MWJlY2QxZQ==
+    MjdhYmMwNWExY2JlM2U1OTE5ZDU3MjRmYTBjNzBmMTM3MmM3NDJiOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTgxNjhmM2ZmZTQ4NWJhOTQ1NjlhNjUzYmU4MGE3MTQ5MDc2NjhlZjQ3ZDg2
-    MmVhMGQ1OWVhMGEyMGIzMzVhMWY0MWE2ZThjZmE1ZjMwNjZhYzZiMzEyYmNk
-    ZTEzM2FlZGZjYzRiYzcwNzU4Y2MzNmUwMjVhZDM3OTQyOWUzODY=
+    NmQ0NzkzMmJlYjA3NGFmZmVkNjJhOTAyNTllZTFhZjBlM2FhMTI5ZmJlN2Iw
+    MjBiZjQ5YzViN2ZmMzM3YWMwNDIzNGI4M2FjY2M1OWU4YTcwYzE1MDQ3YTVm
+    ZTZmNmM4MGQzN2NkM2EzY2NhZDI3ZWQyNTRhOGU0OGRjMWI3NDQ=
   data.tar.gz: !binary |-
-    OGQxODUwNWM4NGE0M2IwNGFlOWIwZTQ5ZmNjNmNkZjQzYjJiODIxYTYyMjli
-    OTYwNWI5ZWVjMDI2NjMwMzk4Mjk4MDEwODNiZmFhNzZkY2JkNzRkZTZkYmY4
-    YTQ3NzdjODk4NjQ5ZWU3N2EwMmY5YTc5YTIyNDFhN2U1ZDFiYjc=
+    NzY5MjE1NmMyYzAyZWQxOTUyYjVlOTgxNTUxMDRmZjViY2JhMzE2YjYzNGNl
+    NjNiNTBhYzJiZWMyZDEzMzMxZGQ4YWI2Yjk1YmFjNGFkNTgyNjI3Y2NkZjVl
+    ZWExMGE5ZTk1M2FmMzM3YjQ3YmRiYzFmYjVhNjg0NWQ5MmQxNjM=

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+ - "2.2.3"
+ - "2.0.0"
+ - "1.9.3"
+script: bundle exec rspec

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in timetwister.gemspec
+
+group :development, :test do
+	gem 'rspec'
+end
+
 gemspec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/alexduryee/timetwister.svg?branch=master)](https://travis-ci.org/alexduryee/timetwister)
+
 # Timetwister
 
 A Chronic wrapper with improved date format parsing and fewer surprises.
@@ -53,4 +55,5 @@ Output explanation:
 - [Alex Duryee](https://github.com/alexduryee/)
 - [Trevor Thornton](https://github.com/trevorthornton/)
 - [Matt Miller](https://github.com/thisismattmiller/)
+- [Kristopher Kelly](https://github.com/emu47)
 - [Stephen Schor](https://github.com/nodanaonlyzuul/)

data/lib/timetwister/parser.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 require 'chronic'
 
 class Parser
 
 	def self.string_to_dates(str, options)
-		@string = str
+		@string = str.clone
 		@options = options
 
 		@dates = { :original_string => str, :index_dates => [], :date_start => nil, :date_end => nil,
@@ -19,7 +21,12 @@ class Parser
 		# perform this here, before the string gets purged of certainty indicators
 		@dates[:certainty] = return_certainty(@string)
 
+		# normalize the string into the parser's preferred form
 		@string = clean_string(@string)
+		@string = language_to_english(@string)
+		@string = replace_ordinals(@string)
+
+		# parse!
 		self.match_replace
 
 		# if there are any future dates, return an empty hash
@@ -1089,4 +1096,97 @@ class Parser
 
 	    return nil
 	end
+
+	def self.replace_ordinals(str)
+
+		work_str = str.clone
+
+		ordinals = {
+			# replace fulltext ordinals with numbers
+			'first' => '1',
+			'second' => '2',
+			'third' => '3',
+			'fourth' => '4',
+			'fifth' => '5',
+			'sixth' => '6',
+			'seventh' => '7',
+			'eighth' => '8',
+			'ninth' => '9',
+			'tenth' => '10',
+			'eleventh' => '11',
+			'twelfth' => '12',
+			'thirteenth' => '13',
+			'fourteenth' => '14',
+			'fifteenth' => '15',
+			'sixteenth' => '16',
+			'seventeenth' => '17',
+			'eighteenth' => '18',
+			'nineteenth' => '19',
+			'twentieth' => '20',
+			'twenty-' => '2',
+			'thirtieth' => '30',
+			'thirty-' => '3',
+
+			# replace numeric ordinals with plain numbers
+			'1st' => '1',
+			'2nd' => '2',
+			'3rd' => '3',
+			'3d' => '3',
+			'4th' => '4',
+			'5th' => '5',
+			'6th' => '6',
+			'7th' => '7',
+			'8th' => '8',
+			'9th' => '9',
+			'0th' => '0'
+		}
+
+		ordinals.each do |key, value|
+			work_str.gsub!(Regexp.new(key), value)
+		end
+
+		return work_str
+	end
+
+	def self.language_to_english(str)
+
+		work_str = str.clone
+
+		languages = {
+
+			# french
+			'janvier' => 'January',
+			'février' => 'February',
+			'mars' => 'March',
+			'avril' => 'April',
+			'mai' => 'May',
+			'juin' => 'June',
+			'juillet' => 'July',
+			'août' => 'August',
+			'septembre' => 'September',
+			'octobre' => 'October',
+			'novembre' => 'November',
+			'décembre' => 'December',
+
+			# spanish
+			'enero' => 'January',
+			'febrero' => 'February',
+			'marzo' => 'March',
+			'abril' => 'April',
+			'mayo' => 'May',
+			'junio' => 'June',
+			'julio' => 'July',
+			'agosto' => 'August',
+			'septiembre' => 'September',
+			'octubre' => 'October',
+			'noviembre' => 'November',
+			'diciembre' => 'December'
+		}
+
+		languages.each do |key, value|
+			work_str.gsub!(/#{key}/i, value)
+		end
+
+		return work_str
+	end
 end

data/lib/timetwister/version.rb

@@ -1,3 +1,3 @@
 module Timetwister
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/timetwister.rb

@@ -6,23 +6,59 @@ module Timetwister
   	def self.parse(str, options={})
 
   		out = []
+      str = rearrange_conjunctions(str)
 
   		str.split(';').each do |semi|
-  			semi.split(' and ').each do |conj|
-
-  				# check for dates of form "Month Day(-Day), Year" before splitting on commas
-  				# (removes certainty markers as to not jam the regex)
-  				if conj.gsub(/[\?\[\]]/, '').match(/[JFMASOND][A-Za-z]*\.?\s[0-9]{1,2}(\s?-[0-9]{1,2})?\,\s[0-9]{4}/)
-  					out << Parser.string_to_dates(conj, options)
-  				else
-  					conj.split(',').each do |comma|
-  						out << Parser.string_to_dates(comma, options)
-  					end
-  				end
-  			end
-  		end
+   			semi.split(/\sand\s|\s\&\s/i).each do |conj|
+
+   				# check for dates of form "Month Day(-Day), Year" before splitting on commas
+   				# (removes certainty markers as to not jam the regex)
+   				if Parser.replace_ordinals(conj).gsub(/[\?\[\]]/, '').match(/[a-z]*\.?\s[0-9]{1,2}(\s?-[0-9]{1,2})?\,\s[0-9]{4}/i)
+   					out << Parser.string_to_dates(conj, options)
+   				else
+   					conj.split(',').each do |comma|
+   						out << Parser.string_to_dates(comma, options)
+   					end
+   				end
+   			end
+      end
 
 		return out
 
 	end
+
+  # sometimes years are considered implicit in complex dates
+  # e.g. "1900 January & February"
+  # this rearranges them into complete atomic dates
+  def self.rearrange_conjunctions(str)
+
+    # if we don't have a complete year and month, call it quits
+    if !str.match(/[0-9]{4}/) || !str.match(/[a-z]+/i)
+      return str
+    end
+
+    year = str.match(/[0-9]{4}/)[0]
+    month = str.match(/[a-z]+/i)[0]
+    return_str = ''
+
+    if month.eql?('and')
+      return str
+    end
+
+    str.split(/\sand\s|\s\&\s/).each do |conj|
+
+      if !conj.match(/[0-9]{4}/)
+        conj << ' ' + year
+      end
+
+      if !conj.match(/[a-z]+/i)
+        conj = month + ' ' + conj
+      end
+
+      return_str << ' and ' + conj
+    end
+
+    return return_str.sub(/\sand\s/, '')
+
+  end
 end

data/spec/dates_spec.rb

@@ -0,0 +1,650 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'timetwister'
+
+describe Timetwister do
+
+	it "parses ISO 8601 single dates" do
+		date = Timetwister.parse("1776-07-04")
+		expect(date[0][:date_start]).to eq(date[0][:date_end])
+		expect(date[0][:test_data]).to eq("30")
+	end
+
+	it "parses ISO 8601 date ranges" do
+		date = Timetwister.parse("1776-07-04/1789-03-01")
+		expect(date[0][:date_start]).to eq("1776-07-04")
+		expect(date[0][:date_end]).to eq("1789-03-01")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:test_data]).to eq("40")
+	end
+
+	it "parses definite and approximate single years" do
+		date = Timetwister.parse("1776")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:test_data]).to eq("70")
+
+		date = Timetwister.parse("ca. 1776")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:test_data]).to eq("70")
+
+		date = Timetwister.parse("[1776]")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:test_data]).to eq("70")
+	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"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1789-03-01")
+			expect(date[0][:date_end_full]).to eq("1789-03-01")
+			expect(date[0][:inclusive_range]).to eq(true)
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("80")
+		end
+	end
+
+	it "parses ranges of months+dates" do
+		forms = ["July 1776 - March 1789", "1776 July - 1789 March"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07")
+			expect(date[0][:date_start_full]).to eq("1776-07-01")
+			expect(date[0][:date_end]).to eq("1789-03")
+			expect(date[0][:date_end_full]).to eq("1789-03-31")
+			expect(date[0][:inclusive_range]).to eq(true)
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("100")
+		end
+	end
+
+	it "parses ranges of just years" do
+		date = Timetwister.parse("1776 - 1789")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end]).to eq("1789")
+		expect(date[0][:date_end_full]).to eq("1789-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+		expect(date[0][:test_data]).to eq("120")
+	end
+
+	it "parses ranges of decades" do
+		date = Timetwister.parse("1770's - 1780s")
+		expect(date[0][:date_start]).to eq("1770")
+		expect(date[0][:date_start_full]).to eq("1770-01-01")
+		expect(date[0][:date_end]).to eq("1789")
+		expect(date[0][:date_end_full]).to eq("1789-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+		expect(date[0][:test_data]).to eq("190")
+	end
+
+	it "parses ranges of a year and a decade" do
+		date = Timetwister.parse("1770's - 1787")
+		expect(date[0][:date_start]).to eq("1770")
+		expect(date[0][:date_start_full]).to eq("1770-01-01")
+		expect(date[0][:date_end]).to eq("1787")
+		expect(date[0][:date_end_full]).to eq("1787-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787])
+		expect(date[0][:test_data]).to eq("140")
+
+		date = Timetwister.parse("1776 - 1780's")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end]).to eq("1789")
+		expect(date[0][:date_end_full]).to eq("1789-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+		expect(date[0][:test_data]).to eq("130")
+	end
+
+	it "parses ranges of a year and a two-digit year" do
+		date = Timetwister.parse("1771 - 76")
+		expect(date[0][:date_start]).to eq("1771")
+		expect(date[0][:date_start_full]).to eq("1771-01-01")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1771, 1772, 1773, 1774, 1775, 1776])
+		expect(date[0][:test_data]).to eq("145")
+	end
+
+	it "parses open-ended ranges" do
+		date = Timetwister.parse("1776 - ")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("150")
+
+		date = Timetwister.parse(" - 1776")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:date_start]).to eq(nil)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("160")
+	end
+
+	it "parses undated values" do
+		forms = ["n.d.", "undated", "no date"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			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
+	end
+
+	it "parses single decades" do
+		date = Timetwister.parse("1770's")
+		expect(date[0][:date_start]).to eq("1770")
+		expect(date[0][:date_start_full]).to eq("1770-01-01")
+		expect(date[0][:date_end]).to eq("1779")
+		expect(date[0][:date_end_full]).to eq("1779-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779])
+		expect(date[0][:test_data]).to eq("180")
+	end
+
+	it "parses single full dates" do
+		forms = ["July 4 1776", "4 July 1776", "1776 July 4", "1776 4 July"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1776-07-04")
+			expect(date[0][:date_end_full]).to eq("1776-07-04")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("200")
+		end
+	end
+
+	it "parses single month+year" do
+		forms = ["December 1776", "1776 December", "Dec 1776", "1776 Dec"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-12")
+			expect(date[0][:date_start_full]).to eq("1776-12-01")
+			expect(date[0][:date_end]).to eq("1776-12")
+			expect(date[0][:date_end_full]).to eq("1776-12-31")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("220")
+		end
+	end
+
+	it "parses month ranges within one year" do
+		forms = ["July-September 1776", "1776 July-September"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07")
+			expect(date[0][:date_start_full]).to eq("1776-07-01")
+			expect(date[0][:date_end]).to eq("1776-09")
+			expect(date[0][:date_end_full]).to eq("1776-09-30")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:inclusive_range]).to eq(true)
+			expect(date[0][:test_data]).to eq("230")
+		end
+	end
+
+	it "parses a day range within a single month+year" do
+		forms = ["4-10 July 1776", "1776 July 4-10", "July 4-10, 1776", "1776 4-10 July"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1776-07-10")
+			expect(date[0][:date_end_full]).to eq("1776-07-10")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("240")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+	end
+
+	it "parses decades with early/mid/late qualifiers" do
+		date = Timetwister.parse("early 1770's")
+		expect(date[0][:date_start]).to eq("1770")
+		expect(date[0][:date_start_full]).to eq("1770-01-01")
+		expect(date[0][:date_end]).to eq("1775")
+		expect(date[0][:date_end_full]).to eq("1775-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1770, 1771, 1772, 1773, 1774, 1775])
+		expect(date[0][:test_data]).to eq("250")
+
+		date = Timetwister.parse("mid 1770's")
+		expect(date[0][:date_start]).to eq("1773")
+		expect(date[0][:date_start_full]).to eq("1773-01-01")
+		expect(date[0][:date_end]).to eq("1778")
+		expect(date[0][:date_end_full]).to eq("1778-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1773, 1774, 1775, 1776, 1777, 1778])
+		expect(date[0][:test_data]).to eq("250")
+
+		date = Timetwister.parse("late 1770's")
+		expect(date[0][:date_start]).to eq("1775")
+		expect(date[0][:date_start_full]).to eq("1775-01-01")
+		expect(date[0][:date_end]).to eq("1779")
+		expect(date[0][:date_end_full]).to eq("1779-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1775, 1776, 1777, 1778, 1779])
+		expect(date[0][:test_data]).to eq("250")
+	end
+
+	it "parses ambiguous dates (e.g. 18--)" do
+		date = Timetwister.parse("17--")
+		expect(date[0][:date_start]).to eq("1700")
+		expect(date[0][:date_start_full]).to eq("1700-01-01")
+		expect(date[0][:date_end]).to eq("1799")
+		expect(date[0][:date_end_full]).to eq("1799-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates][0]).to eq(1700)
+		expect(date[0][:index_dates][99]).to eq(1799)
+		expect(date[0][:test_data]).to eq("290")
+	end
+
+	it "parses day/month ranges within a single year" do
+		forms = ["4 May - 10 July 1776", "1776 May 4 - July 10", "May 4 - July 10 1776", "4 May - 10 July 1776"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-05-04")
+			expect(date[0][:date_start_full]).to eq("1776-05-04")
+			expect(date[0][:date_end]).to eq("1776-07-10")
+			expect(date[0][:date_end_full]).to eq("1776-07-10")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("310")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+	end
+
+	it "parses full date + year/month date range" do
+		forms = ["4 July 1776 - March 1789", "1776 July 4 - 1789 March"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1789-03-31")
+			expect(date[0][:date_end_full]).to eq("1789-03-31")
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("330")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+
+		forms = ["July 1776 - March 1, 1789", "1776 July - 1789 March 1"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-01")
+			expect(date[0][:date_start_full]).to eq("1776-07-01")
+			expect(date[0][:date_end]).to eq("1789-03-01")
+			expect(date[0][:date_end_full]).to eq("1789-03-01")
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("330")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+	end
+
+	# the normalized dates returned here are a bit funny
+	# we could do with standardizing them
+	it "parses year + month/year range" do
+		forms = ["1776 - March 1789", "1776 - 1789 March"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-01")
+			expect(date[0][:date_start_full]).to eq("1776-01-01")
+			expect(date[0][:date_end]).to eq("1789-03")
+			expect(date[0][:date_end_full]).to eq("1789-03-31")
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("340")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+
+		forms = ["1776 July - 1789", "July 1776 - 1789"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07")
+			expect(date[0][:date_start_full]).to eq("1776-07-01")
+			expect(date[0][:date_end]).to eq("1789-12")
+			expect(date[0][:date_end_full]).to eq("1789-12-31")
+			expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+			expect(date[0][:test_data]).to eq("340")
+			expect(date[0][:inclusive_range]).to eq(true)
+		end
+	end
+
+	it "parses mm/dd/yyyy dates" do
+		forms = ["7/4/1776", "07/4/1776", "7/04/1776", "07/04/1776"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1776-07-04")
+			expect(date[0][:date_end_full]).to eq("1776-07-04")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("350")
+		end
+	end
+
+	it "parses seasons" do
+		date = Timetwister.parse("Winter 1776")
+		expect(date[0][:date_start]).to eq("1776-01-01")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end]).to eq("1776-03-20")
+		expect(date[0][:date_end_full]).to eq("1776-03-20")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("310")
+
+		date = Timetwister.parse("1776 Spring")
+		expect(date[0][:date_start]).to eq("1776-03-20")
+		expect(date[0][:date_start_full]).to eq("1776-03-20")
+		expect(date[0][:date_end]).to eq("1776-06-21")
+		expect(date[0][:date_end_full]).to eq("1776-06-21")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("310")
+
+		date = Timetwister.parse("1776 Summer")
+		expect(date[0][:date_start]).to eq("1776-06-21")
+		expect(date[0][:date_start_full]).to eq("1776-06-21")
+		expect(date[0][:date_end]).to eq("1776-09-23")
+		expect(date[0][:date_end_full]).to eq("1776-09-23")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("310")
+
+		date = Timetwister.parse("Fall 1776")
+		expect(date[0][:date_start]).to eq("1776-09-23")
+		expect(date[0][:date_start_full]).to eq("1776-09-23")
+		expect(date[0][:date_end]).to eq("1776-12-22")
+		expect(date[0][:date_end_full]).to eq("1776-12-22")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("310")
+	end
+
+	it "parses dates with punctuation" do
+		forms = ["July 4 1776?", "July 4 1776 [?]", "July 4? 1776", "?July 4 1776?", "[July] 4 1776?"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1776-07-04")
+			expect(date[0][:date_end_full]).to eq("1776-07-04")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("200")
+		end
+	end
+
+	it "parses circa dates" do
+		multi = ["ca. 1776 - 1777", "1776 - circa 1777", "ca 1776-77", "circa 1776 - 1777"]
+		multi.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq('1776')
+			expect(date[0][:date_end]).to eq('1777')
+			expect(date[0][:index_dates]).to eq([1776,1777])
+		end
+
+		single = ["ca. December 1776", "circa 1776 Dec", "ca 1776 December"]
+		single.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq('1776-12')
+			expect(date[0][:index_dates]).to eq([1776])
+		end
+
+		multi_months = ["ca. January 1776 - February 1777", "January 1776 - circa February 1777"]
+		multi_months.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq('1776-01')
+			expect(date[0][:date_end]).to eq('1777-02')
+			expect(date[0][:index_dates]).to eq([1776,1777])
+		end
+
+		# weird date forms
+		date = Timetwister.parse("ca. 1776-77")
+		expect(date[0][:date_start]).to eq('1776')
+		expect(date[0][:date_end]).to eq('1777')
+		expect(date[0][:index_dates]).to eq([1776,1777])
+
+		date = Timetwister.parse("ca. January - February 1776")
+		expect(date[0][:date_start]).to eq('1776-01')
+		expect(date[0][:date_end]).to eq('1776-02')
+		expect(date[0][:index_dates]).to eq([1776])
+
+		date = Timetwister.parse("ca. early 1770's")
+		expect(date[0][:date_start]).to eq('1770')
+		expect(date[0][:date_end]).to eq('1775')
+		expect(date[0][:index_dates]).to eq([1770,1771,1772,1773,1774,1775])
+
+		date = Timetwister.parse("ca. 01/01/1776")
+		expect(date[0][:date_start]).to eq('1776-01-01')
+		expect(date[0][:index_dates]).to eq([1776])
+	end
+
+	it "parses dates with certainty values" do
+		date = Timetwister.parse("Approximately July 4, 1776")
+		expect(date[0][:date_start]).to eq("1776-07-04")
+		expect(date[0][:date_start_full]).to eq("1776-07-04")
+		expect(date[0][:date_end]).to eq("1776-07-04")
+		expect(date[0][:date_end_full]).to eq("1776-07-04")
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("200")
+		expect(date[0][:certainty]).to eq("approximate")
+
+		date = Timetwister.parse("[July 4, 1776]")
+		expect(date[0][:date_start]).to eq("1776-07-04")
+		expect(date[0][:date_start_full]).to eq("1776-07-04")
+		expect(date[0][:date_end]).to eq("1776-07-04")
+		expect(date[0][:date_end_full]).to eq("1776-07-04")
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("200")
+		expect(date[0][:certainty]).to eq("inferred")
+
+		date = Timetwister.parse("July 4?, 1776")
+		expect(date[0][:date_start]).to eq("1776-07-04")
+		expect(date[0][:date_start_full]).to eq("1776-07-04")
+		expect(date[0][:date_end]).to eq("1776-07-04")
+		expect(date[0][:date_end_full]).to eq("1776-07-04")
+		expect(date[0][:index_dates]).to eq([1776])
+		expect(date[0][:test_data]).to eq("200")
+		expect(date[0][:certainty]).to eq("questionable")
+
+		date = Timetwister.parse("1771 - 76?")
+		expect(date[0][:date_start]).to eq("1771")
+		expect(date[0][:date_start_full]).to eq("1771-01-01")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1771, 1772, 1773, 1774, 1775, 1776])
+		expect(date[0][:test_data]).to eq("145")
+		expect(date[0][:certainty]).to eq("questionable")
+	end
+
+	it "DOES NOT parse dates without years" do
+		forms = ["July 4", "June - July", "January 12 - July 4"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			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
+	end
+
+	it "DOES NOT parse dates that are obviously junk" do
+		forms = ["July 4 2776", "July 4 776", "July 4 1776 - July 4 7776", "1897-19??"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			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
+	end
+
+	it "parses lists of years" do
+		date = Timetwister.parse("1776, 1789, 1812")
+		expect(date[0][:date_start]).to eq("1776")
+		expect(date[0][:date_start_full]).to eq("1776-01-01")
+		expect(date[0][:date_end]).to eq("1776")
+		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		expect(date[0][:test_data]).to eq("70")
+
+		expect(date[1][:date_start]).to eq("1789")
+		expect(date[1][:date_start_full]).to eq("1789-01-01")
+		expect(date[1][:date_end]).to eq("1789")
+		expect(date[1][:date_end_full]).to eq("1789-12-31")
+		expect(date[1][:test_data]).to eq("70")
+
+		expect(date[2][:date_start]).to eq("1812")
+		expect(date[2][:date_start_full]).to eq("1812-01-01")
+		expect(date[2][:date_end]).to eq("1812")
+		expect(date[2][:date_end_full]).to eq("1812-12-31")
+		expect(date[2][:test_data]).to eq("70")
+	end
+
+	it "parses lists of mixed date types" do
+		date = Timetwister.parse("July 1776 - August 1789, 1812 - 1820, 1900")
+		expect(date[0][:date_start]).to eq("1776-07")
+		expect(date[0][:date_start_full]).to eq("1776-07-01")
+		expect(date[0][:date_end]).to eq("1789-08")
+		expect(date[0][:date_end_full]).to eq("1789-08-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+		expect(date[0][:test_data]).to eq("100")
+
+
+		expect(date[1][:date_start]).to eq("1812")
+		expect(date[1][:date_start_full]).to eq("1812-01-01")
+		expect(date[1][:date_end]).to eq("1820")
+		expect(date[1][:date_end_full]).to eq("1820-12-31")
+		expect(date[1][:inclusive_range]).to eq(true)
+		expect(date[1][:index_dates]).to eq([1812, 1813, 1814, 1815, 1816, 1817, 1818, 1819, 1820])
+		expect(date[1][:test_data]).to eq("120")
+
+		expect(date[2][:date_start]).to eq("1900")
+		expect(date[2][:date_start_full]).to eq("1900-01-01")
+		expect(date[2][:date_end]).to eq("1900")
+		expect(date[2][:date_end_full]).to eq("1900-12-31")
+		expect(date[2][:test_data]).to eq("70")
+	end
+
+	it "parses lists with mixed delimiters" do
+		date = Timetwister.parse("July 1776 - August 1789; 1812 - 1820, 1900 and June 10-11, 1910")
+		expect(date[0][:date_start]).to eq("1776-07")
+		expect(date[0][:date_start_full]).to eq("1776-07-01")
+		expect(date[0][:date_end]).to eq("1789-08")
+		expect(date[0][:date_end_full]).to eq("1789-08-31")
+		expect(date[0][:inclusive_range]).to eq(true)
+		expect(date[0][:index_dates]).to eq([1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789])
+		expect(date[0][:test_data]).to eq("100")
+
+		expect(date[1][:date_start]).to eq("1812")
+		expect(date[1][:date_start_full]).to eq("1812-01-01")
+		expect(date[1][:date_end]).to eq("1820")
+		expect(date[1][:date_end_full]).to eq("1820-12-31")
+		expect(date[1][:inclusive_range]).to eq(true)
+		expect(date[1][:index_dates]).to eq([1812, 1813, 1814, 1815, 1816, 1817, 1818, 1819, 1820])
+		expect(date[1][:test_data]).to eq("120")
+
+		expect(date[2][:date_start]).to eq("1900")
+		expect(date[2][:date_start_full]).to eq("1900-01-01")
+		expect(date[2][:date_end]).to eq("1900")
+		expect(date[2][:date_end_full]).to eq("1900-12-31")
+		expect(date[2][:test_data]).to eq("70")
+
+		expect(date[3][:date_start]).to eq("1910-06-10")
+		expect(date[3][:date_start_full]).to eq("1910-06-10")
+		expect(date[3][:date_end]).to eq("1910-06-11")
+		expect(date[3][:date_end_full]).to eq("1910-06-11")
+		expect(date[3][:test_data]).to eq("240")
+	end
+
+	it "parses dates with ordinal numbers" do
+		forms = ["July twenty-first 1776", "July twenty-first, 1776", "July 21st, 1776", "July 21st 1776"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-21")
+			expect(date[0][:date_start_full]).to eq("1776-07-21")
+			expect(date[0][:date_end]).to eq("1776-07-21")
+			expect(date[0][:date_end_full]).to eq("1776-07-21")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("200")
+		end
+	end
+
+	it "parses dates in multiple languages" do
+		forms = ["august 4 1776", "août 4 1776", "agosto 4 1776"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-08-04")
+			expect(date[0][:date_start_full]).to eq("1776-08-04")
+			expect(date[0][:date_end]).to eq("1776-08-04")
+			expect(date[0][:date_end_full]).to eq("1776-08-04")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("200")
+		end
+	end
+
+	it "parses dates without clean conjunctions" do
+		forms = ["july 4 and 5 1776", "4 & 5 july 1776", "1776 july 4 and 5"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07-04")
+			expect(date[0][:date_start_full]).to eq("1776-07-04")
+			expect(date[0][:date_end]).to eq("1776-07-04")
+			expect(date[0][:date_end_full]).to eq("1776-07-04")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("200")
+
+			expect(date[1][:date_start]).to eq("1776-07-05")
+			expect(date[1][:date_start_full]).to eq("1776-07-05")
+			expect(date[1][:date_end]).to eq("1776-07-05")
+			expect(date[1][:date_end_full]).to eq("1776-07-05")
+			expect(date[1][:index_dates]).to eq([1776])
+			expect(date[1][:test_data]).to eq("200")
+		end
+
+		forms = ["july and august 1776", "1776 july and august"]
+		forms.each do |f|
+			date = Timetwister.parse(f)
+			expect(date[0][:date_start]).to eq("1776-07")
+			expect(date[0][:date_start_full]).to eq("1776-07-01")
+			expect(date[0][:date_end]).to eq("1776-07")
+			expect(date[0][:date_end_full]).to eq("1776-07-31")
+			expect(date[0][:index_dates]).to eq([1776])
+			expect(date[0][:test_data]).to eq("220")
+
+			expect(date[1][:date_start]).to eq("1776-08")
+			expect(date[1][:date_start_full]).to eq("1776-08-01")
+			expect(date[1][:date_end]).to eq("1776-08")
+			expect(date[1][:date_end_full]).to eq("1776-08-31")
+			expect(date[1][:index_dates]).to eq([1776])
+			expect(date[1][:test_data]).to eq("220")
+		end
+
+	end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetwister
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Duryee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,6 +68,8 @@ files:
 - lib/timetwister.rb
 - lib/timetwister/parser.rb
 - lib/timetwister/version.rb
+- spec/dates_spec.rb
+- spec/spec_helper.rb
 - timetwister.gemspec
 homepage: http://github.com/alexduryee/timetwister
 licenses:
@@ -92,4 +95,6 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Chronic wrapper to handle common date formats
-test_files: []
+test_files:
+- spec/dates_spec.rb
+- spec/spec_helper.rb