multi_range 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 201ed1151cccd779945250523ac3872fc7496d6b
-  data.tar.gz: 8fe06100aeffb7392877ad7c5ce51561eabc65b4
+SHA256:
+  metadata.gz: 82aa8d60271246bff1316449278536578153d944fd33bb8c1247175c055d98c4
+  data.tar.gz: bac913e6497fc532f69a5a4dfca6066b9856b5ab82f80279a9d3669013a5620d
 SHA512:
-  metadata.gz: 341b27fe3a106b36021fc5480d6e3529941c3b32e18e2d7280bb1264a8d2cebf694d6fda12f2eba0a27812cb668eb48e0e4503fedd144b1836bdebc7b715d17d
-  data.tar.gz: ce029763753f86cf0ad073bcccb8ed66c482f288b5bd50d1229179b5afd744d285267ba9364f63728847852ff35bc5a58c7332a9c4b0185ef90b180f587e3ffa
+  metadata.gz: 99c502e9fb9998ef235af41f696cdb41cdfb0559ed4431baff0b28e4873564c1c44e60c86638a7f72ff3f1f247b41effb807defb83aa1c91ed56225ff46f70f4
+  data.tar.gz: 4804d00e47dbaec3c2f1a5013489fcd4a4a2f86204419176676b7c11e88c4fa9114c9f13956ad8c2e491a05619813af2f1de923eb334edec2b0a370a145d55a1

data/.rubocop.yml

@@ -76,10 +76,6 @@ Layout/EndAlignment:
   Description: 'Align ends correctly.'
   Enabled: true
 
-Lint/EndInMethod:
-  Description: 'END blocks should not be placed inside method definitions.'
-  Enabled: true
-
 Lint/EnsureReturn:
   Description: 'Do not use return in an ensure block.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
@@ -581,9 +577,12 @@ Style/For:
 Style/FormatString:
   Description: 'Enforce the use of Kernel#sprintf, Kernel#format or String#%.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#sprintf'
-  EnforcedStyle: sprintf
+  EnforcedStyle: percent
   Enabled: true
 
+Style/FormatStringToken:
+  Enabled: false
+
 Style/GlobalVars:
   Description: 'Do not introduce global variables.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
@@ -809,7 +808,7 @@ Style/PercentQLiterals:
 Style/PerlBackrefs:
   Description: 'Avoid Perl-style regex back references.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
