edtf 0.0.3 → 0.0.4

data/spec/edtf/interval_spec.rb

@@ -0,0 +1,12 @@
+module EDTF
+  describe 'Interval' do
+    describe 'when it ends in 2008' do
+
+      let(:interval) { Interval.new(Date.new(2007), Date.new(2008)) }
+      
+      it 'should include any day in the year 2008' do
+        interval.should include(Date.new(2008, 12, 31))
+      end
+    end
+  end
+end

data/spec/edtf/parser_spec.rb

@@ -2,7 +2,7 @@ module EDTF
   describe Parser do
     describe '#parse' do
       
-      it 'parses simple dates' do
+      it 'parses simple dates "2001-02-03"' do
         Parser.new.parse('2001-02-03').to_s.should == '2001-02-03'
       end
       
@@ -10,6 +10,10 @@ module EDTF
         Parser.new.parse('-2323').to_s.should == '-2323-01-01'
       end
       
+			it 'parses the negative year -2101 and sets the precision to :year' do
+				Parser.new.parse('-2101').should be_year_precision
+			end
+			
       it 'parses year zero' do
         Parser.new.parse('0000').to_s.should == '0000-01-01'
       end
@@ -20,11 +24,12 @@ module EDTF
       
       it 'parses simple intervals like "2007/2008"' do
         Parser.new.parse('2007/2008').should include(Date.new(2007,12,24))
-        Parser.new.parse('2007/2008').should_not include(Date.new(2008,1,2))
+        Parser.new.parse('2007/2008').should include(Date.new(2008,1,2))
+        Parser.new.parse('2007/2008').should_not include(Date.new(2009,1,2))
       end
    
       it 'parses uncertain dates' do
-        Parser.new.parse('1984?').should be_uncertain
+        Parser.new.parse('1984?').should be_uncertain        
         Parser.new.parse('1984').should be_certain
       end
 

data/spec/edtf/{seasons_spec.rb → season_spec.rb}

@@ -1,35 +1,28 @@
 module EDTF
   describe 'Seasons' do
-    let(:subject) { Date.new }    
+    let(:subject) { Season.new }    
     
     describe '#season?' do
-      it 'returns false by default' do
-        subject.should_not be_season
-      end
-      
-      context 'when a season code is set' do
-        before(:all) { subject.season = 21 }
-        it 'returns true if a season code is set' do
-          subject.should be_season
-        end
+      it 'returns true by default' do
+        subject.should be_season
       end
     end
-    
+
     describe '#season' do
-      before(:each) { subject.season = 21 }
+      before(:each) { subject.season = :summer }
       
       it 'returns the season code' do
-        subject.season.should == 21
+        subject.season.should == :summer
       end
     end
     
     describe '#season=' do
       it 'sets the season code when called with a valid season code' do
-        lambda do
+        lambda {
           (21..22).each do |i|
             subject.season = i
           end
-        end.should_not raise_error
+        }.should_not raise_error
       end
       
       it 'throws an exception if given invalid season code' do
@@ -38,22 +31,31 @@ module EDTF
     end
 
     describe '#winter!' do
-      it 'sets the season code to 24' do
-        lambda { subject.winter! }.should change { subject.season }.to(24)
+      it 'sets the season to :winter' do
+        lambda { subject.winter! }.should change { subject.season }.to(:winter)
       end
     end
 
     describe '#winter?' do
-      it 'returns true if the season code is 24' do
-        subject.season = 24
+      it 'returns true if the season is set to :winter' do
+        subject.season = :winter
         subject.should be_winter
       end
-      it 'returns false if the season code is not 24' do
-        subject.season = 23
+      it 'returns false if the season is not set to :winter' do
+        subject.season = :summer
         subject.should_not be_winter
       end
     end
 
+    describe '#include?' do
+      
+      context 'for summer' do
+        it 'returns true for August 24' do
+          Season.new(1980, :summer).should include(Date.new(1980,8,24))
+        end
+      end
+      
+    end
     
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,3 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
-require 'rubygems'
 require 'edtf'
