4 files changed, 28 insertions, 9 deletions
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index a0ce848..d498e0b 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -20,18 +20,20 @@ class CSV < Source
     nodes = []
     open(File.expand_path @cfg.file).each_line do |line|
       next if line.match(/^\s*#/)
-      data  = line.chomp.split @cfg.delimiter
+      data  = line.chomp.split(@cfg.delimiter, -1)
       next if data.empty?
       # 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
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = data[position].to_s.empty? ? nil : data[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate data[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 93361a2..4fd388b 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -20,6 +20,7 @@ class HTTP < Source
     uri = URI.parse(@cfg.url)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if uri.scheme == 'https'
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @cfg.secure
 
     # map headers
     headers = {}
@@ -39,13 +40,15 @@ 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
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = line[position].to_s.empty? ? nil : line[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate line[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys
diff --git a/lib/oxidized/source/source.rb b/lib/oxidized/source/source.rb
index 7862dd1..9b8bc94 100644
--- a/lib/oxidized/source/source.rb
+++ b/lib/oxidized/source/source.rb
@@ -1,11 +1,23 @@
 module Oxidized
   class Source
     class NoConfig < OxidizedError; end
+
     def initialize
       @map = (Oxidized.config.model_map or {})
     end
+
     def map_model model
       @map.has_key?(model) ? @map[model] : model
     end
+
+    def node_var_interpolate var
+       case var
+       when "nil"   then nil
+       when "false" then false
+       when "true"  then true
+       else var
+       end
+    end
+
   end
 end
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index fc1caa8..13fc39b 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -26,12 +26,14 @@ 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
       vars = {}
-      @cfg.vars_map.each { |key, sql_column| vars[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.vars_map.each do |key, sql_column|
+        vars[key.to_sym] = node_var_interpolate node[sql_column.to_sym]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys