edtf 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68aac723f31efd30a29639ccddba4f552d32f3e2
-  data.tar.gz: 0997aa8f2861ababa527f1f39b0811ef2db055c9
+  metadata.gz: 78ea9e9fd8f43b0113aadd9b17a62de265c11972
+  data.tar.gz: 14afd317d3146be4e5d2e4f9bfbf3cbf0c365856
 SHA512:
-  metadata.gz: fae111479f8b85e8d308e0075e62a713be2d651ad402c7867183fadb5d929541333d78baad12712b6a244b5dc890557bd9b331188656989508d657117401e9d8
-  data.tar.gz: 5d3ad065005556811991a501b1ad5f1a73210b0fa5c6e5bd88e4808145d24a5135d48f8bcd7b0d8c0de97634ac61a8e578bd830ffd4e2285f2a0e8874934b2d6
+  metadata.gz: 3ae6ab55647c39ed69d384f7b3f82579d58ec6c9c156cc5c6f255d95660229dd518c13039f327e8839c163c126a997978cce9e5a54a170439e5875fa3ac8fafe
+  data.tar.gz: 45ce22b6fed0acfec4376094f05a75e7529fb33e28c8311f128451bbf4143498a627c67f62ec0a9e372f827650bf6ff607576a1a0c57f94a20168d2368d3cadf

data/.travis.yml

@@ -2,11 +2,11 @@ language: ruby
 bundler_args: --without debug extra
 script: bundle exec rake test_with_coveralls
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - rbx-2.1.1
-  - rbx
+  - rbx-2
 notifications:
   email:
     - sk@semicolon.at

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 group :debug do
   gem 'ruby-debug', :require => false, :platform => :jruby
-  gem 'debugger', ['~>1.6', '>=1.6.5'], :require => false, :platform => :mri
+  gem 'byebug', :require => false, :platform => :mri
   gem 'rubinius-compiler', '~>2.0', :require => false, :platform => :rbx
   gem 'rubinius-debugger', '~>2.0', :require => false, :platform => :rbx
 end
@@ -12,7 +12,7 @@ group :development do
   gem 'rake'
   gem 'racc', :platform => :ruby
   gem 'cucumber'
-  gem 'rspec'
+  gem 'rspec', '~>3.0'
   gem 'simplecov', '~>0.8', :require => false
   gem 'rubinius-coverage', :platform => :rbx
   gem 'coveralls', :require => false
@@ -26,6 +26,11 @@ end
 gem 'i18n'
 
 platform :rbx do
-  gem 'rubysl', '~>2.0'
+  gem 'rubysl-singleton', '~>2.0'
+  gem 'rubysl-open3', '~>2.0'
+  gem 'rubysl-enumerator', '~>2.0'
+  gem 'rubysl-base64', '~>2.0'
+  gem 'rubysl-bigdecimal', '~>2.0'
+  gem 'rubysl-drb', '~>2.0'
   gem 'json'
 end

data/README.md

