dry_crud 1.6.0 → 1.7.0

data/lib/generators/dry_crud/templates/app/helpers/standard_table_builder.rb

@@ -10,7 +10,7 @@ class StandardTableBuilder
 
   # Delegate called methods to template.
   # including StandardHelper would lead to problems with indirectly called methods.
-  delegate :content_tag, :format_attr, :column_type, :association,
+  delegate :content_tag, :format_attr, :column_type, :association, :dom_id,
            :captionize, :add_css_class, :content_tag_nested, :to => :template
 
   def initialize(entries, template, options = {})
@@ -48,9 +48,10 @@ class StandardTableBuilder
   # Define a column for the given attribute and an optional header.
   # If no header is given, the attribute name is used. The cell will
   # contain the formatted attribute value for the current entry.
-  def attr(a, header = nil)
+  def attr(a, header = nil, &block)
     header ||= attr_header(a)
-    col(header, :class => align_class(a)) { |e| format_attr(e, a) }
+    block ||= lambda { |e| format_attr(e, a) }
+    col(header, :class => align_class(a), &block)
   end
 
   # Renders the table as HTML.
@@ -85,11 +86,17 @@ class StandardTableBuilder
   end
 
   def html_row(entry)
-    content_tag_nested(:tr, cols) { |c| c.html_cell(entry) }
+    attrs = {}
+    attrs[:id] = dom_id(entry) if entry.respond_to?(:dom_id)
+    content_tag_nested(:tr, cols, attrs) { |c| c.html_cell(entry) }
   end
 
   def entry_class
-    entries.first.class
+    if entries.respond_to?(:klass)
+      entries.klass
+    else 
+      entries.first.class
+    end
   end
 
   # Helper class to store column information.
@@ -98,7 +105,7 @@ class StandardTableBuilder
     delegate :content_tag, :to => :template
 
     def content(entry)
-      block.call(entry)
+      entry.nil? ? '' : template.capture(entry, &block)
     end
 
     def html_header

data/lib/generators/dry_crud/templates/app/views/crud/_form.html.erb

@@ -1 +1 @@
-<%= crud_form %>
+<%= entry_form %>

data/lib/generators/dry_crud/templates/app/views/crud/_form.html.haml

@@ -1 +1 @@
-= crud_form
+= entry_form

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

@@ -14,10 +14,10 @@
   <%= stylesheet_link_tag 'application', :media => 'all' %>
 
   <!-- 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">
+  <%= favicon_link_tag %>
+  <%= favicon_link_tag '/apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
+  <%= favicon_link_tag '/apple-touch-icon-72x72.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "72x72" %>
+  <%= favicon_link_tag '/apple-touch-icon-114x114.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "114x114" %>
 
   <%= yield :head %>
 </head>

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

@@ -12,11 +12,11 @@
     <![endif]-->
 
     = stylesheet_link_tag 'application', :media => 'all'
-
-    %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"}
+    
+    = favicon_link_tag
+    = favicon_link_tag '/apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png'
+    = favicon_link_tag '/apple-touch-icon-72x72.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "72x72"
+    = favicon_link_tag '/apple-touch-icon-114x114.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "114x114"
 
     = yield :head
 

data/lib/generators/dry_crud/templates/spec/controllers/crud_test_models_controller_spec.rb

