edtf 2.3.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcceec6058c69ebeff88be3fdbf269ee69f69fab
-  data.tar.gz: 4790a440bd05bb6bef2335bbeccc84836051e23c
+  metadata.gz: aa655e4e89a8cb161181b107461ecfc658d4c9e9
+  data.tar.gz: d463ec75229bb90823ff4972dea2a7cf6fe6e2d4
 SHA512:
-  metadata.gz: d08ef863ffaf2ffc248f1213af38b25c6ae1963bbce4599735bedef87d0c025f3d4bc329cb5fc3a89d018c8b3a144693784bbecec163a970909f6e502e1b49cd
-  data.tar.gz: eee5144c546253056593e414621a4b9202999bf0a7f15fbdd1e0e7fa88835a67f4eb384eaf4eb9f8a287b0964daa465dae352f5d606705febd8d95610c5577ee
+  metadata.gz: 673e1462165a23d661c145305041799a1cc1c9dd8ea2129c19a549b5e17eade2271e48fbdc9b6038fbde747d90149e2b5b6f78f01d63c6606efb6b49b44ade61
+  data.tar.gz: e36ba83aacd9675b9cc3a59360ddb4428b55629ec28cbaaac48be4f413aa685d9ca984bb878af3d3c365159e9249788660e1c2442571d2bc8448e9d91c5ed3a4

data/.travis.yml

@@ -1,15 +1,17 @@
 language: ruby
 bundler_args: --without debug extra
+sudo: false
+cache: bundler
+before_install:
+  - gem install bundler
 script: bundle exec rake test_with_coveralls
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0
-  - jruby-19mode
-  - rbx-2
+  - 2.3.1
+  - 2.2.5
+  - jruby-9.0.5.0
 notifications:
   email:
     - sk@semicolon.at
     - namyra@gmail.com
   on_success: change
-  on_failure: always
+  on_failure: change

data/README.md

@@ -26,6 +26,11 @@ 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).
 
+### ISO 8601-2
+
+A variation of EDTF will part of the upcoming ISO 8601-2 standard. EDTF-Ruby
+does not support this new version of EDTF yet, but if you are curious,
+[EDTF.js](inukshuk/edtf.js), an ES6 implementation is already available.
 
 Quickstart
 ----------

data/edtf.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = 'A Ruby implementation of the Extended Date/Time Format (EDTF).'
   s.license     = 'BSD-2-Clause-FreeBSD'
 
-  s.add_runtime_dependency('activesupport', '>= 3.0', '< 5.0')
+  s.add_runtime_dependency('activesupport', '>= 3.0', '< 6.0')
 
   s.files        = `git ls-files`.split("\n") << 'lib/edtf/parser.rb'
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/features/parser/intervals.feature

@@ -1,11 +1,11 @@
 Feature: EDTF parses ISO 8601 interval strings
 	As a user of edtf-ruby
 	I want to parse ISO 8601 interval strings
-	
+
 	Scenario Outline: parse intervals
 		When I parse the string "<string>"
 		Then the interval should cover the date "<date>"
-	
+
 	@004 @level0
 	Scenarios: specification intervals
 		| string                | date       |

data/features/print/level_0_edtf.feature

@@ -8,6 +8,12 @@ Feature: Print Date/Time objects as Level 0 EDTF strings
     When I convert the date
     Then the EDTF string should be "2004-08-12"
 
+  @001 @level0
+  Scenario: Convert simple negative dates
+    Given the date "-0300-08-12"
+    When I convert the date
+    Then the EDTF string should be "-0300-08-12"
+
   @001 @level0
   Scenario: Convert simple dates with precision
     Given the date "1980-08-24" with precision set to "day"

data/lib/edtf/date.rb

@@ -174,7 +174,9 @@ class Date
   def edtf
     return "y#{year}" if long_year?
 
-    s = FORMATS.take(values.length).zip(values).map { |f,v| f % v }
+    v = values
+    s = FORMATS.take(v.length).zip(v).map { |f,d| f % d.abs }
+    s[0] = "-#{s[0]}" if year < 0
     s = unspecified.mask(s)
 
     unless (h = ua_hash).zero?

data/lib/edtf/interval.rb

@@ -1,5 +1,5 @@
 module EDTF
