view_mapper 0.3.3 → 0.3.4

data/lib/view_mapper/views/has_many_existing/templates/view_child_form.html.erb

@@ -0,0 +1,16 @@
+<div class="child">
+<% for attribute in hmt_model.through_model.attributes -%>
+  <p>
+    <%= hmt_model.through_model.name %> <%%= f.label :<%= attribute.name %> %><br />
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  </p>
+<% end -%>
+  <p>
+    <%= hmt_model.name.titleize %>:<br />
+    <%%= f.collection_select(:<%= hmt_model.name.underscore %>_id, <%= hmt_model.name %>.all, :id, :<%= field_for(hmt_model) %>, { :prompt => true }) %>
+  </p>
+  <p>
+    <%%= f.hidden_field :_destroy, :class => 'delete' %>
+    <%%= remove_child_link 'remove', f %>
+  </p>
+</div>

data/lib/view_mapper/views/has_many_existing/templates/view_form.html.erb

@@ -0,0 +1,20 @@
+<%%= f.error_messages %>
+<% for attribute in attributes -%>
+
+<p>
+  <%%= f.label :<%= attribute.name %> %><br />
+  <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+</p>
+<% end -%>
+<% has_many_through_models.each do |hmt_model| -%>
+
+<div id='<%= hmt_model.through_model.name.underscore %>_children'>
+  <%% f.fields_for :<%= hmt_model.through_model.name.underscore.pluralize %> do |<%= hmt_model.through_model.name.underscore %>_form| %>
+    <%%= render :partial => '<%= hmt_model.through_model.name.underscore %>', :locals => { :f => <%= hmt_model.through_model.name.underscore %>_form } %>
+  <%% end %>
+</div>
+
+<p>
+  <%%= add_child_link 'Add <%= hmt_model.through_model.name %>', '<%= hmt_model.through_model.name.underscore %>', f %>
+</p>
+<% end -%>

data/lib/view_mapper/views/has_many_existing/templates/view_show.html.erb

@@ -0,0 +1,26 @@
+<% for attribute in attributes -%>
+<p>
+  <b><%= attribute.column.human_name %>:</b>
+  <%%=h @<%= singular_name %>.<%= attribute.name %> %>
+</p>
+
+<% end -%>
+<% has_many_through_models.each do |hmt_model| -%>
+<%% @<%= singular_name %>.<%= hmt_model.through_model.name.underscore.pluralize %>.each do |<%= hmt_model.through_model.name.underscore %>| %>
+  <div class="child">
+<% for attribute in hmt_model.through_model.attributes -%>
+    <p>
+      <b><%= hmt_model.through_model.name %> <%= attribute.column.human_name %>:</b>
+      <%%=h <%= hmt_model.through_model.name.underscore%>.<%= attribute.name %> %>
+    </p>
+<% end -%>
+    <p>
+      <b><%= hmt_model.name %>:</b>
+      <%%=h <%= hmt_model.through_model.name.underscore%>.<%= hmt_model.name.underscore%>_<%= field_for(hmt_model) %> %>
+    </p>
+  </div>
+<%% end %>
+
+<% end -%>
+<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/test/generators/scaffold_for_view/scaffold_for_view_generator_test.rb

@@ -15,14 +15,14 @@ class ScaffoldForViewGeneratorTest < Test::Unit::TestCase
       end
     end
 
-    context "run on a Testy model" do
-      should "create a manifest = scaffold for Testy" do
+    context "run on a TestModel" do
+      should "create a manifest = scaffold for TestModel" do
 
         directories = [
           'app/models/',
           'app/controllers/',
           'app/helpers/',
-          'app/views/testies',
+          'app/views/test_models',
           'app/views/layouts/',
           'test/functional/',
           'test/unit/',
@@ -31,31 +31,31 @@ class ScaffoldForViewGeneratorTest < Test::Unit::TestCase
         ].each { |path| Rails::Generator::Commands::Create.any_instance.expects(:directory).with(path) }
 
         templates = {
-          'view_index.html.erb' => 'app/views/testies/index.html.erb',
-          'view_show.html.erb'  => 'app/views/testies/show.html.erb',
-          'view_new.html.erb'   => 'app/views/testies/new.html.erb',
-          'view_edit.html.erb'  => 'app/views/testies/edit.html.erb',
-          'layout.html.erb'     => 'app/views/layouts/testies.html.erb',
+          'view_index.html.erb' => 'app/views/test_models/index.html.erb',
+          'view_show.html.erb'  => 'app/views/test_models/show.html.erb',
+          'view_new.html.erb'   => 'app/views/test_models/new.html.erb',
+          'view_edit.html.erb'  => 'app/views/test_models/edit.html.erb',
+          'layout.html.erb'     => 'app/views/layouts/test_models.html.erb',
           'style.css'           => 'public/stylesheets/scaffold.css',
-          'controller.rb'       => 'app/controllers/testies_controller.rb',
-          'functional_test.rb'  => 'test/functional/testies_controller_test.rb',
-          'helper.rb'           => 'app/helpers/testies_helper.rb',
-          'helper_test.rb'      => 'test/unit/helpers/testies_helper_test.rb'
+          'controller.rb'       => 'app/controllers/test_models_controller.rb',
+          'functional_test.rb'  => 'test/functional/test_models_controller_test.rb',
+          'helper.rb'           => 'app/helpers/test_models_helper.rb',
+          'helper_test.rb'      => 'test/unit/helpers/test_models_helper_test.rb'
         }.each { |template, target| Rails::Generator::Commands::Create.any_instance.expects(:template).with(template, target) }
 