@@ -0,0 +1,433 @@
+require 'spec_helper'
+
+# Tests all actions of the CrudController based on a dummy model
+# (CrudTestModel). This is useful to test the general behavior
+# of CrudController.
+
+describe CrudTestModelsController do
+
+  include CrudTestHelper
+
+  before(:all) do 
+    reset_db
+    setup_db
+    create_test_data
+  end
+  
+  after(:all) { reset_db }
+  
+  before { special_routing }
+  
+  
+  include_examples 'crud controller', {}
+
+  let(:test_entry) { crud_test_models(:AAAAA) } 
+  let(:new_entry_attrs) do
+    {:name => 'foo',
+     :children => 42,
+     :companion_id => 3,
+     :rating => 8.5,
+     :income => 2.42,
+     :birthdate => '31-12-1999'.to_date,
+     :human => true,
+     :remarks => "some custom\n\tremarks"}
+  end
+  let(:edit_entry_attrs) do
+    {:name => 'foo',
+     :children => 42,
+     :rating => 8.5,
+     :income => 2.42,
+     :birthdate => '31-12-1999'.to_date,
+     :human => true,
+     :remarks => "some custom\n\tremarks"}
+  end
+  
+  
+  describe "setup" do
+    it "model count should be correct" do
+      CrudTestModel.count.should == 6
+    end
+    
+    it "should have models_label" do
+      controller.models_label.should == 'Crud Test Models'
+    end
+    
+    it "should have models_label singular" do
+      controller.models_label(false).should == 'Crud Test Model'
+    end
+    
+    it "should route index" do
+      { :get => "/crud_test_models" }.should route_to(
+        :controller => "crud_test_models",
+        :action => "index"
+      )
+    end
+    
+    it "should route show" do
+      { :get => "/crud_test_models/1" }.should route_to(
+        :controller => "crud_test_models",
+        :action => "show",
+        :id => '1'
+      )
+    end
+  end
+  
+  describe_action :get, :index do
+    context '.html', :format => :html do
+      context 'plain', :combine => 'ihp' do
+        it "should contain all entries" do
+          entries.size.should == 6
+        end
+        
+        it "session should have empty list_params" do
+          session[:list_params].should == Hash.new
+        end
+        
+        it "should provide entries helper method" do
+        should render_template('index')
+          entries.should be(controller.send(:entries))
+        end
+      end
+      
+      context "search" do
+        let(:params) { {:q => search_value} }
+      
+        context "regular", :combine => 'ihse' do
+          it "entries should only contain test_entry" do
+            entries.should == [test_entry]
+          end
+          
+          it "session should have query list param" do
+            session[:list_params]['/crud_test_models.html'].should == {:q => 'AAAA'}
+          end
+        end
+        
+        context "with custom options", :combine => 'ihsec' do
+          let(:params) { {:q => 'DDD', :filter => true} }
+          
+          it_should_respond
+          
+          it "entries should have one item" do
+            entries.should == [CrudTestModel.find_by_name('BBBBB')]
+          end
+          
+          it "session should have query list param" do
+            session[:list_params]['/crud_test_models.html'].should == {:q => 'DDD'}
+          end
+        end
+      end
+      
+      context "sort" do
+        context "for given column", :combine => 'ihsog' do
+          let(:params) { {:sort => 'children', :sort_dir => 'asc'} }
+          
+          it_should_respond
+          
+          it "entries should be in correct order" do
+            entries.should == CrudTestModel.all.sort_by(&:children)
+          end
+          
+          it "session should have sort list param" do
+            session[:list_params]['/crud_test_models.html'].should == {:sort => 'children', :sort_dir => 'asc'}
+          end
+        end
+        
+        context "for virtual column", :combine => 'ihsov' do
+          let(:params) { {:sort => 'chatty', :sort_dir => 'desc'} }
+          
+          it_should_respond
+          
+          it "entries should be in correct order" do
+            names = entries.collect(&:name)
+            assert names.index('BBBBB') < names.index('AAAAA')
+            assert names.index('BBBBB') < names.index('DDDDD')
+            assert names.index('EEEEE') < names.index('AAAAA')
+            assert names.index('EEEEE') < names.index('DDDDD')
+            assert names.index('AAAAA') < names.index('CCCCC')
+            assert names.index('DDDDD') < names.index('CCCCC')
+          end
+          
+          it "session should have sort list param" do
+            session[:list_params]['/crud_test_models.html'].should == {:sort => 'chatty', :sort_dir => 'desc'}
+          end
+        end
+        
+        context "with search", :combine => 'ihsose' do
+          let(:params) { {:q => 'DDD', :sort => 'chatty', :sort_dir => 'asc'} }
+        
+          it_should_respond
+          
+          it "entries should be in correct order" do
+            entries.collect(&:name).should == ['CCCCC', 'DDDDD', 'BBBBB']
+          end
+          
+          it "session should have sort list param" do
+            session[:list_params]['/crud_test_models.html'].should == {:q => 'DDD', :sort => 'chatty', :sort_dir => 'asc'}
+          end
+        end
+      end
+            
+      context "with custom options", :combine => 'ihsoco' do
+        let(:params) { {:filter => true} }
+        
+        it_should_respond
+        
+        context "entries" do
+          subject { entries }
+          it { should have(2).items }
+          it { should == entries.sort_by(&:children).reverse }
+        end
+      end
+      
+      context "returning", :perform_request => false do
+        before do
+          session[:list_params] = {}
+          session[:list_params]['/crud_test_models'] = {:q => 'DDD', :sort => 'chatty', :sort_dir => 'desc'}
+          get :index, :returning => true
+        end
+        
+        it_should_respond
+        
+        it "entries should be in correct order" do
+          entries.collect(&:name).should == ['BBBBB', 'DDDDD', 'CCCCC']
+        end
+      
+        it "params should be set" do
+          controller.params[:q].should == 'DDD'
+          controller.params[:sort].should == 'chatty'
+          controller.params[:sort_dir].should == 'desc'
+        end
+      end
+    end
+    
+    context ".js", :format => :js, :combine => 'ijs' do
+      it_should_respond
+      it_should_assign_entries
+      its(:body) { should == 'index js' }
+    end
+  end
+  
+  describe_action :get, :new do
+    context "plain", :combine => 'new' do
+      it "should assign companions" do
+        assigns(:companions).should be_present
+      end
+      
+      it "should have called two render callbacks" do
+        controller.called_callbacks.should == [:before_render_new, :before_render_form]
+      end
+    end
+    
+    context "with before_render callback redirect", :perform_request => false do
+      before do
+        controller.should_redirect = true
+        get :new
+      end
+      
+      it { should redirect_to(crud_test_models_path) }
+      
+      it "should not set companions" do
+        assigns(:companions).should be_nil
+      end
+    end
+  end
+  
+  describe_action :post, :create do
+    let(:params) { {model_identifier => new_entry_attrs} }
+    
+    it "should have called the correct callbacks" do
+      controller.called_callbacks.should == [:before_create, :before_save, :after_save, :after_create]
+    end
+    
+    context "with before callback" do
+      let(:params) { {:crud_test_model => {:name => 'illegal', :children => 2}} }
+      it "should not create entry", :perform_request => false do
+        expect { perform_request }.to change { CrudTestModel.count }.by(0)
+      end
+      
+      context "plain", :combine => 'chcp' do
+        it_should_respond
+        it_should_render('new')
+        it_should_persist_entry(false)
+        it_should_have_flash(:alert)
+        
+        it "should set entry name" do
+          entry.name.should == 'illegal'
+        end
+        
+        it "should assign companions" do
+          assigns(:companions).should be_present
+        end
+        
+        it "should have called the correct callbacks" do
+          controller.called_callbacks.should == [:before_render_new, :before_render_form]
+        end
+      end
+      
+      context "redirect", :perform_request => false do
+        before { controller.should_redirect = true }
+      
+        it "should not create entry" do
+          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+        end
+        
+        it { perform_request; should redirect_to(crud_test_models_path) }
+        
+        it "should have called no callbacks" do
+          perform_request
+          controller.called_callbacks.should be_nil
+        end
+      end
+    end
+    
+    context "with invalid params" do
+      let(:params) { {:crud_test_model => {:children => 2}} }
+      
+      context ".html" do
+        it "should not create entry", :perform_request => false do
+          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+        end
+        
+        context "plain", :combine => 'chip' do
+          it_should_respond
+          it_should_render('new')
+          it_should_persist_entry(false)
+          it_should_not_have_flash(:notice)
+          it_should_not_have_flash(:alert)
+                
+          it "should assign companions" do
+            assigns(:companions).should be_present
+          end
+          
+          it "should have called the correct callbacks" do
+            controller.called_callbacks.should == [:before_create, :before_save, :before_render_new, :before_render_form]
+          end
+        end
+      end
+      
+      context ".json", :format => :json do
+        it "should not create entry", :perform_request => false do
+          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+        end
+        
+        context "plain", :combine => 'cjcb' do
+          it_should_respond(422)
+          it_should_persist_entry(false)
+          it_should_not_have_flash(:notice)
+          it_should_not_have_flash(:alert)
+                
+          it "should not assign companions" do
+            assigns(:companions).should be_nil
+          end
+          
+          it "should have called the correct callbacks" do
+            controller.called_callbacks.should == [:before_create, :before_save]
+          end
+          
+          its(:body) { should match(/errors/) }
+        end
+      end
+    end
+    
+  end
+
+  describe_action :get, :edit, :id => true do
+    it "should have called the correct callbacks" do
+      controller.called_callbacks.should == [:before_render_edit, :before_render_form]
+    end
+  end
+
+  describe_action :put, :update, :id => true do
+    let(:params) { {model_identifier => edit_entry_attrs} }
+    
+    it "should have called the correct callbacks" do
+      controller.called_callbacks.should == [:before_update, :before_save, :after_save, :after_update]
+    end
+    
+    context "with invalid params" do
+      let(:params) { {:crud_test_model => {:rating => 20}} }
+      
+      context ".html", :combine => 'uhivp' do
+        it_should_respond
+        it_should_render('edit')
+        it_should_not_have_flash(:notice)
+        
+        it "should change entry" do
+          entry.should be_changed
+        end
+        
+        it "should set entry rating" do
+          entry.rating.should == 20
+        end
+        
+        it "should have called the correct callbacks" do
+          controller.called_callbacks.should == [:before_update, :before_save, :before_render_edit, :before_render_form]
+        end
+      end
+      
+      context ".json", :format => :json, :combine => 'ujivp' do
+        it_should_respond(422)
+        it_should_not_have_flash(:notice)
+        
+        it "should have called the correct callbacks" do
+          controller.called_callbacks.should == [:before_update, :before_save]
+        end
+        
+        its(:body) { should match(/errors/) }
+      end
+    end
+    
+  end
+  
+  describe_action :delete, :destroy, :id => true do
+    it "should have called the correct callbacks" do
+      controller.called_callbacks.should == [:before_destroy, :after_destroy]
+    end
+    
+    context "with failure" do
+      let(:test_entry) { crud_test_models(:BBBBB) }
+      context ".html" do
+        it "should not delete entry from database", :perform_request => false do
+          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+        end
+        
+        it "should redirect to referer", :perform_request => false do
+          ref = @request.env['HTTP_REFERER'] = crud_test_model_url(test_entry)
+          perform_request
+          should redirect_to(ref)
+        end
+        
+        it_should_have_flash(:alert, /companion/)
+        it_should_not_have_flash(:notice)
+      end
+      
+      context ".json", :format => :json, :combine => 'djf' do
+        it_should_respond(422)
+        it_should_not_have_flash(:notice)
+        its(:body) { should match(/errors/) }
+      end
+      
+      context "callback", :perform_request => false do
+        before do
+          test_entry.update_attribute :name, 'illegal'
+        end
+        
+        it "should not delete entry from database" do
+          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+        end
+        
+        it "should redirect to index" do
+          perform_request
+          should redirect_to(crud_test_models_path(:returning => true))
+        end
+        
+        it "should have flash alert" do
+          perform_request
+          flash[:alert].should match(/illegal name/)
+        end
+      end
+    end
+    
+  end
+  
+end

