edtf 0.0.5 → 0.0.6

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/spec/edtf/parser_spec.rb

@@ -33,6 +33,11 @@ module EDTF
         Parser.new.parse('1984').should be_certain
       end
 
+      it 'parses uncertain dates (day precision)' do
+        Parser.new.parse('1984-11-23?').should be_uncertain        
+        Parser.new.parse('1984-11-23').should be_certain
+      end
+
       it 'parses approximate dates' do
         Parser.new.parse('1984-01~').should be_approximate
         Parser.new.parse('1984-01').should be_precise
@@ -171,6 +176,91 @@ module EDTF
         Parser.new.parse('1999-uu-01').unspecified.to_s.should == 'ssss-uu-ss'
       end
       
+			it 'parses "2004?-06-11": uncertain year; month, day known' do
+				d = Parser.new.parse('2004?-06-11')
+				d.uncertain?(:year).should be true
+				d.uncertain?([:month, :day]).should be false
+			end
+
+			it 'parses "2004-06~-11": year and month are approximate; day known' do
+				d = Parser.new.parse('2004-06~-11')
+				d.approximate?(:year).should be true
+				d.approximate?(:month).should be true
+				d.approximate?(:day).should be false
+			end
+			
+			it 'parses "2004-(06)?-11": uncertain month, year and day known' do
+				d = Parser.new.parse('2004-(06)?-11')
+
+				d.uncertain?(:year).should be false
+				d.approximate?(:year).should be false
+
+				d.uncertain?(:month).should be true
+				d.approximate?(:month).should be false
+
+				d.uncertain?(:day).should be false
+				d.approximate?(:day).should be false
+			end
+
+			it 'parses "2004-06-(11)~": day is approximate; year, month known' do
+				d = Parser.new.parse('2004-06-(11)~')
+				d.approximate?(:year).should be false
+				d.approximate?(:month).should be false
+				d.approximate?(:day).should be true
+			end
+
+			it 'parses "2004-(06)?~": year known, month within year is approximate and uncertain' do
+				d = Parser.new.parse('2004-(06)?~')
+				
+				d.approximate?(:year).should be false
+				d.uncertain?(:year).should be false
+				
+				d.approximate?(:month).should be true
+				d.uncertain?(:month).should be true
+				
+				d.approximate?(:day).should be false
+				d.uncertain?(:day).should be false
+			end
+
+			it 'parses "2004-(06-11)?": year known, month and day uncertain' do
+				d = Parser.new.parse('2004-(06-11)?')
+				
+				d.approximate?(:year).should be false
+				d.uncertain?(:year).should be false
+				
+				d.approximate?(:month).should be false
+				d.uncertain?(:month).should be true
+				
+				d.approximate?(:day).should be false
+				d.uncertain?(:day).should be true
+			end
+
+			it 'parses "2004?-06-(11)~": year uncertain, month known, day approximate' do
+				d = Parser.new.parse('2004?-06-(11)~')
+				
+				d.approximate?(:year).should be false
+				d.uncertain?(:year).should be true
+				
+				d.approximate?(:month).should be false
+				d.uncertain?(:month).should be false
+				
+				d.approximate?(:day).should be true
+				d.uncertain?(:day).should be false
+			end
+			
+			it 'parses "(2004-(06)~)?": year uncertain and month is both uncertain and approximate' do
+				d = Parser.new.parse('(2004-(06)~)?')
+				
+				d.approximate?(:year).should be false
+				d.uncertain?(:year).should be true
+				
+				d.approximate?(:month).should be true
+				d.uncertain?(:month).should be true
+				
+				d.approximate?(:day).should be false
+				d.uncertain?(:day).should be false
+			end
+
     end
   end
 end

metadata

@@ -1,123 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: edtf
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156218120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156218120
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156217480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: racc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156217480
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: &2156216920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156216920
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2156216360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156216360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156215840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156215840
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &2156215240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 4
-        - 6
-        version: "4.6"
+      - !ruby/object:Gem::Version
+        version: '4.6'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *2156215240
 description: An Extended Date/Time Format (EDTF) Parser for Ruby.
-email: 
+email:
 - http://sylvester.keil.or.at
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
@@ -131,8 +99,8 @@ files:
 - features/parser/intervals.feature
 - features/parser/precision.feature
 - features/parser/unspecified.feature
+- features/print/level_0_edtf.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
@@ -155,52 +123,45 @@ files:
 - spec/spec_helper.rb
 - lib/edtf/parser.rb
 homepage: http://inukshuk.github.com/edtf-ruby
-licenses: 
+licenses:
 - FreeBSD
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- "\"EDTF-Ruby\""
+- ! '"EDTF-Ruby"'
 - --main
 - README.md
 - --webcvs=http://github.com/inukshuk/edtf-ruby/tree/master/
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Extended Date/Time Format for Ruby.
-test_files: 
+test_files:
 - features/parser/date_times.feature
 - features/parser/dates.feature
 - features/parser/intervals.feature
 - features/parser/precision.feature
 - features/parser/unspecified.feature
+- features/print/level_0_edtf.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

data/features/print/level_2_edtf.feature

@@ -1,8 +0,0 @@
-Feature: Print Date/Time objects as Level 2 EDTF strings
-  As a Ruby programmer
-  I want to convert Date/Time objects to EDTF strings
-  
-	Scenario: Uncertain or approximate dates
-		When I parse the string "2001?"
-		When I convert the date
-		Then the EDTF string should be "2001?"