-  
+
   # An interval behaves like a regular Range but is dedicated to EDTF dates.
   # Most importantly, intervals use the date's precision when generating
   # the set of contained values and for membership tests. All tests are
@@ -21,20 +21,38 @@ module EDTF
   class Interval
 
     extend Forwardable
-    
+
     include Comparable
     include Enumerable
 
     # Intervals delegate hash calculation to Ruby Range
     def_delegators :to_range, :eql?, :hash
     def_delegators :to_a, :length, :empty?
-    
-    attr_accessor :from, :to
+
+    attr_reader :from, :to
 
     def initialize(from = Date.today, to = :open)
-      @from, @to = from, to
+      self.from, self.to = from, to
+    end
+
+    def from=(date)
+      case date
+      when Date, :unknown
+        @from = date
+      else
+        throw ArgumentError.new("Intervals cannot start with: #{date}")
+      end
+    end
+
+    def to=(date)
+      case date
+      when Date, :unknown, :open
+        @to = date
+      else
+        throw ArgumentError.new("Intervals cannot end with: #{date}")
+      end
     end
-    
+
     [:open, :unknown].each do |method_name|
       define_method("#{method_name}_end!") do
         @to = method_name
@@ -45,34 +63,34 @@ module EDTF
         @to == method_name
       end
     end
-    
+
     alias open! open_end!
     alias open? open_end?
-    
+
     def unknown_start?
       from == :unknown
     end
-    
+
     def unknown_start!
       @from = :unknown
       self
     end
-    
+
     def unknown?
       unknown_start? || unknown_end?
     end
-    
+
     # Returns the intervals precision. Mixed precisions are currently not
     # supported; in that case, the start date's precision takes precedence.
     def precision
       min.precision || max.precision
     end
-    
+
     # Returns true if the precisions of start and end date are not the same.
     def mixed_precision?
       min.precision != max.precision
     end
-    
+
     def each(&block)
       step(1, &block)
     end
@@ -90,37 +108,37 @@ module EDTF
     # If not block is given, returns an enumerator instead.
     #
     def step(by = 1)
-      raise ArgumentError unless by.respond_to?(:to_i) 
-      
+      raise ArgumentError unless by.respond_to?(:to_i)
+
       if block_given?
         f, t, by = min, max, by.to_i
 
         unless f.nil? || t.nil? || by < 1
           by = { Date::PRECISIONS[precision] => by }
-          
+
           until f > t do
             yield f
             f = f.advance(by)
           end
         end
-        
+
         self
       else
         enum_for(:step, by)
       end
     end
 
-    
+
     # This method always returns false for Range compatibility. EDTF intervals
     # always include the last date.
     def exclude_end?
       false
     end
-    
-    
+
+
     # TODO how to handle +/- Infinity for Dates?
     # TODO we can't delegate to Ruby range for mixed precision intervals
-    
+
     # Returns the Interval as a Range.
     def to_range
       case
@@ -130,7 +148,7 @@ module EDTF
         Range.new(unknown_start? ? Date.new : @from, max)
       end
     end
-    
+
     # Returns true if other is an element of the Interval, false otherwise.
     # Comparision is done according to the Interval's min/max date and
     # precision.
@@ -138,15 +156,15 @@ module EDTF
       cover?(other) && precision == other.precision
     end
     alias member? include?
-    
+
     # Returns true if other is an element of the Interval, false otherwise.
     # In contrast to #include? and #member? this method does not take into
-    # account the date's precision.    
+    # account the date's precision.
     def cover?(other)
       return false unless other.is_a?(Date)
-      
+
       other = other.day_precision
-      
+
       case
       when unknown_start?
         max.day_precision! == other
@@ -158,7 +176,7 @@ module EDTF
         min.day_precision! <= other && other <= max.day_precision!
       end
     end
-    
+
     # call-seq:
     #     interval.first     -> Date or nil
     #     interval.first(n)  -> Array
@@ -166,12 +184,12 @@ module EDTF
     # Returns the first date in the interval, or the first n dates.
     def first(n = 1)
       if n > 1
-        (ds = Array(min)).empty? ? ds : ds.concat(ds[0].next(n - 1))        
+        (ds = Array(min)).empty? ? ds : ds.concat(ds[0].next(n - 1))
       else
         min
       end
     end
