RubyGems - dry_crud - Versions diffs - 1.2.5 → 1.2.6 - Mend

dry_crud 1.2.5 → 1.2.6

Files changed (42) hide show

data/lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb CHANGED Viewed

@@ -8,18 +8,31 @@
   <%= stylesheet_link_tag 'crud' %>
   <%= javascript_include_tag :all %>
   <%= csrf_meta_tag %>
+  <%= yield :head %>
 </head>
 <body>
-<h1><%= @title %></h1>
-<% if flash[:notice].present? %>
-    <div id="flash_notice"><%= flash[:notice] %></div>
-<% elsif flash[:alert].present? %>
-    <div id="flash_alert"><%= flash[:alert] %></div>
-<% end %>
-<%= yield %>
+<div id="container">
+	<ul id="menu">
+		<%= render :partial => 'layouts/menu' %>
+	</ul>
+	<h1><%= @title %></h1>
+	<% if flash.notice.present? %>
+		<div id="flash_notice"><%= flash.notice %></div>
+	<% elsif flash.alert.present? %>
+		<div id="flash_alert"><%= flash.alert %></div>
+	<% end %>
+	<div class="actions">
+		<%= yield :actions %>
+	</div>
+	<div id="content">
+		<%= yield %>
+	</div>
+</div>
 </body>
 </html>

data/lib/generators/dry_crud/templates/app/views/list/_search.html.erb CHANGED Viewed

@@ -1,7 +1,5 @@
-<%= form_tag(nil, {:method => :get}) do %>
+<%= form_tag(nil, {:method => :get, :class => 'search'}) do %>
   <%= hidden_field_tag :returning, true %>
   <%= search_field_tag :q, params[:q] %>
   <%= submit_tag 'Search' %>
 <% end %>
-<br/>

data/lib/generators/dry_crud/templates/app/views/list/index.html.erb CHANGED Viewed

@@ -1,9 +1,9 @@
 <% @title ||= "Listing #{models_label}" -%>
-<%= render :partial => 'search' if search_support? %>
+<% content_for(:actions, render(:partial => 'actions_index')) %>
-<%= render :partial => 'list' %>
+<%= render :partial => 'search' if search_support? %>
-<br/>
+<%= clear %>
-<%= render :partial => 'actions_index' %>
+<%= render :partial => 'list' %>

data/lib/generators/dry_crud/templates/public/images/actions/add.png ADDED Viewed

Binary file

data/lib/generators/dry_crud/templates/public/images/actions/delete.png ADDED Viewed

Binary file

data/lib/generators/dry_crud/templates/public/images/actions/edit.png ADDED Viewed

Binary file

data/lib/generators/dry_crud/templates/public/images/actions/list.png ADDED Viewed

Binary file

data/lib/generators/dry_crud/templates/public/images/actions/show.png ADDED Viewed

Binary file

data/lib/generators/dry_crud/templates/public/stylesheets/crud.css CHANGED Viewed

@@ -3,17 +3,27 @@ body, div, p, td, th {
 	font-size: 11pt;
 }
-td {
-	vertical-align: top;
+body {
+	text-align: center;
+    margin: 0pt;
+    background-color: #ddf;
 }
-table.list {}
-/* div rendered if no entries available for list */
-div.list {}
+#container {
+	padding: 20pt 20pt;
+	margin: 0 auto;
+	text-align: left;
+	width: 600pt;
+	height: 100%;
+    background-color: #f6f6ff;
+	-moz-box-shadow: 0px 0px 10px #2580a2;
+    -webkit-box-shadow: 0px 0px 10px #2580a2;
+    box-shadow: 0px 0px 10px #2580a2;
+}
-table.list th a {
-     color: darkblue;
+h1 {
+	font-size: 150%;
+	margin: 30px 0 15px 0;
 }
 tr.even {
@@ -24,10 +34,69 @@ tr.odd {
 	background-color: #F8F8F8;
 }
+td {
+	vertical-align: top;
+}
 td p {
     margin: 0;
 }
+a {
+	color: #2580a2;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+a:visited {
+	color:  #2580a2;
+}
+a img {
+	border: none;
+}
+.list {
+	margin-top: 10pt;
+}
+table.list {
+	border-collapse: collapse;
+	width: 100%;
+	padding: 0;
+}
+/* div rendered if no entries available for list */
+div.list {}
+table.list th {
+	text-align: left;
+	background-color: #2580a2;
+    color: white;
+	font-weight: bold;
+    padding: 2px 4px;
+}
+table.list th a {
+    color: white;
+    text-decoration: none;
+}
+table.list td {
+	padding: 2px 4px;
+}
+.clear {
+  clear: both;
+  height: 0;
+  overflow: hidden;
+}
 .right {
 	text-align: right;
 }
@@ -56,31 +125,46 @@ td p {
 	margin: 0px;
 }
-.attributes {}
+.actions {
+	float: right;
+}
 a.action {
-	color: red;
-	text-decoration: none;
+    margin-right: 10pt;
 }
-a:hover.action {
-	text-decoration: underline;
+a.action img {
+	vertical-align: text-top;
+}
+.cancel {
+    font-size: 80%;
+    margin-left: 7pt;
+}
+.required {
+	font-size: 80%;
+	vertical-align: top;
 }
-a:visited.action {
-	color: red;
+#flash_notice, #flash_alert {
+    margin: 15pt;
+    padding: 5pt 10pt;
 }
 #flash_notice {
     border: solid 2px #6a6;
     background-color: #afa;
-    margin: 20pt;
-    padding: 5pt 10pt;
+}
+#flash_alert {
+    border: solid 2px #da9;
+    background-color: #fec;
 }
 #error_explanation {
 	border: solid 2pt #da9;
-	margin: 20pt;
+	margin: 10pt;
 	padding: 5pt 10pt;
 	background-color: #fec;
 }
