Merge pull request #56 from geophilusd/cleanup

Add frozen_string_literal to all files and some static code cleanup

Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 gem 'rake', require: false

Rakefile

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 $GEM_ROOT = File.dirname(__FILE__)
 
-$: << File.join($GEM_ROOT, 'lib')
+$LOAD_PATH << File.join($GEM_ROOT, 'lib')
 
 $VERSION = ENV['VERSION'] || File.read(File.join($GEM_ROOT, 'VERSION'))
 $GITHUB_ACCESS_TOKEN = ENV['JMESPATH_GITHUB_ACCESS_TOKEN']

bin/jmespath.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'jmespath'
 require 'json'

gemfiles/json-latest.gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 eval_gemfile(File.expand_path('../../Gemfile', __FILE__))
 
 gem 'json'

gemfiles/json-old.gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 eval_gemfile(File.expand_path('../../Gemfile', __FILE__))
 
 gem 'json', '< 2.0'

gemfiles/json-pure.gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 eval_gemfile(File.expand_path('../../Gemfile', __FILE__))
 
 gem 'json_pure', require: 'json/pure'

gemfiles/no-deps.gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 eval_gemfile(File.expand_path('../../Gemfile', __FILE__))
 
 # no dependency on `json` gem

jmespath.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Gem::Specification.new do |spec|
   spec.name          = 'jmespath'
   spec.version       = File.read(File.expand_path('../VERSION', __FILE__)).strip
@@ -8,5 +9,5 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://github.com/trevorrowe/jmespath.rb'
   spec.license       = 'Apache-2.0'
   spec.require_paths = ['lib']
-  spec.files         = Dir['lib/**/*.rb'] + %w[LICENSE.txt VERSION]
+  spec.files         = Dir['lib/**/*.rb'] + %w(LICENSE.txt VERSION)
 end

lib/jmespath.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
 require 'json'
 require 'stringio'
 require 'pathname'
 
 module JMESPath
-
   require 'jmespath/caching_parser'
   require 'jmespath/errors'
   require 'jmespath/lexer'
@@ -16,26 +16,24 @@ module JMESPath
   require 'jmespath/version'
 
   class << self
-
     # @param [String] expression A valid
     #   [JMESPath](https://github.com/boto/jmespath) expression.
     # @param [Hash] data
     # @return [Mixed,nil] Returns the matched values. Returns `nil` if the
     #   expression does not resolve inside `data`.
     def search(expression, data, runtime_options = {})
       data = case data
-        when Hash, Struct then data # check for most common case first
-        when Pathname then load_json(data)
-        when IO, StringIO then JSON.parse(data.read)
-        else data
+             when Hash, Struct then data # check for most common case first
+             when Pathname then load_json(data)
+             when IO, StringIO then JSON.parse(data.read)
+             else data
         end
       Runtime.new(runtime_options).search(expression, data)
     end
 
     # @api private
     def load_json(path)
-      JSON.parse(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
+      JSON.parse(File.open(path, 'r', encoding: 'UTF-8', &:read))
     end
-
   end
 end

lib/jmespath/caching_parser.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 require 'thread'
 
 module JMESPath
   class CachingParser
-
     def initialize(options = {})
       @parser = options[:parser] || Parser.new(options)
       @mutex = Mutex.new
@@ -25,6 +25,5 @@ def cache_expression(expression)
         @cache[expression] = @parser.parse(expression)
       end
     end
-
   end
 end

lib/jmespath/errors.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module JMESPath
   module Errors
-
     class Error < StandardError; end
 
     class RuntimeError < Error; end
@@ -14,6 +15,5 @@ class InvalidValueError < Error; end
     class InvalidArityError < Error; end
 
     class UnknownFunctionError < Error; end
-
   end
 end

lib/jmespath/lexer.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 require 'json'
 require 'set'
 
 module JMESPath
   # @api private
   class Lexer
-
     T_DOT = :dot
     T_STAR = :star
     T_COMMA = :comma
@@ -134,14 +134,14 @@ class Lexer
       'w'  => STATE_IDENTIFIER,
       'x'  => STATE_IDENTIFIER,
       'y'  => STATE_IDENTIFIER,
-      'z'  => STATE_IDENTIFIER,
-    }
+      'z'  => STATE_IDENTIFIER
+    }.freeze
 
     VALID_IDENTIFIERS = Set.new(%w(
-      A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-      a b c d e f g h i j k l m n o p q r s t u v w x y z
-      _ 0 1 2 3 4 5 6 7 8 9
-    ))
+                                  A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+                                  a b c d e f g h i j k l m n o p q r s t u v w x y z
+                                  _ 0 1 2 3 4 5 6 7 8 9
+                                ))
 
     NUMBERS = Set.new(%w(0 1 2 3 4 5 6 7 8 9))
 
