dry_crud 1.5.0 → 1.6.0

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_helper_test.rb

@@ -12,7 +12,7 @@ class StandardHelperTest < ActionView::TestCase
   def format_size(obj)
     "#{f(obj.size)} items"
   end
-  
+
   def format_string_size(obj)
     "#{f(obj.size)} chars"
   end
@@ -79,7 +79,7 @@ class StandardHelperTest < ActionView::TestCase
   test "format attr with custom format_string_size method" do
     assert_equal "4 chars", format_attr("abcd", :size)
   end
-  
+
   test "format attr with custom format_size method" do
     assert_equal "2 items", format_attr([1,2], :size)
   end
@@ -124,12 +124,12 @@ class StandardHelperTest < ActionView::TestCase
     m = crud_test_models(:AAAAA)
     assert_equal '1910-01-01', format_type(m, :birthdate)
   end
-  
+
   test "format time column" do
     m = crud_test_models(:AAAAA)
     assert_equal '01:01', format_type(m, :gets_up_at)
   end
-  
+
   test "format datetime column" do
     m = crud_test_models(:AAAAA)
     assert_equal "2010-01-01 11:21", format_type(m, :last_seen)
@@ -141,6 +141,46 @@ class StandardHelperTest < ActionView::TestCase
     assert format_type(m, :remarks).html_safe?
   end
 
+  test "format belongs to column without content" do
+    m = crud_test_models(:AAAAA)
+    assert_equal t(:'global.associations.no_entry'), format_attr(m, :companion)
+  end
+
+  test "format belongs to column with content" do
+    m = crud_test_models(:BBBBB)
+    assert_equal "AAAAA", format_attr(m, :companion)
+  end
+
+  test "format has_many column with content" do
+    m = crud_test_models(:CCCCC)
+    assert_equal "<ul><li>AAAAA</li><li>BBBBB</li></ul>", format_attr(m, :others)
+  end
+
+  test "content_tag_nested escapes safe correctly" do
+    html = content_tag_nested(:div, ['a', 'b']) { |e| content_tag(:span, e) }
+    assert_equal "<div><span>a</span><span>b</span></div>", html
+  end
+
+  test "content_tag_nested escapes unsafe correctly" do
+    html = content_tag_nested(:div, ['a', 'b']) { |e| "<#{e}>" }
+    assert_equal "<div>&lt;a&gt;&lt;b&gt;</div>", html
+  end
+
+  test "content_tag_nested without block" do
+    html = content_tag_nested(:div, ['a', 'b'])
+    assert_equal "<div>ab</div>", html
+  end
+
+  test "safe_join without block" do
+    html = safe_join(['<a>', '<b>'.html_safe])
+    assert_equal "&lt;a&gt;<b>", html
+  end
+
+  test "safe_join with block" do
+    html = safe_join(['a', 'b']) { |e| content_tag(:span, e) }
+    assert_equal "<span>a</span><span>b</span>", html
+  end
+
   test "empty table should render message" do
     result = table([]) { }
     assert result.html_safe?
@@ -212,7 +252,7 @@ class StandardHelperTest < ActionView::TestCase
     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[^>]* id='error_explanation'/, f
-    assert_match /div class="field_with_errors"\>.*?\<input .*?name="crud_test_model\[name\]" .*?type="text"/, f
+    assert_match /div class="control-group error"\>.*?\<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
@@ -221,47 +261,47 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
     assert_match /button .*?type="submit">Save<\/button>/, f
   end
-  
+
   test "translate inheritable lookup" do
     # current controller is :crud_test_models, action is :index
     @controller = CrudTestModelsController.new
 
     I18n.backend.store_translations :en, :global => { :test_key => 'global' }
     assert_equal 'global', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :list => {  :global => {:test_key => 'list global'} }
     assert_equal 'list global', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :list => {  :index => {:test_key => 'list index'} }
     assert_equal 'list index', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :crud => {  :global => {:test_key => 'crud global'} }
     assert_equal 'crud global', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :crud => {  :index => {:test_key => 'crud index'} }
     assert_equal 'crud index', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :crud_test_models => {  :global => {:test_key => 'test global'} }
     assert_equal 'test global', ti(:test_key)
-    
+
     I18n.backend.store_translations :en, :crud_test_models => {  :index => {:test_key => 'test index'} }
     assert_equal 'test index', ti(:test_key)
   end
-  
+
   test "translate association lookup" do
     assoc = CrudTestModel.reflect_on_association(:companion)
-    
+
     I18n.backend.store_translations :en, :global => { :associations => {:test_key => 'global'} }
     assert_equal 'global', ta(:test_key, assoc)
