edtf 3.2.0 → 4.0.0

data/lib/edtf/interval.rb

@@ -37,7 +37,7 @@ module EDTF
 
     def from=(date)
       case date
-      when Date, :unknown
+      when Date, :unknown, :open
         @from = date
       else
         throw ArgumentError.new("Intervals cannot start with: #{date}")
@@ -54,6 +54,15 @@ module EDTF
     end
 
     [:open, :unknown].each do |method_name|
+      define_method("#{method_name}_start!") do
+        @from = method_name
+        self
+      end
+
+      define_method("#{method_name}_start?") do
+        @from == method_name
+      end
+
       define_method("#{method_name}_end!") do
         @to = method_name
         self
@@ -64,16 +73,8 @@ module EDTF
       end
     end
 
-    alias open! open_end!
-    alias open? open_end?
-
-    def unknown_start?
-      from == :unknown
-    end
-
-    def unknown_start!
-      @from = :unknown
-      self
+    def open?
+      open_start? || open_end?
     end
 
     def unknown?
@@ -83,12 +84,12 @@ module EDTF
     # 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
+      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
+      min&.precision != max&.precision
     end
 
     def each(&block)
@@ -165,16 +166,8 @@ module EDTF
 
       other = other.day_precision
 
-      case
-      when unknown_start?
-        max.day_precision! == other
-      when unknown_end?
-        min.day_precision! == other
-      when open_end?
-        min.day_precision! <= other
-      else
-        min.day_precision! <= other && other <= max.day_precision!
-      end
+      (unbounded_start? || min.day_precision! <= other) &&
+        (unbounded_end? || other <= max.day_precision!)
     end
 
     # call-seq:
@@ -216,7 +209,7 @@ module EDTF
         to_a.min(&block)
       else
         case
-        when unknown_start?, !unknown_end? && !open? && to < from
+        when open_start?, unknown_start?, !(open_end? || unknown_end?) && !open? && to < from
           nil
         when from.day_precision?
           from
@@ -249,7 +242,7 @@ module EDTF
         to_a.max(&block)
       else
         case
-        when open_end?, unknown_end?, !unknown_start? && to < from
+        when open_end?, unknown_end?, !(open_start? || unknown_start?) && to < from
           nil
         when to.day_precision?
           to
@@ -265,12 +258,20 @@ module EDTF
       max
     end
 
+    # Intervals are compared by their min and max dates. Open and unknown
+    # starts and ends are treated like -/+ infinity, with open being the
+    # more extreme of the two. Dates are equal to an interval if they are
+    # covered by it.
     def <=>(other)
       case other
       when Interval, Season, Epoch
-        [min, max] <=> [other.min, other.max]
+        bounds <=> bounds_of(other)
       when Date
-        cover?(other) ? min <=> other : 0
+        case
+        when cover?(other) then 0
+        when unbounded_start? then -1
+        else min.day_precision <=> other.day_precision
+        end
       else
         nil
       end
@@ -279,7 +280,8 @@ module EDTF
     def ===(other)
       case other
       when Interval
-        cover?(other.min) && cover?(other.max)
+        (other.unbounded_start? ? unbounded_start? : cover?(other.min)) &&
+          (other.unbounded_end? ? unbounded_end? : cover?(other.max))
       when Date
         cover?(other)
       else
@@ -298,6 +300,32 @@ module EDTF
 
     alias to_s edtf
 
+    protected
+
+    def unbounded_start?
+      open_start? || unknown_start?
+    end
+
+    def unbounded_end?
+      open_end? || unknown_end?
+    end
+
+    START_RANK = { :open => -2, :unknown => -1 }.freeze
+    END_RANK = { :unknown => 1, :open => 2 }.freeze
+
+    def bounds
+      [
+        unbounded_start? ? START_RANK[from] : 0, min,
+        unbounded_end? ? END_RANK[to] : 0, max
+      ]
+    end
+
+    private
+
+    def bounds_of(other)
+      other.is_a?(Interval) ? other.bounds : [0, other.min, 0, other.max]
+    end
+
   end
 
 end