-    
+
     # call-seq:
     #     interval.last     -> Date or nil
     #     interval.last(n)  -> Array
@@ -179,12 +197,12 @@ module EDTF
     # Returns the last date in the interval, or the last n dates.
     def last(n = 1)
       if n > 1
-        (ds = Array(max)).empty? ? ds : ds.concat(ds[0].prev(n - 1))        
+        (ds = Array(max)).empty? ? ds : ds.concat(ds[0].prev(n - 1))
       else
         max
       end
     end
-    
+
     # call-seq:
     #     interval.min                  -> Date or nil
     #     interval.min { |a,b| block }  -> Date or nil
@@ -209,11 +227,11 @@ module EDTF
         end
       end
     end
-    
+
     def begin
       min
     end
-    
+
     # call-seq:
     #     interval.max                  -> Date or nil
     #     interval.max { |a,b| block }  -> Date or nil
@@ -233,7 +251,7 @@ module EDTF
         case
         when open_end?, unknown_end?, !unknown_start? && to < from
           nil
-        when to.day_precision? 
+        when to.day_precision?
           to
         when to.month_precision?
           to.end_of_month
@@ -242,11 +260,11 @@ module EDTF
         end
       end
     end
-    
+
     def end
       max
     end
-    
+
     def <=>(other)
       case other
       when Interval, Season, Epoch
@@ -257,7 +275,7 @@ module EDTF
         nil
       end
     end
-    
+
     def ===(other)
       case other
       when Interval
@@ -268,8 +286,8 @@ module EDTF
         false
       end
     end
-    
-    
+
+
     # Returns the Interval as an EDTF string.
     def edtf
       [
@@ -277,9 +295,9 @@ module EDTF
         to.send(to.respond_to?(:edtf) ? :edtf : :to_s)
       ] * '/'
     end
-    
+
     alias to_s edtf
-    
+
   end
-  
+
 end

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '2.3.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/spec/edtf/date_spec.rb

@@ -5,7 +5,7 @@ describe 'Date/DateTime' do
       expect(Date).to respond_to(:edtf)
     end
   end
-  
+
   describe 'instance methods' do
     [:uncertain?, :approximate?, :unspecified?, :uncertain, :approximate, :unspecified].each do |method|
       it "responds to #{method}" do
@@ -13,14 +13,14 @@ describe 'Date/DateTime' do
       end
     end
   end
-  
+
   describe '#dup' do
     let(:date) { Date.edtf('2004-09?~') }
-    
+
     it 'copies all date values' do
       date.dup.to_s == '2004-09-01'
     end
-    
+
     it 'copies uncertainty' do
       expect(date.dup).to be_uncertain
     end
@@ -32,50 +32,50 @@ describe 'Date/DateTime' do
     it 'copies precision' do
       expect(date.dup.precision).to eq(:month)
     end
-    
+
     it 'copies uncertainty by value' do
       expect { date.dup.certain! }.not_to change { date.uncertain? }
     end
-    
+
   end
 
 	describe 'precisions' do
 		let(:date) { Date.today }
-		
+
 		it 'has day precision by default' do
 			expect(date).to be_day_precision
 		end
-		
+
 		it '#day_precison returns a new date object' do
 			expect(date.day_precision).not_to equal(date)
 			expect(date.day_precision).to eq(date)
 		end
-		
+
 	end
-	
-  
+
+
 	describe '#negate' do
     let(:date) { Date.edtf('2004?') }
-		
+
 		it 'returns a new date with the negated year' do
 			expect(date.negate.year).to eq(date.year * -1)
 		end
-		
+
 		it 'returns a new date with the same month' do
 			expect(date.negate.month).to eq(date.month)
 		end
-		
+
 		it 'returns a new date with the same day' do
 			expect(date.negate.day).to eq(date.day)
 		end
-		
+
 		it 'returns a new date with the same precision' do
 			expect(date.negate.precision).to eq(date.precision)
 		end
 	end
-	
+
 	describe '#succ' do
-		
+
 		it 'the successor of 2004 is 2005' do
 			expect(Date.edtf('2004').succ.year).to eq(2005)
 		end
@@ -93,43 +93,43 @@ describe 'Date/DateTime' do
 		end
 
 	end
