dry_crud 1.4.0 → 1.5.0

data/test/templates/test/functional/admin/countries_controller_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+require File.join('functional', 'crud_controller_test_helper')
+
+class Admin::CountriesControllerTest < ActionController::TestCase
+
+  include CrudControllerTestHelper
+
+  def test_setup
+    assert_equal 3, Country.count
+    assert_recognizes({:controller => 'admin/countries', :action => 'index'}, 'admin/countries')
+    assert_recognizes({:controller => 'admin/countries', :action => 'show', :id => '1'}, 'admin/countries/1')
+  end
+
+  def test_index
+    super
+    assert_equal Country.order('name').all, assigns(:entries)
+    assert_equal [:admin], @controller.send(:parents)
+    assert_nil @controller.send(:parent)
+    assert_equal Country.scoped, @controller.send(:model_scope)
+    assert_equal [:admin,2], @controller.send(:path_args, 2)
+  end
+
+  def test_show
+    get :show, test_params(:id => test_entry.id)
+    assert_redirected_to_index
+  end
+
+  def test_show_with_non_existing_id_raises_RecordNotFound #not
+    get :show, test_params(:id => 9999)
+    assert_redirected_to_index
+  end
+  
+  protected
+
+  def test_entry
+    countries(:usa)
+  end
+
+  def test_entry_attrs
+    {:name => 'United States of America', :code => 'US'}
+  end
+
+end

data/test/templates/test/functional/people_controller_test.rb

@@ -14,7 +14,12 @@ class PeopleControllerTest < ActionController::TestCase
   def test_index
     super
     assert_equal 2, assigns(:entries).size
-    assert_equal Person.includes(:city).order('people.name, cities.country_code, cities.name').all, assigns(:entries)
+    assert_equal Person.includes(:city => :country).order('people.name, countries.code, cities.name').all, assigns(:entries)
+    
+    assert_equal [], @controller.send(:parents)
+    assert_nil @controller.send(:parent)
+    assert_equal Person.scoped, @controller.send(:model_scope)
+    assert_equal [2], @controller.send(:path_args, 2)
   end
 
   def test_index_search

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 +01:00
+date: 2012-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 2
+        version: "3.2"
   type: :runtime
   version_requirements: *id001
 description: |
@@ -52,7 +52,8 @@ files:
 - lib/generators/dry_crud/templates/app/assets/images/actions/edit.png
 - lib/generators/dry_crud/templates/app/assets/images/actions/list.png
 - lib/generators/dry_crud/templates/app/assets/images/actions/show.png
-- lib/generators/dry_crud/templates/app/assets/stylesheets/crud.css
+- lib/generators/dry_crud/templates/app/assets/stylesheets/crud.scss
+- lib/generators/dry_crud/templates/app/assets/stylesheets/sample.scss
 - lib/generators/dry_crud/templates/app/controllers/crud_controller.rb
 - lib/generators/dry_crud/templates/app/controllers/list_controller.rb
 - lib/generators/dry_crud/templates/app/helpers/crud_helper.rb
@@ -61,22 +62,43 @@ files:
 - lib/generators/dry_crud/templates/app/helpers/standard_helper.rb
 - lib/generators/dry_crud/templates/app/helpers/standard_table_builder.rb
 - lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/_attrs.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_attrs.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/_form.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_form.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/_list.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_list.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/edit.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/edit.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/new.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/new.html.haml
 - lib/generators/dry_crud/templates/app/views/crud/show.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/show.html.haml
+- lib/generators/dry_crud/templates/app/views/layouts/_flash.html.erb
+- lib/generators/dry_crud/templates/app/views/layouts/_flash.html.haml
 - lib/generators/dry_crud/templates/app/views/layouts/_menu.html.erb
+- lib/generators/dry_crud/templates/app/views/layouts/_menu.html.haml
+- lib/generators/dry_crud/templates/app/views/layouts/_nav.html.erb
+- lib/generators/dry_crud/templates/app/views/layouts/_nav.html.haml
 - lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb
