thefox-ext 1.10.0 → 3.0.0.pre.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b68b006a1bf2b6cdc73ca86ef2291c7fe8561e622cdf9f4b6434df6ced40a48
-  data.tar.gz: 9e05dc8bedd4a625040d4899ed3f19315fa58c9a998e8cfc5749e929e15d7451
+  metadata.gz: a20be9c295afd672782bd04e2ab56b507fa81cf0f66e89c7557b1d88dc527687
+  data.tar.gz: b5bb8440e0df05a68571e9fa957f6e13e904a50697b34215383c1bd209eea5c8
 SHA512:
-  metadata.gz: 91b5ff18299878084605508f46a5559b8339d52006e32b1908c5a44ee8c04bfa420cddd6fabdf8c7f0996b4d093dae9c916d9affd4efc0c22df3aca2d4ff181d
-  data.tar.gz: d7629b1cff75db5e14ea30a5cd5d08f12227146e61491ca41368d696d7f5b3c5ee020161389fa6d7af113bbe8b7ac0fb9038ec95f32260fff4b552b6a48e7603
+  metadata.gz: 7aef25246b059342d994fbb7dd981f16a962abed342a474611d38acc8878d9487673286b4f802ed8a791eec92cfcc34189fa63fe2b9e5965ad16e2dbaf4022e6
+  data.tar.gz: 363c224dade536a709cc24f7eee8cdaf0a86d39a1ab676e80bd6b7f1cad2462f6f70e52f39c29f9e3904313bba93d24b4c54b3b7dfec749f06a26920d9a13601

data/.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
   push:
     branches:
       - master
