dry_crud 0.6.0 → 1.0.0

data/{rails_generators → lib/generators}/dry_crud/templates/test/unit/crud_helper_test.rb

@@ -15,18 +15,53 @@ class CrudHelperTest < ActionView::TestCase
   
   test "standard crud table" do
     @entries = CrudTestModel.all
-    t = crud_table
+    
+    t = with_test_routing do 
+      crud_table
+    end
+    
     assert_match /(<tr.+?<\/tr>){7}/m, t
     assert_match /(<th.+?<\/th>){14}/m, t
     assert_match /(<a href.+?<\/a>.*?){18}/m, t
   end
+  
+  test "custom crud table with attributes" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do
+      crud_table :name, :children, :companion_id
+    end
+        
+    assert_match /(<tr.+?<\/tr>){7}/m, t
+    assert_match /(<th.+?<\/th>){4}/m, t
+    assert_match /(<a href.+?<\/a>.*?){18}/m, t
+  end
     
-  test "custom crud table" do
+  test "custom crud table with block" do
     @entries = CrudTestModel.all
-    t = crud_table do |t|
-      t.attrs :name, :children, :companion_id
-      t.col("head") {|e| content_tag :span, e.income.to_s }
+    
+    t = with_test_routing do
+      crud_table do |t|
+        t.attrs :name, :children, :companion_id
+        t.col("head") {|e| content_tag :span, e.income.to_s }
+      end
     end
+    
+    assert_match /(<tr.+?<\/tr>){7}/m, t
+    assert_match /(<th.+?<\/th>){4}/m, t
+    assert_match /(<span>.+?<\/span>.*?){6}/m, t
+    assert_no_match /(<a href.+?<\/a>.*?)/m, t
+  end
+  
+  test "custom crud table with attributes and block" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do
+      crud_table :name, :children, :companion_id do |t|
+        t.col("head") {|e| content_tag :span, e.income.to_s }
+      end
+    end
+    
     assert_match /(<tr.+?<\/tr>){7}/m, t
     assert_match /(<th.+?<\/th>){4}/m, t
     assert_match /(<span>.+?<\/span>.*?){6}/m, t
@@ -35,7 +70,9 @@ class CrudHelperTest < ActionView::TestCase
   
   test "crud form" do
     @entry = CrudTestModel.first
-    f = capture { crud_form }
+    f = with_test_routing do
+      capture { crud_form }
+    end
     
     assert_match /form .*?action="\/crud_test_models\/#{@entry.id}"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
@@ -53,5 +90,13 @@ class CrudHelperTest < ActionView::TestCase
     assert_equal [:name, :whatever, :children, :companion_id, :rating, :income, 
                   :birthdate, :human, :remarks, :created_at, :updated_at], default_attrs
   end
+    
+  private
   
+  def with_test_routing
+    with_routing do |set|
+      set.draw { resources :crud_test_models }
+      yield
+    end
+  end
 end

data/{rails_generators → lib/generators}/dry_crud/templates/test/unit/render_inheritable_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-TEST_VIEW_PATH = File.join(RAILS_ROOT, 'test', 'test_views')
+TEST_VIEW_PATH = File.join(Rails.root, 'test', 'test_views')
 
-class RootController < ActionController::Base
+class RootController < ApplicationController
   include RenderInheritable
   
   attr_accessor :default_template_format
@@ -28,7 +28,7 @@ class GrandChildrenController < ChildrenController
   
 end
 
-# mock File ojbect
+# mock File object
 class File
   class << self
     def touched
@@ -54,8 +54,8 @@ class RenderInheritableTest < ActiveSupport::TestCase
     teardown
     @controller = ChildrenController.new
     @grand_controller = GrandChildrenController.new
-    ChildrenController.inheritable_cache.clear
-    GrandChildrenController.inheritable_cache.clear
+    ChildrenController.send(:inheritable_cache).clear
+    GrandChildrenController.send(:inheritable_cache).clear
   end
   
   def teardown
@@ -69,59 +69,59 @@ class RenderInheritableTest < ActiveSupport::TestCase
   end
 
   test "lookup path" do
-    assert_equal ['children', 'root'], ChildrenController.send(:lookup_path)
-    assert_equal ['grand_children', 'children', 'root'], GrandChildrenController.send(:lookup_path)
+    assert_equal ['children', 'root'], ChildrenController.send(:inheritance_lookup_path)
+    assert_equal ['grand_children', 'children', 'root'], GrandChildrenController.send(:inheritance_lookup_path)
   end
   
