month_range 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0794936fca957eccd5a5e26c3379a804f0d8366d8cc894b7b130c707d94029
-  data.tar.gz: c9ea79c7184cc854ef6d5e420897659b3dea15be9340f9f06c10eccd48ea77f5
+  metadata.gz: 145bd280f50a75b41f7ee8db8764ad61df4abb453104342b111d3e318a446976
+  data.tar.gz: a67950427a8cbc5c36456cd2e7397126b0f0ac8ed7b30563b699d0a5da8349b9
 SHA512:
-  metadata.gz: 45a38afb12b658a7780d92575f4ebad4bd5809ba119ad1c4c3b694cc45b39b51d59737fa383b80795c248e0c3fc99956f4d5599e57bce2ec4998177af6db044f
-  data.tar.gz: 24003570f17366a2dcab778d2e4b361622e05a86ade6ddcca95bc5f2da858f5ccb7c3579a8f6d96a3b5e7f2b4046a1dad89ce093c6312cfa5ab4bd16473645bd
+  metadata.gz: 12085289adf414dbe060ae5dca642c0b1b86abf0142bb519eee399373422f1a64a0a1a6dae6e08009fee8ea254a18e190483fe38b0d8014b178ec5b839ba8865
+  data.tar.gz: 801af3b96e8306bde0c4f2e90dd7895455cd12dd055d0de645f95babb974a486a35d247d87fad75f3ef9babd255743dd4e507e2fec04aee1c42706c4f222bbf5

data/.github/workflows/gempush.yml

@@ -0,0 +1,30 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          version: 2.6.x
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.github/workflows/rspec.yml

@@ -0,0 +1,16 @@
+name: RSpec
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          version: 2.6
+      - name: Build
+        run: |
+          gem install bundler
+          bundle install
+      - name: rspec
+        run: bundle exec rspec

data/.github/workflows/rubocop.yml

@@ -0,0 +1,16 @@
+name: RuboCop
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          version: 2.6
+      - name: Build
+        run: |
+          gem install bundler
+          bundle install
+      - name: rubocop
+        run: bundle exec rubocop

data/.rubocop.yml

@@ -6,10 +6,14 @@ Style/ClassAndModuleChildren:
 Style/AsciiComments:
   Enabled: false
 Layout/LineLength:
-  Max: 120
+  Max: 393
+  Exclude:
+    - "spec/**/*"
 Style/Documentation:
   Enabled: false
-
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*"
 AllCops:
   Exclude:
     - tmp/**/*

data/.rubocop_todo.yml