@@ -100,3 +184,37 @@ a:visited.action {
 	padding: 1px 1px;
 }
+#menu {
+    background: #333;
+	-moz-box-shadow: 0px 3px 3px #2580a2;
+    -webkit-box-shadow: 0px 3px 3px #2580a2;
+    box-shadow: 0px 3px 3px #2580a2;
+    float: left;
+    list-style: none;
+    margin: -20pt;
+    padding: 0 20px;
+    width: 610pt;
+}
+#menu li {
+    float: left;
+    font-size: 110%;
+    margin: 0;
+    padding: 0;
+}
+#menu a {
+    background: #333 bottom right no-repeat;
+    color: #ddd;
+    display: block;
+    float: left;
+    margin: 0;
+    padding: 4px 12px;
+    text-decoration: none;
+}
+#menu a:hover {
+    background: #2580a2 bottom center no-repeat;
+    color: #fff;
+    padding-bottom: 4px;
+}

data/lib/generators/dry_crud/templates/test/crud_test_model.rb CHANGED Viewed

@@ -1,13 +1,13 @@
 # A dummy model used for general testing.
 class CrudTestModel < ActiveRecord::Base #:nodoc:
+  belongs_to :companion, :class_name => 'CrudTestModel'
   validates :name, :presence => true
   validates :rating, :inclusion => { :in => 1..10 }
   default_scope order('name')
-  belongs_to :companion, :class_name => 'CrudTestModel'
   def label
     name
   end
@@ -68,7 +68,7 @@ class CrudTestModelsController < CrudController #:nodoc:
   end
   # create callback methods that record the before_render callbacks
-  [:index, :show, :new, :edit].each do |a|
+  [:index, :show, :new, :edit, :form].each do |a|
     callback = "before_render_#{a.to_s}"
     send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
   end
@@ -110,6 +110,7 @@ module CrudTestHelper
       silence_stream(STDOUT) do
         ActiveRecord::Base.connection.create_table :crud_test_models, :force => true do |t|
           t.string  :name, :null => false, :limit => 50
+          t.string  :password
           t.string  :whatever
           t.integer :children
           t.integer :companion_id

data/lib/generators/dry_crud/templates/test/custom_assertions.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module CustomAssertions
     assert_block(full_message) { !collection.include?(element) }
   end