data/lib/generators/dry_crud/templates/spec/helpers/crud_helper_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+  
+describe CrudHelper do
+  
+  include StandardHelper
+  include ListHelper
+  include CrudTestHelper
+  
+    
+  before(:all) do 
+    reset_db
+    setup_db
+    create_test_data
+  end
+  
+  after(:all) { reset_db }
+  
+  
+  describe "#crud_table" do
+    let(:entries) { CrudTestModel.all }
+    
+    context "default" do
+      subject do
+        with_test_routing { crud_table }
+      end
+      
+      it "has 7 rows" do
+        subject.scan(REGEXP_ROWS).size.should == 7
+      end
+      
+      it "has 13 sort headers" do
+        subject.scan(REGEXP_SORT_HEADERS).size.should == 13
+      end
+      
+      it "has 12 action cells" do
+        subject.scan(REGEXP_ACTION_CELL).size.should == 12
+      end
+    end
+    
+    context "with custom attrs" do
+      subject do
+        with_test_routing { crud_table(:name, :children, :companion_id) }
+      end
+      
+      it "has 3 sort headers" do
+        subject.scan(REGEXP_SORT_HEADERS).size.should == 3
+      end
+    end
+    
+    context "with custom block" do
+      subject do
+        with_test_routing do
+          crud_table do |t|
+            t.attrs :name, :children, :companion_id
+            t.col("head") {|e| content_tag :span, e.income.to_s }
+          end
+        end
+      end
+      
+      it "has 4 headers" do
+        subject.scan(REGEXP_HEADERS).size.should == 6
+      end
+      
+      it "has 6 custom col spans" do
+        subject.scan(/<span>.+?<\/span>/m).size.should == 6
+      end
+      
+      it "has 12 action cells" do
+        subject.scan(REGEXP_ACTION_CELL).size.should == 12
+      end
+    end
+    
+    context "with custom attributes and block" do
+      subject do
+        with_test_routing do
+          crud_table(:name, :children, :companion_id) do |t|
+            t.col("head") {|e| content_tag :span, e.income.to_s }
+          end
+        end
+      end
+      
+      it "has 3 sort headers" do
+        subject.scan(REGEXP_SORT_HEADERS).size.should == 3
+      end
+      
+      it "has 6 custom col spans" do
+        subject.scan(/<span>.+?<\/span>/m).size.should == 6
+      end
+      
+      it "has 12 action cells" do
+        subject.scan(REGEXP_ACTION_CELL).size.should == 12
+      end
+    end
+  end
+  
+  describe "#entry_form" do
+    let(:entry) { CrudTestModel.first }
+    subject do
+      with_test_routing { entry_form }
+    end
+    
+    it { should match /form .*?action="\/crud_test_models\/#{entry.id}"/ }
+    it { should match /input .*?name="crud_test_model\[name\]" .*?type="text"/ }
+    it { should match /input .*?name="crud_test_model\[whatever\]" .*?type="text"/ }
+    it { should match /input .*?name="crud_test_model\[children\]" .*?type="number"/ }
+    it { should match /input .*?name="crud_test_model\[rating\]" .*?type="number"/ }
+    it { should match /input .*?name="crud_test_model\[income\]" .*?type="number"/ }
+    it { should match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/ }
+    it { should match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/ }
+    it { should match /select .*?name="crud_test_model\[companion_id\]"/ }
+    it { should match /textarea .*?name="crud_test_model\[remarks\]"/ }
+    it { should match(/a .*href="\/crud_test_models\/#{entry.id}\?returning=true".*>Cancel<\/a>/) }
+  end
+  
+  describe "#crud_form" do
+    
+    context "for existing entry" do
+      subject do
+        with_test_routing do
+          capture do
+            crud_form(entry, 
+                      :name, :children, :birthdate, :human, 
+                      :cancel_url => "/somewhere",
+                      :html => {:class => 'special'})
+          end
+        end
+      end
+      
+      let(:entry) { crud_test_models(:AAAAA) }
+      
+      it { should match(/form .*?action="\/crud_test_models\/#{entry.id}" .?class="special form-horizontal" .*?method="post"/) }
+      it { should match(/input .*?name="_method" .*?type="hidden" .*?value="put"/) }
+      it { should match(/input .*?name="crud_test_model\[name\]" .*?type="text" .*?value="AAAAA"/) }
+      it { should match(/select .*?name="crud_test_model\[birthdate\(1i\)\]"/) }
+      it { should match(/option selected="selected" value="1910">1910<\/option>/) }
+      it { should match(/option selected="selected" value="1">January<\/option>/) }
+      it { should match(/option selected="selected" value="1">1<\/option>/) }
+      it { should match(/input .*?name="crud_test_model\[children\]" .*?type="number" .*?value=\"9\"/) }
+      it { should match(/input .*?name="crud_test_model\[human\]" .*?type="checkbox"/) }
+      it { should match(/button .*?type="submit">Save<\/button>/) }
+      it { should match(/a .*href="\/somewhere".*>Cancel<\/a>/) }
+    end
+  end
+  
+end