edtf 2.0.0 → 2.1.0

data/lib/edtf/season.rb

@@ -2,22 +2,22 @@ module EDTF
 
   class Season
     extend Forwardable
-    
+
     SEASONS = Hash[21, :spring, 22, :summer, 23, :autumn, 24, :winter].freeze
-    
+
     CODES = Hash.new { |h,k| h.fetch(k.to_sym, nil) }.merge(
       SEASONS.invert).merge({ :fall => 23 }).freeze
-    
+
     NORTHERN = Hash[:spring, [3,4,5], :summer, [6,7,8], :autumn, [9,10,11], :winter, [12,1,2]].freeze
     SOUTHERN = Hash[:autumn, [3,4,5], :winter, [6,7,8], :spring, [9,10,11], :summer, [12,1,2]].freeze
-    
+
     NORTHERN_MONTHS = Hash[*NORTHERN.map { |s,ms| ms.map { |m| [m,s] } }.flatten].freeze
     SOUTHERN_MONTHS = Hash[*SOUTHERN.map { |s,ms| ms.map { |m| [m,s] } }.flatten].freeze
-    
-    
+
+
     include Comparable
     include Enumerable
-    
+
     class << self
       def current
         Date.today.season
@@ -25,20 +25,21 @@ module EDTF
     end
 
     attr_reader :season, :year
-    
+
     attr_accessor :qualifier, :uncertain, :approximate
-    
-    def_delegators :to_range,
-      *Range.instance_methods(false).reject { |m| m.to_s =~ /^(each|min|max|cover?|inspect)$|^\W/ }
-    
+
+    def_delegators :to_range, *Range.instance_methods(false).reject { |m|
+      m.to_s =~ /^(each|min|max|cover\?|inspect|to_s)$|^\W/
+    }
+
     SEASONS.each_value do |s|
       define_method("#{s}?") { @season == s }
       define_method("#{s}!") { @season =  s }
     end
-    
+
     alias fall? autumn?
     alias fall! autumn!
-    
+
     [:first, :second, :third, :fourth].zip([:spring, :summer, :autumn, :winter]).each do |quarter, season|
       alias_method("#{quarter}?", "#{season}?")
       alias_method("#{quarter}!", "#{season}!")
@@ -48,7 +49,7 @@ module EDTF
     def initialize(*arguments)
       arguments.flatten!
       raise ArgumentError, "wrong number of arguments (#{arguments.length} for 0..3)" if arguments.length > 3
-      
+
       if arguments.length == 1
         case arguments[0]
         when Date
@@ -67,45 +68,45 @@ module EDTF
     end
 
 
-		[:uncertain, :approximate].each do |m|
-			
-			define_method("#{m}?") { !!send(m) }
-			
-			define_method("#{m}!") do
-				send("#{m}=", true)
-				self
-			end
-		end
-
-		def certain?; !uncertain; end
-		def precise?; !approximate; end
-		
-		def certain!
-			@uncertain = false
-			self
-		end
-		
-		def precise!
-			@approximate = false
-		end
-		
-		# Returns the next season.
-		def succ
-			s = dup
-			s.season = next_season_code
-			s.year = year + 1 if s.first?
-			s
-		end
-		
-		# def next(n = 1)
-		# end
-
-		def cover?(other)
-			return false unless other.respond_to?(:day_precision)
-			other = other.day_precision
-			min.day_precision! <= other && other <= max.day_precision!
-		end
-		
+    [:uncertain, :approximate].each do |m|
+
+      define_method("#{m}?") { !!send(m) }
+
+      define_method("#{m}!") do
+        send("#{m}=", true)
+        self
+      end
+    end
+
+    def certain?; !uncertain; end
+    def precise?; !approximate; end
+
+    def certain!
+      @uncertain = false
+      self
+    end
+
+    def precise!
+      @approximate = false
+    end
+
+    # Returns the next season.
+    def succ
+      s = dup
+      s.season = next_season_code
+      s.year = year + 1 if s.first?
+      s
+    end
+
+    # def next(n = 1)
+    # end
+
+    def cover?(other)
+      return false unless other.respond_to?(:day_precision)
+      other = other.day_precision
+      min.day_precision! <= other && other <= max.day_precision!
+    end
+
     def each
       if block_given?
         to_range.each(&Proc.new)
@@ -114,33 +115,33 @@ module EDTF
         to_enum
       end
     end
-    
+
     def year=(new_year)
       @year = new_year.to_i
     end
-    
+
     def season=(new_season)
       @season = SEASONS[new_season] || SEASONS[CODES[new_season]] ||
         raise(ArgumentError, "unknown season/format: #{new_season.inspect})")
     end
 
     def season?; true; end
-    
+
     def qualified?; !!@qualifier; end
-    
+
     def edtf
       '%04d-%2d%s' % [year, CODES[season], qualified? ? "^#{qualifier}" : '']
     end
 
     alias to_s edtf
 
-    
+
     def <=>(other)
       case other
       when Date
         cover?(other) ? 0 : to_date <=> other
-			when Interval, Epoch
-				[min, max] <=> [other.min, other.max]
+      when Interval, Epoch
+        [min, max] <=> [other.min, other.max]
       when Season
         [year, month, qualifier] <=> [other.year, other.month, other.qualifier]
       else
@@ -149,42 +150,42 @@ module EDTF
     rescue
       nil
     end
-    
+
     def ===(other)
       (self <=> other) == 0
     rescue
       false
     end
-    
+
     def to_date
       Date.new(year, month, 1)
     end
 
