jsonpathv2 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201b3003cb94eb5886d93deaa0461d4870a9aa4b
-  data.tar.gz: 349b5bf6214dca4bfae76d07ca44b936aa2e0d4b
+  metadata.gz: f23e4231290ad706db184bb34ab670e849963295
+  data.tar.gz: c8855a86cff8cc2fa40054f782bc006bd7b42f3d
 SHA512:
-  metadata.gz: 094045c7c6e8cc3b7ad100e5094aaa15dfc42c4a9932872d66f5ac41ab6001d171753e1218ecad046f6b91074a208e7fad7a7c3330b5bb2ea5d0c210adc4d036
-  data.tar.gz: b343a18a2c68bec865368d9ae763b634760f9f6659183a415f47133e8f7b7b3f21b5448f81773f7cc7307a5e5b8cba950345a025fc7ccb97acd3c1bf457a69ab
+  metadata.gz: da31e03333972e227a8ec457c03cba2fe35efb714245ee8427f479f8414e0e9dad11973ea309d2895e598f8c75e1833fce5c5f6d8c41903c36bbfa1de0418ba6
+  data.tar.gz: c3750c04010e7fd14e78e8b9b88cbca3cd9e057b71a181692519854551b634786a78813f4e51695788ca9c933e2814d0901eff86facc54019d4b32c30f57ba46

data/ROADMAP.md

@@ -1,6 +1,9 @@
 Roadmap for JsonPath
 ====================
 
+*0.1.0*
+
+  * Get rid of eval. Or replace it with something sensible. 
 
 *0.0.3*
 -------

data/lib/jsonpathv2/enumerable.rb

@@ -29,7 +29,7 @@ class JsonPath
         handle_wildecard(node, expr, context, key, pos, &blk)
       else
         if pos == (@path.size - 1) && node && allow_eval?
-          yield_value(blk, context, key) if eval("node #{@path[pos]}")
+          yield_value(blk, context, key) if instance_eval("node #{@path[pos]}")
         end
       end
 
@@ -116,9 +116,13 @@ class JsonPath
       return nil unless allow_eval? && @_current_node
 
       identifiers = /@?(\.(\w+))+/.match(exp)
+      # puts JsonPath.on(@_current_node, "#{identifiers}") unless identifiers.nil? ||
+      #                                                           @_current_node
+      #                                                           .methods
+      #                                                           .include?(identifiers[2].to_sym)
 
-      if !identifiers.nil? &&
-         !@_current_node.methods.include?(identifiers[2].to_sym)
+      unless identifiers.nil? ||
+             @_current_node.methods.include?(identifiers[2].to_sym)
 
         exp_to_eval = exp.dup
         exp_to_eval[identifiers[0]] = identifiers[0].split('.').map do |el|
@@ -126,12 +130,13 @@ class JsonPath
         end.join
 
         begin
-          return eval(exp_to_eval)
+          return instance_eval(exp_to_eval)
           # if eval failed because of bad arguments or missing methods
         rescue StandardError
           return default
         end
       end
+
       # otherwise eval as is
       # TODO: this eval is wrong, because hash accessor could be nil and nil
       # cannot be compared with anything, for instance,
@@ -139,7 +144,7 @@ class JsonPath
       # node, but it's only in several nodes I wrapped this eval into rescue
       # returning false when error, but this eval should be refactored.
       begin
-        eval(exp.gsub(/@/, '@_current_node'))
+        instance_eval(exp.gsub(/@/, '@_current_node'))
       rescue
         false
       end

data/lib/jsonpathv2/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonpathv2
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Gergely Brautigam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json