-        Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('testies')
+        Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('test_models')
         Rails::Generator::Commands::Create.any_instance.expects(:file).never
 
         Rails::Generator::Commands::Create.any_instance.stubs(:dependency)
 
-        @generator_script.run(['scaffold_for_view', 'testy'])
+        @generator_script.run(['scaffold_for_view', 'test_model'])
       end
     end
   end
 
   context "A scaffold_for_view generator" do
     setup do
-      @scaffold_for_view_gen = Rails::Generator::Base.instance('scaffold_for_view', ['testy'] )
+      @scaffold_for_view_gen = Rails::Generator::Base.instance('scaffold_for_view', ['test_model'] )
     end
 
     should "not call any actions when invalid" do

data/test/generators/view_for/view_for_generator_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class ViewForGeneratorTest < Test::Unit::TestCase
 
@@ -33,17 +33,17 @@ class ViewForGeneratorTest < Test::Unit::TestCase
       @generator_script.run(['view_for', 'blah'])
     end
 
-    context "run on a Testy model" do
+    context "run on a TestModel" do
       setup do
-        @model = setup_test_model
+        ClassFactory :test_model
       end
 
-      should "create a manifest = (scaffold for Testy) - (model template)" do
+      should "create a manifest = (scaffold for TestModel) - (model template)" do
 
         directories = [
           'app/controllers/',
           'app/helpers/',
-          'app/views/testies',
+          'app/views/test_models',
           'app/views/layouts/',
           'test/functional/',
           'test/unit/',
@@ -52,30 +52,30 @@ class ViewForGeneratorTest < Test::Unit::TestCase
         ].each { |path| Rails::Generator::Commands::Create.any_instance.expects(:directory).with(path) }
 
         templates = {
-          'view_index.html.erb' => 'app/views/testies/index.html.erb',
-          'view_show.html.erb'  => 'app/views/testies/show.html.erb',
-          'view_new.html.erb'   => 'app/views/testies/new.html.erb',
-          'view_edit.html.erb'  => 'app/views/testies/edit.html.erb',
-          'layout.html.erb'     => 'app/views/layouts/testies.html.erb',
+          'view_index.html.erb' => 'app/views/test_models/index.html.erb',
+          'view_show.html.erb'  => 'app/views/test_models/show.html.erb',
+          'view_new.html.erb'   => 'app/views/test_models/new.html.erb',
+          'view_edit.html.erb'  => 'app/views/test_models/edit.html.erb',
+          'layout.html.erb'     => 'app/views/layouts/test_models.html.erb',
           'style.css'           => 'public/stylesheets/scaffold.css',
-          'controller.rb'       => 'app/controllers/testies_controller.rb',
-          'functional_test.rb'  => 'test/functional/testies_controller_test.rb',
-          'helper.rb'           => 'app/helpers/testies_helper.rb',
-          'helper_test.rb'      => 'test/unit/helpers/testies_helper_test.rb'
+          'controller.rb'       => 'app/controllers/test_models_controller.rb',
+          'functional_test.rb'  => 'test/functional/test_models_controller_test.rb',
+          'helper.rb'           => 'app/helpers/test_models_helper.rb',
+          'helper_test.rb'      => 'test/unit/helpers/test_models_helper_test.rb'
         }.each { |template, target| Rails::Generator::Commands::Create.any_instance.expects(:template).with(template, target) }
 
