view_mapper 0.3.0 → 0.3.1

data/test/{auto_complete_test.rb → views/auto_complete/auto_complete_test.rb}

@@ -1,53 +1,69 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class AutoCompleteViewTest < Test::Unit::TestCase
 
   attr_reader :singular_name
   attr_reader :plural_name
   attr_reader :attributes
-  attr_reader :auto_complete_attribute
+  attr_reader :auto_complete_attributes
   attr_reader :controller_class_name
   attr_reader :table_name
   attr_reader :class_name
   attr_reader :file_name
   attr_reader :controller_singular_name
 
+  context "A view_for generator instantiated for a test model" do
+    setup do
+      setup_test_model
+    end
+
+    should "detect all of the text fields when no auto_complete field is specified" do
+      gen = new_generator_for_test_model('view_for', ['--view', 'auto_complete'])
+      assert_contains         gen.auto_complete_attributes, 'first_name'
+      assert_contains         gen.auto_complete_attributes, 'last_name'
+      assert_contains         gen.auto_complete_attributes, 'address'
+      assert_does_not_contain gen.auto_complete_attributes, 'some_flag'
+    end
+  end
+
+  context "A scaffold_for_view generator instantiated for a test model" do
+    setup do
+      setup_test_model
+    end
+
+    should "return an error message without an auto_complete param" do
+      Rails::Generator::Base.logger.expects('error').with('No auto_complete attribute specified.')
+      new_generator_for_test_model('scaffold_for_view', ['--view', 'auto_complete'])
+    end
+  end
+
   generators = %w{ view_for scaffold_for_view }
   generators.each do |gen|
 
     context "A #{gen} generator instantiated for a test model" do
-      should "return an error message without an auto_complete param" do
-        Rails::Generator::Base.logger.expects('error').with('No auto_complete attribute specified.')
-        new_generator_for_test_model(gen, ['--view', 'auto_complete'])
+      setup do
+        setup_test_model
       end
 
       should "return an error message with a bad auto_complete param" do
         Rails::Generator::Base.logger.expects('error').with('Field \'blah\' does not exist.')
         new_generator_for_test_model(gen, ['--view', 'auto_complete:blah'])
       end
-    end
 
-    context "A #{gen} generator instantiated for a test model with auto_complete on the first_name field" do
-      setup do
-        @gen = new_generator_for_test_model(gen, ['--view', 'auto_complete:first_name'])
-      end
-
-      should "find the auto complete column name" do
-        assert_equal 'first_name', @gen.auto_complete_attribute
-      end
-
-      should "have the correct auto_complete_for method name" do
-        assert_equal 'auto_complete_for_testy_first_name', @gen.auto_complete_for_method
+      should "return an error message when the auto_complete param matches a field that is not a text field" do
+        Rails::Generator::Base.logger.expects('error').with('Field \'some_flag\' is not a text field.')
+        new_generator_for_test_model(gen, ['--view', 'auto_complete:some_flag'])
       end
     end
 
-    context "A #{gen} generator instantiated for a test model with auto_complete on the address field" do
+    context "A #{gen} generator instantiated for a test model with auto_complete on the first and last name fields" do
       setup do
-        @gen = new_generator_for_test_model(gen, ['--view', 'auto_complete:address'])
+        setup_test_model
+        @gen = new_generator_for_test_model(gen, ['--view', 'auto_complete:first_name,last_name'])
       end
 
-      should "return the proper source root folder" do
-        assert_equal './test/../lib/view_mapper/auto_complete_templates', @gen.source_root
+      should "return the proper source root" do
+        assert_equal File.expand_path(File.dirname(__FILE__) + '/../../..//lib/view_mapper/views/auto_complete/templates'), ViewMapper::AutoCompleteView.source_root
       end
 
       view_for_templates = %w{ new edit index show }
@@ -56,19 +72,19 @@ class AutoCompleteViewTest < Test::Unit::TestCase
           @attributes = @gen.attributes
           @singular_name = @gen.singular_name
           @plural_name = @gen.plural_name