@@ -4,7 +4,7 @@ EDTF-Ruby
 [![Coverage Status](https://coveralls.io/repos/inukshuk/edtf-ruby/badge.png)](https://coveralls.io/r/inukshuk/edtf-ruby)
 
 EDTF-Ruby comprises a parser and an API implementation of the [Extended
-Date/Time Format standard](http://www.loc.gov/standards/datetime/spec.html).
+Date/Time Format standard](http://www.loc.gov/standards/datetime/).
 
 
 Compatibility
@@ -21,8 +21,8 @@ EDTF-Ruby parser implements all levels and features of the EDTF specification
   examples, though).
 
 EDTF-Ruby has been confirmed to work on the following Ruby implementations:
-2.1, 2.0, 1.9.3, Rubinius, and JRuby (1.8.7 and 1.9.2 were originally
-we are not testing compatibility actively anymore). Active Support's date
+2.1, 2.0, 1.9.3, Rubinius, and JRuby (1.8.7 and 1.9.2 were originally supported
+but we are not testing compatibility actively anymore). Active Support's date
 extensions are currently listed as a dependency, because of many functional
 overlaps (version 3.x and 4.x are supported).
 
@@ -63,10 +63,10 @@ precision to month, however, the natural successor is not the next day, but
 a day a month from now. Always keep precision in mind when comparing dates,
 too:
 
-    > Date.new(1666).year_precision! == Date.new(1966)
+    > Date.new(1966).year_precision! == Date.new(1966)
     => false
 
-The year 1666 is not equal to the January 1st, 1966. You can set a date's
+The year 1966 is not equal to the January 1st, 1966. You can set a date's
 precision directly, or else use the dedicated bang! methods:
 
     > d = Date.new(1993)
@@ -213,7 +213,7 @@ and the `choice` attribute.
     => false
     > s.choice!
     > s.edtf
-    => "[1667, 1668, 1670..1672]"
+    => "[1667,1668,1670..1672]"
 
 As you can see above, EDTF-Ruby remembers which parts of the set were
 specified as a range; ranges are however enumerated for membership tests:
@@ -233,7 +233,7 @@ When in doubt, you can always map the set to an array. This will also
 enumerate all ranges:
 
     > s.map(&:year)
-    => [1667, 1668, 1670, 1671, 1672] # when enumerated there are 5 elements
+    => [1667,1668,1670,1671,1672] # when enumerated there are 5 elements
 
 EDTF sets also feature an `#earlier?` and `#later?` attribute:
 
@@ -241,7 +241,7 @@ EDTF sets also feature an `#earlier?` and `#later?` attribute:
     => false
     > s.earlier!
     > s.edtf
-    => "[..1667, 1668, 1670..1672]"
+    => "[..1667,1668,1670..1672]"
 
 
 ### Decades and Centuries

data/features/parser/date_times.feature

@@ -2,7 +2,7 @@ Feature: EDTF parses date/time strings
 
 	As a user of edtf-ruby
 	I want to parse date/time strings formatted in EDTF
-	
+
 	Scenario Outline: EDTF parses a date/time string
 		When I parse the string "<string>"
 		Then the year should be "<year>"
@@ -33,9 +33,9 @@ Feature: EDTF parses date/time strings
 			| 2004-01-01T10:10:10Z      | 2004 | 1     | 1   | 10    | 10      | 10      |
 			| 2004-01-01T10:10:10+05:00 | 2004 | 1     | 1   | 5     | 10      | 10      |
 			| 2004-01-01T02:10:10+05:00 | 2003 | 12    | 31  | 21    | 10      | 10      |
-			
+
     # Scenarios: fractions
     #   | string                    | year | month | day | hours | minutes | seconds |
     #   | 2004-01-01T10             | 2004 | 1     | 1   | 10    | 0       | 0       |
     #   | 2004-01-01T10:10:10+05:00 | 2004 | 1     | 1   | 5     | 10      | 10      |
-    #   | 2004-01-01T02:10:10+05:00 | 2003 | 12    | 31  | 21    | 10      | 10      |
+    #   | 2004-01-01T02:10:10+05:00 | 2003 | 12    | 31  | 21    | 10      | 10      |

data/features/print/level_0_edtf.feature

@@ -1,73 +1,73 @@
 Feature: Print Date/Time objects as Level 0 EDTF strings
   As a Ruby programmer
   I want to convert Date/Time objects to EDTF strings
-  
+
   @001 @level0
   Scenario: Convert simple dates
     Given the date "2004-08-12"
     When I convert the date
     Then the EDTF string should be "2004-08-12"
 
-	@001 @level0
-	Scenario: Convert simple dates with precision
-		Given the date "1980-08-24" with precision set to "day"
-		When I convert the date
-		Then the EDTF string should be "1980-08-24"
-		Given the date "1980-08-24" with precision set to "month"
-		When I convert the date
-		Then the EDTF string should be "1980-08"
-		Given the date "1980-08-24" with precision set to "year"
-		When I convert the date
-		Then the EDTF string should be "1980"
+  @001 @level0
+  Scenario: Convert simple dates with precision
+    Given the date "1980-08-24" with precision set to "day"
+    When I convert the date
+    Then the EDTF string should be "1980-08-24"
+    Given the date "1980-08-24" with precision set to "month"
+    When I convert the date
+    Then the EDTF string should be "1980-08"
+    Given the date "1980-08-24" with precision set to "year"
+    When I convert the date
+    Then the EDTF string should be "1980"
 
-	@001 @level0
-	Scenario: Date Roundtrips
-		When I parse the string "2001-02-03"
-		When I convert the date
-		Then the EDTF string should be "2001-02-03"
-		When I parse the string "2001-02"
-		When I convert the date
-		Then the EDTF string should be "2001-02"
-		When I parse the string "2001"
-		When I convert the date
-		Then the EDTF string should be "2001"
-		When I parse the string "-9909"
-		When I convert the date
-		Then the EDTF string should be "-9909"
-		When I parse the string "0000"
-		When I convert the date
-		Then the EDTF string should be "0000"
+  @001 @level0
+  Scenario: Date Roundtrips
+    When I parse the string "2001-02-03"
+    When I convert the date
+    Then the EDTF string should be "2001-02-03"
+    When I parse the string "2001-02"
+    When I convert the date
+    Then the EDTF string should be "2001-02"
+    When I parse the string "2001"
+    When I convert the date
+    Then the EDTF string should be "2001"
+    When I parse the string "-9909"
+    When I convert the date
+    Then the EDTF string should be "-9909"
+    When I parse the string "0000"
+    When I convert the date
+    Then the EDTF string should be "0000"
 
-	@002 @level0
-	Scenario: DateTime Roundtrips
-		When I parse the string "2001-02-03T09:30:01"
-		When I convert the date
-		Then the EDTF string should be "2001-02-03T09:30:01+00:00"
-		When I parse the string "2004-01-01T10:10:10Z"
-		When I convert the date
-		Then the EDTF string should be "2004-01-01T10:10:10+00:00"
-		When I parse the string "2004-01-01T10:10:10+05:00"
-		When I convert the date
-		Then the EDTF string should be "2004-01-01T10:10:10+05:00"
+  @002 @level0
+  Scenario: DateTime Roundtrips
+    When I parse the string "2001-02-03T09:30:01"
+    When I convert the date
+    Then the EDTF string should be "2001-02-03T09:30:01"
+    When I parse the string "2004-01-01T10:10:10Z"
+    When I convert the date
+    Then the EDTF string should be "2004-01-01T10:10:10+00:00"
+    When I parse the string "2004-01-01T10:10:10+05:00"
+    When I convert the date
+    Then the EDTF string should be "2004-01-01T10:10:10+05:00"
+
+  @004 @level0
+  Scenario: Interval Roundtrips
+    When I parse the string "1964/2008"
+    When I convert the date
+    Then the EDTF string should be "1964/2008"
+    When I parse the string "2004-06/2006-08"
+    When I convert the date
+    Then the EDTF string should be "2004-06/2006-08"
+    When I parse the string "2004-02-01/2005-02-08"
+    When I convert the date
+    Then the EDTF string should be "2004-02-01/2005-02-08"
+    When I parse the string "2004-02-01/2005-02"
+    When I convert the date
+    Then the EDTF string should be "2004-02-01/2005-02"
+    When I parse the string "2004-02-01/2005"
+    When I convert the date
+    Then the EDTF string should be "2004-02-01/2005"
+    When I parse the string "2005/2006-02"
+    When I convert the date
+    Then the EDTF string should be "2005/2006-02"
 
-	@004 @level0
-	Scenario: Interval Roundtrips
-		When I parse the string "1964/2008"
-		When I convert the date
-		Then the EDTF string should be "1964/2008"
-		When I parse the string "2004-06/2006-08"
-		When I convert the date
-		Then the EDTF string should be "2004-06/2006-08"
-		When I parse the string "2004-02-01/2005-02-08"
-		When I convert the date
-		Then the EDTF string should be "2004-02-01/2005-02-08"
-		When I parse the string "2004-02-01/2005-02"
-		When I convert the date
-		Then the EDTF string should be "2004-02-01/2005-02"
-		When I parse the string "2004-02-01/2005"
-		When I convert the date
-		Then the EDTF string should be "2004-02-01/2005"		
-		When I parse the string "2005/2006-02"
-		When I convert the date
-		Then the EDTF string should be "2005/2006-02"
-		

data/features/step_definitions/edtf_steps.rb

@@ -8,7 +8,7 @@ When /^I convert the date$/ do
 end
 
 Then /^the EDTF String should be "([^"]*)"$/i do |edtf|