-    
+
     I18n.backend.store_translations :en, :activerecord => { :associations => { :crud_test_model => {:test_key => 'model'} } }
     assert_equal 'model', ta(:test_key, assoc)
-    
+
     I18n.backend.store_translations :en, :activerecord => { :associations => { :models => {
     :crud_test_model => { :companion => {:test_key => 'companion'} } } } }
     assert_equal 'companion', ta(:test_key, assoc)
-    
+
     assert_equal 'global', ta(:test_key)
   end
-  
+
 end

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_table_builder_test.rb

@@ -61,7 +61,7 @@ class StandardTableBuilderTest < ActionView::TestCase
       <thead>
       <tr><th>Upcase</th><th>Size</th></tr>
       </thead>
-	  <tbody>
+    <tbody>
       <tr><td>FOO</td><td>3 chars</td></tr>
       <tr><td>BAHR</td><td>4 chars</td></tr>
       </tbody>
@@ -105,7 +105,7 @@ class StandardTableBuilderTest < ActionView::TestCase
 
     assert_dom_equal dom, table.to_html
   end
-  
+
   test "empty entries collection renders empty table" do
     dom = <<-FIN
       <table class="table">
@@ -117,8 +117,8 @@ class StandardTableBuilderTest < ActionView::TestCase
       </table>
     FIN
     dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
-    
- 	table = StandardTableBuilder.new([], self)
+
+   table = StandardTableBuilder.new([], self)
     table.col('head', :class => 'left') { |e| link_to e, "/" }
     table.attrs :upcase, :size
     table.col { |e| "Never #{e}" }

data/test/templates/Gemfile

@@ -25,6 +25,7 @@ group :assets do
   gem 'coffee-rails'   #, '~> 3.2.1'
   gem 'uglifier'       #, '>= 1.0.3'
   gem 'bootstrap-sass-rails'
+  #gem 'therubyracer'
 end
 
 gem 'jquery-rails'

data/test/templates/app/controllers/admin/cities_controller.rb

@@ -3,12 +3,5 @@ class Admin::CitiesController < AjaxController
   self.nesting = :admin, Country
 
   self.search_columns = :name, 'countries.name'
-  
-  def show
-    respond_to do |format|
-      format.html { redirect_to_index flash.to_hash }
-      format.json  { render :json => entry }
-    end
-  end
 
 end

data/test/templates/app/controllers/admin/countries_controller.rb

@@ -5,9 +5,8 @@ class Admin::CountriesController < AjaxController
   self.search_columns = :name, :code
 
   def show
-    respond_to do |format|
-      format.html { redirect_to_index flash.to_hash }
-      format.json  { render :json => entry }
+    super do |format|
+      format.html { redirect_to index_url, flash.to_hash }
     end
   end
 

data/test/templates/app/controllers/ajax_controller.rb

@@ -1,5 +1,7 @@
 class AjaxController < CrudController
 
+  respond_to :html, :json, :js
+
   def ajax
 
   end

data/test/templates/app/controllers/people_controller.rb

@@ -1,6 +1,6 @@
 class PeopleController < AjaxController
 
-  self.search_columns = [:name, :children, :rating, :income, :birthdate, :remarks]
+  self.search_columns = [:name, :children, :rating, :income, :birthdate, :remarks, 'cities.name']
 
   self.sort_mappings = {:city_id => 'cities.name'}
 

data/test/templates/app/models/city.rb

@@ -1,5 +1,7 @@
 class City < ActiveRecord::Base
 
+  attr_protected nil
+
   belongs_to :country
   has_many :people
 

data/test/templates/app/models/country.rb

@@ -1,5 +1,7 @@
 class Country < ActiveRecord::Base
 
+  attr_protected nil
+
   has_many :cities, :dependent => :destroy
 
   validates :name, :presence => true

data/test/templates/app/models/person.rb

@@ -1,5 +1,7 @@
 class Person < ActiveRecord::Base
 
+  attr_protected nil
+
   belongs_to :city
 
   validates :name, :presence => true

data/test/templates/app/views/admin/cities/_attrs.html.erb

@@ -0,0 +1 @@
+<%= render_attrs @city, :people %>

data/test/templates/app/views/admin/cities/_attrs.html.haml

@@ -0,0 +1 @@
+= render_attrs entry, :people

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

@@ -1 +1,7 @@
-<%= crud_form :name %>
+<% remote ||= false %>
+<%= crud_form :remote => remote do |f| %>
+  <%= f.labeled(:name, 'Called') do %>
+    <%= f.input_field :name %>
+  <% end %>
+  <%= f.labeled_input_field :person_ids %>
+<% end %>