-          @auto_complete_attribute = @gen.auto_complete_attribute
-          template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/auto_complete_templates/view_#{template}.html.erb"))
+          @auto_complete_attributes = @gen.auto_complete_attributes
+          template_file = File.open(@gen.source_path("view_#{template}.html.erb"))
           result = ERB.new(template_file.read, nil, '-').result(binding)
-          expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/auto_complete/#{template}.html.erb"))
+          expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/#{template}.html.erb"), 'rb')
           assert_equal expected_file.read, result
         end
       end
 
       should "render the layout template as expected" do
         @controller_class_name = @gen.controller_class_name
-        template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/auto_complete_templates/layout.html.erb"))
+        template_file = File.open(@gen.source_path("layout.html.erb"))
         result = ERB.new(template_file.read, nil, '-').result(binding)
-        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/auto_complete/testies.html.erb"))
+        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/testies.html.erb"))
         assert_equal expected_file.read, result
       end
 
@@ -78,10 +94,10 @@ class AutoCompleteViewTest < Test::Unit::TestCase
         @class_name = @gen.class_name
         @file_name = @gen.file_name
         @controller_singular_name = @gen.controller_singular_name
-        @auto_complete_attribute = @gen.auto_complete_attribute
-        template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/auto_complete_templates/controller.rb"))
+        @auto_complete_attributes = @gen.auto_complete_attributes
+        template_file = File.open(@gen.source_path("controller.rb"))
         result = ERB.new(template_file.read, nil, '-').result(binding)
-        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/auto_complete/testies_controller.rb"))
+        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/testies_controller.rb"))
         assert_equal expected_file.read, result
       end
     end
@@ -100,7 +116,7 @@ class AutoCompleteViewTest < Test::Unit::TestCase
         Rails::Generator::Commands::Create.any_instance.stubs(:dependency)
         Rails::Generator::Base.logger.stubs(:route)
 
-        expected_path = File.dirname(__FILE__) + '/expected_templates/auto_complete'
+        expected_path = File.dirname(__FILE__) + '/expected_templates'
         standard_routes_file = expected_path + '/standard_routes.rb'
         expected_routes_file = expected_path + '/expected_routes.rb'
         test_routes_file = expected_path + '/routes.rb'
@@ -112,17 +128,24 @@ class AutoCompleteViewTest < Test::Unit::TestCase
         assert_equal File.open(expected_routes_file).read, File.open(test_routes_file).read
         File.delete(test_routes_file)
       end
+    end
+  end
 
-      should "not perform any actions when run on the #{gen} generator with no auto_complete field" do
-        Rails::Generator::Commands::Create.any_instance.expects(:directory).never
-        Rails::Generator::Commands::Create.any_instance.expects(:template).never
-        Rails::Generator::Commands::Create.any_instance.expects(:route_resources).never
-        Rails::Generator::Commands::Create.any_instance.expects(:file).never
-        Rails::Generator::Commands::Create.any_instance.expects(:route).never
-        Rails::Generator::Base.logger.stubs(:error)
-        Rails::Generator::Base.logger.stubs(:route)
-        @generator_script.run(generator_script_cmd_line(gen, ['--view', 'auto_complete']))
-      end
+  context "A Rails generator script" do
+    setup do
+      setup_test_model
+      @generator_script = Rails::Generator::Scripts::Generate.new
+    end
+
+    should "not perform any actions when run on the scaffold_for_view generator with no auto_complete field" do
+      Rails::Generator::Commands::Create.any_instance.expects(:directory).never
+      Rails::Generator::Commands::Create.any_instance.expects(:template).never
+      Rails::Generator::Commands::Create.any_instance.expects(:route_resources).never
+      Rails::Generator::Commands::Create.any_instance.expects(:file).never
+      Rails::Generator::Commands::Create.any_instance.expects(:route).never
+      Rails::Generator::Base.logger.stubs(:error)
+      Rails::Generator::Base.logger.stubs(:route)
+      @generator_script.run(generator_script_cmd_line('scaffold_for_view', ['--view', 'auto_complete']))
     end
   end
 