-  test "inheritable controller without routes finds root" do
-    assert_equal 'root', ChildrenController.send(:inheritable_controller)
-    assert_equal 'root', GrandChildrenController.send(:inheritable_controller)
+  test "inheritable controller finds controller instance" do
+    assert_equal 'children', ChildrenController.send(:inheritable_controller)
+    assert_equal 'grand_children', GrandChildrenController.send(:inheritable_controller)
   end
     
   test "find non-existing inheritable file" do
-    assert_nil ChildrenController.send(:find_inheritable_file, 'foo')
+    assert_nil @controller.send(:find_inheritable_template_folder, 'foo')
   end
   
   test "find inheritable file not overwritten" do
     touch("root/root.html.erb")
     
-    assert_equal 'root', ChildrenController.send(:find_inheritable_file, 'root')
-    assert_equal 'root', GrandChildrenController.send(:find_inheritable_file, 'root')
+    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'root')
+    assert_equal 'root', @grand_controller.send(:find_inheritable_template_folder, 'root')
   end
   
   test "find inheritable file partially overwritten" do
     touch("root/child.html.erb")
     touch("children/child.html.erb")
     
-    assert_equal 'children', ChildrenController.send(:find_inheritable_file, 'child')
-    assert_equal 'children', GrandChildrenController.send(:find_inheritable_file, 'child')
+    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'child')
+    assert_equal 'children', @grand_controller.send(:find_inheritable_template_folder, 'child')
   end
   
   test "find inheritable file partially overwritten with gaps" do
     touch("root/grandchild.html.erb")
     touch("grand_children/grandchild.rhtml")
     
-    assert_equal 'root', ChildrenController.send(:find_inheritable_file, 'grandchild')
-    assert_equal 'grand_children', GrandChildrenController.send(:find_inheritable_file, 'grandchild')
+    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild')
+    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild')
   end
     
   test "find inheritable file for js format" do
     touch("root/_grandchild.js.rjs")
     touch("grand_children/_grandchild.js.rjs")
        
-    assert_equal 'root', ChildrenController.send(:find_inheritable_file, '_grandchild', :js)
-    assert_equal 'grand_children', GrandChildrenController.send(:find_inheritable_file, '_grandchild', :js)
+    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
+    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
         