data/test/templates/app/views/admin/cities/_form.html.haml

@@ -1 +1,5 @@
-= crud_form :name
+- remote ||= false
+= crud_form :remote => remote do |f|
+  = f.labeled(:name, 'Called') do
+    = f.input_field :name
+  = f.labeled_input_field :person_ids

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

@@ -1,6 +1,3 @@
 <% @title = ti(:country_title, :country => @parents.last) -%>
 
-<%= crud_table *default_attrs do |t|
-    action_col_edit(t)
-    action_col_destroy(t)
-  end %>
+<%= render 'crud/list' %>

data/test/templates/app/views/admin/cities/_list.html.haml

@@ -1,5 +1,3 @@
 - @title = ti(:country_title, :country => @parents.last)
 
-= crud_table *default_attrs do |t|
-  - action_col_edit(t)
-  - action_col_destroy(t)
+= render 'crud/list'

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

@@ -0,0 +1,4 @@
+<%= link_action_index %>
+<%= link_action_edit %>
+<%= link_action ti(:"link.edit") + ' AJAX', 'pencil', edit_polymorphic_path(path_args(entry), :format => :js), :remote => true %>
+<%= link_action_destroy %>

data/test/templates/app/views/ajax/_actions_show.html.haml

@@ -0,0 +1,4 @@
+= link_action_index
+= link_action_edit
+= link_action ti(:"link.edit") + ' AJAX', 'pencil', edit_polymorphic_path(path_args(entry), :format => :js), :remote => true
+= link_action_destroy

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

@@ -0,0 +1,2 @@
+<% remote ||= false %>
+<%= crud_form :remote => remote %>

data/test/templates/app/views/ajax/_form.html.haml

@@ -0,0 +1,2 @@
+- remote ||= false
+= crud_form :remote => remote

data/test/templates/app/views/ajax/edit.js.erb

@@ -0,0 +1 @@
+$('#content').html('<%= escape_javascript(render 'form', :remote => true) %>');

data/test/templates/app/views/ajax/edit.js.haml

@@ -0,0 +1 @@
+$('#content').html('#{escape_javascript(render 'form', :remote => true)}');

data/test/templates/app/views/ajax/show.js.erb

@@ -0,0 +1 @@
+$('#content').html('<%= escape_javascript(render 'attrs') %>');

data/test/templates/app/views/ajax/show.js.haml

@@ -0,0 +1 @@
+$('#content').html('#{escape_javascript(render 'attrs')}');

data/test/templates/app/views/ajax/update.js.erb

@@ -0,0 +1,5 @@
+<% if entry.errors.present? %>
+  alert('<%= escape_javascript(entry.errors.full_messages.join("\n")) %>');
+<% else %>
+  $('#content').html('<%= escape_javascript(render 'attrs') %>')
+<% end %>

data/test/templates/app/views/ajax/update.js.haml

@@ -0,0 +1,5 @@
+- if entry.errors.present?
+  alert('#{escape_javascript(entry.errors.full_messages.join("\n"))}');
+- else
+  $('#content').html('#{escape_javascript(render 'attrs')}')
+

data/test/templates/app/views/layouts/_nav.html.erb

@@ -0,0 +1,6 @@
+<%= link_to 'MyApp', root_path, :class => 'brand' %>
+<ul class="nav">
+  <li><%= link_to t(:'global.menu.people'), people_path %></li>
+  <li><%= link_to t(:'global.menu.countries'), admin_countries_path %></li>
+  <li><%= link_to t(:'global.menu.vips'), vips_path %></li>
+</ul>

data/test/templates/app/views/layouts/_nav.html.haml

@@ -0,0 +1,5 @@
+= link_to 'MyApp', root_path, :class => 'brand'
+%ul.nav
+  %li= link_to t(:'global.menu.people'), people_path
+  %li= link_to t(:'global.menu.countries'), admin_countries_path
+  %li= link_to t(:'global.menu.vips'), vips_path

