Removed conditional construction from Source

kevinrutherford · Jun 15, 2009 · b3f2406 · b3f2406
1 parent 8d5e4b8
commit b3f2406
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/reek/sniffer.rb b/lib/reek/sniffer.rb
@@ -67,8 +67,8 @@ def smell_listeners()
       @detectors
     end
 
-    def load_local(file)
-      path = File.expand_path(file)
+    def configure_using(filename)
+      path = File.expand_path(File.dirname(filename))
       all_reekfiles(path).each do |rfile|
         YAML.load_file(rfile).push_keys(@config)
       end

diff --git a/lib/reek/source.rb b/lib/reek/source.rb
@@ -46,7 +46,8 @@ def self.from_f(file)
     #
     def self.from_path(filename)
       code = IO.readlines(filename).join
-      return new(code, filename, File.dirname(filename))
+      sniffer = Sniffer.new.configure_using(filename)
+      return new(code, filename, sniffer)
     end
 
     #
@@ -58,11 +59,10 @@ def self.from_pathlist(paths)
       SourceList.new(sources)
     end
 
-    def initialize(code, desc, dir = nil)     # :nodoc:
+    def initialize(code, desc, sniffer = Sniffer.new)     # :nodoc:
       @source = code
       @desc = desc
-      @sniffer = Sniffer.new
-      @sniffer = @sniffer.load_local(dir) if dir
+      @sniffer = sniffer
     end
 
     def generate_syntax_tree