enumpath 0.1.1 → 0.1.2

data/lib/enumpath/operator/union.rb

@@ -32,7 +32,7 @@ module Enumpath
       # @yieldparam remaining_path [Array] the union member plus remaining_path
       # @yieldparam enum [Enumerable] enum
       # @yieldparam resolved_path [Array] resolved_path
-      def apply(remaining_path, enum, resolved_path, &block)
+      def apply(remaining_path, enum, resolved_path)
         parts = operator.split(SPLIT_REGEX).map { |part| part.strip.gsub(/^['"]|['"]$/, '') }
         Enumpath.log('Applying union parts') { { parts: parts } }
         parts.each { |part| yield([part] + remaining_path, enum, resolved_path) }

data/lib/enumpath/operator/wildcard.rb

@@ -23,7 +23,7 @@ module Enumpath
       # @yieldparam remaining_path [Array] the key of the given member plus remaining_path
       # @yieldparam enum [Enumerable] enum
       # @yieldparam resolved_path [Array] resolved_path
-      def apply(remaining_path, enum, resolved_path, &block)
+      def apply(remaining_path, enum, resolved_path)
         keys = keys(enum)
         Enumpath.log('Applying wildcard to keys') { { keys: keys } }
         keys.each { |key| yield([key.to_s] + remaining_path, enum, resolved_path) }

data/lib/enumpath/path.rb

@@ -46,13 +46,8 @@ module Enumpath
     def trace(path_segments, enum, resolved_path = [], nesting_level = 0)
       Enumpath.logger.level = nesting_level
       if path_segments.any?
-        Enumpath.log("Applying") { { operator: path_segments, to: enum } }
-        segment = path_segments.first
-        remaining_path = path_segments[1..-1]
-        operator = Enumpath::Operator.detect(segment, enum)
-        operator&.apply(remaining_path, enum, resolved_path) do |s, e, c|
-          trace(s, e, c, nesting_level + 1)
-        end
+        Enumpath.log('Applying') { { operator: path_segments, to: enum } }
+        apply_segments(path_segments, enum, resolved_path, nesting_level)
       else
         Enumpath.log('Storing') { { resolved_path: resolved_path, enum: enum } }
         results.store(resolved_path, enum)
@@ -60,7 +55,14 @@ module Enumpath
       Enumpath.logger.level = nesting_level
     end
 
-    private
+    def apply_segments(path_segments, enum, resolved_path, nesting_level)
+      segment = path_segments.first
+      remaining_path = path_segments[1..-1]
+      operator = Enumpath::Operator.detect(segment, enum)
+      operator&.apply(remaining_path, enum, resolved_path) do |s, e, c|
+        trace(s, e, c, nesting_level + 1)
+      end
+    end
 
     def cache
       @cache ||= Enumpath.path_cache

data/lib/enumpath/path/normalized_path.rb

@@ -16,34 +16,43 @@ module Enumpath
 
       def normalize(path)
         return path if path.is_a?(Array)
+
         normalized_path = path.dup
-        normalized_path, filter_expressions = remove_filter_expressions(normalized_path)
-        normalized_path.gsub!(/'?\.'?|\['?/, ';')    # Replace "'?.'?" or "['?" with ";"
-        normalized_path.gsub!(/;;;|;;/, ';..;')      # Replace ";;;" or ";;" with ";..;"
-        normalized_path.gsub!(/;\z|'?\]|'\z/, '')    # Replace ";$" or "'?]" or "'$" with ""
-        normalized_path = restore_filter_expressions(normalized_path, filter_expressions)
-        normalized_path.gsub!(/\A\$(;|\z)/, '')      # Remove root operator
+        filter_expressions = remove_filter_expressions!(normalized_path)
+        replace_tokens!(normalized_path)
+        restore_filter_expressions!(normalized_path, filter_expressions)
+        remove_root!(normalized_path)
         normalized_path = normalized_path.split(';') # Split into segment parts
-        normalized_path.reject! do |segment|         # Get rid of any blank segments
-          segment.nil? || segment.size == 0
-        end
+        normalized_path.reject! { |segment| segment.nil? || segment.size.zero? } # Remove blanks
         Enumpath.log('Path normalized') { { original: path, normalized: normalized_path } }
         normalized_path
       end
 
       # Move filter expressions (`[?(expr)]`) to the temporary array and replace with an index notation
-      def remove_filter_expressions(path)
+      def remove_filter_expressions!(path)
         filter_expressions = []
-        stripped_path = path.gsub(FILTER_EXPRESSION_REGEX) do
-          filter_expressions << $1
+        path.gsub!(FILTER_EXPRESSION_REGEX) do
+          filter_expressions << Regexp.last_match(1)
           "[##{filter_expressions.size - 1}]"
         end
-        [stripped_path, filter_expressions]
+        filter_expressions
+      end
+
+      def replace_tokens!(path)
+        path.gsub!(/'?\.'?|\['?/, ';') # Replace "'?.'?" or "['?" with ";"
+        path.gsub!(/;;;|;;/, ';..;')   # Replace ";;;" or ";;" with ";..;"
+        path.gsub!(/;\z|'?\]|'\z/, '') # Replace ";$" or "'?]" or "'$" with ""
       end
 
       # Replace index notations with their corresponding filter expressions (`?(expr)`) from the temporary array
-      def restore_filter_expressions(path_expression, filter_expressions)
-        path_expression.gsub(INDEX_NOTATION_REGEX) { filter_expressions[$1.to_i] }
+      def restore_filter_expressions!(path, filter_expressions)
+        path.gsub!(INDEX_NOTATION_REGEX) do
+          filter_expressions[Regexp.last_match(1).to_i]
+        end
+      end
+
+      def remove_root!(path)
+        path.gsub!(/\A\$(;|\z)/, '') # Remove root operator
       end
     end
   end

data/lib/enumpath/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumpath
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: enumpath
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Bloom
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: to_regexp
+  name: mini_cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: mini_cache
+  name: to_regexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: null-logger
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
 description: |
   Enumpath is an implementation of the JSONPath spec for Ruby objects,
   plus some added sugar. It's like Ruby's native Enumerable#dig method,
@@ -131,15 +159,19 @@ description: |
   (Extract, Transform, Load) processes by allowing you to define paths
   through your data in a simple, easily readable, easily storable syntax.
 email:
-- open-source@youearnedit.com
 - chrisbloom7@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/greetings.yml"
+- ".github/workflows/rubocop-analysis.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
@@ -167,11 +199,11 @@ files:
 - lib/enumpath/resolver/simple.rb
 - lib/enumpath/results.rb
 - lib/enumpath/version.rb
-homepage: https://github.com/youearnedit/enumpath
+homepage: https://github.com/chrisbloom7/enumpath
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,9 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A JSONPath-compatible library for navigating nested Ruby objects using path
   expressions

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1