Refactoring.

gilesbowkett · Oct 4, 2008 · b7b0a77 · b7b0a77
1 parent 3e7dfcd
commit b7b0a77
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/lib/console.erb → lib/duplicates.erb b/lib/console.erb → lib/duplicates.erb
diff --git a/lib/node_analysis.rb b/lib/node_analysis.rb
@@ -3,9 +3,6 @@ module NodeAnalysis
     def duplication?
       not duplicates.empty?
     end
-    def duplicated
-      duplicates
-    end
     def duplicates
       (@method_definitions.collect do |node|
         node if @method_definitions.duplicates? node

diff --git a/lib/text.erb b/lib/text.erb
diff --git a/lib/towelie.rb b/lib/towelie.rb
@@ -6,13 +6,14 @@
 class Towelie
   def initialize
     @model = Model.new
-    @view = View.new("console.erb")
+    @view = View.new
   end
   def parse(dir)
     @model.parse(dir)
   end
-  delegate_thru_view :duplicated
   def duplicates
-    @view.render(:nodes => @model.duplicates, :unique_nodes => @model.duplicates.uniq)
+    @view.render(:template => "duplicates.erb",
+                 :nodes => @model.duplicates,
+                 :unique_nodes => @model.duplicates.uniq)
   end
 end
diff --git a/lib/view.rb b/lib/view.rb
@@ -1,11 +1,8 @@
 class View
-  def initialize(template_name)
-    @template_name = template_name
-  end
   def to_ruby(nodes)
     Ruby2Ruby.new.process(nodes) + "\n"
   end
   def render(options = {})
-    ERB.new(File.read("#{File.dirname(__FILE__) + "/" + @template_name}"), nil, ">").result(binding)
+    ERB.new(File.read("#{File.dirname(__FILE__) + "/" + options[:template]}"), nil, ">").result(binding)
   end
 end
diff --git a/spec/model_spec.rb b/spec/model_spec.rb
@@ -117,10 +117,10 @@
   end
   it "isolates duplicated blocks" do
     @model.parse("spec/test_data")
-    @model.duplicated.should == @duplicated_nodes
+    @model.duplicates.should == @duplicated_nodes
 
     @model.parse("spec/classes_modules")
-    @model.duplicated.should == @duplicated_nodes
+    @model.duplicates.should == @duplicated_nodes
   end
   it "reports unique code" do
     @model.parse("spec/test_data")