data/test/{expected_templates/auto_complete/index.html.erb → views/auto_complete/expected_templates/actual_index}

@@ -5,6 +5,7 @@
     <th>First name</th>
     <th>Last name</th>
     <th>Address</th>
+    <th>Some flag</th>
   </tr>
 
 <% @testies.each do |testy| %>
@@ -12,6 +13,7 @@
     <td><%=h testy.first_name %></td>
     <td><%=h testy.last_name %></td>
     <td><%=h testy.address %></td>
+    <td><%=h testy.some_flag %></td>
     <td><%= link_to 'Show', testy %></td>
     <td><%= link_to 'Edit', edit_testy_path(testy) %></td>
     <td><%= link_to 'Destroy', testy, :confirm => 'Are you sure?', :method => :delete %></td>

data/test/{expected_templates/auto_complete → views/auto_complete/expected_templates}/edit.html.erb

@@ -4,15 +4,19 @@
   <%= f.error_messages %>
   <p>
     <%= f.label :first_name %><br />
-    <%= f.text_field :first_name %>
+    <%= text_field_with_auto_complete :testy, :first_name, {}, { :method => :get } %>
   </p>
   <p>
     <%= f.label :last_name %><br />
-    <%= f.text_field :last_name %>
+    <%= text_field_with_auto_complete :testy, :last_name, {}, { :method => :get } %>
   </p>
   <p>
     <%= f.label :address %><br />
-    <%= text_field_with_auto_complete :testy, :address, {}, { :method => :get } %>
+    <%= f.text_field :address %>
+  </p>
+  <p>
+    <%= f.label :some_flag %><br />
+    <%= f.check_box :some_flag %>
   </p>
   <p>
     <%= f.submit 'Update' %>

data/test/{expected_templates/paperclip → views/auto_complete/expected_templates}/index.html.erb

@@ -5,6 +5,7 @@
     <th>First name</th>
     <th>Last name</th>
     <th>Address</th>
+    <th>Some flag</th>
   </tr>
 
 <% @testies.each do |testy| %>
@@ -12,6 +13,7 @@
     <td><%=h testy.first_name %></td>
     <td><%=h testy.last_name %></td>
     <td><%=h testy.address %></td>
+    <td><%=h testy.some_flag %></td>
     <td><%= link_to 'Show', testy %></td>
     <td><%= link_to 'Edit', edit_testy_path(testy) %></td>
     <td><%= link_to 'Destroy', testy, :confirm => 'Are you sure?', :method => :delete %></td>
@@ -21,4 +23,4 @@
 
 <br />
 
-<%= link_to 'New testy', new_testy_path %>
+<%= link_to 'New testy', new_testy_path %>

data/test/{expected_templates/auto_complete → views/auto_complete/expected_templates}/new.html.erb

@@ -4,15 +4,19 @@
   <%= f.error_messages %>
   <p>
     <%= f.label :first_name %><br />
-    <%= f.text_field :first_name %>
+    <%= text_field_with_auto_complete :testy, :first_name, {}, { :method => :get } %>
   </p>
   <p>
     <%= f.label :last_name %><br />
-    <%= f.text_field :last_name %>
+    <%= text_field_with_auto_complete :testy, :last_name, {}, { :method => :get } %>
   </p>
   <p>
     <%= f.label :address %><br />
-    <%= text_field_with_auto_complete :testy, :address, {}, { :method => :get } %>
+    <%= f.text_field :address %>
+  </p>
+  <p>
+    <%= f.label :some_flag %><br />
+    <%= f.check_box :some_flag %>
   </p>
   <p>
     <%= f.submit 'Create' %>

data/test/{expected_templates/auto_complete → views/auto_complete/expected_templates}/show.html.erb

@@ -13,6 +13,11 @@
   <%=h @testy.address %>
 </p>
 
+<p>
+  <b>Some flag:</b>
+  <%=h @testy.some_flag %>
+</p>
+
 
 <%= link_to 'Edit', edit_testy_path(@testy) %> |