-  # Asserts that <regexp> occurs exactly <expected> times in <string>.
+  # Asserts that regexp occurs exactly expected times in string.
   def assert_count(expected, regexp, string, message = "")
     actual = string.scan(regexp).size
     full_message = build_message(message, "<?> expected to occur ? time(s), but occured ? time(s) in \n<?>.",

data/lib/generators/dry_crud/templates/test/functional/crud_test_models_controller_test.rb CHANGED Viewed

@@ -100,9 +100,24 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal({:sort => 'chatty', :sort_dir => 'asc', :q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
+  def test_index_returning
+    session[:list_params] = {}
+    session[:list_params]['/crud_test_models'] = {:q => 'DDD', :sort => 'chatty', :sort_dir => 'desc'}
+    get :index, :returning => true
+    assert_response :success
+    assert_template 'index'
+    assert_present assigns(:entries)
+    assert_equal 3, assigns(:entries).size
+    assert_equal ['BBBBB', 'DDDDD', 'CCCCC'], assigns(:entries).collect(&:name)
+    assert_equal 'DDD', @controller.params[:q]
+    assert_equal 'chatty', @controller.params[:sort]
+    assert_equal 'desc', @controller.params[:sort_dir]
+  end
   def test_new
     super
     assert assigns(:companions)
+    assert_equal [:before_render_new, :before_render_form], @controller.called_callbacks
   end
   def test_create
@@ -110,6 +125,11 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal [:before_create, :before_save, :after_save, :after_create], @controller.called_callbacks
   end
+  def test_edit
+  	super
+    assert_equal [:before_render_edit, :before_render_form], @controller.called_callbacks
+  end
   def test_update
     super
     assert_equal [:before_update, :before_save, :after_save, :after_update], @controller.called_callbacks
@@ -129,7 +149,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert assigns(:companions)
     assert flash[:error].present?
     assert_equal 'illegal', assigns(:entry).name
-    assert_equal [:before_render_new], @controller.called_callbacks
+    assert_equal [:before_render_new, :before_render_form], @controller.called_callbacks
   end
   def test_create_with_before_callback_redirect

data/lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb CHANGED Viewed

@@ -91,11 +91,6 @@ class CrudHelperTest < ActionView::TestCase
     assert_match /textarea .*?name="crud_test_model\[remarks\]"/, f
   end
-  test "default attributes do not include id" do
-    assert_equal [:name, :whatever, :children, :companion_id, :rating, :income,
-                  :birthdate, :human, :remarks, :created_at, :updated_at], default_attrs
-  end
   # Controller helper methods for the tests
   def model_class

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb CHANGED Viewed

@@ -23,6 +23,11 @@ class StandardFormBuilderTest < ActionView::TestCase
     assert form.string_field(:name).html_safe?
   end
+  test "input_field dispatches password attr to password_field" do
+    assert_equal form.password_field(:password), form.input_field(:password)
+    assert form.password_field(:name).html_safe?
+  end
   test "input_field dispatches text attr to text_area" do
     assert_equal form.text_area(:remarks), form.input_field(:remarks)
     assert form.text_area(:remarks).html_safe?
@@ -106,4 +111,21 @@ class StandardFormBuilderTest < ActionView::TestCase
   	assert_match /label for.+input/m, result
   end
+  test "required mark is shown" do
+    assert_equal StandardFormBuilder::REQUIRED_MARK, form.required_mark(:name)
+    assert_nil form.required_mark(:rating)
+    assert_nil form.required_mark(:anything)
+  end
+  test "method missing still works" do
+    assert_raise(NoMethodError) do
+      form.blabla
+    end
+  end
+  test "respond to still works" do
+    assert !form.respond_to?(:blalba)
+    assert form.respond_to?(:text_field)
+    assert form.respond_to?(:labeled_text_field)
+  end
 end

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

@@ -2,7 +2,10 @@ class City < ActiveRecord::Base
   has_many :people
-  validates_presence_of :name, :country_code
+  validates :name, :presence => true
+  validates :country_code, :presence => true
+  before_destroy :protect_with_inhabitants
   default_scope order('country_code, name')
@@ -10,4 +13,13 @@ class City < ActiveRecord::Base
     "#{name} (#{country_code})"
   end
+  protected
+  def protect_with_inhabitants
+    if people.exists?
+      errors.add(:base, "You cannot destroy this city as long as it has any inhabitants")
+      false
+    end
+  end
 end

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

@@ -4,6 +4,6 @@ class Person < ActiveRecord::Base
   belongs_to :city
-  validates_presence_of :name
+  validates :name, :presence => true
 end

data/test/templates/app/views/ajax/_actions_index.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
 <%= render :partial => 'crud/actions_index' %>
-<%= link_action 'Ajahx', {:action => 'ajax'}, :method => :get, :remote => true %>
+<%= link_action 'Ajahx', nil, {:action => 'ajax'}, :method => :get, :remote => true %>
 <div id="response"></div>

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

@@ -1,4 +1,4 @@
 <%= 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" })%>
+    <%= f.labeled_collection_select(:country_code, ['BR', 'CH', 'DE', 'GB', 'JP', 'USA'], :to_s, :to_s, { :prompt => "Please select" })%>
 <% end -%>

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

@@ -1,4 +1,4 @@
 <%= crud_table *default_attrs do |t|
-	t.col('', :class => 'center') {|e| link_action_edit(e) }
-	t.col('', :class => 'center') {|e| link_action_destroy(e) }
+    action_col(t) { |e| link_table_action_edit(e) }
+    action_col(t) { |e| link_table_action_destroy(e) }
 end %>

data/test/templates/app/views/layouts/_menu.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<li><%= link_to 'People', people_path %></li>
+<li><%= link_to 'Cities', cities_path %></li>
+<li><%= link_to 'VIPs', vips_path %></li>

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

@@ -1,7 +1,5 @@
-<div class="attributes">
-	<%= render_attrs @entry, default_attrs, false %>
-	<%= labeled("I thinks its", "nice") %>
-	<%= labeled("Check google") do %>
-		<%= link_to "Maps", "http://map.google.com/?q=#{@entry.name}" %>
-	<% end %>
-</div>
+<%= render_attrs @entry, *default_attrs %>
+<%= labeled("I thinks its", "nice") %>
+<%= labeled("Check google") do %>
+	<%= link_to "Maps", "http://map.google.com/?q=#{@entry.name}" %>
+<% end %>

data/test/templates/config/routes.rb CHANGED Viewed

@@ -13,6 +13,8 @@ TestApp::Application.routes.draw do
   end
   match 'vips' => 'vips#index', :as => :vips
+  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

data/test/templates/db/seeds.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+if City.count == 0
 be = City.create!(:name => 'Bern', :country_code => 'CH')
 ny = City.create!(:name => 'New York', :country_code => 'USA')
 sf = City.create!(:name => 'San Francisco', :country_code => 'USA')
@@ -52,4 +54,6 @@ Person.create!(:name => 'Andy Warhol',
 			   :rating => 7.5,
 			   :income => 123000,
 			   :birthdate => '1938-09-08',
-			   :remarks => 'Tomato Soup')
+			   :remarks => 'Tomato Soup')
+end

data/test/templates/test/functional/cities_controller_test.rb CHANGED Viewed

@@ -22,6 +22,16 @@ class CitiesControllerTest < ActionController::TestCase
     assert_redirected_to_index
   end
+  def test_destroy_with_inhabitants
+    ny = cities(:ny)
+    assert_no_difference('City.count') do
+      request.env["HTTP_REFERER"]
+      delete :destroy, :id => ny.id
+    end
+    assert_redirected_to :action => 'show'
+    assert flash.alert
+  end
   protected
   def test_entry

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  hash: 21
+  hash: 19
   prerelease: false
   segments:
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors:
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -64,6 +64,7 @@ files:
 - lib/generators/dry_crud/templates/app/views/crud/edit.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/new.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/show.html.erb
+- lib/generators/dry_crud/templates/app/views/layouts/_menu.html.erb
 - lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb
 - lib/generators/dry_crud/templates/app/views/list/_actions_index.html.erb
 - lib/generators/dry_crud/templates/app/views/list/_list.html.erb
@@ -72,6 +73,11 @@ files:
 - lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.erb
 - lib/generators/dry_crud/templates/app/views/shared/_labeled.html.erb
 - lib/generators/dry_crud/templates/INSTALL
+- lib/generators/dry_crud/templates/public/images/actions/add.png
+- lib/generators/dry_crud/templates/public/images/actions/delete.png
+- lib/generators/dry_crud/templates/public/images/actions/edit.png
+- lib/generators/dry_crud/templates/public/images/actions/list.png
+- lib/generators/dry_crud/templates/public/images/actions/show.png
 - lib/generators/dry_crud/templates/public/stylesheets/crud.css
 - lib/generators/dry_crud/templates/test/crud_test_model.rb
 - lib/generators/dry_crud/templates/test/custom_assertions.rb
@@ -99,13 +105,12 @@ files:
 - test/templates/app/views/cities/_form.html.erb
 - test/templates/app/views/cities/_hello.html.erb
 - test/templates/app/views/cities/_list.html.erb
-- test/templates/app/views/layouts/application.html.erb
+- test/templates/app/views/layouts/_menu.html.erb
 - test/templates/app/views/people/_attrs.html.erb
 - test/templates/app/views/people/_list.html.erb
 - test/templates/config/routes.rb
 - test/templates/db/migrate/20100511174904_create_people_and_cities.rb
 - test/templates/db/seeds.rb
-- test/templates/public/stylesheets/demo.css
 - test/templates/test/fixtures/cities.yml
 - test/templates/test/fixtures/people.yml
 - test/templates/test/functional/cities_controller_test.rb

data/test/templates/app/views/layouts/application.html.erb DELETED Viewed

@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title><%= @title %></title>
-  <%= stylesheet_link_tag 'crud', 'demo' %>
-  <%= javascript_include_tag :all %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-<div id="content">
-	<ul id="menu">
-		<li><%= link_to 'People', people_path %></li>
-		<li><%= link_to 'Cities', cities_path %></li>
-        <li><%= link_to 'VIPs', vips_path %></li>
-	</ul>
-	<h1><%= @title %></h1>
-	<% if flash[:notice].present? %>
-	    <div id="flash_notice"><%= flash[:notice] %></div>
-	<% elsif flash[:alert].present? %>
-	    <div id="flash_alert"><%= flash[:alert] %></div>
-	<% end %>
-	<%= yield %>
-</div>
-</body>
-</html>