month_range 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668013602f4cd9be1239f8dd3195a22dc3bc3e211297077f287c9195422f2c31
-  data.tar.gz: d86e45758b7347038faf1ec70437d2d85d54bca28ff4e37cd21b1fed3ce6d01e
+  metadata.gz: 80d382540a11a08d9b7e42ccbf10572420d191006f80726880eded045f5c5246
+  data.tar.gz: 8064de1488e93416960a054a87f4244eae46954f1bb9cd5301601b00c66aa4b5
 SHA512:
-  metadata.gz: fbdbd8f617c64b26c195b641e06bef8e0b5dd12e5aa5983ac1a0dc45555e39b3fc5bb7c51bca3431b2a1ef7a834591130e9f55ab0128fa581c2baaa6c9cb2c5a
-  data.tar.gz: cec517f459484adbc546b58f012fd95e2a017e651d6168b37f1d70cf392b61e8ed06d5365ff2395fc8797a6b3c7482bc2b49a8b8f2aeb22217882a90d4a20a0e
+  metadata.gz: ed1ea3c8932e644096d8f3701c7ce3664354f47520253f4904bde95584a0312ffb0bf1dfe8556d9b22d8d7ebe02a9b9afce16ca3fabdd04400781b8ce389d190
+  data.tar.gz: daf57ae12b1681146daa7dec5af6448c606be15640d831ed8cbc002ad03031990990428c378c4292b2082890008256c30a8b1828b9483acf50a4ed96434f2d88

data/lib/month_range/collection.rb

@@ -8,7 +8,7 @@ class MonthRange::Collection
   end
 
   def to_a
-    @collection_ranges.map { |collection_rang| [collection_rang.start_month, collection_rang.end_month] }
+    @collection_ranges.map { |collection_range| [collection_range.start_month.to_date, collection_range.end_month.to_date] }
   end
 
   def add(range)
@@ -60,11 +60,7 @@ class MonthRange::Collection
 
   def merge_range(ranges, range)
     start_month = (ranges + [range]).map(&:start_month).min { |a, b| a <=> b }
-    end_month = if (ranges + [range]).any?(&:non_terminated?)
-                  nil
-                else
-                  (ranges + [range]).map(&:end_month).max { |a, b| a <=> b }
-                end
+    end_month = (ranges + [range]).map(&:end_month).max { |a, b| a <=> b }
     MonthRange::MRange.new(start_month, end_month)
   end
 
@@ -104,7 +100,7 @@ class MonthRange::Collection
   def continuous?(range, next_range)
     return false if range.nil? || next_range.nil?
     raise if range.start_month >= next_range.start_month
-    return false if range.end_month.nil?
+    return false if range.end_month.infinite?
 
     range.end_month == next_range.just_before
   end

data/lib/month_range/m_range.rb

@@ -4,56 +4,42 @@ require 'date'
 require_relative '../month_range/error'
 
 class MonthRange::MRange < Range
-  class InvalidStartMonth < MonthRange::Error
-  end
-  class InvalidEndMonth < MonthRange::Error
-  end
-  class InvalidStartEndRelation < MonthRange::Error
+  attr_reader :start_month, :end_month
+  class InvalidStartEnd < MonthRange::Error
   end
 
   def initialize(start_month, end_month)
-    raise InvalidStartMonth, start_month unless valid_start_month?(start_month)
-    raise InvalidEndMonth, end_month unless valid_end_month?(end_month)
-    raise InvalidStartEndRelation, [start_month, end_month] unless valid_start_end_relation?(start_month, end_month)
+    raise InvalidStartEnd unless start_month.is_a?(MonthRange::Month)
+    raise InvalidStartEnd unless end_month.is_a?(MonthRange::Month) || end_month.is_a?(MonthRange::Month::Infinity)
+    raise InvalidStartEnd [start_month, end_month] unless valid_start_end_relation?(start_month, end_month)
 
     super(start_month, end_month)
+    @start_month = start_month
+    @end_month = end_month
   end
 
   def overlap?(range)
     raise "#{range} must be MRange." unless range.is_a?(MonthRange::MRange)
-    return true if cover?(range.start_month)
 
-    if range.non_terminated?
-      range.start_month <= start_month
-    else
-      cover?(range.end_month)
+    if cover?(range.start_month) || cover?(range.end_month) || (range.start_month <= start_month && end_month <= range.end_month)
+      true
     end
   end
 
-  def start_month
-    first
+  def non_terminated?
+    end_month.infinite?
   end
 
-  def end_month
-    non_terminated? ? nil : last
-  end
-
-  def non_terminated?
-    count == Float::INFINITY
+  def terminated?
+    !end_month.infinite?
   end
 
   def subtract(range)
     return self unless overlap?(range)
 
     output_range = []
