edtf 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e2bbb05637b4e710097d42429a9488e512a0da
-  data.tar.gz: 6d1035527b4f7395fe782551986a08d5ffd7b2d9
+  metadata.gz: 68aac723f31efd30a29639ccddba4f552d32f3e2
+  data.tar.gz: 0997aa8f2861ababa527f1f39b0811ef2db055c9
 SHA512:
-  metadata.gz: 3fbc959b80bbc2b1215a8899f8713072f16700d75f210468ad30fb617f8f568ceec0d55e4dc92c21fa8d6604426b66d59af36faaed68db49d74bea134f2d5bef
-  data.tar.gz: b05c0b3be42feb8735b81a71d3839663ca6a9028c6a72457d68c8dfa95d80c24bfd1dd1545bed4dea5fdfcfc1681a1514aaa433fc281ce3bfb6312ed31fd121e
+  metadata.gz: fae111479f8b85e8d308e0075e62a713be2d651ad402c7867183fadb5d929541333d78baad12712b6a244b5dc890557bd9b331188656989508d657117401e9d8
+  data.tar.gz: 5d3ad065005556811991a501b1ad5f1a73210b0fa5c6e5bd88e4808145d24a5135d48f8bcd7b0d8c0de97634ac61a8e578bd830ffd4e2285f2a0e8874934b2d6

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -1,7 +1,8 @@
 Gemfile.lock
-lib/edtf/parser.rb
 lib/edtf/parser.output
 *.rbc
 .rbx
 .ruby-version
 *.swp
+.bundle
+coverage

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start do
+  add_filter 'spec/'
+  add_filter 'features/'
+end

data/.travis.yml

@@ -1,15 +1,12 @@
 language: ruby
 bundler_args: --without debug extra
+script: bundle exec rake test_with_coveralls
 rvm:
   - 2.0.0
-  - 1.9.2
   - 1.9.3
-# - jruby-18mode
-# - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7
-  - ree
+  - jruby-19mode
+  - rbx-2.1.1
+  - rbx
 notifications:
   email:
     - sk@semicolon.at

data/Gemfile

@@ -2,15 +2,20 @@ source 'https://rubygems.org'
 gemspec
 
 group :debug do
-	gem 'debugger', :platforms => [:mri_19, :mri_20]
-	gem 'ruby-debug', :platforms => [:mri_18, :jruby]
+  gem 'ruby-debug', :require => false, :platform => :jruby
+  gem 'debugger', ['~>1.6', '>=1.6.5'], :require => false, :platform => :mri
+  gem 'rubinius-compiler', '~>2.0', :require => false, :platform => :rbx
+  gem 'rubinius-debugger', '~>2.0', :require => false, :platform => :rbx
 end
 
 group :development do
   gem 'rake'
-  gem 'racc'
+  gem 'racc', :platform => :ruby
   gem 'cucumber'
   gem 'rspec'
+  gem 'simplecov', '~>0.8', :require => false
+  gem 'rubinius-coverage', :platform => :rbx
+  gem 'coveralls', :require => false
 end
 
 group :extra do
@@ -18,4 +23,9 @@ group :extra do
 end
 
 # active_support requires this
-gem 'i18n'
+gem 'i18n'
+
+platform :rbx do
+  gem 'rubysl', '~>2.0'
+  gem 'json'
+end

data/README.md

@@ -1,5 +1,7 @@
 EDTF-Ruby
 =========