-	
+
 	describe '#next' do
-	  
+
 	  it 'returns the successor when given no argument' do
 			expect(Date.edtf('1999').next[0].year).to eq(2000)
 	  end
-	  
+
 	  it 'returns an array of the next 3 elements when passed 3 as an argument' do
 	    Date.edtf('1999').next(3).map(&:year) == [2000, 2001, 2002]
 	  end
-	  
+
 	end
-	
-	
+
+
   describe '#change' do
     let(:date) { Date.edtf('2004-09?~') }
 
     it 'returns a copy of the date if given empty option hash' do
       expect(date.change({})).to eq(date)
 		end
-		
+
     it 'the returned copy is not identical at object level' do
       expect(date.change({})).not_to equal(date)
     end
-    
+
     describe 'when given a new year' do
       let(:changeset) { { :year => 1999 } }
-      
+
       it 'returns a new date instance with the changed year' do
         expect(date.change(changeset).year).to eq(1999)
       end
-      
+
     end
 
     describe 'when given a new precision' do
       let(:changeset) { { :precision => :year } }
-      
+
       it 'returns a new date instance with the changed precision' do
         expect(date.change(changeset).precision).to eq(:year)
       end
@@ -139,13 +139,13 @@ describe 'Date/DateTime' do
     it 'copies extended values by value' do
       expect { date.change({}).approximate! }.not_to change { date.approximate? }
     end
-    
+
   end
-  
+
   describe '#uncertain?' do
-    
+
     let(:date) { Date.new }
-    
+
     it { expect(Date.new).not_to be_uncertain }
 
     [:year, :month, :day].each do |part|
@@ -164,29 +164,29 @@ describe 'Date/DateTime' do
           expect(date.uncertain?(other)).to eq(false)
         end
       end
-      
+
     end
-    
+
   end
-  
+
   describe 'uncertain/approximate hash' do
-    
+
     it 'is 0 by default' do
       expect(Date.new().send(:ua_hash)).to eq(0)
     end
-    
+
     it 'is 8 for approximate year' do
       expect(Date.new.approximate!(:year).send(:ua_hash)).to eq(8)
     end
-    
+
   end
-  
+
 	describe 'sorting and comparisons' do
 		let(:xmas) { Date.new(2011, 12, 24) }
 		let(:new_years_eve) { Date.new(2011, 12, 31) }
-		
+
 		describe '#values' do
-			
+
 			it 'returns [2011,12,24] for christmas' do
 				expect(xmas.values).to eq([2011,12,24])
 			end
@@ -198,11 +198,11 @@ describe 'Date/DateTime' do
 			it 'returns [2011] for christmas with year precision' do
 				expect(xmas.year_precision!.values).to eq([2011])
 			end
-			
+
 		end
-		
+
 		describe '#<=>' do
-			
+
 			it '2009-12-24 should be less than 2011-12-31' do
 				expect(Date.new(2009,12,24)).to be < Date.new(2011,12,31)
 			end
@@ -214,12 +214,12 @@ describe 'Date/DateTime' do
 			it '2009-12-24 should be less than 2011' do
 				expect(Date.new(2009,12,24)).to be < Date.edtf('2011')
 			end
-			
-			
+
+
 		end
-		
+
 		describe '#==' do
-			
+
 			it "xmas and new year's eve are not equal" do
 				expect(xmas).not_to eq(new_years_eve)
 			end
@@ -231,15 +231,15 @@ describe 'Date/DateTime' do
 			it "xmas and january 24 are not equal using month percision" do
 				expect(xmas.month_precision!).not_to eq(xmas.month_precision!.next)
 			end
-			
+
 
 			it "xmas and new year's eve are equal using year percision" do
 				expect(xmas.year_precision!).to eq(new_years_eve.year_precision!)
 			end
-			
+
 		end
-		
+
 	end
-	
-    
-end
+
+
+end

data/spec/edtf/interval_spec.rb

@@ -132,5 +132,10 @@ module EDTF
       end
     end
 
+    it 'may not have an open start' do
+      expect(
+        proc { Interval.new(:open, Date.today) }
+      ).to raise_error(ArgumentError)
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: A Ruby implementation of the Extended Date/Time Format (EDTF).
 email:
 - http://sylvester.keil.or.at