From 6612535aa3378b99f836b41e675bf8f92a1159e7 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 12 Oct 2016 21:55:38 +0300
Subject: Interpolate also node variables, not just vars map
Fixes #583
---
lib/oxidized/source/csv.rb | 2 +-
lib/oxidized/source/http.rb | 2 +-
lib/oxidized/source/sql.rb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'lib')
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index be5c4a6..d498e0b 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -25,7 +25,7 @@ class CSV < Source
# map node parameters
keys = {}
@cfg.map.each do |key, position|
- keys[key.to_sym] = data[position]
+ keys[key.to_sym] = node_var_interpolate data[position]
end
keys[:model] = map_model keys[:model] if keys.key? :model
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 38387ad..dc1c0b7 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -39,7 +39,7 @@ class HTTP < Source
# map node parameters
keys = {}
@cfg.map.each do |key, position|
- keys[key.to_sym] = line[position]
+ keys[key.to_sym] = node_var_interpolate line[position]
end
keys[:model] = map_model keys[:model] if keys.key? :model
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index ba85447..13fc39b 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -26,7 +26,7 @@ class SQL < Source
query.each do |node|
# map node parameters
keys = {}
- @cfg.map.each { |key, sql_column| keys[key.to_sym] = node[sql_column.to_sym] }
+ @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
keys[:model] = map_model keys[:model] if keys.key? :model
# map node specific vars
--
cgit v1.2.3