+- lib/generators/dry_crud/templates/app/views/layouts/crud.html.haml
 - lib/generators/dry_crud/templates/app/views/list/_actions_index.html.erb
+- lib/generators/dry_crud/templates/app/views/list/_actions_index.html.haml
 - lib/generators/dry_crud/templates/app/views/list/_list.html.erb
+- lib/generators/dry_crud/templates/app/views/list/_list.html.haml
 - lib/generators/dry_crud/templates/app/views/list/_search.html.erb
+- lib/generators/dry_crud/templates/app/views/list/_search.html.haml
 - lib/generators/dry_crud/templates/app/views/list/index.html.erb
+- lib/generators/dry_crud/templates/app/views/list/index.html.haml
 - lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.erb
+- lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.haml
 - lib/generators/dry_crud/templates/app/views/shared/_labeled.html.erb
+- lib/generators/dry_crud/templates/app/views/shared/_labeled.html.haml
 - lib/generators/dry_crud/templates/config/locales/en_crud.yml
 - lib/generators/dry_crud/templates/INSTALL
 - lib/generators/dry_crud/templates/test/crud_test_model.rb
@@ -90,22 +112,38 @@ files:
 - lib/generators/dry_crud/templates/test/unit/helpers/standard_helper_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/standard_table_builder_test.rb
 - lib/generators/dry_crud/USAGE
+- test/templates/app/controllers/admin/cities_controller.rb
+- test/templates/app/controllers/admin/countries_controller.rb
 - test/templates/app/controllers/ajax_controller.rb
-- test/templates/app/controllers/cities_controller.rb
 - test/templates/app/controllers/people_controller.rb
 - test/templates/app/controllers/vips_controller.rb
+- test/templates/app/helpers/cities_helper.rb
 - test/templates/app/helpers/people_helper.rb
 - test/templates/app/models/city.rb
+- test/templates/app/models/country.rb
 - test/templates/app/models/person.rb
+- test/templates/app/views/admin/cities/_actions_index.html.erb
+- test/templates/app/views/admin/cities/_actions_index.html.haml
+- test/templates/app/views/admin/cities/_form.html.erb
+- test/templates/app/views/admin/cities/_form.html.haml
+- test/templates/app/views/admin/cities/_hello.html.erb
+- test/templates/app/views/admin/cities/_hello.html.haml
+- test/templates/app/views/admin/cities/_list.html.erb
+- test/templates/app/views/admin/cities/_list.html.haml
+- test/templates/app/views/admin/countries/_list.html.erb
+- test/templates/app/views/admin/countries/_list.html.haml
 - test/templates/app/views/ajax/_actions_index.html.erb
+- test/templates/app/views/ajax/_actions_index.html.haml
 - test/templates/app/views/ajax/_hello.html.erb
+- test/templates/app/views/ajax/_hello.html.haml
 - test/templates/app/views/ajax/ajax.js.erb
-- 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/ajax/ajax.js.haml
 - test/templates/app/views/layouts/_menu.html.erb
+- test/templates/app/views/layouts/_menu.html.haml
 - test/templates/app/views/people/_attrs.html.erb
+- test/templates/app/views/people/_attrs.html.haml
 - test/templates/app/views/people/_list.html.erb
+- test/templates/app/views/people/_list.html.haml
 - test/templates/config/database.yml
 - test/templates/config/locales/en_cities.yml
 - test/templates/config/routes.rb
@@ -113,8 +151,10 @@ files:
 - test/templates/db/seeds.rb
 - test/templates/Gemfile
 - test/templates/test/fixtures/cities.yml
+- test/templates/test/fixtures/countries.yml
 - test/templates/test/fixtures/people.yml
-- test/templates/test/functional/cities_controller_test.rb
+- test/templates/test/functional/admin/cities_controller_test.rb
+- test/templates/test/functional/admin/countries_controller_test.rb
 - test/templates/test/functional/people_controller_test.rb
 - Rakefile
 - MIT-LICENSE