+[![Build Status](https://travis-ci.org/inukshuk/edtf-ruby.png?branch=master)](https://travis-ci.org/inukshuk/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).
@@ -7,7 +9,6 @@ Date/Time Format standard](http://www.loc.gov/standards/datetime/spec.html).
 
 Compatibility
 -------------
-
 EDTF-Ruby parser implements all levels and features of the EDTF specification
 (version September 16, 2011). With the following known caveats:
 
@@ -20,14 +21,14 @@ 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.0, 1.9.3, 1.9.2, 1.8.7, Rubinius, and JRuby. Active Support's date
+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
 extensions are currently listed as a dependency, because of many functional
-overlaps.
+overlaps (version 3.x and 4.x are supported).
 
 
 Quickstart
 ----------
-
 EDTF Ruby is implemented as an extension to the regular Ruby date/time classes.
 You can parse EDTF strings either using `Date.edtf` or `EDTF.parse`
 (both methods come with an alternative bang! version, that will raise an error
@@ -56,7 +57,7 @@ subtle difference that determines how many other methods work. For instance:
     => Fri, 11 Nov 2011
     > Date.today.month_precision!.succ
     => Sat, 10 Dec 2011
-    
+
 As you can see, dates have day precision by default; after setting the date's
 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,
@@ -64,7 +65,7 @@ too:
 
     > Date.new(1666).year_precision! == Date.new(1966)
     => false
-    
+
 The year 1666 is not equal to the January 1st, 1966. You can set a date's
 precision directly, or else use the dedicated bang! methods:
 
@@ -167,30 +168,30 @@ functionality.
     => true
     > d.include?(Date.new(1987,04,13))
     => false
-    
+
 The day is not included because interval has month precision. However:
 
     > d.cover?(Date.new(1987,04,13))
     => true
-    
+
 The day is still covered by the interval. In general, optimized in the
 same way that Ruby optimizes numeric ranges. Additionally, precision
 plays into the way intervals are enumerated:
 
     > d.length
     => 243
-    
+
 There are 243 months between 1984-06-01 and 2004-08-31.
 
     > d.step(36).map(&:year)
     => [1984, 1987, 1990, 1993, 1996, 1999, 2002]
-    
+
 Here we iterate through the interval in 36-month steps and map each date to
 the year.
 
     > Date.edtf('1582-10-01/1582-10-31').length
     => 21
-    
+
 This interval has day precision, so 21 is the number of days in October 1582,
 which was cut short because of the Gregorian calendar reform.
 
@@ -200,7 +201,7 @@ Intervals can be open or have unknown start or end dates.
     => true
     > Date.edtf('2004/open').cover?(Date.today)
     => true
-    
+
 ### Sets
 
 EDTF supports two kind of sets: choice lists (meaning one date out of a list),
@@ -213,7 +214,7 @@ and the `choice` attribute.
     > s.choice!
     > s.edtf
     => "[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:
 
@@ -221,19 +222,19 @@ specified as a range; ranges are however enumerated for membership tests:
     => false
     > s.include?(Date.edtf('1671'))
     => true
-    
+
 Even though we're still aware that the year 1671 was is not directly an
 element of the set:
 
     > s.length
     => 3
-    
+
 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
-    
+
 EDTF sets also feature an `#earlier?` and `#later?` attribute:
 
     > s.earlier?
@@ -308,17 +309,15 @@ extensive list of rspec examples.
 
 Contributing
 ------------
-
 The EDTF-Ruby source code is [hosted on GitHub](https://github.com/inukshuk/edtf-ruby).
 You can check out a copy of the latest code using Git:
 
     $ git clone https://github.com/inukshuk/edtf-ruby.git
-    
+
 To get started, generate the parser and run all tests:
 
     $ cd edtf-ruby
     $ bundle install
-    $ bundle exec rake racc_debug
     $ bundle exec rspec spec
     $ bundle exec cucumber
 
@@ -330,7 +329,6 @@ and submit a pull request.
 
 Credits
 -------
-
 EDTF-Ruby was written by [Sylvester Keil](http://sylvester.keil.or.at) and
 [Namyra](https://github.com/namyra).
 

data/Rakefile

@@ -13,7 +13,7 @@ require 'edtf/version'
 
 require 'rake/clean'
 
-task :default => [:racc, :spec, :cucumber]
+task :default => [:spec, :cucumber]
 
 desc 'Run an IRB session with CiteProc loaded'
 task :console, [:script] do |t,args|
@@ -21,7 +21,7 @@ task :console, [:script] do |t,args|
 
   require 'irb'
   require 'edtf'
-  
+
   IRB.conf[:SCRIPT] = args.script
   IRB.start
 end
@@ -46,11 +46,21 @@ require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber)
 
 desc 'Builds the gem file'
-task :build => [:racc] do
+task :build => [:check_warnings] do
   system 'gem build edtf.gemspec'
 end
 
-task :release => [:build] do
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+task :test_with_coveralls => [:spec, :cucumber, 'coveralls:push']
+
+task :check_warnings do
+  $VERBOSE = true
+  require 'edtf'
+  puts EDTF::VERSION
+end
+
+task :release => [ :build] do
   system "git tag #{EDTF::VERSION}"
   system "git push --tags"
   system "gem push edtf-#{EDTF::VERSION}.gem"

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     = 'FreeBSD'
 
-  s.add_runtime_dependency('activesupport', ['~>4.0'])
+  s.add_runtime_dependency('activesupport', '>= 3.0', '< 5.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/support/env.rb

@@ -1 +1,22 @@
-require 'edtf'
+begin
+  require 'simplecov'
+  require 'coveralls' if ENV['CI']
+rescue LoadError
+  # ignore
+end
+
+begin
+  case
+  when RUBY_PLATFORM < 'java'
+    require 'debug'
+    Debugger.start
+  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    require 'rubinius/debugger'
+  else
+    require 'debugger'
+  end
+rescue LoadError
+  # ignore
+end
+
+require 'edtf'

data/lib/edtf/date.rb

@@ -1,8 +1,8 @@
 class Date
-  
+
   PRECISION = [:year, :month, :day].freeze
   PRECISIONS = Hash[*PRECISION.map { |p| [p, "#{p}s".to_sym] }.flatten].freeze
-  
+
   FORMATS = %w{ %04d %02d %02d }.freeze
 
   SYMBOLS = {
@@ -11,47 +11,50 @@ class Date
     :calendar    => '^',
     :unspecified => 'u'
   }.freeze
-    
-  EXTENDED_ATTRIBUTES = %w{ calendar precision uncertain approximate
-    unspecified }.map(&:to_sym).freeze
-    
-  extend Forwardable  
-  
+
+  EXTENDED_ATTRIBUTES = %w{
+    calendar precision uncertain approximate unspecified
+  }.map(&:to_sym).freeze
+
+  extend Forwardable
+
   class << self
-    
+
     def edtf(input, options = {})
       edtf!(input, options)
     rescue
       nil
     end
-    
+
     def edtf!(input, options = {})
       ::EDTF::Parser.new(options).parse!(input)
     end
   end
-  
+
   attr_accessor :calendar
-  
+
   PRECISION.each do |p|
     define_method("#{p}_precision?") { precision == p }
-    
+
     define_method("#{p}_precision!") do
       self.precision = p
       self
     end
-    
+
     define_method("#{p}_precision") do
       change(:precision => p)
     end
   end
-  
-  
+
+
+  alias original_initialize_copy initialize_copy
+
   def initialize_copy(other)
-    super
+    original_initialize_copy(other)
     copy_extended_attributes(other)
   end
-  
-  
+
+
   # Alias advance method from Active Support.
   alias original_advance advance
 
@@ -63,7 +66,7 @@ class Date
 
   # Alias change method from Active Support.
   alias original_change change
-  
+
   # Returns a new Date where one or more of the elements have been changed according to the +options+ parameter.
   def change(options)
     d = original_change(options)
@@ -72,13 +75,13 @@ class Date
     end
     d
   end
-  
-  
+
+
   # Returns this Date's precision.
   def precision
     @precision ||= :day
   end
-  
+
   # Sets this Date/Time's precision to the passed-in value.
   def precision=(precision)
     precision = precision.to_sym
@@ -86,7 +89,7 @@ class Date
     @precision = precision
     update_precision_filter[-1]
   end
-  
+
   def uncertain
     @uncertain ||= EDTF::Uncertainty.new
   end
@@ -98,14 +101,14 @@ class Date
   def unspecified
     @unspecified ||= EDTF::Unspecified.new
   end
-  
+
   def_delegators :uncertain, :uncertain?, :certain?
 
   def certain!(arguments = precision_filter)
     uncertain.certain!(arguments)
     self
   end
-  
+
   def uncertain!(arguments = precision_filter)
     uncertain.uncertain!(arguments)
     self
@@ -114,20 +117,20 @@ class Date
   def approximate?(arguments = precision_filter)
     approximate.uncertain?(arguments)
   end
-  
+
   alias approximately? approximate?
-  
+
   def approximate!(arguments = precision_filter)
     approximate.uncertain!(arguments)
     self
   end
-  
+
   alias approximately! approximate!
-  
+
   def precise?(arguments = precision_filter)
     !approximate?(arguments)
   end
-  
+
   alias precisely? precise?
 
   def precise!(arguments = precision_filter)
@@ -136,9 +139,9 @@ class Date
   end
 
   alias precisely! precise!
-  
+
   def_delegators :unspecified, :unspecified?, :specified?, :unspecific?, :specific?
-  
+
   def unspecified!(arguments = precision_filter)
     unspecified.unspecified!(arguments)
     self
@@ -152,10 +155,10 @@ class Date
   end
 
   alias specific! specified!
-  
+
   # Returns false for Dates.
   def season?; false; end
-  
+
   # Returns true if the Date has an EDTF calendar string attached.
   def calendar?; !!@calendar; end
 
@@ -163,11 +166,11 @@ class Date
   def season
     Season.new(self)
   end
-  
+
   # Returns the Date's EDTF string.
   def edtf
     return "y#{year}" if long_year?
-    
+
     s = FORMATS.take(values.length).zip(values).map { |f,v| f % v }
     s = unspecified.mask(s)
 
@@ -183,11 +186,11 @@ class Date
       # not covered by precision!
       #
       y, m, d = s
-      
+
       # ?/~ if true-false or true-true and other false-true
       y << SYMBOLS[:uncertain]   if  3&h==1 || 27&h==19
       y << SYMBOLS[:approximate] if 24&h==8 || 27&h==26
-      
+
 
       # 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)
@@ -199,21 +202,21 @@ class Date
         when 3&h==2 || 24&h==16
           m[0,0] = '('
           m << ')'
-      
+
         # *-false-true
         when 6&h==4 || 48&h==32
           d[0,0] = '('
           d << ')'
         end
-      
-        # ?/~ if *-true-false or *-true-true and other m != d 
+
+        # ?/~ if *-true-false or *-true-true and other m != d
         m << SYMBOLS[:uncertain]   if h!=31 && (6&h==2  ||  6&h==6  && (48&h==16 || 48&h==32))
         m << SYMBOLS[:approximate] if h!=59 && (48&h==16 || 48&h==48 && (6&h==2 || 6&h==4))
       end
-      
+
       # ?/~ if *-*-true
       d << SYMBOLS[:uncertain]   if  4&h==4
-      d << SYMBOLS[:approximate] if 32&h==32      
+      d << SYMBOLS[:approximate] if 32&h==32
     end
 
     s = s.join('-')
@@ -222,13 +225,17 @@ class Date
   end
 
   alias to_edtf edtf
-  
+
+  remove_method :next
+
   # Returns an array of the next n days, months, or years depending on the
   # current Date/Time's precision.
   def next(n = 1)
     1.upto(n).map { |by| advance(PRECISIONS[precision] => by) }
   end
 
+  remove_method :succ
+
   def succ
     advance(PRECISIONS[precision] => 1)
   end
@@ -242,7 +249,7 @@ class Date
       advance(PRECISIONS[precision] => -1)
     end
   end
-  
+
   def <=>(other)
     case other
     when ::Date
@@ -254,36 +261,36 @@ class Date
     end
   end
 
-  
+
   # Returns an array of the current year, month, and day values filtered by
   # the Date/Time's precision.
   def values
     precision_filter.map { |p| send(p) }
   end
-  
+
   # Returns the same date but with negated year.
   def negate
     change(:year => year * -1)
   end
-  
+
   alias -@ negate
-  
+
   # Returns true if this Date/Time has year precision and the year exceeds four digits.
   def long_year?
     year_precision? && year.abs > 9999
   end
-  
-  
+
+
   private
-  
+
   def ua_hash
     uncertain.hash + approximate.hash
   end
-  
+
   def precision_filter
     @precision_filter ||= update_precision_filter
   end
-  
+
   def update_precision_filter
     @precision_filter = case precision
     when :year
@@ -294,9 +301,9 @@ class Date
       [:year,:month,:day]
     end
   end
-    
+
   protected
-  
+
   attr_writer :uncertain, :unspecified, :approximate
 
   def copy_extended_attributes(other)
@@ -308,6 +315,6 @@ class Date
     @precision   = other.precision
 
     self
-  end  
+  end
 
 end