-        Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('testies')
+        Rails::Generator::Commands::Create.any_instance.expects(:route_resources).with('test_models')
         Rails::Generator::Commands::Create.any_instance.expects(:file).never
 
-        @generator_script.run(['view_for', 'testy'])
+        @generator_script.run(['view_for', 'test_model'])
       end
     end
   end
 
   context "A view_for generator" do
     setup do
-      @view_for_gen = Rails::Generator::Base.instance('view_for', ['testy'] )
-      @model = setup_test_model
+      @view_for_gen = Rails::Generator::Base.instance('view_for', ['test_model'] )
+      @model = ClassFactory :test_model
     end
 
     should "have the proper model name" do

data/test/model_info_test.rb

@@ -4,16 +4,16 @@ class ModelInfoTest < Test::Unit::TestCase
 
   context "A model info object created for a test model" do
     setup do
-      setup_test_model
-      @model_info = ViewMapper::ModelInfo.new('testy')
+      ClassFactory :test_model
+      @model_info = ViewMapper::ModelInfo.new('test_model')
     end
 
     should "find the model" do
-      assert_equal Testy, @model_info.model
+      assert_equal TestModel, @model_info.model
     end
 
     should "return the model's name" do
-      assert_equal 'Testy', @model_info.name
+      assert_equal 'TestModel', @model_info.name
     end
 
     should "return the model's columns and not the primary key or time stamp columns" do
@@ -42,10 +42,10 @@ class ModelInfoTest < Test::Unit::TestCase
 
   context "Child and parent model info objects" do
     setup do
-      setup_test_model
-      setup_parent_test_model
-      @child_model = ViewMapper::ModelInfo.new('testy')
-      @parent_model = ViewMapper::ModelInfo.new('parent')
+      ClassFactory :parent_model, :class_eval => 'has_many :second_child_models'
+      ClassFactory :second_child_model
+      @child_model = ViewMapper::ModelInfo.new('second_child_model')
+      @parent_model = ViewMapper::ModelInfo.new('parent_model')
     end
 
     should "not include the parent foreign key column in the child model's columns" do
@@ -53,38 +53,109 @@ class ModelInfoTest < Test::Unit::TestCase
     end
 
     should "determine that the child model belongs to the parent model" do
-      assert_equal true, @child_model.belongs_to?('parent')
+      assert_equal true, @child_model.belongs_to?('parent_model')
     end
 
     should "determine that the parent model has many child models" do
-      assert_equal true, @parent_model.has_many?('testies')
+      assert_equal true, @parent_model.has_many?('second_child_models')
+    end
+
+    should "return the child's foreign key for the parent" do
+      assert_equal 'parent_model_id', @child_model.foreign_key_for('parent_model').name
+      assert_equal true,  @child_model.has_foreign_key_for?('parent_model')
+      assert_equal nil,   @child_model.foreign_key_for('invalid_model')
+      assert_equal false, @child_model.has_foreign_key_for?('invalid_model')
     end
   end
 
   context "Two model info objects for models that in a habtm association" do
     setup do
-      setup_test_model
-      setup_parent_test_model
-      Testy.class_eval do
-        has_and_belongs_to_many :parents
-      end
-      @child_model = ViewMapper::ModelInfo.new('testy')
-      @parent_model = ViewMapper::ModelInfo.new('parent')
+      ClassFactory :parent_model
+      ClassFactory :child_model, :class_eval => 'has_and_belongs_to_many :parent_models'
+      @child_model = ViewMapper::ModelInfo.new('child_model')
+      @parent_model = ViewMapper::ModelInfo.new('parent_model')
     end
 
     should "determine that a habtm association exists" do
-      assert_equal true, @child_model.has_and_belongs_to_many?('parents')
+      assert_equal true, @child_model.has_and_belongs_to_many?('parent_models')
     end
   end
 
   context "A model info object created for a test model that has Paperclip attachments" do
     setup do
-      setup_test_model(true)
-      @model_info = ViewMapper::ModelInfo.new('testy')
+      ClassFactory :test_model
+      @model_info = ViewMapper::ModelInfo.new('test_model')
     end
 
     should "not include the Paperclip columns in the model's columns" do
       assert_equal [ 'first_name', 'last_name', 'address', 'some_flag' ], @model_info.columns
     end
   end
