Merge pull request #250 from Shopify/master0.10.0

refactoring, test coverage and github hook

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb
index b0471f2..09f9781 100644
--- a/lib/oxidized/config/vars.rb
+++ b/lib/oxidized/config/vars.rb
@@ -3,12 +3,12 @@ module Oxidized::Config::Vars
   # nil values will be ignored
   def vars name
     r = @node.vars[name] unless @node.vars.nil?
-    if Oxidized::CFG.groups.has_key?(@node.group)
-      if Oxidized::CFG.groups[@node.group].vars.has_key?(name.to_s)
-        r ||= Oxidized::CFG.groups[@node.group].vars[name.to_s]
+    if Oxidized.config.groups.has_key?(@node.group)
+      if Oxidized.config.groups[@node.group].vars.has_key?(name.to_s)
+        r ||= Oxidized.config.groups[@node.group].vars[name.to_s]
       end
     end
-    r ||= Oxidized::CFG.vars[name.to_s] if Oxidized::CFG.vars.has_key?(name.to_s)
+    r ||= Oxidized.config.vars[name.to_s] if Oxidized.config.vars.has_key?(name.to_s)
     r
   end
 end