dry_crud 1.6.0 → 1.7.0

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

@@ -4,11 +4,6 @@ require 'custom_assertions'
 
 class CrudHelperTest < ActionView::TestCase
 
-  REGEXP_ROWS = /<tr.+?<\/tr>/m
-  REGEXP_HEADERS = /<th.+?<\/th>/m
-  REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
-  REGEXP_ACTION_CELL = /<td class=\"action\"><a href.+?<\/a><\/td>/m
-
   include CustomAssertions
   include StandardHelper
   include ListHelper
@@ -28,7 +23,7 @@ class CrudHelperTest < ActionView::TestCase
 
     assert_count 7, REGEXP_ROWS, t
     assert_count 13, REGEXP_SORT_HEADERS, t
-    assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
+    assert_count 12, REGEXP_ACTION_CELL, t      # edit, delete links
   end
 
   test "custom crud table with attributes" do
@@ -40,7 +35,7 @@ class CrudHelperTest < ActionView::TestCase
 
     assert_count 7, REGEXP_ROWS, t
     assert_count 3, REGEXP_SORT_HEADERS, t
-    assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
+    assert_count 12, REGEXP_ACTION_CELL, t      # edit, delete links
   end
 
   test "custom crud table with block" do
@@ -54,9 +49,9 @@ class CrudHelperTest < ActionView::TestCase
     end
 
     assert_count 7, REGEXP_ROWS, t
-    assert_count 4, REGEXP_HEADERS, t
+    assert_count 6, REGEXP_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/m, t
-    assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
+    assert_count 12, REGEXP_ACTION_CELL, t      # edit, delete links
   end
 
   test "custom crud table with attributes and block" do
@@ -69,15 +64,16 @@ class CrudHelperTest < ActionView::TestCase
     end
 
     assert_count 7, REGEXP_ROWS, t
-    assert_count 4, REGEXP_HEADERS, t
+    assert_count 3, REGEXP_SORT_HEADERS, t
+    assert_count 6, REGEXP_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/m, t
-    assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
+    assert_count 12, REGEXP_ACTION_CELL, t      # edit, delete links
   end
 
 
-  test "crud form" do
+  test "entry form" do
     f = with_test_routing do
-      capture { crud_form }
+      capture { entry_form }
     end
 
     assert_match /form .*?action="\/crud_test_models\/#{entry.id}"/, f
@@ -90,8 +86,25 @@ class CrudHelperTest < ActionView::TestCase
     assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
     assert_match /select .*?name="crud_test_model\[companion_id\]"/, f
     assert_match /textarea .*?name="crud_test_model\[remarks\]"/, f
+    assert_match /a .*href="\/crud_test_models\/#{entry.id}\?returning=true".*>Cancel<\/a>/, f
   end
 
