jmespath 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2892bed3a7fb6f4285e9120e0f062cde8ef8aab2
-  data.tar.gz: 1fac588695e21b8f26ec71b286b998c2abe1f3bb
+  metadata.gz: 9294e09435c687e359584f73e0ee3426c12996f2
+  data.tar.gz: c7baca0f257df2ba6fbf0b4fe08f3bc653836e26
 SHA512:
-  metadata.gz: f55a519231ac35c9f680d2b8db88e21fe9f7ff84ee0c189a35600e0751eb82b536193363c1f0fcbba298932b325bdefde1b209f46db9e92aac0c88b84fd2d2a2
-  data.tar.gz: 9ff7f1d9b5774ee3229009cd0f555ff4fcf0df3bffafedd3300de7388163ba9f95617696c1efc93ca03f81b32bd251917649fc907e354c5c0768fcf696718073
+  metadata.gz: d4a4eb1b6d4caea187a719a21ba0a2377ae4ad60e48553d51a41df20be244a3c526418b5bc533158cd86ecafa82bacce2cf69ce1015b3e015b63e5dfa0190b84
+  data.tar.gz: aa4c37e16951b1463821cfbda071b5362fb9abd0241a9eacdfa6d9dc511d1e07d687a9ae040f29f752ddff61cd33cf4b4567fe59ef29df89a0f158b82dcc93c6

data/lib/jmespath.rb

@@ -1,34 +1,19 @@
-if Object.const_defined?(:JSON) && JSON::VERSION < '1.8.1'
-  warn("WARNING: jmespath gem requires json gem >= 1.8.1; json #{JSON::VERSION} already loaded")
-else
-  begin
-    # Attempt to load the native version if available, not availble
-    # by default for Ruby 1.9.3.
-    gem('json', '>= 1.8.1')
-    require 'json'
-  rescue Gem::LoadError
-    # Fallback on the json_pure gem dependency.
-    gem('json_pure', '>= 1.8.1')
-    require 'json'
-  end
-end
-
+require 'json'
 require 'stringio'
 require 'pathname'
 
 module JMESPath
 
-  autoload :CachingParser, 'jmespath/caching_parser'
-  autoload :Errors, 'jmespath/errors'
-  autoload :ExprNode, 'jmespath/expr_node'
-  autoload :Lexer, 'jmespath/lexer'
-  autoload :Nodes, 'jmespath/nodes'
-  autoload :Parser, 'jmespath/parser'
-  autoload :Runtime, 'jmespath/runtime'
-  autoload :Token, 'jmespath/token'
-  autoload :TokenStream, 'jmespath/token_stream'
-  autoload :Util, 'jmespath/util'
-  autoload :VERSION, 'jmespath/version'
+  require 'jmespath/caching_parser'
+  require 'jmespath/errors'
+  require 'jmespath/lexer'
+  require 'jmespath/nodes'
+  require 'jmespath/parser'
+  require 'jmespath/runtime'
+  require 'jmespath/token'
+  require 'jmespath/token_stream'
+  require 'jmespath/util'
+  require 'jmespath/version'
 
   class << self
 

data/lib/jmespath/lexer.rb

@@ -243,7 +243,7 @@ module JMESPath
           token = inside(chars, '"', T_QUOTED_IDENTIFIER)
           if token.type == T_QUOTED_IDENTIFIER
             token.value = "\"#{token.value}\""
-            token = parse_json(token)
+            token = parse_json(token, true)
           end
           tokens << token
         when STATE_EQ
@@ -295,13 +295,36 @@ module JMESPath
       Token.new(type, buffer.join, position)
     end
 
-    def parse_json(token)
-      begin
-        token.value = JSON.load(token.value)
-      rescue JSON::ParserError
-        token.type = T_UNKNOWN
+    if RUBY_VERSION.match(Regexp.escape('1.9.3'))
+      def parse_json(token, quoted = false)
+        begin
+          if quoted
+            token.value = JSON.load("{\"value\":#{token.value}}")['value']
+          else
+            begin
+              token.value = JSON.load("{\"value\":#{token.value}}")['value']
+            rescue
+              token.value = JSON.load(sprintf('{"value":"%s"}', token.value.lstrip))['value']
+            end
+          end
+        rescue JSON::ParserError
+          token.type = T_UNKNOWN
+        end
+        token
+      end
+    else
+      def parse_json(token, quoted = false)
+        begin
+          if quoted
+            token.value = JSON.load(token.value)
+          else
+            token.value = JSON.load(token.value) rescue JSON.load(sprintf('"%s"', token.value.lstrip))
+          end
+        rescue JSON::ParserError
+          token.type = T_UNKNOWN
+        end
+        token
       end
-      token
     end
 
     class CharacterStream

data/lib/jmespath/nodes.rb

@@ -17,28 +17,29 @@ module JMESPath
         false
       end
     end
+    
+    require  'jmespath/nodes/subexpression'
+    require  'jmespath/nodes/and'
+    require  'jmespath/nodes/comparator'
+    require  'jmespath/nodes/comparator'
+    require  'jmespath/nodes/condition'
+    require  'jmespath/nodes/current'
+    require  'jmespath/nodes/expression'
+    require  'jmespath/nodes/field'
+    require  'jmespath/nodes/flatten'
+    require  'jmespath/nodes/function'
+    require  'jmespath/nodes/index'
+    require  'jmespath/nodes/literal'
+    require  'jmespath/nodes/multi_select_hash'
+    require  'jmespath/nodes/multi_select_list'
+    require  'jmespath/nodes/not'
+    require  'jmespath/nodes/or'
+    require  'jmespath/nodes/pipe'
+    require  'jmespath/nodes/projection'
+    require  'jmespath/nodes/projection'
+    require  'jmespath/nodes/projection'
+    require  'jmespath/nodes/slice'
 
