thefox-ext 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e617d131ab8b09d7056239e1cc53c62e5732522f560d9dafe1d0f00621818d0c
-  data.tar.gz: 878374b414a23b7a3b25b21f0a051e351c073e5dec8b65189f24eaf7e9de298d
+  metadata.gz: 569a588809c70468e59dc2d762bf261d94108cc4d9c535c664c518c99b820914
+  data.tar.gz: 9307e0cf0b76da29e09537bc93e7e77f70137dcb69621d94089ad24f08a080d2
 SHA512:
-  metadata.gz: 2985d78918b8f35dc3be1a8abd7b56ba88d92785bbf0f4df4b7aae233f2f601810204469251ecb2dd53386224792c66b3e0fd7b12a1100561274bed2eb219663
-  data.tar.gz: 40e5fc8277d7c072a24ce43249c43559274b4d204fe57b6b81a6e15a82c31bbcc62946e4b0419057d4b0a42263d6170af8efbfd04fd749cb0ffd6d27aacd6beb
+  metadata.gz: 4e8c14d434bd57584ae5f72d2c99923af6da39c0e88b1e2cee8afb5f03776d1997be3a994e54f97632c9b96e7f280a4e2249717cdb1d4ee1163f9be7c8c98e20
+  data.tar.gz: 5f4527fb0be38f6e1c4018a8896374475405565907484d894e5294bdb43f989050f1af2217b25c12095d454a64f162fd148355a0685218560d6ad1e085e6c735

data/.github/workflows/ci.yml

@@ -10,8 +10,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*
 
 jobs:
   test:

data/CHANGELOG-v1.md

@@ -1,5 +1,10 @@
 # Release Notes for Extended Ruby Classes v1.x
 
+## v1.9.0
+
+- Tests
+- Array Ranges
+
 ## v1.8.0
 
 - Ruby v3 Support

data/README.md

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

data/bin/dev

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# coding: UTF-8
+
+require 'thefox-ext'
+require 'pp'
+
+# pp '5{1,2}'.resolve_range()
+# pp '1,2{1-3,5,6,7},4,5{1,2}'.resolve_range()
+# pp [1, 2].resolve_range_str('3, 4')
+# pp Array.resolve_range_str('3,4')
+# pp '3, 4'.resolve_range()
+# pp '3, 4'.resolve_range()
+# pp '3, 4'.resolve_range2()

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 v1.10.0.
+  def self.resolve_range_str(original_str, prefix = '')
+    warn "[DEPRECATION] `Array.resolve_range_str` is deprecated. Please use `String.resolve_range` instead."
+
     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,71 @@ class String
       self.force_encoding('ISO-8859-1').encode('UTF-8')
     end
   end
+
+  # 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 resolve_range(prefix = '')
+    # puts '-> resolve_range: %s {%s}' % [self, prefix]
+
+    rv = Array.new
+
+    items1 = self.split(',')
+    # pp items1
+
+    items2 = []
+    is_sub_range = false
+    sub_item = []
+    items1.each do |item|
+      if item.count('{') > 0
+        is_sub_range = true
+      end
+      if is_sub_range
+        sub_item.push(item)
+      else
+        items2.push(item)
+      end
+      if item.count('}') > 0
+        is_sub_range = false
+        items2.push(sub_item.join(','))
+        sub_item = []
+      end
+    end
+
+    # pp items2
+
+    items2.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)
+        items = item_striped.split('+')
+        range_begin = items[0].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,7 +1,7 @@
 
 module TheFox
   module Ext
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'
     DATE = '2021-04-05'
     HOMEPAGE = 'https://github.com/TheFox/ext.rb'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thefox-ext
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Christian Mayer
@@ -67,7 +67,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- bin/.gitignore
+- bin/dev
 - bin/install.sh
 - bin/release.sh
 - bin/setup.sh

data/bin/.gitignore

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