-
-RSpec.configuration do |c|
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-08-21 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156677080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156677080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157012300 !ruby/object:Gem::Requirement
+  requirement: &2156676480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2157012300
+  version_requirements: *2156676480
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &2156999280 !ruby/object:Gem::Requirement
+  requirement: &2156675960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *2156999280
+  version_requirements: *2156675960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156998780 !ruby/object:Gem::Requirement
+  requirement: &2156675420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156998780
+  version_requirements: *2156675420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156998280 !ruby/object:Gem::Requirement
+  requirement: &2156674860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2156998280
+  version_requirements: *2156674860
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &2156997760 !ruby/object:Gem::Requirement
+  requirement: &2156674380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: '4.6'
   type: :development
   prerelease: false
-  version_requirements: *2156997760
+  version_requirements: *2156674380
 description: An Extended Date/Time Format (EDTF) Parser for Ruby.
 email:
 - http://sylvester.keil.or.at
@@ -88,20 +99,26 @@ files:
 - features/parser/intervals.feature
 - features/parser/precision.feature
 - features/parser/unspecified.feature
+- features/print/level_1_edtf.feature
+- features/print/level_2_edtf.feature
 - features/step_definitions/edtf_steps.rb
 - features/support/env.rb
 - lib/edtf.rb
 - lib/edtf/compatibility.rb
 - lib/edtf/date.rb
 - lib/edtf/date_time.rb
+- lib/edtf/epoch.rb
 - lib/edtf/extensions.rb
 - lib/edtf/interval.rb
 - lib/edtf/parser.y
-- lib/edtf/seasons.rb
+- lib/edtf/season.rb
 - lib/edtf/uncertainty.rb
 - lib/edtf/version.rb
+- spec/edtf/date_spec.rb
+- spec/edtf/epoch_spec.rb
+- spec/edtf/interval_spec.rb
 - spec/edtf/parser_spec.rb
-- spec/edtf/seasons_spec.rb
+- spec/edtf/season_spec.rb
 - spec/edtf/uncertainty_spec.rb
 - spec/spec_helper.rb
 - lib/edtf/parser.rb
@@ -143,9 +160,14 @@ test_files:
 - features/parser/intervals.feature
 - features/parser/precision.feature
 - features/parser/unspecified.feature
+- features/print/level_1_edtf.feature
+- features/print/level_2_edtf.feature
 - features/step_definitions/edtf_steps.rb
 - features/support/env.rb
+- spec/edtf/date_spec.rb
+- spec/edtf/epoch_spec.rb
+- spec/edtf/interval_spec.rb
 - spec/edtf/parser_spec.rb
-- spec/edtf/seasons_spec.rb
+- spec/edtf/season_spec.rb
 - spec/edtf/uncertainty_spec.rb
 - spec/spec_helper.rb

data/lib/edtf/seasons.rb

@@ -1,36 +0,0 @@
-module EDTF
-  
-  module Seasons
-    
-    attr_reader :season
-    
-    def season?; !!@season; end
-    
-    def season=(new_season)
-      case new_season
-      when 1, 2, 3, 4
-        @season = new_season + 20
-      when 21, 22, 23, 24
-        @season = new_season
-      else
-        raise ArgumentError, "bad season format (21, 22, 23 or 24 expected; was #{new_season.inspect})"
-      end
-    end
-    
-    [:first, :second, :third, :fourth].zip((21..24).to_a).each do |quarter, code|
-      define_method("#{quarter}?") { @season == code }
-      define_method("#{quarter}!") { @season = code }
-    end
-    
-    [:spring, :summer, :autumn, :winter].zip([:first, :second, :third, :fourth]).each do |season, quarter|
-      alias_method("#{season}?", "#{quarter}?")
-      alias_method("#{season}!", "#{quarter}!")
-    end
-    
-    attr_accessor :qualifier
-    
-    def qualified?; !!@qualifier; end
-    
-  end
-  
-end