thefox-ext 1.7.0.pre.rc.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdffb85cdbbe31d2df7577ff7aa3d04b46558ee3901d6fcd666bd547eceb3e2d
-  data.tar.gz: 9527125c68ffd2b21efaaeba4beee8b6958c89823e81f62ccbe9c27f8c82db3e
+  metadata.gz: 6b68b006a1bf2b6cdc73ca86ef2291c7fe8561e622cdf9f4b6434df6ced40a48
+  data.tar.gz: 9e05dc8bedd4a625040d4899ed3f19315fa58c9a998e8cfc5749e929e15d7451
 SHA512:
-  metadata.gz: a4005329ccf5422c2fe81f2e23c15560e03141393c36993c87c98ba891a27be999c943dbccaa75ac15bd57daf8f48e25640bfa8f48902371dcd20f4391457b3e
-  data.tar.gz: 761e16f1c09e1e4891dac67b3bcb3db2a5a3c2f28c865de30c0fae53240a0efde47d38825c8631f9d85b739917597ede588dd9df88a37f6e96bed192d19d6a52
+  metadata.gz: 91b5ff18299878084605508f46a5559b8339d52006e32b1908c5a44ee8c04bfa420cddd6fabdf8c7f0996b4d093dae9c916d9affd4efc0c22df3aca2d4ff181d
+  data.tar.gz: d7629b1cff75db5e14ea30a5cd5d08f12227146e61491ca41368d696d7f5b3c5ee020161389fa6d7af113bbe8b7ac0fb9038ec95f32260fff4b552b6a48e7603

data/.github/workflows/ci.yml

@@ -10,8 +10,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*
 
 jobs:
   test:
@@ -22,6 +20,9 @@ jobs:
           - '2.3'
           - '2.4'
           - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.5'
+          - '3.0'
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/CHANGELOG-v1.md

@@ -1,6 +1,31 @@
 # Release Notes for Extended Ruby Classes v1.x
 
-## v1.7.0 [unreleased]
+## v1.10.0
+
+- [DEPRECATION] `Array.resolve_range_str` is deprecated.
+- [DEPRECATION] `String.resolve_range` is deprecated.
+
+## v1.9.0
+
+- Tests
+- Array Ranges
+
+## v1.8.0
+
+- Ruby v3 Support
+
+## v1.7.0
+
+- GitHub Actions
+- Ruby Support: 2.4, 2.5, 2.6, 2.7
+
+## v1.6.3 [unreleased]
+
+Only RCs.
+
+## v1.6.1
+
+- Deployment
 
 ## v1.6.0
 

data/README.md

@@ -21,7 +21,7 @@ gem install thefox-ext
 or via `Gemfile`:
 
 ```ruby
-gem 'thefox-ext', '~>1.5'
+gem 'thefox-ext', '~>1.10'
 ```
 
 Use it in your sources:

data/bin/dev

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# coding: UTF-8
+
+require 'thefox-ext'
+require 'pp'
+

data/lib/thefox-ext/ext/array.rb

@@ -1,10 +1,10 @@
 
 class Array
 
-  # Resolve a range string to an array.
-  # A range string can be like '1, 3..5, 9-11, 12+, 14++, 17+++'.
-  # Which will be resolved to [1, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20].
-  def self.resolve_range_str(original_str)
+  # DEPRECATED: will be removed in v2.0.0.
+  def self.resolve_range_str(original_str, prefix = '')
+    warn "[DEPRECATION] `Array.resolve_range_str` is deprecated."
+
     rv = Array.new
     if !original_str.is_a?(String)
       return rv
@@ -24,13 +24,13 @@ class Array
       else
         item_striped.to_i
       end
-    }.each do |range|
+    }.each{ |range|
       if range.is_a?(Range)
         rv.push(*range.to_a)
       else
         rv << range
       end
-    end
+    }
 
     rv
   end

data/lib/thefox-ext/ext/string.rb

@@ -63,4 +63,64 @@ class String
       self.force_encoding('ISO-8859-1').encode('UTF-8')
     end
   end
+
+  # DEPRECATED: will be removed in v2.0.0.
+  def resolve_range(prefix = '')
+    # puts '-> resolve_range: %s {%s}' % [self, prefix]
+    warn "[DEPRECATION] `String.resolve_range` is deprecated. Please use `TheFox::Range::Resolver` instead."
+
+    rv = Array.new
+
+    items = []
+    is_sub_range = false
+    sub_item = []
+    self.split(',').each do |item|
+      if item.count('{') > 0
+        is_sub_range = true
+      end
+      if is_sub_range
+        sub_item.push(item)
+      else
+        items.push(item)
+      end
+      if item.count('}') > 0
+        is_sub_range = false
+        items.push(sub_item.join(','))
+        sub_item = []
+      end
+    end
+
+    items.map{ |item|
+      item_striped = item.strip
+      if range_match = item_striped.match(/(\d+)\{([\d\-\+,]+)\}/)
+        range_match[2].resolve_range(range_match[1])
+      elsif /\.\./.match(item_striped) # ( . )( . ) <--- BOOBS
+        Range.new(*item_striped.split('..', 2).map{ |range| range.to_i })
+      elsif /-/.match(item_striped)
+        Range.new(*item_striped.split('-', 2).map{ |range| range.to_i })
+      elsif /\+/.match(item_striped)
+        range_begin = item_striped.split('+').first.to_i
+        range_end = range_begin + item_striped.count('+')
+        Range.new(range_begin, range_end)
+      else
+        item_striped.to_i
+      end
+    }.each{ |range|
+      if range.is_a?(Range)
+        rv.push(*range.to_a)
+      elsif range.is_a?(Array)
+        rv.push(*range)
+      else
+        rv << range
+      end
+    }
+
+    if !prefix.empty?
+      rv = rv.map { |i|
+        (prefix + i.to_s).to_i
+      }
+    end
+
+    rv
+  end
 end

data/lib/thefox-ext/version.rb

@@ -1,8 +1,8 @@
 
 module TheFox
   module Ext
-    VERSION = '1.7.0-rc.1'
-    DATE = '2021-04-05'
+    VERSION = '1.10.0'
+    DATE = '2021-04-08'
     HOMEPAGE = 'https://github.com/TheFox/ext.rb'
   end
 end

data/thefox-ext.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
 	spec.files         = `git ls-files -z`.split("\x0").reject{ |f| f.match(%r{^(test|spec|features)/}) }
 	spec.require_paths = ['lib']
-	spec.required_ruby_version = ['>=2.3.0', '<3.0']
+	spec.required_ruby_version = ['>=2.3.0']
 
 	spec.add_development_dependency 'minitest', '~>5.8'
 	spec.add_development_dependency 'simplecov', '~>0.13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-ext
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre.rc.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -67,7 +67,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- bin/.gitignore
+- bin/dev
 - bin/install.sh
 - bin/release.sh
 - bin/setup.sh
@@ -99,17 +99,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.3.0
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Extended Ruby Classes

data/bin/.gitignore

@@ -1 +0,0 @@
-dev