Merge pull request #3 from ytti/master

Bring Netflix fork in sync with upstream

1 files changed, 23 insertions, 6 deletions

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 4fd388b..7186f98 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -35,19 +35,21 @@ class HTTP < Source
 
     response = http.request(request)
     data = JSON.parse(response.body)
-    data.each do |line|
-      next if line.empty?
+    data.each do |node|
+      next if node.empty?
       # map node parameters
       keys = {}
-      @cfg.map.each do |key, position|
-        keys[key.to_sym] = node_var_interpolate line[position]
+      @cfg.map.each do |key, want_position|
+        want_positions = want_position.split('.')
+        keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
       # map node specific vars
       vars = {}
-      @cfg.vars_map.each do |key, position|
-        vars[key.to_sym] = node_var_interpolate line[position]
+      @cfg.vars_map.each do |key, want_position|
+        want_positions = want_position.split('.')
+        vars[key.to_sym] = node_var_interpolate node.dig(*want_positions)
       end
       keys[:vars] = vars unless vars.empty?
 
@@ -58,3 +60,18 @@ class HTTP < Source
 
 end
 end
+
+if RUBY_VERSION < '2.3'
+  class Hash
+    def dig(key, *rest)
+      value = self[key]
+      if value.nil? || rest.empty?
+        value
+      elsif value.respond_to?(:dig)
+        value.dig(*rest)
+      else # foo.bar.baz (bar exist but is not hash)
+        return nil
+      end
+    end
+  end
+end