dry_crud 1.5.0 → 1.6.0

data/test/templates/db/seeds.rb

@@ -13,62 +13,62 @@ lon = City.create!(:name => 'London', :country => gb)
 br = City.create!(:name => 'Berlin', :country => de)
 
 Person.create!(:name => 'Albert Einstein',
-			   :city => be,
-			   :children => 2,
-			   :rating => 9.8,
-			   :income => 84000,
-			   :birthdate => '1904-10-18',
-			   :gets_up_at => '05:43',
-			   :remarks => "Great physician\n Good cyclist")
+         :city => be,
+         :children => 2,
+         :rating => 9.8,
+         :income => 84000,
+         :birthdate => '1904-10-18',
+         :gets_up_at => '05:43',
+         :remarks => "Great physician\n Good cyclist")
 Person.create!(:name => 'Adolf Ogi',
-			   :city => be,
-			   :children => 3,
-			   :rating => 4.2,
-			   :income => 264000,
-			   :birthdate => '1938-01-22',
-			   :gets_up_at => '04:30',
-			   :remarks => 'Freude herrscht!')
+         :city => be,
+         :children => 3,
+         :rating => 4.2,
+         :income => 264000,
+         :birthdate => '1938-01-22',
+         :gets_up_at => '04:30',
+         :remarks => 'Freude herrscht!')
 Person.create!(:name => 'Jay Z',
-			   :city => ny,
-			   :children => 0,
-			   :rating => 7.2,
-			   :income => 868345,
-			   :birthdate => '1976-05-02',
-			   :gets_up_at => '12:00',
-			   :last_seen => '2011-03-10 17:29',
-			   :cool => true,
-			   :remarks => "If got 99 problems\nbut you *** ain't one\nTschie")
+         :city => ny,
+         :children => 0,
+         :rating => 7.2,
+         :income => 868345,
+         :birthdate => '1976-05-02',
+         :gets_up_at => '12:00',
+         :last_seen => '2011-03-10 17:29',
+         :cool => true,
+         :remarks => "If got 99 problems\nbut you *** ain't one\nTschie")
 Person.create!(:name => 'Queen Elisabeth',
-			   :city => lon,
-			   :children => 1,
-			   :rating => 1.56,
-			   :income => 345622,
-			   :birthdate => '1927-08-11',
-			   :gets_up_at => '17:12',
-			   :remarks => '')
+         :city => lon,
+         :children => 1,
+         :rating => 1.56,
+         :income => 345622,
+         :birthdate => '1927-08-11',
+         :gets_up_at => '17:12',
+         :remarks => '')
 Person.create!(:name => 'Schopenhauer',
-			   :city => br,
-			   :children => 7,
-			   :rating => 6.9,
-			   :income => 14000,
-			   :birthdate => '1788-10-18',
-			   :last_seen => '1854-09-01 11:01',
-			   :remarks => 'Neminem laede, immo omnes, quantum potes, iuva.')
+         :city => br,
+         :children => 7,
+         :rating => 6.9,
+         :income => 14000,
+         :birthdate => '1788-10-18',
+         :last_seen => '1854-09-01 11:01',
+         :remarks => 'Neminem laede, immo omnes, quantum potes, iuva.')
 Person.create!(:name => 'ZZ Top',
-			   :city => ny,
-			   :children => 185,
-			   :rating => 1.8,
-			   :income => 84000,
-			   :birthdate => '1948-03-18',
-			   :cool => true,
-			   :remarks => 'zzz..')
+         :city => ny,
+         :children => 185,
+         :rating => 1.8,
+         :income => 84000,
+         :birthdate => '1948-03-18',
+         :cool => true,
+         :remarks => 'zzz..')
 Person.create!(:name => 'Andy Warhol',
-			   :city => ny,
-			   :children => 0,
-			   :rating => 7.5,
-			   :income => 123000,
-			   :birthdate => '1938-09-08',
-			   :last_seen => '1984-10-10 23:39',
-			   :remarks => 'Tomato Soup')
-			
+         :city => ny,
+         :children => 0,
+         :rating => 7.5,
+         :income => 123000,
+         :birthdate => '1938-09-08',
+         :last_seen => '1984-10-10 23:39',
+         :remarks => 'Tomato Soup')
+
 end

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

@@ -13,37 +13,37 @@ class Admin::CitiesControllerTest < ActionController::TestCase
 
   def test_index
     super
-    assert_equal test_entry.country.cities.order('countries.code, cities.name').to_a, assigns(:entries).to_a
-    
+    assert_equal test_entry.country.cities.order('countries.code, cities.name').to_a, entries.to_a
+
+    assert_equal @controller.send(:entries), assigns(:cities)
     assert_equal [:admin, test_entry.country], @controller.send(:parents)
+    assert_equal test_entry.country, assigns(:country)
     assert_equal test_entry.country, @controller.send(:parent)