-  @string.should == edtf
+  expect(@string).to eq(edtf)
 end
 
 When /^I parse the string "([^"]*)"$/ do |string|
@@ -16,102 +16,102 @@ When /^I parse the string "([^"]*)"$/ do |string|
 end
 
 Then /^the year should be "([^"]*)"$/ do |year|
-  @date.year.should == year.to_i
+  expect(@date.year).to eq(year.to_i)
 end
 
 Then /^the month should be "([^"]*)"$/ do |month|
-  @date.month.should == month.to_i
+  expect(@date.month).to eq(month.to_i)
 end
 
 Then /^the day should be "([^"]*)"$/ do |day|
-  @date.day.should == day.to_i
+  expect(@date.day).to eq(day.to_i)
 end
 
 Then /^the hours should be "([^"]*)"$/ do |hours|
-  @date.hour.should == hours.to_i
+  expect(@date.hour).to eq(hours.to_i)
 end
 
 Then /^the year should be "([^"]*)" \(UTC\)$/ do |year|
-  @date.to_time.utc.year.should == year.to_i
+  expect(@date.to_time.utc.year).to eq(year.to_i)
 end
 
 Then /^the month should be "([^"]*)" \(UTC\)$/ do |month|
-  @date.to_time.utc.month.should == month.to_i
+  expect(@date.to_time.utc.month).to eq(month.to_i)
 end
 
 Then /^the day should be "([^"]*)" \(UTC\)$/ do |day|
