range_compressor 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e62be00199f227f3dae78b086d5f63759205cfa19c5eeb255bf5787b33450b
-  data.tar.gz: f62233009ec12d166fb2072897e8ecc95336ec6df6745facaa7b7cb530d9c2f7
+  metadata.gz: 31e9cdfc716d5a8d19654cd30d69540aaacb5f0b98372cf39de878d0a0b2f33e
+  data.tar.gz: b2b0d7803f967cccda9a729f40e825ff640c300edfbbb93a9824c6166c323750
 SHA512:
-  metadata.gz: 4ca724e589d5827ce79c89556acf4b97d8984f65d8c417f66b227a64b82d5e8b1aa3e20d372818214146ef750d8f445ac731136d1cbc1862de7c3152b29af1a7
-  data.tar.gz: 178feded786fb56dbcd52574a4dca4cae421ef96f37318d3c778206d83849aa9b1d221fb91750c466945eb05fe21342ad381322e3656a8b427a8831f7c11998e
+  metadata.gz: 508c545f44479bd9c3365385acfd92a26fcb77cea09bbe57145580e3e8bb603706cdd4907091ab1eeffc42f5c5de572cd8a7913aabac03e91dcfc90af52edd84
+  data.tar.gz: 3f829b5a3c82158c5b88534646be0327ef306270bd7e5687630aa1dd1760a28762bcb8d30cd417250f71678623f8e3964b5c6274aaaf1d3484fb1eb299eb3960

data/.github/workflows/tests.yml

@@ -0,0 +1,22 @@
+name: tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: [ '2.4', '3.0', 'ruby-head' ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install --jobs 4
+      - name: Test with Rake
+        run: bundle exec rake

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [1.2.0]
+
+### Added
+
+- improved performance
+
+## [1.1.1]
+
+### Fixed
+
+- fixed unnecessary double sorting when given RBTree instances as input
+
+## [1.1.0]
+
+### Added
+
+- support for compressing lists of Ranges as well as mixed and nested inputs
+
+### Fixed
+
+- fixed implicit dependency on `sorted_set` in Ruby >= 3.0 by no longer requiring `sorted_set`
+
+## [1.0.0]
+
+Initial release.

data/Gemfile

@@ -4,3 +4,10 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in range_compressor.gemspec
 gemspec
+
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.8'
+# SortedSet was moved to a gem in Ruby 3.
+if RUBY_VERSION.to_f >= 3.0 && !RUBY_PLATFORM[/java/i]
+  gem 'sorted_set', '~> 1.0'
+end

data/README.md

@@ -1,19 +1,16 @@
 # RangeCompressor
 
 [![Gem Version](https://badge.fury.io/rb/range_compressor.svg)](http://badge.fury.io/rb/range_compressor)
-[![Build Status](https://travis-ci.org/janosch-x/range_compressor.svg?branch=master)](https://travis-ci.org/janosch-x/range_compressor)
+[![Build Status](https://github.com/jaynetics/range_compressor/workflows/tests/badge.svg)](https://github.com/jaynetics/range_compressor/actions)
 
-A micro-gem that turns this:
+A micro-gem that compresses enumerables into Ranges.
 
-```ruby
-[1, 2, 3, 4, 6, 8, 9, 10]
-```
-
-into this:
-
-```ruby
-[1..4, 6..6, 8..10]
-```
+| Input                      | Output               |
+|----------------------------|----------------------|
+| [1, 2, 3, 4, 6, 8, 9, 10]  | [1..4, 6..6, 8..10]  |
+| %w[a b c e f g h]          | ['a'..'c', 'e'..'h'] |
+| [1..5, 3..8]               | [1..8]               |
+| [Set[1, 2], 3..6, [9, 10]] | [1..6, 9..10]        |
 
 ## Installation
 

data/lib/range_compressor/version.rb

@@ -1,3 +1,3 @@
 module RangeCompressor
-  VERSION = '1.0.0'
+  VERSION = '1.2.0'
 end

data/lib/range_compressor.rb

@@ -3,27 +3,16 @@ require 'range_compressor/version'
 module RangeCompressor
   module_function
 
-  SORTED_SET_CLASSES = %w[
-    CharacterSet
-    CharacterSet::Pure
-    ImmutableSet
-    SortedSet
-  ].freeze
-
-  # Set#divide is very slow unfortunately, else it would be nice for this:
-  # divide { |i, j| (i - j).abs == 1 }
-  def compress(enum)
-    if enum.class.ancestors.none? { |anc| SORTED_SET_CLASSES.include? anc.to_s }
-      require 'set'
-      enum = SortedSet.new(enum)
-    end
+  def compress(arg)
+    # make contents flat, unique, and sorted
+    sorted_set = to_sorted_set(arg)
 
     ranges = []
     previous = nil
     current_start = nil
     current_end = nil
 
-    enum.each do |object|
+    sorted_set.each do |object|
       if previous.nil?
         current_start = object
       elsif previous.next != object
@@ -40,4 +29,37 @@ module RangeCompressor
 
     ranges
   end
+
+  SORTED_SET_CLASSES = %w[
+    CharacterSet
+    CharacterSet::Pure
+    ImmutableSet
+    RBTree
+    SortedSet
+  ].freeze
+
+  def to_sorted_set(arg)
+    if arg.nil?
+      []
+    elsif (arg.class.ancestors.map(&:to_s) & SORTED_SET_CLASSES).any?
+      arg
+    elsif arg.respond_to?(:each)
+      hash = {}
+      flatten(arg, hash)
+      hash.keys.sort
+    else
+      raise(ArgumentError, 'value must be enumerable')
+    end
+  end
+
+  def flatten(arg, hash)
+    if arg.respond_to?(:each)
+      if arg.instance_of?(Range) && (arg.begin.nil? || arg.end.nil?)
+        raise ArgumentError, 'beginless and endless Ranges are not supported'
+      end
+      arg.each { |el| flatten(el, hash) }
+    else
+      hash[arg] = true
+    end
+  end
 end

data/range_compressor.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email         = ['janosch84@gmail.com']
 
   s.summary       = 'Compresses Arrays of Objects to Arrays of Ranges.'
-  s.homepage      = 'https://github.com/janosch-x/range_compressor'
+  s.homepage      = 'https://github.com/jaynetics/range_compressor'
   s.license       = 'MIT'
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -18,8 +18,4 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 1.9.3'
-
-  s.add_development_dependency 'bundler', '~> 1.16'
-  s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,67 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: range_compressor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Janosch Müller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
+date: 2022-09-02 00:00:00.000000000 Z
+dependencies: []
+description:
 email:
 - janosch84@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,11 +30,11 @@ files:
 - lib/range_compressor.rb
 - lib/range_compressor/version.rb
 - range_compressor.gemspec
-homepage: https://github.com/janosch-x/range_compressor
+homepage: https://github.com/jaynetics/range_compressor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Compresses Arrays of Objects to Arrays of Ranges.
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2
-  - 2.6
-before_install:
-  - gem update --system
-  - gem install bundler