@@ -1,31 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-31 00:06:07 +0900 using RuboCop version 0.80.1.
+# on 2020-04-12 14:58:59 +0900 using RuboCop version 0.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 393
-
-# Offense count: 2
-Metrics/AbcSize:
-  Max: 23
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 8
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 20
-
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    month_range (0.1.3)
+    month_range (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,4 +1,7 @@
 # MonthRange
+![](https://github.com/junara/month_range/workflows/RuboCop/badge.svg)
+![](https://github.com/junara/month_range/workflows/RSpec/badge.svg)
+
 Calculate month range union and difference including unterminated end.
 
 

data/lib/month_range/collection.rb

@@ -1,107 +1,90 @@
 # frozen_string_literal: true
 
 class MonthRange::Collection
-  attr_reader :collection_ranges
+  attr_reader :stored_m_ranges
 
-  def initialize
-    @collection_ranges = []
+  def initialize(m_ranges = [])
+    @stored_m_ranges = []
+    m_ranges.each { |m_range| add(m_range) }
   end
 
   def to_a
-    @collection_ranges.map { |collection_range| [collection_range.start_month.to_date, collection_range.end_month.to_date] }
+    @stored_m_ranges.map do |collection_range|
+      [collection_range.start_month.to_date, collection_range.end_month.to_date]
+    end
   end
 
-  def add(range)
-    raise MonthRange::Error, 'Need MonthRange::MRange' unless range.is_a?(MonthRange::MRange)
-    return @collection_ranges << range if @collection_ranges.empty?
-
-    overlapped_collection_ranges = @collection_ranges.select { |collection_range| collection_range.overlap?(range) }
-    return @collection_ranges if overlapped_collection_ranges.nil?
+  def add(m_range)
+    raise MonthRange::Error, 'Need MonthRange::MRange' unless m_range.is_a?(MonthRange::MRange)
+    return @stored_m_ranges << m_range if @stored_m_ranges.empty?
 
-    update_collection_ranges(overlapped_collection_ranges, range) { |rs, r| [merge_range(rs, r)] }
+    update_stored_m_ranges(m_range) do |overlapped_collection_ranges|
+      [merge_range(overlapped_collection_ranges, m_range)]
+    end
   end
 
-  def subtract(range)
-    raise MonthRange::Error, 'Need MonthRange::MRange' unless range.is_a?(MonthRange::MRange)
-    raise if @collection_ranges.empty?
-
-    overlapped_collection_ranges = @collection_ranges.select { |collection_range| collection_range.overlap?(range) }
-    return @collection_ranges if overlapped_collection_ranges.nil?
+  def subtract(m_range)
+    raise MonthRange::Error, 'Need MonthRange::MRange' unless m_range.is_a?(MonthRange::MRange)
+    return if @stored_m_ranges.empty?
 
-    update_collection_ranges(overlapped_collection_ranges, range) { |rs, r| subtract_range(rs, r) }
-  end
-
-  def self.new_from_date_range_array(date_range_array)
-    collection = new
-    date_range_array.each do |range|
-      start_month = range[0]
-      end_month = range[1]
-      m_range = MonthRange::MRange.new(start_month, end_month)
-      collection.add(m_range)
+    update_stored_m_ranges(m_range) do |overlapped_collection_ranges|
+      subtract_range(overlapped_collection_ranges, m_range)
     end
-    collection
   end
 
   private
 
-  def update_collection_ranges(overlapped_collection_ranges, range)
-    @collection_ranges -= overlapped_collection_ranges
-    @collection_ranges += yield(overlapped_collection_ranges, range)
-    @collection_ranges = sort_ranges_asc(@collection_ranges.flatten.compact)
-    @collection_ranges = combine_continuous_range(@collection_ranges)
-    @collection_ranges
+  def overlapped_collection_ranges(m_range)
+    @stored_m_ranges.select { |collection_range| collection_range.overlap?(m_range) }
+  end
+
+  def update_stored_m_ranges(m_range)
+    m_ranges = overlapped_collection_ranges(m_range)
+    delete_m_ranges_to_stored(m_ranges)
+    add_m_ranges_to_stored(yield(m_ranges))
   end
 
-  def sort_ranges_asc(ranges)
-    return ranges if ranges.size <= 1
+  def delete_m_ranges_to_stored(m_ranges)
+    @stored_m_ranges -= m_ranges
+    @stored_m_ranges = combine_continuous_range(sort_ranges_asc(@stored_m_ranges.flatten.compact))
+  end
 
-    ranges.sort { |a, b| a.start_month <=> b.start_month }
+  def add_m_ranges_to_stored(m_ranges)
+    @stored_m_ranges += m_ranges
+    @stored_m_ranges = combine_continuous_range(sort_ranges_asc(@stored_m_ranges.flatten.compact))
   end
 
-  def merge_range(ranges, range)
-    start_month = (ranges + [range]).map(&:start_month).min { |a, b| a <=> b }
-    end_month = (ranges + [range]).map(&:end_month).max { |a, b| a <=> b }
-    MonthRange::MRange.new(start_month, end_month)
+  def sort_ranges_asc(m_ranges)
+    return m_ranges if m_ranges.size <= 1
+
+    m_ranges.sort { |a, b| a.start_month <=> b.start_month }
   end
 
-  def subtract_range(ranges, range)
-    output_range = []
-    ranges.each do |r|
-      output_range << r.subtract(range)
-    end
-    output_range.flatten.compact
+  def merge_range(m_ranges, m_range)
+    start_month = (m_ranges + [m_range]).map(&:start_month).min { |a, b| a <=> b }
+    end_month = (m_ranges + [m_range]).map(&:end_month).max { |a, b| a <=> b }
+    MonthRange::MRange.new(start_month, end_month)
   end
 
-  def combine_continuous_range(ranges)
-    return ranges if ranges.count <= 1
-
-    temp_range = nil
-    output_ranges = []
-    ranges.each_with_index do |range, idx|
-      (temp_range = range) && next if idx.zero?
-
-      if idx == ranges.size - 1 && continuous?(temp_range, range)
-        output_ranges << MonthRange::MRange.new(temp_range.start_month, range.end_month)
-        next
-      elsif idx == ranges.size - 1
-        output_ranges << temp_range
-        output_ranges << range
-        next
-      elsif continuous?(temp_range, range)
-        temp_range = MonthRange::MRange.new(temp_range.start_month, range.end_month)
-        next
-      end
-      output_ranges << temp_range
-      temp_range = range
+  def subtract_range(m_ranges, m_range)
+    output_m_range = []
+    m_ranges.each do |r|
+      output_m_range << r.subtract(m_range)
     end
-    output_ranges
+    output_m_range.flatten.compact
   end
 
-  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.infinite?
+  def combine_continuous_range(m_ranges) # rubocop:disable Metrics/CyclomaticComplexity
+    return m_ranges if m_ranges.count <= 1
 
-    range.end_month == next_range.just_before
+    before_m_range = nil
+    output_m_ranges = []
+    m_ranges.each_with_index do |m_range, idx|
+      (before_m_range = m_range) && next if idx.zero?
+      (before_m_range = before_m_range.combine(m_range)) && next if before_m_range.continuous?(m_range)
+      output_m_ranges << before_m_range
+      before_m_range = m_range
+    end
+    output_m_ranges << before_m_range unless output_m_ranges.include?(before_m_range)
   end
 end

data/lib/month_range/m_range.rb

@@ -7,6 +7,8 @@ class MonthRange::MRange < Range
   attr_reader :start_month, :end_month
   class InvalidStartEnd < MonthRange::Error
   end
+  class NotMRange < MonthRange::Error
+  end
 
   def initialize(start_month, end_month)
     raise InvalidStartEnd unless start_month.is_a?(MonthRange::Month)
@@ -18,12 +20,10 @@ class MonthRange::MRange < Range
     @end_month = end_month
   end
 
-  def overlap?(range)
-    raise "#{range} must be MRange." unless range.is_a?(MonthRange::MRange)
+  def overlap?(m_range)
+    raise NotMRange, "#{m_range} must be MRange." unless m_range.is_a?(MonthRange::MRange)
 
-    if cover?(range.start_month) || cover?(range.end_month) || (range.start_month <= start_month && end_month <= range.end_month)
-      true
-    end
+    true if cover?(m_range.start_month) || cover?(m_range.end_month) || m_range.cover?(self)
   end
 
   def non_terminated?
@@ -34,12 +34,12 @@ class MonthRange::MRange < Range
     !end_month.infinite?
   end
 
-  def subtract(range)
-    return self unless overlap?(range)
+  def subtract(m_range) # rubocop:disable Metrics/AbcSize
+    return self unless overlap?(m_range)
 
     output_range = []
-    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 << MonthRange::MRange.new(start_month, m_range.just_before) if cover?(m_range.just_before)
+    output_range << MonthRange::MRange.new(m_range.just_after, end_month) if cover?(m_range.just_after) && m_range.terminated?
     output_range.flatten.compact
   end
 
@@ -51,6 +51,22 @@ class MonthRange::MRange < Range
     non_terminated? ? end_month : end_month.next_month(1)
   end
 
+  def continuous?(m_range)
+    return false if m_range.nil?
+    raise if start_month >= m_range.start_month
+    return false if end_month.infinite?
+
+    end_month == m_range.just_before
+  end
+
+  def combine(m_range)
+    if start_month < m_range.start_month
+      MonthRange::MRange.new(start_month, m_range.end_month)
+    else
+      MonthRange::MRange.new(m_range.start_month, end_month)
+    end
+  end
+
   private
 
   def valid_start_end_relation?(start_month, end_month)

data/lib/month_range/month.rb

@@ -19,21 +19,11 @@ class MonthRange::Month < 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?
+    false
+  end
 
+  class Infinity < Numeric
     def infinite?
       true
     end
@@ -57,21 +47,15 @@ class MonthRange::Month < Date
     def <=>(other)
       case other
       when Infinity
-        return d <=> other.d
+        return 1
       when MonthRange::Month
-        return d
+        return 1
       end
       nil
     end
 
     def to_f
-      return 0 if @d.zero?
-
-      if @d.positive?
-        Float::INFINITY
-      else
-        -Float::INFINITY
-      end
+      Float::INFINITY
     end
   end
 end

data/lib/month_range/service.rb

@@ -30,12 +30,21 @@ class MonthRange::Service
   #  MonthRange::Service.add(range_array, from_range_arrays)
   #
   #  #=> [[#<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 = 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)
+  def self.subtraction(range_array, from_range_arrays) # rubocop:disable Metrics/MethodLength:
+    m_ranges = from_range_arrays.map do |range|
+      MonthRange::MRange.new(
+        MonthRange::Month.create(range[0]),
+        MonthRange::Month.create(range[1])
+      )
+    end
+    collection = MonthRange::Collection.new(m_ranges)
+
+    collection.subtract(
+      MonthRange::MRange.new(
+        MonthRange::Month.create(range_array[0]),
+        MonthRange::Month.create(range_array[1])
+      )
+    )
     collection.to_a
   end
 
@@ -69,26 +78,19 @@ class MonthRange::Service
   #  MonthRange::Service.add(range_array, from_range_arrays)
   #
   #  #=> [[#<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 = 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
-  end
-
-  # Change to MonthRange::Collection
-  # @param [[[Date, Date], [Date, Date],]] range_arrays
-  # @return [MonthRange::Collection]
-  def self.range_arrays_to_collection(range_arrays)
-    collection = MonthRange::Collection.new
-    range_arrays.each do |range|
-      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)
+  def self.add(range_array, from_range_arrays) # rubocop:disable Metrics/MethodLength
+    m_ranges = from_range_arrays.map do |range|
+      MonthRange::MRange.new(
+        MonthRange::Month.create(range[0]),
+        MonthRange::Month.create(range[1])
+      )
     end
-    collection
+    collection = MonthRange::Collection.new(m_ranges)
+
+    collection.add(MonthRange::MRange.new(
+                     MonthRange::Month.create(range_array[0]),
+                     MonthRange::Month.create(range_array[1])
+                   ))
+    collection.to_a
   end
 end

data/lib/month_range/version.rb

@@ -2,6 +2,6 @@
 
 module MonthRange
   class Version
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: month_range
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - jungo araki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -17,6 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
+- ".github/workflows/rspec.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -61,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Addition and subtraction for month range.