-    assert_equal test_entry.country.cities, @controller.send(:model_scope)
+    assert_equal test_entry.country.cities.to_a, @controller.send(:model_scope).to_a
     assert_equal [:admin, test_entry.country, 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
+    super
+    assert_equal @controller.send(:entry), assigns(:city)
+    assert_equal [:admin, test_entry.country], @controller.send(:parents)
+    assert_equal test_entry.country, assigns(:country)
+    assert_equal test_entry.country, @controller.send(:parent)
   end
-  
+#
   def test_create
     super
-    assert_equal test_entry.country, assigns(:entry).country
+    assert_equal test_entry.country, entry.country
   end
 
   def test_destroy_with_inhabitants
     ny = cities(:ny)
     assert_no_difference('City.count') do
-      request.env["HTTP_REFERER"]
+      @request.env["HTTP_REFERER"] = admin_country_city_url(ny.country, ny)
       delete :destroy, :country_id => ny.country_id, :id => ny.id
     end
-    assert_redirected_to :action => 'show'
-    assert flash.alert
+    assert_redirected_to [:admin, ny.country, ny]
+    assert_present flash[:alert]
   end
 
   protected

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

@@ -13,7 +13,7 @@ class Admin::CountriesControllerTest < ActionController::TestCase
 
   def test_index
     super
-    assert_equal Country.order('name').all, assigns(:entries)
+    assert_equal Country.order('name').all, entries
     assert_equal [:admin], @controller.send(:parents)
     assert_nil @controller.send(:parent)
     assert_equal Country.scoped, @controller.send(:model_scope)
@@ -25,12 +25,11 @@ class Admin::CountriesControllerTest < ActionController::TestCase
     assert_redirected_to_index
   end
 
-  def test_show_with_non_existing_id_raises_RecordNotFound #not
-    get :show, test_params(:id => 9999)
+  protected
+
+  def assert_redirected_to_show2(entry)
     assert_redirected_to_index
   end
-  
-  protected
 
   def test_entry
     countries(:usa)

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

@@ -13,9 +13,9 @@ class PeopleControllerTest < ActionController::TestCase
 
   def test_index
     super
-    assert_equal 2, assigns(:entries).size
-    assert_equal Person.includes(:city => :country).order('people.name, countries.code, cities.name').all, assigns(:entries)
-    
+    assert_equal 2, entries.size
+    assert_equal Person.includes(:city => :country).order('people.name, countries.code, cities.name').all, entries
+
     assert_equal [], @controller.send(:parents)
     assert_nil @controller.send(:parent)
     assert_equal Person.scoped, @controller.send(:model_scope)
@@ -24,7 +24,35 @@ class PeopleControllerTest < ActionController::TestCase
 
   def test_index_search
     super
-  	assert_equal 1, assigns(:entries).size
+    assert_equal 1, entries.size
+  end
+
+  def test_show_js
+    get :show, :id => test_entry.id, :format => :js
+    assert_response :success
+    assert_template 'show'
+    assert_match /\$\('#content'\)/, response.body
+  end
+
+  def test_edit_js
+    get :edit, :id => test_entry.id, :format => :js
+    assert_response :success
+    assert_template 'edit'
+    assert_match /\$\('#content'\)/, response.body
+  end
+
+  def test_update_js
+    put :update, :id => test_entry.id, :format => :js, :person => {:name => 'New Name'}
+    assert_response :success
+    assert_template 'update'
+    assert_match /\$\('#content'\)/, response.body
+  end
+
+  def test_update_fail_js
+    put :update, :id => test_entry.id, :format => :js, :person => {:name => ' '}
+    assert_response :success
+    assert_template 'update'
+    assert_match /alert/, response.body
   end
 
   protected

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 +01:00
+date: 2012-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -81,8 +81,6 @@ files:
 - 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
@@ -99,6 +97,7 @@ files:
 - 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/initializers/field_error_proc.rb
 - 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
@@ -124,6 +123,8 @@ files:
 - 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/_attrs.html.erb
+- test/templates/app/views/admin/cities/_attrs.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
@@ -134,12 +135,24 @@ files:
 - 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/_actions_show.html.erb
+- test/templates/app/views/ajax/_actions_show.html.haml
+- test/templates/app/views/ajax/_form.html.erb
+- test/templates/app/views/ajax/_form.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/ajax/ajax.js.haml
-- test/templates/app/views/layouts/_menu.html.erb
-- test/templates/app/views/layouts/_menu.html.haml
+- test/templates/app/views/ajax/edit.js.erb
+- test/templates/app/views/ajax/edit.js.haml
+- test/templates/app/views/ajax/show.js.erb
+- test/templates/app/views/ajax/show.js.haml
+- test/templates/app/views/ajax/update.js.erb
+- test/templates/app/views/ajax/update.js.haml
+- test/templates/app/views/layouts/_nav.html.erb
+- test/templates/app/views/layouts/_nav.html.haml
+- test/templates/app/views/layouts/bootstrap.html.erb
+- test/templates/app/views/layouts/bootstrap.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

data/lib/generators/dry_crud/templates/app/views/layouts/_menu.html.erb

@@ -1,3 +0,0 @@
-<li><%= link_to "Link1", "/path1"  %></li>
-<li><%= link_to "Link2", "/path2"  %></li>
-<li><%= link_to "Link3", "/path3"  %></li>

data/lib/generators/dry_crud/templates/app/views/layouts/_menu.html.haml

@@ -1,3 +0,0 @@
-%li= link_to "Link1", "/path1"
-%li= link_to "Link2", "/path2"
-%li= link_to "Link3", "/path3"

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

@@ -1,3 +0,0 @@
-<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>

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

@@ -1,3 +0,0 @@
-%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