-    if cover?(range.just_before)
-      output_range << MonthRange::MRange.new(start_month, range.just_before)
-      output_range
-    end
-
-    if !range.non_terminated? && cover?(range.just_after)
-      output_range << MonthRange::MRange.new(range.just_after, end_month)
-    end
+    output_range << MonthRange::MRange.new(start_month, range.just_before) if cover?(range.start_month)
+    output_range << MonthRange::MRange.new(range.just_after, end_month) if cover?(range.end_month) && range.terminated?
     output_range.flatten.compact
   end
 
@@ -62,31 +48,14 @@ class MonthRange::MRange < Range
   end
 
   def just_after
-    non_terminated? ? nil : end_month.next_month(1)
+    non_terminated? ? end_month : end_month.next_month(1)
   end
 
   private
 
-  def valid_start_month?(start_month)
-    return true if start_month.is_a?(Date) && beginning_of_month?(start_month)
-
-    false
-  end
-
-  def valid_end_month?(end_month)
-    return true if end_month.nil?
-    return true if end_month.is_a?(Date) && beginning_of_month?(end_month)
-
-    false
-  end
-
   def valid_start_end_relation?(start_month, end_month)
     return true if end_month.nil?
 
     start_month <= end_month
   end
-
-  def beginning_of_month?(date)
-    date.mday == 1
-  end
 end

data/lib/month_range/month.rb

@@ -1,9 +1,85 @@
 # frozen_string_literal: true
 
 require 'date'
+require_relative '../month_range/error'
 
 class MonthRange::Month < Date
-  def initialize
-    super
+  class InvalidMonthFormat < MonthRange::Error
+  end
+
+  def self.create(date)
+    return MonthRange::Month::Infinity.new if date.nil?
+    raise InvalidMonthFormat unless date.is_a?(Date)
+    raise InvalidMonthFormat unless date.mday == 1
+
+    new(date.year, date.month, date.mday)
+  end
+
+  def to_date
+    Date.new(year, month, mday)
+  end
+
+  class Infinity < Numeric
+    def initialize(d = 1)
+      @d = d <=> 0
+    end
+
+    attr_reader :d
+
+    def zero?
+      false
+    end
+
+    def finite?
+      false
+    end
+
+    def infinite?
+      d.nonzero?
+    end
+
+    def <(_other)
+      false
+    end
+
+    def <=(other)
+      other.infinite?
+    end
+
+    def >(_other)
+      true
+    end
+
+    def >=(other)
+      other.infinite?
+    end
+
+    def ==(other)
+      other.infinite?
+    end
+
+    def to_date
+      nil
+    end
+
+    def <=>(other)
+      case other
+      when Infinity
+        return d <=> other.d
+      when MonthRange::Month
+        return d
+      end
+      nil
+    end
+
+    def to_f
+      return 0 if @d.zero?
+
+      if @d.positive?
+        Float::INFINITY
+      else
+        -Float::INFINITY
+      end
+    end
   end
 end

data/lib/month_range/service.rb

@@ -32,8 +32,8 @@ class MonthRange::Service
   #  #=> [[#<Date: 2020-01-01 ((2458850j,0s,0n),+0s,2299161j)>, #<Date: 2020-04-01 ((2458941j,0s,0n),+0s,2299161j)>]]
   def self.subtraction(range_array, from_range_arrays)
     collection = range_arrays_to_collection(from_range_arrays)
-    start_month = range_array[0]
-    end_month = range_array[1]
+    start_month = MonthRange::Month.create(range_array[0])
+    end_month = MonthRange::Month.create(range_array[1])
     m_range = MonthRange::MRange.new(start_month, end_month)
     collection.subtract(m_range)
     collection.to_a
@@ -71,8 +71,8 @@ class MonthRange::Service
   #  #=> [[#<Date: 2020-01-01 ((2458850j,0s,0n),+0s,2299161j)>, nil]]
   def self.add(range_array, from_range_arrays)
     collection = range_arrays_to_collection(from_range_arrays)
-    start_month = range_array[0]
-    end_month = range_array[1]
+    start_month = MonthRange::Month.create(range_array[0])
+    end_month = MonthRange::Month.create(range_array[1])
     m_range = MonthRange::MRange.new(start_month, end_month)
     collection.add(m_range)
     collection.to_a
@@ -84,8 +84,8 @@ class MonthRange::Service
   def self.range_arrays_to_collection(range_arrays)
     collection = MonthRange::Collection.new
     range_arrays.each do |range|
-      start_month = range[0]
-      end_month = range[1]
+      start_month = MonthRange::Month.create(range[0])
+      end_month = MonthRange::Month.create(range[1])
       m_range = MonthRange::MRange.new(start_month, end_month)
       collection.add(m_range)
     end

data/lib/month_range/version.rb

@@ -2,6 +2,6 @@
 
 module MonthRange
   class Version
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/month_range.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
-
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: month_range
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - jungo araki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: