timetwister 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0d0c30070a1b30680aed8c91ab6950f8b3673395546605f1dc1c0bb72954ea
-  data.tar.gz: cee49664ffebe37b764217e1cfd212c12b6e364928425a913598e3dc44eb6903
+  metadata.gz: 9ab710e9b2068bc7945925206c7033765c9ab6c8c03a0dec28e8271e1888d322
+  data.tar.gz: 8d37aba572fc43b434b5da1febff19e77d12155a744787aaada2a98d2748a262
 SHA512:
-  metadata.gz: 897f1be9853d0c9ebe3800519b507f346bb0c78c265fe2b4d42a0d75e148faf9ccc919fe1d0e14bdc9b73676f39ecdd5ceb156dfaf25904f4d62c0e7fb89bd29
-  data.tar.gz: 867c87500e0011732f9c863fff5bb03ee78080f42ad63755d541ed07bc6d72ed83e41c8f490e3323498ff82dd5421cbd989360be66b96520d0dba21b2a0cc1ba
+  metadata.gz: a8ab93f028d366e5dfd48a25c72768796eac9d586b6d03e698eb7e58022b37d9862577a7cccd5425f9749091167481e17d20cbe1197904bb6209602e262eae94
+  data.tar.gz: 780ee2a7bb4575a385dcbf4d0a417e671f1da7d700115a547391546303ae189b7b96301268fecfeb8c16d088aca883cd100672f51167c8b7366651df665b8c0b

data/lib/timetwister/utilities.rb

@@ -236,7 +236,11 @@ class Utilities
 		]
 
 		# transform seasons to months
-		string = replace_seasons(string)
+		string.gsub!(/[Ww]inter/, " January 1 - March 20 ")
+		string.gsub!(/[Ss]pring/, " March 20 - June 21 ")
+		string.gsub!(/[Ss]ummer/, " June 21 - September 23 ")
+		string.gsub!(/[Aa]utumn/, " September 23 - December 22 ")
+		string.gsub!(/[Ff]all/, " September 23 - December 22 ")
 
 		# remove days of the week
 		dow = [/[Ss]unday,?\s+/, /[Mm]onday,?\s+/, /[Tt]uesday,?\s+/, /[Ww]ednesday,?\s+/, /[Tt]hursday,?\s+/, /[Ff]riday,?\s+/, /[Ss]aturday,?\s+/]
@@ -254,28 +258,6 @@ class Utilities
 		return string
 	end
 
-	def self.replace_seasons(string)
-		seasons = {	'win[^\s]*'	=>	['January 1', 'March 20'],
-					'spr[^\s]*'	=>	['March 20', 'June 21'],
-					'sum[^\s]*'	=>	['June 21', 'September 23'],
-					'aut[^\s]*'	=>	['September 23', 'December 31'],
-					'fal[^\s]*'	=>	['September 23', 'December 31']}
-
-		# if we're working with a range, we need to be a little careful, so that we don't create sub-ranges in a string
-		is_range = string.match(/[^-]+?-[^-]+?/)
-
-		seasons.each do |season, dates|
-			regex = Regexp.new(season, Regexp::IGNORECASE)
-
-			# is the season the beginning or the end of a range?
-			new_date = (is_range ? (string.match(Regexp.new(season + '.+?-', Regexp::IGNORECASE)) ? dates[0] : dates[1]) : dates.join(' - '))
-			
-			string = string.gsub(regex, new_date)
-		end
-
-		return string
-	end
-
 	# Removes the first 4-digit number found in the string and returns it
 	def self.extract_year(string)
 		year = string.match(/\d{4}/).to_s

data/lib/timetwister/version.rb

@@ -1,3 +1,3 @@
 module Timetwister
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/spec/dates_spec.rb

@@ -344,7 +344,7 @@ describe Timetwister do
 		end
 	end
 
-	it "parses single seasons" do
+	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")
@@ -354,15 +354,6 @@ describe Timetwister do
 		expect(date[0][:index_dates]).to eq([1776])
 		expect(date[0][:test_data]).to eq("310")
 
-		date = Timetwister.parse("win. 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")
@@ -372,15 +363,6 @@ describe Timetwister do
 		expect(date[0][:index_dates]).to eq([1776])
 		expect(date[0][:test_data]).to eq("310")
 
-		date = Timetwister.parse("1776 Spr")
-		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")
@@ -390,63 +372,16 @@ describe Timetwister do
 		expect(date[0][:index_dates]).to eq([1776])
 		expect(date[0][:test_data]).to eq("310")
 
-		date = Timetwister.parse("1776 Summ")
-		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-31")
-		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([1776])
-		expect(date[0][:test_data]).to eq("310")
-
-		date = Timetwister.parse("Autumn 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-31")
-		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([1776])
-		expect(date[0][:test_data]).to eq("310")
-
-		date = Timetwister.parse("Aut. 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-31")
-		expect(date[0][:date_end_full]).to eq("1776-12-31")
+		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 ranges of seasons" do
-		date = Timetwister.parse("Winter 1776 - Spring 1777")
-		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("1777-06-21")
-		expect(date[0][:date_end_full]).to eq("1777-06-21")
-		expect(date[0][:inclusive_range]).to eq(true)
-		expect(date[0][:index_dates]).to eq([1776, 1777])
-		expect(date[0][:test_data]).to eq("80")
-
-		date = Timetwister.parse("1777 Spring - 1778 Summer")
-		expect(date[0][:date_start]).to eq("1777-03-20")
-		expect(date[0][:date_start_full]).to eq("1777-03-20")
-		expect(date[0][:date_end]).to eq("1778-09-23")
-		expect(date[0][:date_end_full]).to eq("1778-09-23")
-		expect(date[0][:inclusive_range]).to eq(true)
-		expect(date[0][:index_dates]).to eq([1777, 1778])
-		expect(date[0][:test_data]).to eq("80")
-	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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetwister
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Duryee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,7 +46,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile

data/.github/workflows/ruby.yml

@@ -1,35 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
-
-    steps:
-    - uses: actions/checkout@v2
-    - 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
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rspec