+  test "crud form" do
+    e = crud_test_models('AAAAA')
+    f = with_test_routing do
+      f = capture { crud_form(e, :name, :children, :birthdate, :human, :cancel_url => '/somewhere', :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 /input .*?name="crud_test_model\[children\]" .*?type="number" .*?value=\"9\"/, f
+    assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
+    assert_match /button .*?type="submit">Save<\/button>/, f
+    assert_match /a .*href="\/somewhere".*>Cancel<\/a>/, f
+  end
+  
   def entry
     @entry ||= CrudTestModel.first
   end

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

@@ -4,10 +4,6 @@ require 'custom_assertions'
 
 class ListHelperTest < ActionView::TestCase
 
-  REGEXP_ROWS = /<tr.+?<\/tr>/m
-  REGEXP_HEADERS = /<th.+?<\/th>/m
-  REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
-
   include StandardHelper
   include CrudTestHelper
   include CustomAssertions

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

@@ -78,6 +78,12 @@ class StandardFormBuilderTest < ActionView::TestCase
     assert !result.include?(StandardFormBuilder::REQUIRED_MARK)
   end
 
+  test "labeld_input_field adds help text" do
+    result = form.labeled_input_field(:name, :help => 'Some Help')
+    assert result.include?(form.help_block('Some Help'))
+    assert result.include?(StandardFormBuilder::REQUIRED_MARK)
+  end
+
   test "belongs_to_field has all options by default" do
     f = form.belongs_to_field(:companion_id)
     assert_equal 7, f.scan('</option>').size

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

@@ -51,9 +51,9 @@ class StandardHelperTest < ActionView::TestCase
   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)
+    assert_equal "1.000", f(1.0)
+    assert_equal "1.200", f(1.2)
+    assert_equal "3.142", f(3.14159)
   end
 
   test "format Booleans" do
@@ -73,7 +73,7 @@ class StandardHelperTest < ActionView::TestCase
   end
 
   test "format attr with fallthrough to f" do
-    assert_equal "12.23", format_attr("12.23424", :to_f)
+    assert_equal "12.234", format_attr("12.23424", :to_f)
   end
 
   test "format attr with custom format_string_size method" do
@@ -109,15 +109,15 @@ class StandardHelperTest < ActionView::TestCase
 
   test "format float column" do
     m = crud_test_models(:AAAAA)
-    assert_equal '1.10', format_type(m, :rating)
+    assert_equal '1.100', format_type(m, :rating)
 
     m.rating = 3.145001   # you never know with these floats..
-    assert_equal '3.15', format_type(m, :rating)
+    assert_equal '3.145', format_type(m, :rating)
   end
 
   test "format decimal column" do
     m = crud_test_models(:AAAAA)
-    assert_equal '10000000.10', format_type(m, :income)
+    assert_equal '10,000,000.100', format_type(m, :income)
   end
 
   test "format date column" do
@@ -210,34 +210,11 @@ class StandardHelperTest < ActionView::TestCase
   test "standard form for existing entry" do
     e = crud_test_models('AAAAA')
     f = with_test_routing do
-      f = capture { standard_form(e, :name, :children, :birthdate, :human, :class => 'special') }
+      f = capture { standard_form(e, :class => 'special') {|f|} }
     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="1">January<\/option>/, f
-    assert_match /option selected="selected" value="1">1<\/option>/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number" .*?value=\"9\"/, f
-    assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
-    assert_match /button .*?type="submit">Save<\/button>/, f
-  end
-
-  test "standard form for new entry" do
-    e = CrudTestModel.new
-    f = with_test_routing do
-      f = capture { standard_form(e, :name, :children, :birthdate, :human, :html => {:class => 'special'}) }
-    end
-
-    assert_match /form .*?action="\/crud_test_models" .?class="special form-horizontal" .*?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
-    assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number"/, f
-    assert_no_match /input .*?name="crud_test_model\[children\]" .*?type="text" .*?value=/, f
-    assert_match /button .*?type="submit">Save<\/button>/, f
   end
 
   test "standard form with errors" do
@@ -246,7 +223,7 @@ class StandardHelperTest < ActionView::TestCase
     assert !e.valid?
 
     f = with_test_routing do
-      f = capture { standard_form(e, :name, :children, :birthdate, :human) }
+      f = capture { standard_form(e) {|f| f.labeled_input_fields(:name, :birthdate) } }
     end
 
     assert_match /form .*?action="\/crud_test_models\/#{e.id}" .*?method="post"/, f
@@ -257,9 +234,6 @@ class StandardHelperTest < ActionView::TestCase
     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="number" .*?value=\"9\"/, f
-    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

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

@@ -5,10 +5,11 @@ class StandardTableBuilderTest < ActionView::TestCase
   # set dummy helper class for ActionView::TestCase
   self.helper_class = StandardHelper
 
-  attr_reader :table
+  attr_reader :table, :entries
 
   def setup
-    @table = StandardTableBuilder.new(["foo", "bahr"], self)
+    @entries = %w(foo bahr)
+    @table = StandardTableBuilder.new(entries, self)
   end
 
   def format_size(obj)
@@ -28,7 +29,7 @@ class StandardTableBuilderTest < ActionView::TestCase
 
     dom = '<tr><td>FOO</td><td>3 chars</td></tr>'
 
-    assert_dom_equal dom, table.send(:html_row, "foo")
+    assert_dom_equal dom, table.send(:html_row, entries.first)
   end
 
   test "custom row" do
@@ -36,7 +37,7 @@ class StandardTableBuilderTest < ActionView::TestCase
 
     dom = '<tr><td class="hula">Weights 3 kg</td></tr>'
 
-    assert_dom_equal dom, table.send(:html_row, "foo")
+    assert_dom_equal dom, table.send(:html_row, entries.first)
   end
 
   test "attr col output" do

data/test/templates/Gemfile

@@ -18,6 +18,8 @@ gem 'haml'
 
 gem 'kaminari'
 
+gem 'rspec-rails'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
@@ -25,7 +27,7 @@ group :assets do
   gem 'coffee-rails'   #, '~> 3.2.1'
   gem 'uglifier'       #, '>= 1.0.3'
   gem 'bootstrap-sass-rails'
-  #gem 'therubyracer'
+  gem 'therubyracer', :require => RUBY_PLATFORM.include?('linux') && 'v8'
 end
 
 gem 'jquery-rails'

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

@@ -4,7 +4,7 @@ class PeopleController < AjaxController
 
   self.sort_mappings = {:city_id => 'cities.name'}
 
-  protected
+  private
 
   def list_entries
     super.includes(:city => :country).order('people.name, countries.code, cities.name')

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

@@ -4,7 +4,7 @@ class VipsController < ListController
 
   self.sort_mappings = {:city_id => 'cities.name'}
 
-  protected
+  private
 
   class << self
     def model_class

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

@@ -16,7 +16,7 @@ class City < ActiveRecord::Base
     "#{name} (#{country.code})"
   end
 
-  protected
+  private
 
   def protect_with_inhabitants
     if people.exists?

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

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

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

@@ -1,5 +1,5 @@
 - remote ||= false
-= crud_form :remote => remote do |f|
+= entry_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/countries/_list.html.erb

@@ -1,5 +1,4 @@
-<%= crud_table :name, :code do |t|
-    action_col_show(t) {|e| admin_country_cities_path(e) }
-    action_col_edit(t)
-    action_col_destroy(t)
+<%= crud_table do |t|
+    col_show(t, :name) {|e| admin_country_cities_path(e) }
+    t.sortable_attr(:code)
   end %>

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

@@ -1,4 +1,3 @@
-= crud_table :name, :code do |t|
-  - action_col_show(t) {|e| admin_country_cities_path(e) }
-  - action_col_edit(t)
-  - action_col_destroy(t)
+= crud_table do |t|
+  - col_show(t, :name) {|e| admin_country_cities_path(e) }
+  - t.sortable_attr(:code)

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

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

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

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

data/test/templates/spec/controllers/admin/cities_controller_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Admin::CitiesController do
+
+  fixtures :all
+  
+  include_examples 'crud controller', {}
+  
+  let(:test_entry)       { cities(:rj) }
+  let(:test_entry_attrs) { {:name => 'Rejkiavik'} }
+  alias_method :new_entry_attrs, :test_entry_attrs
+  alias_method :edit_entry_attrs, :test_entry_attrs
+
+  it "should load fixtures" do
+    City.count.should == 3
+  end
+  
+  describe_action :get, :index do
+    it "should be ordered by default scope" do
+      entries == test_entry.country.cities.order('countries.code, cities.name')
+    end
+    
+    it "should set parents" do
+      controller.send(:parents).should == [:admin, test_entry.country]
+    end
+    
+    it "should set parent variable" do
+      assigns(:country).should == test_entry.country
+    end
+    
+    it "should use correct model_scope" do
+      controller.send(:model_scope).should == test_entry.country.cities
+    end
+    
+    it "should have correct path args" do
+      controller.send(:path_args, 2).should == [:admin, test_entry.country, 2]
+    end
+  end
+  
+  describe_action :get, :show, :id => true do
+    it "should set parents" do
+      controller.send(:parents).should == [:admin, test_entry.country]
+    end
+    
+    it "should set parent variable" do
+      assigns(:country).should == test_entry.country
+    end
+  end
+  
+  describe_action :post, :create do
+    it "should set parent" do
+      entry.country.should == test_entry.country
+    end
+  end
+  
+  describe_action :delete, :destroy, :id => true do
+    context "with inhabitants" do
+      let(:test_entry) { cities(:ny) }
+      
+      it "should not remove city from database", :perform_request => false do
+        expect { perform_request }.to change { City.count }.by(0)
+      end
+      
+      it "should redirect to referer", :perform_request => false do
+        ref = @request.env["HTTP_REFERER"] = admin_country_city_url(test_entry.country, test_entry)
+        perform_request
+        should redirect_to(ref)
+      end
+      
+      it_should_have_flash(:alert)
+    end
+  end
+
+end

data/test/templates/spec/controllers/admin/countries_controller_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Admin::CountriesController do
+
+  fixtures :all
+  
+  include_examples 'crud controller', :skip => %w(show html plain)
+  
+  let(:test_entry)       { countries(:usa) }
+  let(:test_entry_attrs) { {:name => 'United States of America', :code => 'US'} }
+  alias_method :new_entry_attrs, :test_entry_attrs
+  alias_method :edit_entry_attrs, :test_entry_attrs
+  
+  it "should load fixtures" do
+    Country.count.should == 3
+  end
+  
+  describe_action :get, :index do 
+    it "should be ordered by default scope" do
+      entries == Country.order(:name)
+    end
+    
+    it "should set parents" do
+      controller.send(:parents).should == [:admin]
+    end
+    
+    it "should set nil parent" do
+      controller.send(:parent).should be_nil
+    end
+    
+    it "should use correct model_scope" do
+      controller.send(:model_scope).should == Country.scoped
+    end
+    
+    it "should have correct path args" do
+      controller.send(:path_args, 2).should == [:admin, 2]
+    end
+  end
+  
+  describe_action :get, :show do
+    let(:params) { {:id => test_entry.id} }
+    it_should_redirect_to_index
+  end
+  
+end
+
+class Admin::CountriesControllerTest < ActionController::TestCase
+
+  include CrudControllerTestHelper
+
+  def test_show
+    get :show, test_params(:id => test_entry.id)
+    assert_redirected_to_index
+  end
+
+end

data/test/templates/spec/controllers/people_controller_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe PeopleController do
+
+  fixtures :all
+  
+  render_views
+  
+  include_examples 'crud controller', {}
+  
+  let(:test_entry)       { people(:john) }
+  let(:test_entry_attrs) { {:name => 'Fischers Fritz', 
+                            :children => 2, 
+                            :income => 120, 
+                            :city_id => cities(:rj).id} }
+  alias_method :new_entry_attrs, :test_entry_attrs
+  alias_method :edit_entry_attrs, :test_entry_attrs
+  
+  it "should load fixtures" do
+    Person.count.should == 2
+  end
+  
+  describe_action :get, :index do 
+    it "should be ordered by default scope" do
+      entries == Person.includes(:city => :country).order('people.name, countries.code, cities.name')
+    end
+    
+    it "should set parents" do
+      controller.send(:parents).should == []
+    end
+    
+    it "should set nil parent" do
+      controller.send(:parent).should be_nil
+    end
+    
+    it "should use correct model_scope" do
+      controller.send(:model_scope).should == Person.scoped
+    end
+    
+    it "should have correct path args" do
+      controller.send(:path_args, 2).should == [2]
+    end
+  end
+  
+  describe_action :get, :show, :id => true do
+    context ".js", :format => :js do
+      it_should_respond
+      it_should_render
+      its(:body) { should match(/\$\('#content'\)/) }
+    end
+  end
+  
+  describe_action :get, :edit, :id => true do
+    context ".js", :format => :js do
+      it_should_respond
+      it_should_render
+      its(:body) { should match(/\$\('#content'\)/) }
+    end
+  end
+  
+  describe_action :put, :update, :id => true do
+    context ".js", :format => :js do
+      context 'with valid params' do
+        let(:params) { {:person => {:name => 'New Name'} } }
+        
+        it_should_respond
+        it_should_render
+        its(:body) { should match(/\$\('#content'\)/) }
+      end
+      
+      context "with invalid params" do
+        let(:params) { {:person => {:name => ' '} } }
+        
+        it_should_respond
+        it_should_render
+        its(:body) { should match(/alert/) }
+      end
+    end
+  end
+end

data/test/templates/spec/routing/cities_routing_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Admin::CitiesController do
+  it "should route index" do
+    { :get => 'admin/countries/1/cities' }.should route_to({:controller => 'admin/cities', :action => 'index', :country_id => '1'})
+  end
+  
+  it "should route show" do
+    { :get => 'admin/countries/2/cities/1' }.should route_to({:controller => 'admin/cities', :action => 'show', :country_id => '2', :id => '1'})
+  end
+end

data/test/templates/spec/routing/countries_routing_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Admin::CountriesController do
+  it "should route index" do
+    { :get => 'admin/countries' }.should route_to({:controller => 'admin/countries', :action => 'index'})
+  end
+  
+  it "should route show" do
+    { :get => 'admin/countries/1' }.should route_to({:controller => 'admin/countries', :action => 'show', :id => '1'})
+  end
+end

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

@@ -46,7 +46,7 @@ class Admin::CitiesControllerTest < ActionController::TestCase
     assert_present flash[:alert]
   end
 
-  protected
+  private
 
   def test_entry
     cities(:rj)

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

@@ -25,7 +25,7 @@ class Admin::CountriesControllerTest < ActionController::TestCase
     assert_redirected_to_index
   end
 
-  protected
+  private
 
   def assert_redirected_to_show2(entry)
     assert_redirected_to_index

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

@@ -54,9 +54,9 @@ class PeopleControllerTest < ActionController::TestCase
     assert_template 'update'
     assert_match /alert/, response.body
   end
-
-  protected
-
+  
+  private
+  
   def test_entry
     people(:john)
   end