+
+  context "A model info object created with two models in a has_many/belongs_to setup" do
+    setup do
+      ClassFactory :parent_model
+      ClassFactory :second_parent_model
+      ClassFactory :child_model
+    end
+
+    should "return the proper child model" do
+      parent_model_info = ViewMapper::ModelInfo.new('parent_model')
+      child_models = parent_model_info.child_models
+      assert_equal 1, child_models.size
+      assert_equal 'ChildModel', child_models[0].name
+      assert_equal ChildModel,   child_models[0].model
+      assert_equal nil,          child_models[0].through_model
+    end
+
+    should "return the proper parent model" do
+      child_model_info = ViewMapper::ModelInfo.new('child_model')
+      parent_models = child_model_info.parent_models
+      assert_equal 2, parent_models.size
+      assert_equal 'ParentModel',       parent_models[0].name
+      assert_equal ParentModel,         parent_models[0].model
+      assert_equal nil,                 parent_models[0].through_model
+      assert_equal 'SecondParentModel', parent_models[1].name
+      assert_equal SecondParentModel,   parent_models[1].model
+      assert_equal nil,                 parent_models[1].through_model
+    end
+  end
+
+  context "A model info object created with three models in a has_many through setup" do
+    setup do
+      ClassFactory :programmer
+      ClassFactory :project
+      ClassFactory :assignment
+      @programmer_info = ViewMapper::ModelInfo.new('programmer')
+    end
+
+    should "return the proper through reflection model" do
+      hmt_models = @programmer_info.has_many_through_models
+      assert_equal 1,         hmt_models.size
+      assert_equal 'Project', hmt_models[0].name
+      assert_equal Project,   hmt_models[0].model
+      assert_equal 'Assignment', hmt_models[0].through_model.name
+      assert_equal Assignment,   hmt_models[0].through_model.model
+    end
+
+    should "return the both the target and through models as child models" do
+      child_models = @programmer_info.child_models
+      assert_equal 2, child_models.size
+      assert_equal 'Assignment', child_models[0].name
+      assert_equal Assignment,   child_models[0].model
+      assert_equal 'Project',    child_models[1].name
+      assert_equal Project,      child_models[1].model
+    end
+
+    should "determine that a has_many_through association exists" do
+      assert_equal true, @programmer_info.has_many_through?('projects')
+    end
+
+    should  "find the through model later" do
+      hmt_model = ViewMapper::ModelInfo.new('project')
+      through_model = hmt_model.find_through_model('Programmer')
+      assert_equal 'Assignment', through_model.name
+      assert_equal Assignment,   through_model.model
+    end
+  end
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'active_record'
+require 'class_factory'
 
 ActiveRecord::Base.establish_connection({ :adapter => 'sqlite3', :database => ':memory:' })
 
@@ -21,123 +22,92 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'view_mapper'
 require 'views/fake/fake_view'
 
-def setup_test_table(paperclip_columns = false)
-  ActiveRecord::Base.connection.create_table :testies, :force => true do |table|
-    table.column :first_name, :string
-    table.column :last_name,  :string
-    table.column :address,    :string
-    table.column :some_flag,  :boolean
-    if paperclip_columns
-      table.column :avatar_file_name,     :string
-      table.column :avatar_content_type,  :string
-      table.column :avatar_file_size,     :integer
-      table.column :avatar_updated_at,    :datetime
-      table.column :avatar2_file_name,    :string
-      table.column :avatar2_content_type, :string
-      table.column :avatar2_file_size,    :integer
-      table.column :avatar2_updated_at,   :datetime
-    end
-  end
+ClassFactory.define :test_model do |t|
+  t.string  :first_name
+  t.string  :last_name
+  t.string  :address
+  t.boolean :some_flag
 end
 
-def setup_test_model(paperclip_columns = false)
-  setup_test_table(paperclip_columns)
-  Object.send(:remove_const, "Testy") rescue nil
-  Object.const_set("Testy", Class.new(ActiveRecord::Base))
-  Testy.class_eval do
-    def self.attachment_definitions
-      { :avatar => {:validations => []}, :avatar2 => {:validations => []} }
-    end
-  end
-  ActiveRecord::Base.send(:include, MockPaperclip)
-  ActionController::Base.send(:include, MockAutoComplete)
-  Object.const_get("Testy")
+ClassFactory.define :parent_model, :class_eval => 'has_many :child_models' do |parent|
+  parent.string :name
 end
 