-    assert_equal({:js => { '_grandchild' => {nil => 'root'}}}, ChildrenController.inheritable_cache)
-    assert_equal({:js => { '_grandchild' => {nil => 'grand_children'}}}, GrandChildrenController.inheritable_cache)
+    assert_equal({:js => { true => {'grandchild' => {nil => 'root'}}}}, ChildrenController.send(:inheritable_cache))
+    assert_equal({:js => { true => {'grandchild' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
   end
   
   test "find inheritable file for xml format" do
     touch("root/_grandchild.xml.builder")
     touch("grand_children/_grandchild.xml.builder")
     
-    assert_equal 'root', ChildrenController.send(:find_inheritable_file, '_grandchild', :xml)
-    assert_equal 'grand_children', GrandChildrenController.send(:find_inheritable_file, '_grandchild', :xml)
+    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
+    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
   end
   
   test "find inheritable file all overwritten" do
@@ -129,33 +129,25 @@ class RenderInheritableTest < ActiveSupport::TestCase
     touch("children/all.rhtml")
     touch("grand_children/all.html.erb")
     
-    assert_equal 'children', ChildrenController.send(:find_inheritable_file, 'all')
-    assert_equal 'grand_children', GrandChildrenController.send(:find_inheritable_file, 'all')
+    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
+    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
     
-    assert_equal({:html => { 'all' => {nil => 'children'}}}, ChildrenController.inheritable_cache)
-    assert_equal({:html => { 'all' => {nil => 'grand_children'}}}, GrandChildrenController.inheritable_cache)
+    assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
+    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
     
-    assert_equal 'children', ChildrenController.send(:find_inheritable_file, 'all')
-    assert_equal 'grand_children', GrandChildrenController.send(:find_inheritable_file, 'all')
+    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
+    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
     
-    assert_equal({:html => { 'all' => {nil => 'children'}}}, ChildrenController.inheritable_cache)
-    assert_equal({:html => { 'all' => {nil => 'grand_children'}}}, GrandChildrenController.inheritable_cache)    
+    assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
+    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))    
   end
-  
-  
 
   private
   
   def touch(file)
-    #File.touch_template(file)
     f = File.join(TEST_VIEW_PATH, file)
     FileUtils.mkdir_p(File.dirname(f))
     FileUtils.touch(f)
-    
-    RootController.view_paths.last.instance_variable_set(:@loaded, false)
-    RootController.view_paths.last.load!
   end
   
-  
-  
 end

data/{rails_generators → lib/generators}/dry_crud/templates/test/unit/standard_helper_test.rb

@@ -3,66 +3,66 @@ require 'crud_test_model'
 
 class StandardHelperTest < ActionView::TestCase
 
-	include StandardHelper
+  include StandardHelper
   include CrudTestHelper
   
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
-	
+  
   def format_size(obj)
     "#{f(obj.size)} chars"
   end
   
-	test "labeled text as block" do
-		result = labeled("label") { "value" }
-		
-		assert_dom_equal "<div class='labeled'><div class='caption'>label</div><div class='value'>value</div></div>", result
+  test "labeled text as block" do
+    result = labeled("label") { "value" }
+    
+    assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>value</div> </div>", result.squish
   end
 
   test "labeled text empty" do
     result = labeled("label", "")
     
-    assert_dom_equal "<div class='labeled'><div class='caption'>label</div><div class='value'>#{EMPTY_STRING}</div></div>", result
+    assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>#{EMPTY_STRING}</div> </div>", result.squish
   end
 
   test "labeled text as content" do
     result = labeled("label", "value")
     
-    assert_dom_equal "<div class='labeled'><div class='caption'>label</div><div class='value'>value</div></div>", result
+    assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>value</div> </div>", result.squish
   end
   
-	test "alternate row" do
-		result_1 = tr_alt { "(test row content)" }
-		result_2 = tr_alt { "(test row content)" }
+  test "alternate row" do
+    result_1 = tr_alt { "(test row content)" }
+    result_2 = tr_alt { "(test row content)" }
 
-		assert_dom_equal "<tr class='even'>(test row content)</tr>", result_1
-		assert_dom_equal "<tr class='odd'>(test row content)</tr>", result_2
-	end
-	
-	test "format Fixnums" do
-		assert_equal "0", f(0)
-		assert_equal "10", f(10)
+    assert_dom_equal "<tr class='even'>(test row content)</tr>", result_1
+    assert_dom_equal "<tr class='odd'>(test row content)</tr>", result_2
+  end
+  
+  test "format Fixnums" do
+    assert_equal "0", f(0)
+    assert_equal "10", f(10)
     assert_equal "10,000,000", f(10000000)    
-	end
-	
-	test "format Floats" do
-		assert_equal "1.00", f(1.0)
-		assert_equal "1.20", f(1.2)
-		assert_equal "3.14", f(3.14159)
-	end
-	
-	test "format Booleans" do
-		assert_equal "yes", f(true)
-		assert_equal "no", f(false)
-	end
-	
-	test "format nil" do
-		assert_equal EMPTY_STRING, f(nil)
-	end
-	
-	test "format Strings" do
-		assert_equal "blah blah", f("blah blah")
- 		assert_equal "&lt;injection&gt;", f("<injection>")
+  end
+  
+  test "format Floats" do
+    assert_equal "1.00", f(1.0)
+    assert_equal "1.20", f(1.2)
+    assert_equal "3.14", f(3.14159)
+  end
+  
+  test "format Booleans" do
+    assert_equal "yes", f(true)
+    assert_equal "no", f(false)
+  end
+  
+  test "format nil" do
+    assert_equal EMPTY_STRING, f(nil)
+  end
+  
+  test "format Strings" do
+    assert_equal "blah blah", f("blah blah")
+     assert_equal "&lt;injection&gt;", f("<injection>")
   end
 
   test "format attr with fallthrough to f" do
@@ -101,7 +101,7 @@ class StandardHelperTest < ActionView::TestCase
     m.rating = 3.145
     assert_equal '3.15', format_type(m, :rating)
   end
-	
+  
   test "format decimal column" do
     m = crud_test_models(:AAAAA)
     assert_equal '10000000.10', format_type(m, :income)
@@ -117,29 +117,37 @@ class StandardHelperTest < ActionView::TestCase
     assert_equal "<p>AAAAA AAAAA AAAAA\n<br />AAAAA AAAAA AAAAA\n<br />AAAAA AAAAA AAAAA\n</p>", format_type(m, :remarks)
   end
   
-	test "empty table should render message" do
-		assert_dom_equal "<div class='list'>#{NO_LIST_ENTRIES_MESSAGE}</div>", table([]) { }
-	end	
-	
+  test "empty table should render message" do
+    assert_dom_equal "<div class='list'>#{NO_LIST_ENTRIES_MESSAGE}</div>", table([]) { }
+  end  
+  
   test "non empty table should render table" do
     assert_match(/^\<table.*\<\/table\>$/, table(['foo', 'bar']) {|t| t.attrs :size, :upcase })
   end
   
+  test "table with attrs" do
+    expected = StandardTableBuilder.table(['foo', 'bar'], self) { |t| t.attrs :size, :upcase }
+    actual = table(['foo', 'bar'], :size, :upcase)
+    assert_equal expected, actual
+  end
+  
   test "captionize" do
     assert_equal "Camel Case", captionize(:camel_case)
     assert_equal "All Upper Case", captionize("all upper case")
     assert_equal "With Object", captionize("With object", Object.new)
   end
-	
+  
   test "standard form for existing entry" do
     e = crud_test_models('AAAAA')
-    f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
-    
+    f = with_test_routing do 
+      f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
+    end
+  
     assert_match /form .*?action="\/crud_test_models\/#{e.id}" .*?method="post"/, f
     assert_match /input .*?name="_method" .*?type="hidden" .*?value="put"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text" .*?value="AAAAA"/, f
     assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
-    assert_match /option selected="selected" value="1910">1910<\/option>/, f
+    assert_match /option selected="selected" value="1910">1910<\/option>/, f 
     assert_match /option selected="selected" value="1">January<\/option>/, f
     assert_match /option selected="selected" value="1">1<\/option>/, f
     assert_match /input .*?name="crud_test_model\[children\]" .*?type="text" .*?value=\"1\"/, f
@@ -147,10 +155,13 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end
   
+  
   test "standard form for new entry" do
     e = CrudTestModel.new
-    f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
-    
+    f = with_test_routing do 
+      f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
+    end
+  
     assert_match /form .*?action="\/crud_test_models" .*?method="post"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_no_match /input .*?name="crud_test_model\[name\]" .*?type="text" .*?value=/, f
@@ -164,13 +175,15 @@ class StandardHelperTest < ActionView::TestCase
     e = crud_test_models('AAAAA')
     e.name = nil
     assert !e.valid?
-   
-    f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
     
+    f = with_test_routing do 
+      f = capture { standard_form(e, [:name, :children, :birthdate, :human], :class => 'special') }
+    end
+  
     assert_match /form .*?action="\/crud_test_models\/#{e.id}" .*?method="post"/, f
     assert_match /input .*?name="_method" .*?type="hidden" .*?value="put"/, f
-    assert_match /div class="errorExplanation"/, f
-    assert_match /div class="fieldWithErrors"\>.*?\<input .*?name="crud_test_model\[name\]" .*?type="text"/, f
+    assert_match /div id="error_explanation"/, f
+    assert_match /div class="field_with_errors"\>.*?\<input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
     assert_match /option selected="selected" value="1910">1910<\/option>/, f
     assert_match /option selected="selected" value="1">January<\/option>/, f
@@ -180,4 +193,13 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end
   
-end
+  private
+  
+  def with_test_routing
+    with_routing do |set|
+      set.draw { resources :crud_test_models }
+      yield
+    end
+  end
+  
+end

data/{rails_generators → lib/generators}/dry_crud/templates/test/unit/standard_table_builder_test.rb

@@ -54,46 +54,48 @@ class StandardTableBuilderTest < ActionView::TestCase
     
     assert_equal "4 chars", col.content("abcd")
   end
-	
-	test "two x two table" do
-		dom = <<-FIN
-			<table class="list">
-			<tr><th>Upcase</th><th>Size</th></tr>
-			<tr class="even"><td>FOO</td><td>3 chars</td></tr>
-			<tr class="odd"><td>BAHR</td><td>4 chars</td></tr>
-			</table>
-		FIN
+  
+  test "two x two table" do
+    dom = <<-FIN
+      <table class="list">
+      <tr><th>Upcase</th><th>Size</th></tr>
+      <tr class="even"><td>FOO</td><td>3 chars</td></tr>
+      <tr class="odd"><td>BAHR</td><td>4 chars</td></tr>
+      </table>
+    FIN
+    dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
     
     table.attrs :upcase, :size
     
-		assert_dom_equal dom, table.to_html
-	end
-	
-	test "table with before and after cells" do 
-		dom = <<-FIN
-			<table class="list">
-			<tr><th>head</th><th>Upcase</th><th>Size</th><th></th></tr>
-			<tr class="even">
-				<td class='left'><a href='/'>foo</a></td>
-				<td>FOO</td>
-				<td>3 chars</td>
-				<td>Never foo</td>
-			</tr>
-			<tr class="odd">
-				<td class='left'><a href='/'>bahr</a></td>
-				<td>BAHR</td>
-				<td>4 chars</td>
-				<td>Never bahr</td>
-			</tr>
-			</table>
-		FIN
-		
-	  table.col('head', :class => 'left') { |e| link_to e, "/" }
-	  table.attrs :upcase, :size
-	  table.col { |e| "Never #{e}" }
-		
-		assert_dom_equal dom, table.to_html
-	end
-	
-
-end
+    assert_dom_equal dom, table.to_html
+  end
+  
+  test "table with before and after cells" do 
+    dom = <<-FIN
+      <table class="list">
+      <tr><th>head</th><th>Upcase</th><th>Size</th><th></th></tr>
+      <tr class="even">
+        <td class='left'><a href='/'>foo</a></td>
+        <td>FOO</td>
+        <td>3 chars</td>
+        <td>Never foo</td>
+      </tr>
+      <tr class="odd">
+        <td class='left'><a href='/'>bahr</a></td>
+        <td>BAHR</td>
+        <td>4 chars</td>
+        <td>Never bahr</td>
+      </tr>
+      </table>
+    FIN
+    dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
+    
+    table.col('head', :class => 'left') { |e| link_to e, "/" }
+    table.attrs :upcase, :size
+    table.col { |e| "Never #{e}" }
+    
+    
+    assert_dom_equal dom, table.to_html
+  end
+  
+end

data/test/templates/app/views/ajax/ajax.js.rjs

@@ -1 +1 @@
-page.replace_html(:response, render_inheritable(:partial => 'hello'))
+page.replace_html(:response, :partial => 'hello')

data/test/templates/app/views/ajax/index.html.erb

@@ -1,9 +1,9 @@
 <% @title = "Listing #{models_label}" -%>
 
-<%= render_inheritable :partial => 'list' %>
+<%= render :partial => 'list' %>
 
 <br/>
 
 <%= link_action_add %>
-<%= link_to_remote 'Ajahx', :url => {:action => 'ajax'}, :method => :get %>
+<%= link_to 'Ajahx', {:action => 'ajax'}, :method => :get, :remote => true %>
 <div id="response"></div>

data/test/templates/app/views/cities/_form.html.erb

@@ -1,4 +1,4 @@
-<% crud_form do |f| -%>
+<%= crud_form do |f| -%>
 	<%= f.labeled_input_field :name %>
     <%= f.labeled_collection_select(:country_code, ['BR', 'CH', 'DE', 'GB', 'JP', 'USA'], :to_s, :to_s, { :include_blank => "Please select" })%>
 <% end -%>

data/test/templates/app/views/cities/_list.html.erb

@@ -1,5 +1,4 @@
-<%= crud_table do |t|
-	t.attrs :name, :country_code
+<%= crud_table :name, :country_code do |t|
 	t.col {|e| link_action_edit(e) }
 	t.col {|e| link_action_destroy(e) }
 end %>

data/test/templates/config/routes.rb

@@ -1,11 +1,20 @@
-ActionController::Routing::Routes.draw do |map|
+TestApp::Application.routes.draw do
   
-  map.resources :cities, :new => {:ajax => :get}
-  map.resources :people, :new => {:ajax => :get}
+  resources :cities do
+    collection do
+      get :ajax
+    end
+  end  
+  
+  resources :people do
+  	collection do
+      get :ajax
+    end
+  end
   
   # Install the default routes as the lowest priority.
   # Note: These default routes make all actions in every controller accessible via GET requests. You should
   # consider removing or commenting them out if you're using named routes and resources.
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
+  #map.connect ':controller/:action/:id.:format'
+  #map.connect ':controller/:action/:id'
 end