Rebased from master

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb
index bf28ae7..c4523f3 100644
--- a/lib/oxidized/manager.rb
+++ b/lib/oxidized/manager.rb
@@ -7,11 +7,11 @@ module Oxidized
     class << self
       def load dir, file
         begin
-          require File.join dir, file+'.rb'
+          require File.join dir, file + '.rb'
           klass = nil
           [Oxidized, Object].each do |mod|
             klass = mod.constants.find { |const| const.to_s.downcase == file.downcase }
-            klass = mod.constants.find { |const| const.to_s.downcase == 'oxidized'+ file.downcase } unless klass
+            klass = mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase } unless klass
             klass = mod.const_get klass if klass
             break if klass
           end
@@ -31,16 +31,19 @@ module Oxidized
       @source = {}
       @hook = {}
     end
+
     def add_input method
       method = Manager.load Config::InputDir, method
       return false if method.empty?
       @input.merge! method
     end
+
     def add_output method
       method = Manager.load Config::OutputDir, method
       return false if method.empty?
       @output.merge! method
     end
+
     def add_model _model
       name = _model
       _model = Manager.load File.join(Config::Root, 'model'), name
@@ -48,14 +51,16 @@ module Oxidized
       return false if _model.empty?
       @model.merge! _model
     end
+
     def add_source _source
-      return nil if @source.key? _source
+      return nil if @source.has_key? _source
       _source = Manager.load Config::SourceDir, _source
       return false if _source.empty?
       @source.merge! _source
     end
+
     def add_hook _hook
-      return nil if @hook.key? _hook
+      return nil if @hook.has_key? _hook
       name = _hook
       _hook = Manager.load File.join(Config::Root, 'hook'), name
       _hook = Manager.load Config::HookDir, name if _hook.empty?