-def setup_parent_test_model(create_foreign_key = true, child_belongs_to_parent = true, parent_has_many_children = true)
-  ActiveRecord::Base.connection.create_table :parents, :force => true do |table|
-    table.column :name, :string
-  end
-  ActiveRecord::Base.connection.create_table :some_other_models, :force => true do |table|
-    table.column :name,      :string
-    table.column :parent_id, :integer
+ClassFactory.define :second_parent_model, :class_eval => 'has_many :child_models' do |parent|
+  parent.string :name
+  parent.string :other_field
+end
+
+child_model_code = <<END
+  belongs_to :parent_model
+  def parent_model_name
+    'something'
   end
-  ActiveRecord::Base.connection.add_column :testies, :parent_id, :integer unless !create_foreign_key
-  Object.send(:remove_const, "Parent") rescue nil
-  Object.const_set("Parent", Class.new(ActiveRecord::Base))
-  Object.send(:remove_const, "SomeOtherModel") rescue nil
-  Object.const_set("SomeOtherModel", Class.new(ActiveRecord::Base))
-  Parent.class_eval do
-    has_many :testies
-    has_many :some_other_models unless !parent_has_many_children
-    def testies_attributes=
-      'fake'
-    end
-    def some_other_models_attributes=
-      'fake'
-    end
+  def parent_model_name=
   end
-  Testy.class_eval do
-    belongs_to :parent unless !child_belongs_to_parent
+
+  belongs_to :second_parent_model
+  def second_parent_model_name
+    'something else'
   end
-  SomeOtherModel.class_eval do
-    belongs_to :parent
-    def parent_name
-      'something'
-    end
-    def parent_name=
-    end
+  def second_parent_model_name=
   end
-  Object.const_get("Parent")
+END
+
+ClassFactory.define :child_model, :class_eval => child_model_code do |child|
+  child.string  :name
+  child.integer :parent_model_id
+  child.integer :second_parent_model_id
 end
 
-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
+second_child_model_code = <<END
+  belongs_to :parent_model
+  def parent_model_name
+    'something'
   end
-  ActiveRecord::Base.connection.add_column :some_other_models, :second_parent_id, :integer unless !has_foreign_key
-  Object.send(:remove_const, "SecondParent") rescue nil
-  Object.const_set("SecondParent", Class.new(ActiveRecord::Base))
-  SecondParent.class_eval do
-    has_many :some_other_models
-    def some_other_models_attributes=
-      'fake'
-    end
-    def name
-      'fake'
-    end unless !parent_has_name_method
-  end
-  SomeOtherModel.class_eval do
-    belongs_to :second_parent
-    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
+  def parent_model_name=
   end
+END
+
+ClassFactory.define :second_child_model, :class_eval => second_child_model_code do |child|
+  child.integer :parent_model_id
+  child.string  :first_name
+  child.string  :last_name
+  child.string  :address
+  child.boolean :some_flag
 end
 
-def setup_test_model_without_nested_attributes
-  ActiveRecord::Base.connection.create_table :third_models, :force => true do |table|
-    table.column :name, :string
-  end
-  Object.send(:remove_const, "ThirdModel") rescue nil
-  Object.const_set("ThirdModel", Class.new(ActiveRecord::Base))
-  Parent.class_eval do
-    has_many :third_model
-  end
+has_many_through_code = <<SRC
+has_many :programmers, :through => :assignments
+has_many :assignments
+SRC
+ClassFactory.define :project, :class_eval => has_many_through_code do |t|
+  t.string :name
+end
+
+has_many_through_code = <<SRC
+has_many :projects, :through => :assignments
+has_many :assignments
+def assignments_attributes=
+  'fake'
+end
+SRC
+ClassFactory.define :programmer, :class_eval => has_many_through_code do |t|
+  t.string :name
+end
+
+through_model_code = <<SRC
+belongs_to :project
+belongs_to :programmer
+def project_name
+  'something'
+end
+def project_name=
+end
+SRC
+ClassFactory.define :assignment, :class_eval => through_model_code do |a|
+  a.integer :project_id
+  a.integer :programmer_id
 end
 
 module MockPaperclip
@@ -179,11 +149,11 @@ def generator_cmd_line(gen, args, model)
   (cmd_line << args).flatten
 end
 
-def generator_script_cmd_line(gen, args, model = 'testy')
+def generator_script_cmd_line(gen, args, model = 'test_model')
   ([gen] << generator_cmd_line(gen, args, model)).flatten
 end
 
-def new_generator_for_test_model(gen, args, model = 'testy')
+def new_generator_for_test_model(gen, args, model = 'test_model')
   Rails::Generator::Base.instance(gen, generator_cmd_line(gen, args, model))
 end