@@ -127,11 +167,10 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Dry Crud
+- "\"Dry Crud\""
 - --main
 - README.rdoc
 - --line-numbers
-- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/generators/dry_crud/templates/app/assets/stylesheets/crud.css

@@ -1,239 +0,0 @@
-body, div, p, td, th {
-	font-family: Verdana, Geneva, Helvetica, Arial, sans-serif;
-	font-size: 11pt;
-}
-
-body {
-	text-align: center;
-    margin: 0pt;
-    background-color: #ddf;
-}
-
-#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;
-}
-
-h1 {
-	font-size: 150%;
-	margin: 30px 0 15px 0;
-}
-
-tr.even {
-	background-color: #F0F0F0;
-}
-
-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;
-}
-
-.center {
-	text-align: center;
-}
-
-.labeled {
-	vertical-align: top;
-	margin: 1pt;
-}
-
-.labeled .caption {
-	font-style: italic;
-	width: 120pt;
-	padding-right: 5pt;
-	float: left;
-}
-
-.labeled .value {
-	margin-left: 125pt;
-}
-
-.labeled .value p {
-	margin: 0px;
-}
-
-.actions {
-	float: right;
-}
-
-a.action {
-    margin-right: 10pt;
-}
-
-a.action img {
-	vertical-align: text-top;
-}
-
-input, textarea {
-	font-family: Verdana, Geneva, Helvetica, Arial, sans-serif;
-	font-size: 10pt;
-}
-
-input[type=text], input[type=password] {
-  	width: 180pt;
-}
-
-input[type=number] {
-  	width: 80pt;
-}
-
-textarea {
-	width: 180pt;
-	height: 80pt;
-}
-
-.cancel {
-    font-size: 80%;
-    margin-left: 7pt;
-}
-
-.required {
-	font-size: 80%;
-	vertical-align: top;
-	margin-left: 1pt;
-}
-
-#flash_notice, #flash_alert {
-    margin: 15pt;
-    padding: 5pt 10pt;
-}
-
-#flash_notice {
-    border: solid 2px #6a6;
-    background-color: #afa;
-}
-
-#flash_alert {
-    border: solid 2px #da9;
-    background-color: #fec;
-}
-
-#error_explanation {
-	border: solid 2pt #da9;
-	margin: 10pt;
-	padding: 5pt 10pt;
-	background-color: #fec;
-}
-
-#error_explanation h2 {
-	font-size: 11pt;
-	margin-top: 0pt;
-}
-
-#error_explanation ul {
-	margin-bottom: 5pt;
-}
-
-.value div.field_with_errors {
-	background-color: #da9;
-	display: inline-block;
-	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/test/templates/app/controllers/cities_controller.rb

@@ -1,10 +0,0 @@
-class CitiesController < AjaxController
-
-  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/views/cities/_form.html.erb

@@ -1,8 +0,0 @@
-<%= 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, 
-                                    f.select_options(:country_code)) %>
-<% end -%>

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

@@ -1,4 +0,0 @@
-<%= crud_table *default_attrs do |t|
-    action_col(t) { |e| link_table_action_edit(e) }
-    action_col(t) { |e| link_table_action_destroy(e) }
-end %>

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

@@ -1,45 +0,0 @@
-require 'test_helper'
-require File.join('functional', 'crud_controller_test_helper')
-
-class CitiesControllerTest < ActionController::TestCase
-
-  include CrudControllerTestHelper
-
-  def test_setup
-    assert_equal 3, City.count
-    assert_recognizes({:controller => 'cities', :action => 'index'}, '/cities')
-    assert_recognizes({:controller => 'cities', :action => 'show', :id => '1'}, '/cities/1')
-  end
-
-  def test_index
-    super
-    assert_equal 3, assigns(:entries).size
-    assert_equal City.order('country_code, name').all, assigns(:entries)
-  end
-
-  def test_show
-    get :show, :id => test_entry.id
-    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
-    cities(:rj)
-  end
-
-  def test_entry_attrs
-    {:name => 'Rejkiavik', :country_code => 'IS'}
-  end
-
-end