+      - feature/*
 
 jobs:
   test:
@@ -17,8 +18,6 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.3'
-          - '2.4'
           - '2.5'
           - '2.6'
           - '2.7'

data/CHANGELOG-v2.md

@@ -0,0 +1,8 @@
+# Release Notes for Extended Ruby Classes v2.x
+
+## v2.0.0
+
+- Removed deprecated `Array.resolve_range_str`.
+- Removed deprecated `String.resolve_range`.
+- Dropped support for Ruby version 2.3.
+- Added Range Resolver class.

data/CHANGELOG-v3.md

@@ -0,0 +1,6 @@
+# Release Notes for Extended Ruby Classes v2.x
+
+## v3.0.0 [unreleased]
+
+- Dropped support for Ruby version 2.4.
+- Range Resolver v2

data/README.md

@@ -21,7 +21,7 @@ gem install thefox-ext
 or via `Gemfile`:
 
 ```ruby
-gem 'thefox-ext', '~>1.10'
+gem 'thefox-ext', '~>2.0'
 ```
 
 Use it in your sources:
@@ -40,11 +40,16 @@ require 'thefox-ext'
 - Date
 	- `today?`
 	- Get week array for a specific date.
-- Array
-	- Range String Resolver
 - Hash
 	- Recursive Merge
+- Range String Resolver
 
 ## Project Links
 
 - [Gem](https://rubygems.org/gems/thefox-ext)
+
+## Dev
+
+```bash
+bundler exec ./bin/test.rb
+```

data/bin/dev

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-# coding: UTF-8
 
 require 'thefox-ext'
 require 'pp'
 
+rr = TheFox::Range::Resolver.new(ARGV.join(' '))
+pp rr.to_a

data/bin/test.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'pry'
+require 'thefox-ext'
+require 'pp'
+
+include TheFox::Range::Lexer
+
+n1 = Number.new('123')
+
+binding.pry
+
+puts '-> exit pry'

data/bin/test.sh

@@ -10,4 +10,5 @@ which bundler &> /dev/null || { echo 'ERROR: bundler not found in PATH'; exit 1;
 
 cd "${SCRIPT_BASEDIR}/.."
 
+echo 'run tests'
 bundler exec ./test/suite_all.rb $*

data/lib/thefox-ext.rb

@@ -8,6 +8,21 @@ require 'thefox-ext/ext/integer'
 require 'thefox-ext/ext/nil'
 require 'thefox-ext/ext/string'
 require 'thefox-ext/ext/true'
-require 'thefox-ext/ext/array'
 
 require 'thefox-ext/console'
+
+# Resolver
+require 'thefox-ext/range/resolver'
+require 'thefox-ext/range/lexer/lexer'
+require 'thefox-ext/range/lexer/collection'
+require 'thefox-ext/range/lexer/base'
+require 'thefox-ext/range/lexer/block_level'
+require 'thefox-ext/range/lexer/block'
+require 'thefox-ext/range/lexer/block_down'
+require 'thefox-ext/range/lexer/block_up'
+require 'thefox-ext/range/lexer/operator'
+require 'thefox-ext/range/lexer/scope'
+require 'thefox-ext/range/lexer/number'
+require 'thefox-ext/range/lexer/separator'
+require 'thefox-ext/range/lexer/range'
+require 'thefox-ext/range/lexer/interval'

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

@@ -63,64 +63,4 @@ 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/range/lexer/base.rb

@@ -0,0 +1,124 @@
+
+module TheFox
+module Range
+module Lexer
+  class Base
+    @@instance_id = 0
+
+    def initialize(symbole = nil)
+      # puts '-> Base.initialize'
+
+      @@instance_id += 1
+      @instance_id = @@instance_id
+      @nonce = Base.generate_nonce()
+      @symbole = symbole
+      @prev_item = nil
+      @org_prev_item = nil
+      @next_item = nil
+
+      @parent_item = nil
+      #@parent_scope = nil
+      @children = []
+    end
+
+    # :nocov:
+    def inspect()
+      'Base'
+    end
+    # :nocov:
+
+    def instance_id()
+      @instance_id
+    end
+    def instance_id=(instance_id)
+      @instance_id = instance_id
+    end
+
+    def nonce()
+      @nonce
+    end
+    def nonce=(nonce)
+      @nonce = nonce
+    end
+
+    def chain(prev_item)
+      # puts '%s(%s).chain' % [self.inspect, opts.inspect]
+      self.prev_item = prev_item
+      if !prev_item.nil?
+        prev_item.next_item = self
+      end
+    end
+
+    def symbole()
+      @symbole
+    end
+
+    def org_prev_item()
+      @org_prev_item
+    end
+    def org_prev_item=(org_prev_item)
+      @org_prev_item = org_prev_item
+    end
+
+    def prev_item()
+      @prev_item
+    end
+    def prev_item=(prev_item)
+      @prev_item = prev_item
+    end
+
+    def next_item()
+      @next_item
+    end
+    def next_item=(next_item)
+      @next_item = next_item
+    end
+
+    def parent_item()
+      @parent_item
+    end
+    def parent_item=(parent_item)
+      @parent_item = parent_item
+    end
+    def has_parent_item()
+      !@parent_item.nil?
+    end
+
+    def children()
+      @children
+    end
+    def add_child(child)
+      @children.push(child)
+    end
+    def has_children()
+      @children.length > 0
+    end
+
+    def dup()
+      # puts '-> Base.dup'
+      o = super()
+      o.nonce = Base.generate_nonce()
+      o.prev_item = nil
+      o.next_item = nil
+      o
+    end
+
+    def resolve()
+      puts '-> Base.resolve'
+    end
+
+    class << self
+      def generate_nonce()
+        rand(10 ** 3).to_s.rjust(3, '0')
+      end
+      def keep_nonce_on_dup()
+        false
+      end
+      def keep_instance_id_on_dup()
+        false
+      end
+    end
+  end # Base
+end # Lexer
+end # Range
+end # TheFox

data/lib/thefox-ext/range/lexer/block.rb

@@ -0,0 +1,19 @@
+
+module TheFox
+module Range
+module Lexer
+  # { }
+  class Block < Base
+    def initialize(level)
+      super()
+      # puts '-> Block.initialize(%s)' % [level.inspect]
+      @level = level.dup
+    end
+
+    def level()
+      @level
+    end
+  end # Block
+end # Lexer
+end # Range
+end # TheFox

data/lib/thefox-ext/range/lexer/block_down.rb

@@ -0,0 +1,25 @@
+
+module TheFox
+module Range
+module Lexer
+  # {
+  class BlockDown < Block
+    def initialize(level)
+      level.inc
+      super(level)
+      # puts '-> BlockDown.initialize(%s)' % [level.inspect]
+    end
+
+    # :nocov:
+    def inspect()
+      'BlockDown(%s)' % [@level.level]
+      # if @prev_item.nil?
+      # else
+      #   'BlockDown(%s <%s)' % [@level.inspect, @prev_item.inspect]
+      # end
+    end
+    # :nocov:
+  end # BlockDown
+end # Lexer
+end # Range
+end # TheFox

data/lib/thefox-ext/range/lexer/block_level.rb

@@ -0,0 +1,37 @@
+
+module TheFox
+module Range
+module Lexer
+  class BlockLevel
+    def initialize()
+      # puts '-> BlockLevel.initialize()'
+      @level = 0
+    end
+
+    # :nocov:
+    def inspect()
+      'BlockLevel(%d)' % [@level]
+    end
+    # :nocov:
+
+    def inc()
+      @level += 1
+    end
+
+    def dec()
+      @level -= 1
+    end
+
+    def level()
+      @level
+    end
+
+    def ==(other)
+      if other.is_a?(BlockLevel)
+        @level == other.level
+      end
+    end
+  end # BlockLevel
+end # Lexer
+end # Range
+end # TheFox

data/lib/thefox-ext/range/lexer/block_up.rb

@@ -0,0 +1,23 @@
+
+module TheFox
+module Range
+module Lexer
+  # }
+  class BlockUp < Block
+    def initialize(level)
+      super(level)
+      level.dec
+      # puts '-> BlockUp.initialize(%s)' % [level.inspect]
+      # puts '-> BlockUp.initialize()'
+    end
+
+    # :nocov:
+    def inspect()
+      'BlockUp(%s)' % [@level.level]
+      # 'BlockUp()'
+    end
+    # :nocov:
+  end # BlockUp
+end # Lexer
+end # Range
+end # TheFox

data/lib/thefox-ext/range/lexer/collection.rb

@@ -0,0 +1,73 @@
+
+module TheFox
+module Range
+module Lexer
+  class Collection
+    def initialize(items = nil)
+      # puts '-> Collection.initialize()'
+      @items = items.to_a
+      @block_level = 0
+    end
+
+    # :nocov:
+    def inspect()
+      'Collection(L=%d %s)' % [
+        @items.length,
+        @items.map{ |i| i.inspect }
+      ]
+    end
+    # :nocov:
+
+    def items()
+      @items
+    end
+
+    def curr()
+      @items.last
+    end
+
+    def prev()
+      @items[-2]
+    end
+
+    def is_empty()
+      @items.length == 0
+    end
+
+    def length()
+      @items.length
+    end
+
+    def push(item)
+      # puts '-> %s.push(%s)' % [self.inspect, item.inspect]
+      if item.nil?
+        return
+      end
+
+      # Prev
+      org_prev_item = item.prev_item
+      prev_item = @items.last
+
+      # Dup
+      curr_item = item.dup
+      @items.push(curr_item)
+
+      # Chain
+      curr_item.chain(prev_item)
+      curr_item.org_prev_item = org_prev_item
+
+      if curr_item.class.keep_nonce_on_dup
+        curr_item.nonce = item.nonce
+      end
+      if curr_item.class.keep_instance_id_on_dup
+        curr_item.instance_id = item.instance_id
+      end
+    end
+
+    def pop()
+      @items.pop
+    end
+  end # Collection
+end # Lexer
+end # Range
+end # TheFox