-<%= link_to 'Back', testies_path %>
+<%= link_to 'Back', testies_path %>

data/test/{expected_templates/auto_complete → views/auto_complete/expected_templates}/testies_controller.rb

@@ -1,6 +1,7 @@
 class TestiesController < ApplicationController
 
-  auto_complete_for :testy, :address
+  auto_complete_for :testy, :first_name
+  auto_complete_for :testy, :last_name
 
   # GET /testies
   # GET /testies.xml

data/test/views/fake/fake_view.rb

@@ -0,0 +1,7 @@
+module ViewMapper
+  module FakeView
+    def self.source_root
+      File.expand_path(File.dirname(__FILE__) + '/templates')
+    end
+  end
+end

data/test/views/fake/templates/fake_template1.html.erb

@@ -0,0 +1 @@
+This is fake.

data/test/{expected_templates/has_many → views/has_many/expected_templates}/_person.html.erb

@@ -11,6 +11,10 @@
     Testy <%= f.label :address %><br />
     <%= f.text_field :address %>
   </p>
+  <p>
+    Testy <%= f.label :some_flag %><br />
+    <%= f.check_box :some_flag %>
+  </p>
   <p>
     <%= f.hidden_field :_delete, :class => 'delete' %>
     <%= remove_child_link 'remove', f %>

data/test/{expected_templates/has_many → views/has_many/expected_templates}/create_parents.rb

@@ -1,9 +1,10 @@
 class CreateParents < ActiveRecord::Migration
   def self.up
     create_table :parents do |t|
-      t.string   :first_name
-      t.string   :last_name
-      t.string   :address
+      t.string :first_name
+      t.string :last_name
+      t.string :address
+      t.boolean :some_flag
 
       t.timestamps
     end

data/test/{expected_templates/has_many → views/has_many/expected_templates}/index.html.erb

@@ -17,4 +17,4 @@
 
 <br />
 
-<%= link_to 'New parent', new_parent_path %>
+<%= link_to 'New parent', new_parent_path %>

data/test/{expected_templates/has_many → views/has_many/expected_templates}/parent.rb

@@ -9,6 +9,7 @@ class Parent < ActiveRecord::Base
                                 :reject_if => proc { |attrs|
                                   attrs['first_name'].blank? &&
                                   attrs['last_name'].blank? &&
-                                  attrs['address'].blank?
+                                  attrs['address'].blank? &&
+                                  attrs['some_flag'].blank?
                                 }
 end

data/test/{expected_templates/has_many → views/has_many/expected_templates}/show.html.erb

@@ -26,6 +26,10 @@
       <b>Testy Address:</b>
       <%=h testy.address %>
     </p>
+    <p>
+      <b>Testy Some flag:</b>
+      <%=h testy.some_flag %>
+    </p>
   </div>
 <% end %>
 