data/test/templates/app/views/layouts/bootstrap.html.erb

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= strip_tags(@title) %></title>
+  <%= csrf_meta_tag %>
+
+  <!-- HTML5 shim, for IE6-8 support of HTML elements -->
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+  <![endif]-->
+
+  <%= stylesheet_link_tag 'application', :media => 'all' %>
+  <style type="text/css">
+    body { padding-top: 70px; }
+    h1 { margin-bottom: 10px; }
+  </style>
+
+  <!-- fav and touch icons -->
+  <link href="images/favicon.ico" rel="shortcut icon">
+  <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
+  <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
+  <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
+
+  <%= yield :head %>
+</head>
+<body>
+
+<div class="navbar navbar-fixed-top">
+  <div class="navbar-inner">
+    <div class="container">
+      <%= render 'layouts/nav' %>
+    </div>
+  </div>
+</div>
+  
+<div class="container">
+
+  <h1><%= @title %></h1>
+
+  <%= render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level %>
+
+  <div class="actions btn-toolbar">
+    <div class="pull-right">
+      <%= yield :actions %>
+    </div>
+    <div class="pull-left">
+      <%= yield :tools %>
+    </div>
+  </div>
+
+  <div id="content">
+    <%= yield %>
+  </div>
+
+  <footer>
+    <p>&copy; code!z <%= Time.zone.now.year %></p>
+  </footer>
+
+</div>
+
+<!-- Javascript placed at the end of the document so the pages load faster -->
+<%= javascript_include_tag 'application' %>
+<%= javascript_tag yield(:javascripts) if content_for?(:javascripts) %>
+
+</body>
+</html>

data/test/templates/app/views/layouts/bootstrap.html.haml

@@ -0,0 +1,49 @@
+!!! 5
+
+%html
+  %head
+    %meta{:charset => 'utf-8'}
+    %title= strip_tags(@title)
+    = csrf_meta_tag
+
+    <!-- HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+    <![endif]-->
+
+    = stylesheet_link_tag 'application', :media => 'all'
+    %style{:type => "text/css"}
+      body { padding-top: 70px; }
+      h1 { margin-bottom: 10px; }
+  
+    %link{:href => "images/favicon.ico", :rel => "shortcut icon"}
+    %link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}
+    %link{:href => "images/apple-touch-icon-72x72.png", :rel => "apple-touch-icon", :sizes => "72x72"}
+    %link{:href => "images/apple-touch-icon-114x114.png", :rel => "apple-touch-icon", :sizes => "114x114"}
+
+    = yield :head
+
+  %body
+
+    .navbar.navbar-fixed-top
+      .navbar-inner
+        .container= render 'layouts/nav'
+
+    .container
+
+      %h1= @title
+
+      = render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level
+
+      .actions.btn-toolbar
+        .pull-right= yield :actions
+        .pull-left= yield :tools
+
+      #content= yield
+
+      %footer
+        %p
+          &copy; code!z #{Time.zone.now.year}
+
+  = javascript_include_tag 'application'
+  = javascript_tag yield(:javascripts) if content_for?(:javascripts)

data/test/templates/app/views/people/_attrs.html.erb

@@ -1,5 +1,5 @@
-<%= render_attrs @entry, *default_attrs %>
+<%= render_attrs @person, *default_attrs %>
 <%= labeled(ti(:i_think_its), ti(:nice)) %>
 <%= labeled(ti(:check_google)) do %>
-	<%= link_to ti(:"link.maps"), "http://map.google.com/?q=#{@entry.name}" %>
+  <%= link_to ti(:"link.maps"), "http://map.google.com/?q=#{@person.name}" %>
 <% end %>

data/test/templates/app/views/people/_attrs.html.haml

@@ -1,4 +1,4 @@
-= render_attrs @entry, *default_attrs
+= render_attrs entry, *default_attrs
 = labeled(ti(:i_think_its), ti(:nice))
 = labeled(ti(:check_google)) do
-	= link_to ti(:"link.maps"), "http://map.google.com/?q=#{@entry.name}"
+  = link_to ti(:"link.maps"), "http://map.google.com/?q=#{entry.name}"

data/test/templates/config/routes.rb

@@ -1,19 +1,19 @@
 TestApp::Application.routes.draw do
-  
+
   resources :people do
-  	collection do
+    collection do
       get :ajax
     end
   end
 
   match 'vips' => 'vips#index', :as => :vips
-  
+
   namespace :admin do
     resources :countries do
       collection do
         get :ajax
       end
-        
+
       resources :cities do
         collection do
           get :ajax
@@ -23,7 +23,7 @@ TestApp::Application.routes.draw do
   end
 
   root :to => 'people#index'
-  
+
   # 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.

data/test/templates/db/migrate/20100511174904_create_people_and_cities.rb

@@ -4,7 +4,7 @@ class CreatePeopleAndCities < ActiveRecord::Migration
       t.string :name, :null => false
       t.string :code, :null => :false, :limit => 3
     end
-    
+
     create_table :cities do |t|
       t.string :name, :null => false
       t.integer :country_id, :null => false