-		alias min to_date
-		
-		def max
-			to_date.months_since(2).end_of_month
-		end
-		
+    alias min to_date
+
+    def max
+      to_date.months_since(2).end_of_month
+    end
+
     # Returns a Range that covers the season (a three month period).
     def to_range
-			min .. max
+      min .. max
     end
-			
+
     protected
-    
+
     def month
       NORTHERN[@season][0]
     end
-    
-		def season_code
-			CODES[season]
-		end
-		
-		def next_season_code(by = 1)
-			((season_code + by) % 4) + 20
-		end
-		
+
+    def season_code
+      CODES[season]
+    end
+
+    def next_season_code(by = 1)
+      ((season_code + by) % 4) + 20
+    end
+
   end
-  
-end
+
+end

data/lib/edtf/set.rb

@@ -1,79 +1,81 @@
 module EDTF
-	
-	class Set
-		extend Forwardable
-		
-		include Enumerable
-		include Comparable
-				
-		def_delegators :@dates, :size, :length, :empty?
-		def_delegators :to_a, :include?
-		
-		attr_accessor :choice, :later, :earlier
-		
-		
-		def initialize(*dates)
-			@dates = ::Set.new(dates.flatten)
-			@choice, @later, @earlier = false, false, false
-		end
-		
-		def initialize_copy(other)
-			@set = other.to_set
-		end
-
-		[:choice, :later, :earlier].each do |m|
-			define_method("#{m}?") { send(m) }
-			define_method("#{m}!") do
-				send("#{m}=", true)
-				self
-			end
-		end
-
-		def <<(date)
-			dates << date
-			self
-		end
-		
-		def each
-			if block_given?
-				to_a.each(&Proc.new)
-				self
-			else
-				to_enum
-			end
-		end
-		
-		def edtf
-			parenthesize(dates.map { |d| d.respond_to?(:edtf) ? d.edtf : d.to_s }.sort.join(', '))
-		end
-		
-		def to_a
-			dates.map { |d| Array(d) }.flatten.sort
-		end
-		
-		def to_set
-			to_a.to_set
-		end
-		
-		alias to_s edtf
-		
-		def <=>(other)
-			return nil unless other.respond_to?(:to_a)
-			to_a <=> other.to_a
-		end
-		
-		private
-				
-		attr_reader :dates
-		
-		def parenthesize(string)
-			p = choice? ? %w([ ]) : %w({ })
-			p[-1,0] = '..' if earlier?
-			p[-1,0] = string unless string.empty?
-			p[-1,0] = '..' if later?
-			p.join
-		end
-				
-	end
-	
-end
+
+  class Set
+    extend Forwardable
+
+    include Enumerable
+    include Comparable
+
+    def_delegators :@dates, :size, :length, :empty?
+    def_delegators :to_a, :include?
+
+    attr_accessor :choice, :later, :earlier
+
+
+    def initialize(*dates)
+      @dates = ::Set.new(dates.flatten)
+      @choice, @later, @earlier = false, false, false
+    end
+
+    def initialize_copy(other)
+      @set = other.to_set
+    end
+
+    [:choice, :later, :earlier].each do |m|
+      define_method("#{m}?") { send(m) }
+      define_method("#{m}!") do
+        send("#{m}=", true)
+        self
+      end
+    end
+
+    def <<(date)
+      dates << date
+      self
+    end
+
+    def each
+      if block_given?
+        to_a.each(&Proc.new)
+        self
+      else
+        to_enum
+      end
+    end
+
+    def edtf
+      parenthesize(dates.map { |d| d.respond_to?(:edtf) ? d.edtf : d.to_s }.sort.join(', '))
+    end
+
+    def to_a
+      dates.map { |d| Array(d) }.flatten.sort
+    end
+
+    def to_set
+      to_a.to_set
+    end
+
+    alias to_s edtf
+
+    def <=>(other)
+      return nil unless other.respond_to?(:to_a)
+      to_a <=> other.to_a
+    end
+
+    protected
+
+    attr_reader :dates
+
+    private
+
+    def parenthesize(string)
+      p = choice? ? %w([ ]) : %w({ })
+      p[-1,0] = '..' if earlier?
+      p[-1,0] = string unless string.empty?
+      p[-1,0] = '..' if later?
+      p.join
+    end
+
+  end
+
+end

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/spec_helper.rb

@@ -1,3 +1,24 @@
+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
+
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
 require 'edtf'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: A Ruby implementation of the Extended Date/Time Format (EDTF).
 email:
 - http://sylvester.keil.or.at
@@ -33,10 +39,12 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .travis.yml
+- ".autotest"
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -62,6 +70,7 @@ files:
 - lib/edtf/epoch.rb
 - lib/edtf/extensions.rb
 - lib/edtf/interval.rb
+- lib/edtf/parser.rb
 - lib/edtf/parser.y
 - lib/edtf/season.rb
 - lib/edtf/set.rb
@@ -75,35 +84,34 @@ files:
 - spec/edtf/set_spec.rb
 - spec/edtf/uncertainty_spec.rb
 - spec/spec_helper.rb
-- lib/edtf/parser.rb
 homepage: http://github.com/inukshuk/edtf-ruby
 licenses:
 - FreeBSD
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- '"EDTF-Ruby"'
-- --main
+- "--line-numbers"
+- "--inline-source"
+- "--title"
+- "\"EDTF-Ruby\""
+- "--main"
 - README.md
-- --webcvs=http://github.com/inukshuk/edtf-ruby/tree/master/
+- "--webcvs=http://github.com/inukshuk/edtf-ruby/tree/master/"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Extended Date/Time Format for Ruby.