-  @date.to_time.utc.day.should == day.to_i
+  expect(@date.to_time.utc.day).to eq(day.to_i)
 end
 
 Then /^the hours should be "([^"]*)" \(UTC\)$/ do |hours|
-  @date.to_time.utc.hour.should == hours.to_i
+  expect(@date.to_time.utc.hour).to eq(hours.to_i)
 end
 
 
 Then /^the minutes should be "([^"]*)"$/ do |minutes|
-  @date.min.should == minutes.to_i
+  expect(@date.min).to eq(minutes.to_i)
 end
 
 Then /^the seconds should be "([^"]*)"$/ do |seconds|
-  @date.sec.should == seconds.to_i
+  expect(@date.sec).to eq(seconds.to_i)
 end
 
 Then /^the duration should range from "([^"]*)" to "([^"]*)"$/ do |from,to|
-  [@date.begin.year.to_s, @date.end.year.to_s].should == [from,to]
+  expect([@date.begin.year.to_s, @date.end.year.to_s]).to eq([from,to])
 end
 
 Then /^the interval should start at "([^"]*)"$/ do |date|
-  @date.begin.to_s.should == date
+  expect(@date.begin.to_s).to eq(date)
 end
 
 Then /^the interval should end at "([^"]*)"$/ do |date|
-  @date.end.to_s.should == date
+  expect(@date.end.to_s).to eq(date)
 end
 
 Then /^the interval should include the date "([^"]*)"$/ do |date|
-  @date.should include(Date.parse(date))
+  expect(@date).to include(Date.parse(date))
 end
 
 Then /^the interval should cover the date "([^"]*)"$/ do |date|
-  @date.should be_cover(Date.parse(date))
+  expect(@date).to be_cover(Date.parse(date))
 end
 
 
 Then /^the date should be uncertain\? "([^"]*)"$/ do |arg1|
-  @date.uncertain?.should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.uncertain?).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the year should be uncertain\? "([^"]*)"$/ do |arg1|
-  @date.uncertain?(:year).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.uncertain?(:year)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the month should be uncertain\? "([^"]*)"$/ do |arg1|
-  @date.uncertain?(:month).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.uncertain?(:month)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the day should be uncertain\? "([^"]*)"$/ do |arg1|
-  @date.uncertain?(:day).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.uncertain?(:day)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the date should be approximate\? "([^"]*)"$/ do |arg1|
-  @date.approximate?.should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.approximate?).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the year should be approximate\? "([^"]*)"$/ do |arg1|
-  @date.approximate?(:year).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.approximate?(:year)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the month should be approximate\? "([^"]*)"$/ do |arg1|
-  @date.approximate?(:month).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.approximate?(:month)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 Then /^the day should be approximate\? "([^"]*)"$/ do |arg1|
-  @date.approximate?(:day).should == !!(arg1 =~ /y(es)?/i)
+  expect(@date.approximate?(:day)).to eq(!!(arg1 =~ /y(es)?/i))
 end
 
 
 Then /^the unspecified string code be "([^"]*)"$/ do |arg1|
-  @date.unspecified.to_s.should == arg1
+  expect(@date.unspecified.to_s).to eq(arg1)
 end
 
 When /^I parse the following strings an error should be raised:$/ do |table|

data/features/support/env.rb

@@ -13,7 +13,7 @@ begin
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
   else
-    require 'debugger'
+    require 'byebug'
   end
 rescue LoadError
   # ignore

data/lib/edtf/date.rb

@@ -13,7 +13,7 @@ class Date
   }.freeze
 
   EXTENDED_ATTRIBUTES = %w{
-    calendar precision uncertain approximate unspecified
+    calendar precision uncertain approximate unspecified skip_timezone
   }.map(&:to_sym).freeze
 
   extend Forwardable
@@ -31,7 +31,7 @@ class Date
     end
   end
 
-  attr_accessor :calendar
+  attr_accessor :calendar, :skip_timezone
 
   PRECISION.each do |p|
     define_method("#{p}_precision?") { precision == p }
@@ -162,6 +162,9 @@ class Date
   # Returns true if the Date has an EDTF calendar string attached.
   def calendar?; !!@calendar; end
 
+  # Returns true if the Date's EDTF string should be printed without timezone.
+  def skip_timezone?; !!@skip_timezone; end
+
   # Converts the Date into a season.
   def season
     Season.new(self)
@@ -192,7 +195,7 @@ class Date
       y << SYMBOLS[:approximate] if 24&h==8 || 27&h==26
 
 
-      # combine if false-true-true and other m == d 
+      # combine if false-true-true and other m == d
       if 7&h==6 && (48&h==48 || 48&h==0)  || 56&h==48 && (6&h==6 || 6&h==0)
         m[0,0] = '('
         d << ')'