-  Enabled: true
+  Enabled: false
 
 Naming/PredicateName:
   Description: 'Check the names of predicate methods.'

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v0.0.4](https://github.com/khiav223577/multi_range/compare/v0.0.3...v0.0.4) 2020/03/26
+- [#7](https://github.com/khiav223577/multi_range/pull/7) Add flatten method (@khiav223577)
+
 ### [v0.0.3](https://github.com/khiav223577/multi_range/compare/v0.0.2...v0.0.3) 2020/03/02
 - [#6](https://github.com/khiav223577/multi_range/pull/6) freeze internal ranges variable (@khiav223577)
 - [#5](https://github.com/khiav223577/multi_range/pull/5) Add min, max, to_a method (@khiav223577)

data/README.md

@@ -49,6 +49,29 @@ multi_range.ranges
 # => [1...5, 86..100]
 ```
 
+```rb
+multi_range = MultiRange.new([1..10, 50..70, 80..100])
+multi_range -= MultiRange.new([5..60, 75..85])
+multi_range.ranges
+# => [1...5, 61..70, 86..100] 
+```
+
+### Range union
+
+```rb
+multi_range = MultiRange.new([1..5])
+multi_range |= 3..8
+multi_range.ranges
+# => [1..8]
+```
+
+```rb
+multi_range = MultiRange.new([1..5, 10..15, 20..25])
+multi_range |= MultiRange.new([3..6, 14..22, 30])
+multi_range.ranges
+# => [1..6, 10..25, 30..30]
+```
+
 ### Flatten
 ```rb
 multi_range = MultiRange.new([1, 2, 4..6, 7, 8..12])
@@ -56,6 +79,26 @@ multi_range.flatten.ranges
 # => [1..2, 4..12]
 ```
 
+### Overlaps?
+
+```rb
+multi_range = MultiRange.new([1..5, 10..15, 20..25])
+multi_range.overlaps?(7..8)
+# => false
+
+multi_range.overlaps?(3..8)
+# => true
+
+multi_range.overlaps?(7..12)
+# => true
+```
+
+```rb
+multi_range = MultiRange.new([1..5, 10..15, 20..25])
+multi_range.overlaps?(MultiRange.new([6..8, 18..22]))
+# => true
+```
+
 ### Range-like interface
 
 #### each
@@ -94,6 +137,50 @@ MultiRange.new([1..3, 6, 8..9]).to_a
 # => [1, 2, 3, 6, 8, 9]
 ```
 
+
+#### size
+```rb
+MultiRange.new([1..3, 6, 8..9]).size
+# => 6
+```
+
+### Warning
+
+The return value may be different when there are some overlapped ranges.
+Call `flatten` if you want to merge overlapped ranges.
+
+```rb
+MultiRange.new([1..5, 3..6]).to_a
+# => [1, 2, 3, 4, 5, 3, 4, 5, 6] 
+
+MultiRange.new([1..5, 3..6]).flatten.to_a
+# => [1, 2, 3, 4, 5, 6]
+```
+
+```rb
+MultiRange.new([1..5, 3..6]).each{|s| print s }
+# => 123453456
+
+MultiRange.new([1..5, 3..6]).flatten.each{|s| print s }
+# => 123456
+```
+
+```rb
+MultiRange.new([1..5, 3..6]).map{|s| s * 2 }
+# => [2, 4, 6, 8, 10, 6, 8, 10, 12] 
+
+MultiRange.new([1..5, 3..6]).flatten.map{|s| s * 2 }
+# => [2, 4, 6, 8, 10, 12] 
+```
+
+```rb
+MultiRange.new([1..5, 3..6]).size
+# => 9
+
+MultiRange.new([1..5, 3..6]).flatten.size
+# => 6
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/multi_range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'multi_range/version'
 require 'roulette-wheel-selection'
 
@@ -19,12 +21,12 @@ class MultiRange
 
   attr_reader :ranges
 
-  def initialize(ranges) # range 要由小到大排序，且各 range 不能重疊
-    @ranges = ranges.map{|s| s.is_a?(Integer) ? s..s : s }.freeze
+  def initialize(ranges)
+    @ranges = ranges.map{|s| s.is_a?(Integer) ? s..s : s }.sort_by(&:begin).freeze
   end
 
   def flatten
-    return if @ranges.size == 0
+    return MultiRange.new([]) if @ranges.size == 0
 
     new_ranges = []
     current_range = nil
@@ -46,6 +48,12 @@ class MultiRange
   end
 
   def -(other)
+    if other.is_a?(MultiRange)
+      new_multi_range = dup
+      other.ranges.each{|range| new_multi_range -= range }
+      return new_multi_range
+    end
+
     new_ranges = @ranges.dup
 
     return MultiRange.new(new_ranges) if new_ranges.empty?
@@ -72,6 +80,16 @@ class MultiRange
     return MultiRange.new(new_ranges)
   end
 
+  def |(other)
+    other_ranges = other.is_a?(MultiRange) ? other.ranges : [other]
+    return MultiRange.new(@ranges + other_ranges).flatten
+  end
+
+  def overlaps?(other)
+    multi_range = flatten
+    return multi_range.size != (multi_range - other).size
+  end
+
   def sample
     range = RouletteWheelSelection.sample(@ranges.map{|s| [s, s.size] }.to_h)
     return nil if range == nil

data/lib/multi_range/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MultiRange
-  VERSION = '0.0.4'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_range
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides cross-rails methods for you to upgrade rails, backport features,