@@ -155,13 +155,12 @@ class Lexer
       '(' => T_LPAREN,
       ')' => T_RPAREN,
       '{' => T_LBRACE,
-      '}' => T_RBRACE,
-    }
+      '}' => T_RBRACE
+    }.freeze
 
     # @param [String<JMESPath>] expression
     # @return [Array<Hash>]
     def tokenize(expression)
-
       tokens = []
       chars = CharacterStream.new(expression.chars.to_a)
 
@@ -253,7 +252,7 @@ def tokenize(expression)
           tokens << match_or(chars, '&', '&', T_AND, T_EXPREF)
         when STATE_NOT
           # consume not equals
-          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_NOT);
+          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_NOT)
         else
           # either '<' or '>'
           # consume less than and greater than
@@ -321,11 +320,9 @@ def inside(chars, delim, type)
     # if we have to wrap scalar JSON values to parse them or not.
     # @api private
     def self.requires_wrapping?
-      begin
-        JSON.parse('false')
-      rescue JSON::ParserError
-        true
-      end
+      JSON.parse('false')
+    rescue JSON::ParserError
+      true
     end
 
     if requires_wrapping?
@@ -351,7 +348,11 @@ def parse_json(token, quoted = false)
           if quoted
             token.value = JSON.parse(token.value)
           else
-            token.value = JSON.parse(token.value) rescue JSON.parse(sprintf('"%s"', token.value.lstrip))
+            token.value = begin
+                            JSON.parse(token.value)
+                          rescue
+                            JSON.parse(sprintf('"%s"', token.value.lstrip))
+                          end
           end
         rescue JSON::ParserError
           token.type = T_UNKNOWN
@@ -361,7 +362,6 @@ def parse_json(token, quoted = false)
     end
 
     class CharacterStream
-
       def initialize(chars)
         @chars = chars
         @position = 0
@@ -376,10 +376,7 @@ def next
         @chars[@position]
       end
 
-      def position
-        @position
-      end
-
+      attr_reader :position
     end
   end
 end

lib/jmespath/nodes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -9,11 +10,11 @@ def optimize
         self
       end
 
-      def chains_with?(other)
+      def chains_with?(_other)
         false
       end
     end
-    
+
     require  'jmespath/nodes/subexpression'
     require  'jmespath/nodes/and'
     require  'jmespath/nodes/comparator'
@@ -35,7 +36,5 @@ def chains_with?(other)
     require  'jmespath/nodes/projection'
     require  'jmespath/nodes/projection'
     require  'jmespath/nodes/slice'
-
-
   end
 end

lib/jmespath/nodes/and.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 module JMESPath
   module Nodes
     class And < Node
-
       def initialize(left, right)
         @left = left
         @right = right
@@ -19,7 +19,6 @@ def visit(value)
       def optimize
         self.class.new(@left.optimize, @right.optimize)
       end
-
     end
   end
 end

lib/jmespath/nodes/comparator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -35,7 +36,7 @@ def optimize
 
       private
 
-      def check(left_value, right_value)
+      def check(_left_value, _right_value)
         nil
       end
 
@@ -47,7 +48,6 @@ def comparable?(left_value, right_value)
     end
 
     module Comparators
-
       class Eq < Comparator
         def check(left_value, right_value)
           Util.as_json(left_value) == Util.as_json(right_value)
@@ -62,41 +62,25 @@ def check(left_value, right_value)
 
       class Gt < Comparator
         def check(left_value, right_value)
-          if comparable?(left_value, right_value)
-            left_value > right_value
-          else
-            nil
-          end
+          left_value > right_value if comparable?(left_value, right_value)
         end
       end
 
       class Gte < Comparator
         def check(left_value, right_value)
-          if comparable?(left_value, right_value)
-            left_value >= right_value
-          else
-            nil
-          end
+          left_value >= right_value if comparable?(left_value, right_value)
         end
       end
 
       class Lt < Comparator
         def check(left_value, right_value)
-          if comparable?(left_value, right_value)
-            left_value < right_value
-          else
-            nil
-          end
+          left_value < right_value if comparable?(left_value, right_value)
         end
       end
 
       class Lte < Comparator
         def check(left_value, right_value)
-          if comparable?(left_value, right_value)
-            left_value <= right_value
-          else
-            nil
-          end
+          left_value <= right_value if comparable?(left_value, right_value)
         end
       end
     end

lib/jmespath/nodes/condition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -35,7 +36,7 @@ def initialize(left, right, child)
         @child = child
       end
 
-      def visit(value)
+      def visit(_value)
         nil
       end
 

lib/jmespath/nodes/current.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes

lib/jmespath/nodes/expression.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -8,7 +9,7 @@ def initialize(expression)
         @expression = expression
       end
 
-      def visit(value)
+      def visit(_value)
         self
       end
 
@@ -22,4 +23,3 @@ def optimize
     end
   end
 end
-