summaryrefslogtreecommitdiff
path: root/lib/oxidized/source/source.rb
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2016-09-28 16:14:35 +0300
committerSaku Ytti <saku@ytti.fi>2016-09-28 16:14:35 +0300
commite638e7c9685d375afbfba2949943da1c542dae53 (patch)
treece2f25bfd9fadbb7480360fc7125c1b12ece9a10 /lib/oxidized/source/source.rb
parenta4df8447d7126f3d333a95b97f688421684141e3 (diff)
interpolate node variable values
Empty value was variably considered "" or nil, now it will always be "" string. Now "nil", "false", "true" strings are converted to their respective types nil, false and true. This also means we cannot have verbatim strings by that name, like if your password was "false", you're shit out of luck. If this is the case, we can add some __false__ hack or consider other similar solutions. Fixes #500 Fixes #534 May break stuff with ""/nil changing now, but as it was not consistent to begin with, I find it acceptable. Users now may need to manually enter nil in some fields to regain old behaviour.
Diffstat (limited to 'lib/oxidized/source/source.rb')
-rw-r--r--lib/oxidized/source/source.rb12
1 files changed, 12 insertions, 0 deletions
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