-    autoload :And, 'jmespath/nodes/and'
-    autoload :Comparator, 'jmespath/nodes/comparator'
-    autoload :Comparators, 'jmespath/nodes/comparator'
-    autoload :Condition, 'jmespath/nodes/condition'
-    autoload :Current, 'jmespath/nodes/current'
-    autoload :Expression, 'jmespath/nodes/expression'
-    autoload :Field, 'jmespath/nodes/field'
-    autoload :Flatten, 'jmespath/nodes/flatten'
-    autoload :Function, 'jmespath/nodes/function'
-    autoload :Index, 'jmespath/nodes/index'
-    autoload :Literal, 'jmespath/nodes/literal'
-    autoload :MultiSelectHash, 'jmespath/nodes/multi_select_hash'
-    autoload :MultiSelectList, 'jmespath/nodes/multi_select_list'
-    autoload :Not, 'jmespath/nodes/not'
-    autoload :Or, 'jmespath/nodes/or'
-    autoload :Pipe, 'jmespath/nodes/pipe'
-    autoload :Projection, 'jmespath/nodes/projection'
-    autoload :ArrayProjection, 'jmespath/nodes/projection'
-    autoload :ObjectProjection, 'jmespath/nodes/projection'
-    autoload :Slice, 'jmespath/nodes/slice'
-    autoload :Subexpression, 'jmespath/nodes/subexpression'
 
   end
 end

data/lib/jmespath/nodes/function.rb

@@ -361,7 +361,7 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          String === value ? value : JSON.dump(value)
+          String === value ? value : value.to_json
         else
           return maybe_raise Errors::InvalidArityError, "function to_string() expects one argument"
         end
@@ -424,14 +424,22 @@ module JMESPath
         if args.count == 1
           value = args.first
           if Array === value
-            value.sort do |a, b|
-              a_type = get_type(a)
-              b_type = get_type(b)
-              if (a_type == STRING_TYPE || a_type == NUMBER_TYPE) && a_type == b_type
-                a <=> b
-              else
-                return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
+            # every element in the list must be of the same type
+            array_type = get_type(value[0])
+            if array_type == STRING_TYPE || array_type == NUMBER_TYPE || value.size == 0
+              # stable sort
+              n = 0
+              value.sort_by do |v|
+                value_type = get_type(v)
+                if value_type != array_type
+                  msg = "function sort() expects values to be an array of only numbers, or only integers"
+                  return maybe_raise Errors::InvalidTypeError, msg
+                end
+                n += 1
+                [v, n]
               end
+            else
+              return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
             end
           else
             return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
@@ -452,16 +460,22 @@ module JMESPath
           if get_type(args[0]) == ARRAY_TYPE && get_type(args[1]) == EXPRESSION_TYPE
             values = args[0]
             expression = args[1]
-            values.sort do |a,b|
-              a_value = expression.eval(a)
-              b_value = expression.eval(b)
-              a_type = get_type(a_value)
-              b_type = get_type(b_value)
-              if (a_type == STRING_TYPE || a_type == NUMBER_TYPE) && a_type == b_type
-                a_value <=> b_value
-              else
-                return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
+            array_type = get_type(expression.eval(values[0]))
+            if array_type == STRING_TYPE || array_type == NUMBER_TYPE || values.size == 0
+              # stable sort the list
+              n = 0
+              values.sort_by do |value|
+                value = expression.eval(value)
+                value_type = get_type(value)
+                if value_type != array_type
+                  msg = "function sort() expects values to be an array of only numbers, or only integers"
+                  return maybe_raise Errors::InvalidTypeError, msg
+                end
+                n += 1
+                [value, n]
               end
+            else
+              return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
             end
           else
             return maybe_raise Errors::InvalidTypeError, "function sort_by() expects an array and an expression"

data/lib/jmespath/parser.rb

@@ -46,7 +46,7 @@ module JMESPath
 
     # @api private
     def method_missing(method_name, *args)
-      if matches = method_name.match(/^(nud_|led_)(.*)/)
+      if matches = method_name.to_s.match(/^(nud_|led_)(.*)/)
         raise Errors::SyntaxError, "unexpected token #{matches[2]}"
       else
         super
@@ -155,6 +155,10 @@ module JMESPath
       parse_wildcard_object(stream, CURRENT_NODE)
     end
 
+    def nud_unknown(stream)
+      raise Errors::SyntaxError, "unknown token #{stream.token.value.inspect}"
+    end
+
     def led_comparator(stream, left)
       token = stream.token
       stream.next

data/lib/jmespath/util.rb

@@ -8,15 +8,11 @@ module JMESPath
       #   https://github.com/jmespath/jmespath.site/blob/master/docs/proposals/improved-filters.rst#and-expressions-1
       #
       def falsey?(value)
-        value.nil? ||
-        value === false ||
-        value == '' ||
-        value == {} ||
-        value == [] ||
-        (value.respond_to?(:entries) && value.entries.compact.empty?)
+        !value ||
+        (value.respond_to?(:empty?) && value.empty?) ||
+        (value.respond_to?(:entries) && !value.entries.any?)
         # final case necessary to support Enumerable and Struct
       end
-
     end
   end
 end

data/lib/jmespath/version.rb

@@ -1,3 +1,3 @@
 module JMESPath
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Trevor Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
+date: 2016-07-07 00:00:00.000000000 Z
+dependencies: []
 description: Implements JMESPath for Ruby
 email: trevorrowe@gmail.com
 executables: []
@@ -80,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: JMESPath - Ruby Edition