multi_range 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dce52f266fe1dd26eaccbac184ee8c1ed5cc160322d92ded5471fb3efda0ee4
-  data.tar.gz: d001904ffda1cf620638042afd72da56b1b810b457df6227bd1d9fb3e7986a4e
+  metadata.gz: 770406d2ee94a20090941404e6bfde0d3a516554be093ae1eb09aa0f85b19688
+  data.tar.gz: b1d0e13fb9cd75e2d897d8f2b7e5b9a54ca5c543fcb16c12fb9e35a4cd8717ac
 SHA512:
-  metadata.gz: 36fb852c41b4802589fd950b3beadbccad986e8e5e31da5993acfd11e19339e7034eba7099bcd36903e74e592c397e4501682cae47f482c74ad9d86d136b25cc
-  data.tar.gz: 0a763c262c12b7b45fc0c47f50bbbee929a19c2399e9e9725f70d49222bcdf1d0860c8b1162d8a04e2f2b992e42287b2deacbbf6dbf9c051f98c3fad04ec0488
+  metadata.gz: a0fbb1372f1ccdd9967142fa2ad0e13da8859e3c796c594ea2d53c61646ec98d21a395a0f81f1cc41486fc4b408161ceb2ed45c5fe97aeca701e4688892fd979
+  data.tar.gz: e41cfe73cc1024d9899a1722215dfbfc2ab0b74bd446e279b1c7c791df162e7c6068332c8ebb01a0594b04d71c7322890fb68c4be148aff46b8a1637a5420717

data/.rubocop.yml

@@ -177,8 +177,8 @@ Lint/UselessAssignment:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
   Enabled: true
 
-Lint/UselessComparison:
-  Description: 'Checks for comparison of something with itself.'
+Lint/BinaryOperatorWithIdenticalOperands:
+  Description: 'This cop checks for places where binary operator has identical operands.'
   Enabled: true
 
 Lint/UselessElseWithoutRescue:
@@ -1064,7 +1064,7 @@ Style/SymbolProc:
   Description: 'Use symbols as procs instead of blocks when possible.'
   Enabled: false # wants to support ruby 1.8
 
-Layout/Tab:
+Layout/IndentationStyle:
   Description: 'No hard tabs.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true

data/lib/multi_range.rb

@@ -26,7 +26,7 @@ class MultiRange
     @is_float = @ranges.any?{|range| range.begin.is_a?(Float) || range.end.is_a?(Float) }
   end
 
-  def merge_overlaps
+  def merge_overlaps(merge_same_value = true)
     return MultiRange.new([]) if @ranges.size == 0
 
     new_ranges = []
@@ -36,7 +36,7 @@ class MultiRange
       next current_range = range if current_range == nil
       next if range.end <= current_range.end
 
-      if can_combine?(current_range, range)
+      if can_combine?(current_range, range, merge_same_value)
         current_range = range.exclude_end? ? current_range.begin...range.end : current_range.begin..range.end
       else
         new_ranges << current_range
@@ -68,7 +68,11 @@ class MultiRange
 
       sub_range1 = range.begin...other.begin
 
-      sub_range2_begin = other.exclude_end? ? other.end : other.end + (other.end.is_a?(Float) ? Float::EPSILON : 1)
+      sub_range2_begin = if other.exclude_end?
+                           other.end
+                         else
+                           other.end + (other.end.is_a?(Float) ? Float::EPSILON : 1)
+                         end
       sub_range2 = range.exclude_end? ? sub_range2_begin...range.end : sub_range2_begin..range.end
 
       sub_ranges = []
@@ -144,10 +148,15 @@ class MultiRange
     return range.max if range
   end
 
+  def contain_overlaps?
+    merge_overlaps(false).ranges != ranges
+  end
+
   private
 
   # make sure that range1.begin <= range2.begin
-  def can_combine?(range1, range2)
+  def can_combine?(range1, range2, merge_same_value)
+    return merge_same_value if range1.end == range2.begin and range1.exclude_end?
     return range1.end >= range2.begin if @is_float
     return range1.end + 1 >= range2.begin
   end

data/lib/multi_range/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class MultiRange
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_range
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler