From eff861dc81aed658cbccfcc2ea86b3d7f02d975d Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 6 May 2014 12:28:43 +0300
Subject: require config/vars earlier
- we need config/vars before model
- some whitespace changes
Bump up gemspec
---
lib/oxidized/core.rb | 2 +-
lib/oxidized/model/model.rb | 2 +-
lib/oxidized/source/csv.rb | 2 +-
lib/oxidized/source/sql.rb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'lib')
diff --git a/lib/oxidized/core.rb b/lib/oxidized/core.rb
index 31e7d49..8b7b45e 100644
--- a/lib/oxidized/core.rb
+++ b/lib/oxidized/core.rb
@@ -2,10 +2,10 @@ module Oxidized
require 'oxidized/log'
require 'oxidized/string'
require 'oxidized/config'
+ require 'oxidized/config/vars'
require 'oxidized/worker'
require 'oxidized/nodes'
require 'oxidized/manager'
- require 'oxidized/config/vars'
class << self
def new *args
Core.new args
diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb
index 277a01b..addb981 100644
--- a/lib/oxidized/model/model.rb
+++ b/lib/oxidized/model/model.rb
@@ -1,7 +1,7 @@
module Oxidized
class Model
include Oxidized::Config::Vars
-
+
class << self
def inherited klass
klass.instance_variable_set '@cmd', Hash.new { |h,k| h[k] = [] }
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 113c272..484a186 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -26,7 +26,7 @@ class CSV < Source
keys[key.to_sym] = data[position]
end
keys[:model] = map_model keys[:model] if keys.key? :model
-
+
# map node specific vars, empty value is considered as nil
vars = {}
@cfg.vars_map.each { |key, position| vars[key.to_sym] = data[position].to_s.empty? ? nil : data[position] }
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index a115da8..c744e31 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -39,7 +39,7 @@ class SQL < Source
keys = {}
@cfg.map.each { |key, sql_column| keys[key.to_sym] = 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] }
--
cgit v1.2.3