Fixed a problem where deleting slices was not working. (#90)

Skarlso · web-flow · commit e2d2e8a62244 · 2018-07-08T10:04:33.000+02:00
* Fixed a problem where deleting slices was not working.

* Ran a rubocop fix.

* Added rubocop run.

* Added rubocop todo

* Updated rescue.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -0,0 +1,112 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-07-07 21:29:45 +0200 using RuboCop version 0.57.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 15
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/jsonpath.rb'
+    - 'lib/jsonpath/parser.rb'
+
+# Offense count: 1
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'lib/jsonpath.rb'
+
+# Offense count: 16
+Metrics/AbcSize:
+  Max: 54
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 33
+
+# Offense count: 1
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 4
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 578
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 18
+
+# Offense count: 24
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 52
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 6
+Metrics/PerceivedComplexity:
+  Max: 20
+
+# Offense count: 1
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:
+  Exclude:
+    - 'lib/jsonpath/parser.rb'
+
+# Offense count: 2
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/jsonpath/enumerable.rb'
+    - 'lib/jsonpath/proxy.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/jsonpath/enumerable.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/jsonpath/enumerable.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/jsonpath/enumerable.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/jsonpath/parser.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Exclude:
+    - 'lib/jsonpath/enumerable.rb'
+    - 'lib/jsonpath/parser.rb'
+
+# Offense count: 71
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 175
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+language: ruby
 rvm:
   - 2.1.6
   - 2.3.1
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,6 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'http://rubygems.org'
 gemspec
-gem 'simplecov', :require => false, :group => :test
+gem 'rubocop', require: true, group: :test
+gem 'simplecov', require: false, group: :test
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,12 @@
+# frozen_string_literal: true
+
+desc 'run rubocop'
+task(:rubocop) do
+  require 'rubocop'
+  cli = RuboCop::CLI.new
+  cli.run
+end
+
 require 'simplecov'
 SimpleCov.start do
   add_filter '/test/'
@@ -11,4 +20,4 @@ task :test do
   Dir['./test/**/test_*.rb'].each { |test| require test }
 end
 
-task default: :test
+task default: %i[test rubocop]
diff --git a/bin/jsonpath b/bin/jsonpath
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'jsonpath'
 require 'multi_json'
diff --git a/jsonpath.gemspec b/jsonpath.gemspec
@@ -1,12 +1,14 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require File.join(File.dirname(__FILE__), 'lib', 'jsonpath', 'version')
 
 Gem::Specification.new do |s|
   s.name = 'jsonpath'
   s.version = JsonPath::VERSION
-  s.required_rubygems_version =
-    Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  if s.respond_to? :required_rubygems_version=
+    s.required_rubygems_version =
+      Gem::Requirement.new('>= 0')
+  end
   s.authors = ['Joshua Hull', 'Gergely Brautigam']
   s.summary = 'Ruby implementation of http://goessner.net/articles/JsonPath/'
   s.description = 'Ruby implementation of http://goessner.net/articles/JsonPath/.'
@@ -25,10 +27,9 @@ Gem::Specification.new do |s|
   # dependencies
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'to_regexp', '~> 0.2.1'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'code_stats'
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest', '~> 2.2.0'
   s.add_development_dependency 'phocus'
-  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
 end
-
diff --git a/lib/jsonpath.rb b/lib/jsonpath.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'strscan'
 require 'multi_json'
 require 'jsonpath/proxy'
@@ -8,7 +10,7 @@
 # JsonPath: initializes the class with a given JsonPath and parses that path
 # into a token array.
 class JsonPath
-  PATH_ALL = '$..*'.freeze
+  PATH_ALL = '$..*'
 
   attr_accessor :path
 
@@ -73,7 +75,7 @@ def enum_on(obj_or_str, mode = nil)
     JsonPath::Enumerable.new(self, self.class.process_object(obj_or_str), mode,
                              @opts)
   end
-  alias_method :[], :enum_on
+  alias [] enum_on
 
   def self.on(obj_or_str, path, opts = {})
     new(path, opts).on(process_object(obj_or_str))
diff --git a/lib/jsonpath/enumerable.rb b/lib/jsonpath/enumerable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class JsonPath
   class Enumerable
     include ::Enumerable
@@ -32,7 +34,7 @@ def each(context = @object, key = nil, pos = 0, &blk)
 
     private
 
-    def handle_wildecard(node, expr, context, key, pos, &blk)
+    def handle_wildecard(node, expr, _context, _key, pos, &blk)
       expr[1, expr.size - 2].split(',').each do |sub_path|
         case sub_path[0]
         when '\'', '"'
@@ -60,27 +62,32 @@ def handle_wildecard(node, expr, context, key, pos, &blk)
           end_idx %= node.size
           step = process_function_or_literal(array_args[2], 1)
           next unless step
-          (start_idx..end_idx).step(step) { |i| each(node, i, pos + 1, &blk) }
+          if @mode == :delete
+            (start_idx..end_idx).step(step) { |i| node[i] = nil }
+            node.compact!
+          else
+            (start_idx..end_idx).step(step) { |i| each(node, i, pos + 1, &blk) }
+          end
         end
       end
     end
 
     def handle_question_mark(sub_path, node, pos, &blk)
       case node
-        when Array
-          node.size.times do |index|
-            @_current_node = node[index]
-            # exps = sub_path[1, sub_path.size - 1]
-            # if @_current_node.send("[#{exps.gsub(/@/, '@_current_node')}]")
-              if process_function_or_literal(sub_path[1, sub_path.size - 1])
-                each(@_current_node, nil, pos + 1, &blk)
-              end
-            end
-        when Hash
+      when Array
+        node.size.times do |index|
+          @_current_node = node[index]
+          # exps = sub_path[1, sub_path.size - 1]
+          # if @_current_node.send("[#{exps.gsub(/@/, '@_current_node')}]")
           if process_function_or_literal(sub_path[1, sub_path.size - 1])
             each(@_current_node, nil, pos + 1, &blk)
           end
-          else
+        end
+      when Hash
+        if process_function_or_literal(sub_path[1, sub_path.size - 1])
+          each(@_current_node, nil, pos + 1, &blk)
+        end
+      else
         yield node if process_function_or_literal(sub_path[1, sub_path.size - 1])
       end
     end
diff --git a/lib/jsonpath/parser.rb b/lib/jsonpath/parser.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'strscan'
 require 'to_regexp'
 
@@ -23,7 +25,7 @@ def parse(exp)
     end
 
     def parse_exp(exp)
-      exp = exp.sub(/@/, '').gsub(/^\(/, '').gsub(/\)$/, '').gsub(/"/, '\'').strip
+      exp = exp.sub(/@/, '').gsub(/^\(/, '').gsub(/\)$/, '').tr('"', '\'').strip
       scanner = StringScanner.new(exp)
       elements = []
       until scanner.eos?
@@ -39,25 +41,25 @@ def parse_exp(exp)
           operator = t
         elsif t = scanner.scan(/(\s+)?'?.*'?(\s+)?/)
           # If we encounter a node which does not contain `'` it means
-          # that we are dealing with a boolean type.
-          if t == "true"
-            operand = true
-          elsif t == "false"
-            operand = false
-          else
-            operand = operator.strip == "=~" ? t.to_regexp : t.delete("'").strip
-          end
+          #  that we are dealing with a boolean type.
+          operand = if t == 'true'
+                      true
+                    elsif t == 'false'
+                      false
+                    else
+                      operator.strip == '=~' ? t.to_regexp : t.delete("'").strip
+                    end
         elsif t = scanner.scan(/\/\w+\//)
         elsif t = scanner.scan(/.*/)
           raise "Could not process symbol: #{t}"
         end
       end
 
-      if elements.empty?
-        el = @_current_node
-      else
-        el = dig(elements, @_current_node)
-      end
+      el = if elements.empty?
+             @_current_node
+           else
+             dig(elements, @_current_node)
+           end
       return false if el.nil?
       return true if operator.nil? && el
 
diff --git a/lib/jsonpath/proxy.rb b/lib/jsonpath/proxy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class JsonPath
   class Proxy
     attr_reader :obj
diff --git a/lib/jsonpath/version.rb b/lib/jsonpath/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class JsonPath
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.2'
 end
diff --git a/test/test_jsonpath.rb b/test/test_jsonpath.rb
diff --git a/test/test_jsonpath_bin.rb b/test/test_jsonpath_bin.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+language: ruby`
`1`	`2`	`rvm:`
`2`	`3`	`- 2.1.6`
`3`	`4`	`- 2.3.1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/usr/bin/env ruby`
	`2`	`+# frozen_string_literal: true`
`2`	`3`
`3`	`4`	`require 'jsonpath'`
`4`	`5`	`require 'multi_json'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`class JsonPath`
`2`	`4`	`class Proxy`
`3`	`5`	`attr_reader :obj`