data/test/{has_many_view_test.rb → views/has_many/has_many_view_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class HasManyViewTest < Test::Unit::TestCase
 
@@ -26,8 +26,8 @@ class HasManyViewTest < Test::Unit::TestCase
       assert_equal 2, child_models.size
       assert_equal 'SomeOtherModel', child_models[0].name
       assert_equal 'Testy',          child_models[1].name
-      assert_equal [ 'name' ],                               child_models[0].columns
-      assert_equal [ 'first_name', 'last_name', 'address' ], child_models[1].columns
+      assert_equal [ 'name' ],       child_models[0].columns
+      assert_equal [ 'first_name', 'last_name', 'address', 'some_flag' ], child_models[1].columns
     end
 
     should "use find the specified valid child model if provided" do
@@ -43,8 +43,8 @@ class HasManyViewTest < Test::Unit::TestCase
       assert_equal 2, gen.child_models.size
       assert_equal 'Testy',          child_models[0].name
       assert_equal 'SomeOtherModel', child_models[1].name
-      assert_equal [ 'first_name', 'last_name', 'address' ], child_models[0].columns
-      assert_equal [ 'name' ],                               child_models[1].columns
+      assert_equal [ 'name' ],       child_models[1].columns
+      assert_equal [ 'first_name', 'last_name', 'address', 'some_flag' ], child_models[0].columns
     end
 
     should "return an error message with a bad child model param" do
@@ -117,8 +117,8 @@ class HasManyViewTest < Test::Unit::TestCase
       @gen = new_generator_for_test_model('view_for', ['--view', 'has_many'], 'parent')
     end
 
-    should "return the proper source root folder" do
-      assert_equal './test/../lib/view_mapper/has_many_templates', @gen.source_root
+    should "return the proper source root" do
+      assert_equal File.expand_path(File.dirname(__FILE__) + '/../../..//lib/view_mapper/views/has_many/templates'), ViewMapper::HasManyView.source_root
     end
 
     view_for_templates = %w{ new edit show index }
@@ -128,9 +128,9 @@ class HasManyViewTest < Test::Unit::TestCase
         @singular_name = @gen.singular_name
         @plural_name = @gen.plural_name
         @child_models = @gen.child_models
-        template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_#{template}.html.erb"))
+        template_file = File.open(@gen.source_path("view_#{template}.html.erb"))
         result = ERB.new(template_file.read, nil, '-').result(binding)
-        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/#{template}.html.erb"))
+        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/#{template}.html.erb"))
         assert_equal expected_file.read, result
       end
     end
@@ -140,17 +140,17 @@ class HasManyViewTest < Test::Unit::TestCase
       @singular_name = @gen.singular_name
       @plural_name = @gen.plural_name
       @child_models = @gen.child_models
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_form.html.erb"))
+      template_file = File.open(@gen.source_path("view_form.html.erb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/_form.html.erb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/_form.html.erb"))
       assert_equal expected_file.read, result
     end
 
     should "render the person partial as expected" do
       @child_model = @gen.child_models[1]
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/view_child_form.html.erb"))
+      template_file = File.open(@gen.source_path("view_child_form.html.erb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/_person.html.erb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/_person.html.erb"))
       assert_equal expected_file.read, result
     end
   end
@@ -166,9 +166,9 @@ class HasManyViewTest < Test::Unit::TestCase
       @child_models = @gen.child_models
       @class_name = @gen.class_name
       @attributes = @gen.attributes
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/model.rb"))
+      template_file = File.open(@gen.source_path("model.rb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/parent.rb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/parent.rb"))
       assert_equal expected_file.read, result
     end
 
@@ -178,9 +178,9 @@ class HasManyViewTest < Test::Unit::TestCase
       @migration_name = 'CreateParents'
       @table_name = @gen.table_name
       @options = {}
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/has_many_templates/migration.rb"))
+      template_file = File.open(@gen.source_path("migration.rb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/has_many/create_parents.rb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/create_parents.rb"))
       assert_equal expected_file.read, result
     end
   end

data/test/{expected_templates/paperclip → views/paperclip/expected_templates}/create_testies.rb

@@ -1,9 +1,10 @@
 class CreateTesties < ActiveRecord::Migration
   def self.up
     create_table :testies do |t|
-      t.string   :first_name
-      t.string   :last_name
-      t.string   :address
+      t.string :first_name
+      t.string :last_name
+      t.string :address
+      t.boolean :some_flag
       t.string   :avatar_file_name
       t.string   :avatar_content_type
       t.integer  :avatar_file_size

data/test/{expected_templates/paperclip → views/paperclip/expected_templates}/edit.html.erb

@@ -14,6 +14,10 @@
     <%= f.label :address %><br />
     <%= f.text_field :address %>
   </p>
+  <p>
+    <%= f.label :some_flag %><br />
+    <%= f.check_box :some_flag %>
+  </p>
   <p>
     <%= f.label :avatar %><br />
     <%= f.file_field :avatar %>

data/test/views/paperclip/expected_templates/index.html.erb

@@ -0,0 +1,26 @@
+<h1>Listing testies</h1>
+
+<table>
+  <tr>
+    <th>First name</th>
+    <th>Last name</th>
+    <th>Address</th>
+    <th>Some flag</th>
+  </tr>
+
+<% @testies.each do |testy| %>
+  <tr>
+    <td><%=h testy.first_name %></td>
+    <td><%=h testy.last_name %></td>
+    <td><%=h testy.address %></td>
+    <td><%=h testy.some_flag %></td>
+    <td><%= link_to 'Show', testy %></td>
+    <td><%= link_to 'Edit', edit_testy_path(testy) %></td>
+    <td><%= link_to 'Destroy', testy, :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New testy', new_testy_path %>

data/test/{expected_templates/paperclip → views/paperclip/expected_templates}/new.html.erb

@@ -14,6 +14,10 @@
     <%= f.label :address %><br />
     <%= f.text_field :address %>
   </p>
+  <p>
+    <%= f.label :some_flag %><br />
+    <%= f.check_box :some_flag %>
+  </p>
   <p>
     <%= f.label :avatar %><br />
     <%= f.file_field :avatar %>

data/test/{expected_templates/paperclip → views/paperclip/expected_templates}/show.html.erb

@@ -13,6 +13,11 @@
   <%=h @testy.address %>
 </p>
 
+<p>
+  <b>Some flag:</b>
+  <%=h @testy.some_flag %>
+</p>
+
 <p>
   <b>Avatar:</b>
   <%= link_to @testy.avatar_file_name, @testy.avatar.url %><br>

data/test/{paperclip_view_test.rb → views/paperclip/paperclip_view_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class PaperclipViewTest < Test::Unit::TestCase
 
@@ -129,8 +129,16 @@ class PaperclipViewTest < Test::Unit::TestCase
       @gen = new_generator_for_test_model('view_for', ['--view', 'paperclip'])
     end
 
-    should "return the proper source root folder" do
-      assert_equal './test/../lib/view_mapper/paperclip_templates', @gen.source_root
+    should "return the proper source root" do
+      assert_equal File.expand_path(File.dirname(__FILE__) + '/../../..//lib/view_mapper/views/paperclip/templates'), ViewMapper::PaperclipView.source_root
+    end
+
+    should "have the proper value for source_roots_for_view" do
+      assert_equal [
+        File.expand_path(File.dirname(__FILE__) + '/../../..//lib/view_mapper/views/paperclip/templates'),
+        @gen.class.lookup('scaffold').path + '/templates',
+        @gen.class.lookup('model').path + '/templates'
+      ], @gen.source_roots_for_view
     end
 
     view_for_templates = %w{ new edit index show }
@@ -140,9 +148,9 @@ class PaperclipViewTest < Test::Unit::TestCase
         @singular_name = @gen.singular_name
         @plural_name = @gen.plural_name
         @attachments = @gen.attachments
-        template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/paperclip_templates/view_#{template}.html.erb"))
+        template_file = File.open(@gen.source_path("view_#{template}.html.erb"))
         result = ERB.new(template_file.read, nil, '-').result(binding)
-        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/paperclip/#{template}.html.erb"))
+        expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/#{template}.html.erb"))
         assert_equal expected_file.read, result
       end
     end
@@ -254,9 +262,9 @@ class PaperclipViewTest < Test::Unit::TestCase
       @class_name = @gen.class_name
       @attributes = @gen.attributes
       @attachments = @gen.attachments
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/paperclip_templates/model.rb"))
+      template_file = File.open(@gen.source_path("model.rb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/paperclip/testy.rb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/testy.rb"))
       assert_equal expected_file.read, result
     end
 
@@ -267,9 +275,9 @@ class PaperclipViewTest < Test::Unit::TestCase
       @migration_name = 'CreateTesties'
       @table_name = @gen.table_name
       @options = {}
-      template_file = File.open(File.join(File.dirname(__FILE__), "/../lib/view_mapper/paperclip_templates/migration.rb"))
+      template_file = File.open(@gen.source_path("migration.rb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
-      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/paperclip/create_testies.rb"))
+      expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/create_testies.rb"))
       assert_equal expected_file.read, result
     end
   end