view_mapper 0.3.2 → 0.3.3

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-require 'ftools'
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
@@ -51,6 +50,7 @@ def setup_test_model(paperclip_columns = false)
     end
   end
   ActiveRecord::Base.send(:include, MockPaperclip)
+  ActionController::Base.send(:include, MockAutoComplete)
   Object.const_get("Testy")
 end
 
@@ -85,11 +85,13 @@ def setup_parent_test_model(create_foreign_key = true, child_belongs_to_parent =
     def parent_name
       'something'
     end
+    def parent_name=
+    end
   end
   Object.const_get("Parent")
 end
 
-def setup_second_parent_test_model(has_name_virtual_attribute = true, has_foreign_key = true, parent_has_name_method = false, parent_has_name_column = true)
+def setup_second_parent_test_model(has_virtual_attribute_setter = true, has_virtual_attribute = true, has_foreign_key = true, parent_has_name_method = false, parent_has_name_column = true)
   ActiveRecord::Base.connection.create_table :second_parents, :force => true do |table|
     table.column :name, :string unless !parent_has_name_column
     table.column :other_field, :string
@@ -108,9 +110,22 @@ def setup_second_parent_test_model(has_name_virtual_attribute = true, has_foreig
   end
   SomeOtherModel.class_eval do
     belongs_to :second_parent
-    def second_parent_name
-      'something'
-    end unless !has_name_virtual_attribute
+    if has_virtual_attribute
+      def second_parent_name
+        'something'
+      end
+      def second_parent_other_field
+        'something'
+      end
+    end
+    if has_virtual_attribute_setter
+      def second_parent_name=
+        'something'
+      end
+      def second_parent_other_field=
+        'something'
+      end
+    end
   end
 end
 
@@ -142,8 +157,15 @@ class Rails::Generator::NamedBase
 end
 
 module ActionController
-  class Base
-    def self.auto_complete_for
+  class Base; end
+end
+
+module MockAutoComplete
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  module ClassMethods
+    def auto_complete_for
     end
   end
 end

data/test/views/auto_complete/auto_complete_test.rb

@@ -122,7 +122,7 @@ class AutoCompleteViewTest < Test::Unit::TestCase
         test_routes_file = expected_path + '/routes.rb'
         ViewForGenerator.any_instance.stubs(:destination_path).returns test_routes_file
         ScaffoldForViewGenerator.any_instance.stubs(:destination_path).returns test_routes_file
-        File.copy(standard_routes_file, test_routes_file)
+        FileUtils.copy(standard_routes_file, test_routes_file)
         Rails::Generator::Commands::Create.any_instance.stubs(:route_file).returns(test_routes_file)
         @generator_script.run(generator_script_cmd_line(gen, ['--view', 'auto_complete:address']))
         assert_equal File.open(expected_routes_file).read, File.open(test_routes_file).read

data/test/views/belongs_to/belongs_to_test.rb

@@ -76,7 +76,7 @@ class BelongsToViewTest < Test::Unit::TestCase
     setup do
       setup_test_model
       setup_parent_test_model
-      setup_second_parent_test_model(false)
+      setup_second_parent_test_model(true, false)
     end
 
     should "return a warning and stop when the problem model is specified" do
@@ -99,7 +99,7 @@ class BelongsToViewTest < Test::Unit::TestCase
     setup do
       setup_test_model
       setup_parent_test_model
-      setup_second_parent_test_model(true, true, false, false)
+      setup_second_parent_test_model(true, true, true, false, false)
     end
 
     should "return a warning and stop when the problem model is specified" do
@@ -122,7 +122,7 @@ class BelongsToViewTest < Test::Unit::TestCase
     setup do
       setup_test_model
       setup_parent_test_model
-      setup_second_parent_test_model(true, true, true, false)
+      setup_second_parent_test_model(true, true, true, true, false)
     end
 
     should "continue to generate as usual" do
@@ -137,7 +137,7 @@ class BelongsToViewTest < Test::Unit::TestCase
     setup do
       setup_test_model
       setup_parent_test_model
-      setup_second_parent_test_model(true, false)
+      setup_second_parent_test_model(true, true, false)
     end
 
     should "return a warning and stop when the problem model is specified" do
@@ -161,7 +161,7 @@ class BelongsToViewTest < Test::Unit::TestCase
       setup_test_model
       setup_parent_test_model
       setup_second_parent_test_model
-      @gen = new_generator_for_test_model('view_for', ['--view', 'belongs_to'], 'some_other_model')
+      @gen = new_generator_for_test_model('view_for', ['--view', 'belongs_to:parent,second_parent[other_field]'], 'some_other_model')
     end
 
     should "return the proper source root" do
@@ -199,14 +199,14 @@ class BelongsToViewTest < Test::Unit::TestCase
       setup_test_model
       setup_parent_test_model
       setup_second_parent_test_model
-      @gen = new_generator_for_test_model('scaffold_for_view', ['--view', 'belongs_to:parent,second_parent'], 'some_other_model')
+      @gen = new_generator_for_test_model('scaffold_for_view', ['--view', 'belongs_to:parent,second_parent[other_field]'], 'some_other_model')
     end
 
     should "render the model template as expected" do
       @parent_models = @gen.parent_models
       @class_name = @gen.class_name
       @attributes = @gen.attributes
-      template_file = File.open(@gen.source_path("model.rb"))
+      template_file = File.open(@gen.source_path("model.erb"))
       result = ERB.new(template_file.read, nil, '-').result(binding)
       expected_file = File.open(File.join(File.dirname(__FILE__), "expected_templates/some_other_model.rb"))
       assert_equal expected_file.read, result
@@ -305,9 +305,9 @@ class BelongsToViewTest < Test::Unit::TestCase
         'functional_test.rb'   => 'test/functional/some_other_models_controller_test.rb',
         'helper.rb'            => 'app/helpers/some_other_models_helper.rb',
         'helper_test.rb'       => 'test/unit/helpers/some_other_models_helper_test.rb',
-        'model.rb'            => 'app/models/some_other_model.rb',
-        'unit_test.rb'        => 'test/unit/some_other_model_test.rb',
-        'fixtures.yml'        => 'test/fixtures/some_other_models.yml'
+        'model.erb'            => 'app/models/some_other_model.rb',
+        'unit_test.rb'         => 'test/unit/some_other_model_test.rb',
+        'fixtures.yml'         => 'test/fixtures/some_other_models.yml'
       }.each { |template, target| Rails::Generator::Commands::Create.any_instance.expects(:template).with(template, target) }
 
       Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('some_other_models')
@@ -345,4 +345,7 @@ class BelongsToViewTest < Test::Unit::TestCase
     end
   end
 
+  def field_for(parent_model)
+    @gen.field_for(parent_model)
+  end
 end

data/test/views/belongs_to/expected_templates/_form.html.erb

@@ -9,5 +9,5 @@
 </p>
 <p>
   Second Parent:<br />
-  <%= f.collection_select(:second_parent_id, SecondParent.all, :id, :name, { :prompt => true }) %>
+  <%= f.collection_select(:second_parent_id, SecondParent.all, :id, :other_field, { :prompt => true }) %>
 </p>

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

@@ -11,7 +11,7 @@
   <tr>
     <td><%=h some_other_model.name %></td>
     <td><%=h some_other_model.parent_name %></td>
-    <td><%=h some_other_model.second_parent_name %></td>
+    <td><%=h some_other_model.second_parent_other_field %></td>
     <td><%= link_to 'Show', some_other_model %></td>
     <td><%= link_to 'Edit', edit_some_other_model_path(some_other_model) %></td>
     <td><%= link_to 'Destroy', some_other_model, :confirm => 'Are you sure?', :method => :delete %></td>

data/test/views/belongs_to/expected_templates/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <b>Second Parent:</b>
-  <%=h @some_other_model.second_parent_name %>
+  <%=h @some_other_model.second_parent_other_field %>
 </p>
 
 <%= link_to 'Edit', edit_some_other_model_path(@some_other_model) %> |

data/test/views/belongs_to/expected_templates/some_other_model.rb

@@ -4,7 +4,7 @@ class SomeOtherModel < ActiveRecord::Base
   def parent_name
     parent.name if parent
   end
-  def second_parent_name
-    second_parent.name if second_parent
+  def second_parent_other_field
+    second_parent.other_field if second_parent
   end
 end