datagrid 1.5.1 → 1.5.2

data/lib/datagrid/form_builder.rb

@@ -19,10 +19,6 @@ module Datagrid
       label(filter.name, text, options, &block)
     end
 
-    def datagrid_extra_checkbox_options
-      ::ActionPack::VERSION::MAJOR >= 4 ? {:include_hidden => false} : {}
-    end
-
     protected
     def datagrid_boolean_enum_filter(attribute_or_filter, options = {})
       datagrid_enum_filter(attribute_or_filter, options)
@@ -62,18 +58,18 @@ module Datagrid
         @template.render(
           :partial => partial,
           :locals => {
-            :elements => elements, 
-            :form => self, 
+            :elements => elements,
+            :form => self,
             :filter => filter,
             :options => options,
-          } 
+          }
         )
       else
         if !options.has_key?(:multiple) && filter.multiple?
           options[:multiple] = true
         end
         select(
-          filter.name, 
+          filter.name,
           object.select_options(filter) || [],
           {:include_blank => filter.include_blank,
            :prompt => filter.prompt,
@@ -219,7 +215,7 @@ module Datagrid
     def partial_path(options, name)
       if partials = options.delete(:partials)
         partial_name = File.join(partials, name)
-        # Second argument is []: no magical namespaces to lookup added from controller 
+        # Second argument is []: no magical namespaces to lookup added from controller
         if @template.lookup_context.template_exists?(partial_name, [], true)
           return partial_name
         end

data/lib/datagrid/utils.rb

@@ -132,6 +132,10 @@ module Datagrid
           !property_availability(grid, unless_option, false)
       end
 
+      def callable(value)
+        value.respond_to?(:call) ? value.call : value
+      end
+
       protected
       def property_availability(grid, option, default)
         case option

data/spec/datagrid/core_spec.rb

@@ -71,7 +71,7 @@ describe Datagrid::Core do
     end
   end
 
-  describe ".inspect" do
+  describe "#inspect" do
     it "should show all attribute values" do
       class InspectTest
         include Datagrid
@@ -84,4 +84,29 @@ describe Datagrid::Core do
       expect(grid.inspect).to eq('#<InspectTest order: :name, descending: true, created_at: [Wed, 01 Jan 2014, Tue, 05 Aug 2014]>')
     end
   end
+
+  describe "#==" do
+    class EqualTest
+      include Datagrid
+      scope {Entry}
+      filter(:created_at, :date)
+      column(:name)
+      column(:created_at)
+    end
+    it "work on empty objects" do
+      expect(EqualTest.new).to eq(EqualTest.new)
+    end
+    it "sees the difference on the filter value" do
+      expect(EqualTest.new(created_at: Date.yesterday)).to_not eq(EqualTest.new(created_at: Date.today))
+    end
+    it "sees the difference on order" do
+      expect(EqualTest.new(order: :created_at)).to_not eq(EqualTest.new(order: :name))
+    end
+    it "doesn't destinguish between String and Symbol order" do
+      expect(EqualTest.new(order: :created_at)).to eq(EqualTest.new(order: "created_at"))
+    end
+    it "checks for redefined scope" do
+      expect(EqualTest.new).to_not eq(EqualTest.new {|s| s.reorder(:name)})
+    end
+  end
 end

data/spec/datagrid/drivers/active_record_spec.rb

@@ -25,12 +25,12 @@ describe Datagrid::Drivers::ActiveRecord do
     subject do
       test_report(:order => :test, :descending => true) do
         scope { Entry }
-        column(:test, order: Arel::Nodes::Count.new(["entries.group_id"]))
+        column(:test, order: Entry.arel_table[:group_id].count)
       end.assets
     end
 
     it "should support ordering by Arel columns" do
-      expect(subject.to_sql.strip).to include "ORDER BY COUNT('entries.group_id') DESC"
+      expect(subject.to_sql.strip).to include 'ORDER BY COUNT("entries"."group_id") DESC'
     end
   end
 

data/spec/datagrid/drivers/mongo_mapper_spec.rb

@@ -2,98 +2,100 @@ require "spec_helper"
 
 describe Datagrid::Drivers::MongoMapper, :mongomapper do
 
-  describe ".match?" do
-    
-    subject { described_class }
+  if defined?(MongoMapper)
+    describe ".match?" do
 
-    it {should be_match(MongoMapperEntry)}
-    # MongoMapper doesn't have a scoped method, instead it has a query method which returns a Plucky::Query object
-    it {should be_match(MongoMapperEntry.query)}
-    it {should_not be_match(Entry.where(:id => 1))}
+      subject { described_class }
+
+      it {should be_match(MongoMapperEntry)}
+      # MongoMapper doesn't have a scoped method, instead it has a query method which returns a Plucky::Query object
+      it {should be_match(MongoMapperEntry.query)}
+      it {should_not be_match(Entry.where(:id => 1))}
 
-  end
-  describe "api" do
-  
-    subject do
-      MongoMapperGrid.new(
-        defined?(_attributes) ? _attributes : {}
-      )
-    end
-  
-    let!(:first) do
-      MongoMapperEntry.create!(
-        :group_id => 2,
-        :name => "Main First",
-        :disabled => false
-      )
-    end
-    let!(:second) do
-      MongoMapperEntry.create!(
-        :group_id => 3,
-        :name => "Main Second",
-        :disabled => true
-      )
-    end
-  
-  
-    describe '#assets' do
-      subject { super().assets }
-      it {should include(first, second)}
     end
-      
-    describe '#assets' do
-      subject { super().assets }
-      describe '#size' do
-        subject { super().size }
-        it {should == 2}
+    describe "api" do
+
+      subject do
+        MongoMapperGrid.new(
+          defined?(_attributes) ? _attributes : {}
+        )
       end
-    end
 
-    describe '#rows' do
-      subject { super().rows }
-      it {should == [["Main First", 2, false], ["Main Second", 3, true]]}
-    end
+      let!(:first) do
+        MongoMapperEntry.create!(
+          :group_id => 2,
+          :name => "Main First",
+          :disabled => false
+        )
+      end
+      let!(:second) do
+        MongoMapperEntry.create!(
+          :group_id => 3,
+          :name => "Main Second",
+          :disabled => true
+        )
+      end
 
-    describe '#header' do
-      subject { super().header }
-      it {should ==[ "Name", "Group", "Disabled"]}
-    end
-      
-    describe '#data' do
-      subject { super().data }
-      it {should == [[ "Name", "Group", "Disabled"], ["Main First", 2, false], ["Main Second", 3, true]]}
-    end
-      
-      
-    describe "when some filters specified" do
-      let(:_attributes) { {:from_group_id => 3} }
 
       describe '#assets' do
         subject { super().assets }
-        it {should_not include(first)}
+        it {should include(first, second)}
       end
 
       describe '#assets' do
         subject { super().assets }
-        it {should include(second)}
+        describe '#size' do
+          subject { super().size }
+          it {should == 2}
+        end
       end
-    end
-      
-    describe "when reverse ordering is specified" do
-      let(:_attributes) { {:order => :name, :descending => true} }
 
       describe '#rows' do
         subject { super().rows }
-        it {should == [["Main Second", 3, true], ["Main First", 2, false]]}
+        it {should == [["Main First", 2, false], ["Main Second", 3, true]]}
+      end
+
+      describe '#header' do
+        subject { super().header }
+        it {should ==[ "Name", "Group", "Disabled"]}
+      end
+
+      describe '#data' do
+        subject { super().data }
+        it {should == [[ "Name", "Group", "Disabled"], ["Main First", 2, false], ["Main Second", 3, true]]}
+      end
+
+
+      describe "when some filters specified" do
+        let(:_attributes) { {:from_group_id => 3} }
+
+        describe '#assets' do
+          subject { super().assets }
+          it {should_not include(first)}
+        end
+
+        describe '#assets' do
+          subject { super().assets }
+          it {should include(second)}
+        end
+      end
+
+      describe "when reverse ordering is specified" do
+        let(:_attributes) { {:order => :name, :descending => true} }
+
+        describe '#rows' do
+          subject { super().rows }
+          it {should == [["Main Second", 3, true], ["Main First", 2, false]]}
+        end
+      end
+      it "should not provide default order for non declared fields" do
+        expect {
+          test_report(:order => :test) do
+            scope { MongoMapperEntry }
+            column(:test)
+            end.assets
+        }.to raise_error(Datagrid::OrderUnsupported)
+          end
       end
-    end
-    it "should not provide default order for non declared fields" do
-      expect {
-        test_report(:order => :test) do
-          scope { MongoMapperEntry }
-          column(:test)
-        end.assets
-      }.to raise_error(Datagrid::OrderUnsupported)
     end
   end
-end

data/spec/datagrid/filters/enum_filter_spec.rb

@@ -26,7 +26,7 @@ describe Datagrid::Filters::EnumFilter do
     instance = klass.new
     expect(klass.filter_by_name(:group_id).select(instance)).to eq(instance.object_id)
   end
-  
+
   it "should initialize select option only on instanciation" do
     class ReportWithLazySelect
       include Datagrid
@@ -37,7 +37,7 @@ describe Datagrid::Filters::EnumFilter do
 
 
   it "should support select given as symbol" do
-    report = test_report do 
+    report = test_report do
       scope {Entry}
       filter(:group_id, :enum, :select => :selectable_group_ids)
       def selectable_group_ids

data/spec/datagrid/filters/integer_filter_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Datagrid::Filters::IntegerFilter do
 
-
   let(:entry1) { Entry.create!(:group_id => 1) }
   let(:entry2) { Entry.create!(:group_id => 2) }
   let(:entry3) { Entry.create!(:group_id => 3) }
@@ -12,7 +11,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should support integer range argument" do
     report = test_report(:group_id => 3..5) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer)
     end
     expect(report.assets).not_to include(entry1)
@@ -22,7 +21,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should support integer range given as array argument" do
     report = test_report(:group_id => [3.to_s, 5.to_s]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
     expect(report.assets).not_to include(entry7)
@@ -32,7 +31,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should support minimum integer argument" do
     report = test_report(:group_id => [5.to_s, nil]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
     expect(report.assets).not_to include(entry1)
@@ -42,7 +41,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should support maximum integer argument" do
     report = test_report(:group_id => [nil, 5.to_s]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
     expect(report.assets).to include(entry1)
@@ -53,7 +52,7 @@ describe Datagrid::Filters::IntegerFilter do
   it "should find something in one integer interval" do
 
     report = test_report(:group_id => (4..4)) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
     expect(report.assets).not_to include(entry7)
@@ -63,7 +62,7 @@ describe Datagrid::Filters::IntegerFilter do
   it "should support invalid range" do
 
     report = test_report(:group_id => (7..1)) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
     expect(report.assets).not_to include(entry7)
@@ -74,7 +73,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should support block" do
     report = test_report(:group_id => 5) do
-      scope { Entry } 
+      scope { Entry }
       filter(:group_id, :integer, :range => true) do |value|
         where("group_id >= ?", value)
       end
@@ -86,7 +85,7 @@ describe Datagrid::Filters::IntegerFilter do
 
   it "should not prefix table name if column is joined" do
     report = test_report(:rating => [4,nil]) do
-      scope { Entry.joins(:group) } 
+      scope { Entry.joins(:group) }
       filter(:rating, :integer, :range => true)
     end
     expect(report.rating).to eq([4,nil])
@@ -114,7 +113,7 @@ describe Datagrid::Filters::IntegerFilter do
     expect(report.assets).to include(entry2)
     expect(report.assets).not_to include(entry3)
   end
-  
+
   it "should support multiple with allow_blank allow_nil options" do
     report  = test_report do
       scope {Entry}
@@ -130,4 +129,14 @@ describe Datagrid::Filters::IntegerFilter do
     expect(report.assets).to include(entry1)
     expect(report.assets).to include(entry2)
   end
+
+  it "normalizes AR object to ID" do
+    group = Group.create!
+    report  = test_report(group_id: group) do
+      scope {Entry}
+      filter(:group_id, :integer)
+    end
+
+    expect(report.group_id).to eq(group.id)
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -18,7 +18,7 @@ describe Datagrid::FormBuilder do
       v.view_paths << File.expand_path("../../support/test_partials", __FILE__)
     end
   end
-  let(:view) { ActionView::Helpers::FormBuilder.new(:report, _grid, template, {}, Proc.new {|f| })}
+  let(:view) { ActionView::Helpers::FormBuilder.new(:report, _grid, template, {})}
 
 
   describe ".datagrid_filter" do
@@ -44,7 +44,7 @@ describe Datagrid::FormBuilder do
       }
       let(:_filter) { :name }
       it { should equal_to_dom(
-        '<input class="name default_filter" id="report_name" name="report[name]" size="30" type="text"/>'
+        '<input class="name default_filter" type="text" name="report[name]" id="report_name"/>'
       )}
     end
     context "with integer filter type" do
@@ -56,13 +56,13 @@ describe Datagrid::FormBuilder do
         end
       }
       it { should equal_to_dom(
-        '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
+        '<input class="group_id integer_filter" type="text" name="report[group_id]" id="report_group_id"/>'
       )}
 
       context "when partials option is passed for filter that don't support range" do
         let(:_filter_options) { {partials: 'anything' } }
         it { should equal_to_dom(
-          '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
+          '<input class="group_id integer_filter" type="text" name="report[group_id]" id="report_group_id"/>'
         )}
       end
     end
@@ -76,7 +76,7 @@ describe Datagrid::FormBuilder do
         end
       }
       it { should equal_to_dom(
-        '<input class="created_at date_filter" id="report_created_at" name="report[created_at]" size="30" type="text"/>'
+        '<input class="created_at date_filter" type="text" name="report[created_at]" id="report_created_at"/>'
       )}
       context "when special date format specified" do
         around(:each) do |example|
@@ -86,7 +86,7 @@ describe Datagrid::FormBuilder do
           end
         end
         it { should equal_to_dom(
-          '<input class="created_at date_filter" id="report_created_at" name="report[created_at]" size="30" type="text" value="01/02/2012"/>'
+          '<input value="01/02/2012" class="created_at date_filter" type="text" name="report[created_at]" id="report_created_at"/>'
         )}
       end
     end
@@ -103,27 +103,27 @@ describe Datagrid::FormBuilder do
         let(:_filter_options) { {:id => "hello"} }
         let(:_range) { [1,2]}
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" id="from_hello" multiple name="report[group_id][]" size="30" type="text" value="1"/>' +
+          '<input id="from_hello" class="group_id integer_filter from" multiple value="1" type="text" name="report[group_id][]"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" id="to_hello" multiple name="report[group_id][]" size="30" type="text" value="2"/>'
+          '<input id="to_hello" class="group_id integer_filter to" multiple value="2" type="text" name="report[group_id][]"/>'
         )}
       end
       context "with only left bound" do
 
         let(:_range) { [10, nil]}
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text" value="10"/>' +
+          '<input class="group_id integer_filter from" multiple value="10" type="text" name="report[group_id][]"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text"/>'
+          '<input class="group_id integer_filter to" multiple type="text" name="report[group_id][]"/>'
         )}
         it { should be_html_safe }
       end
       context "with only right bound" do
         let(:_range) { [nil, 10]}
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"/>' +
+          '<input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text" value="10"/>'
+          '<input class="group_id integer_filter to" multiple value="10" type="text" name="report[group_id][]"/>'
         )}
         it { should be_html_safe }
       end
@@ -131,9 +131,9 @@ describe Datagrid::FormBuilder do
       context "with invalid range value" do
         let(:_range) { 2..1 }
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text" value="2"/>' +
+          '<input class="group_id integer_filter from" multiple value="2" type="text" name="report[group_id][]"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text" value="1"/>'
+          '<input class="group_id integer_filter to" multiple value="1" type="text" name="report[group_id][]"/>'
         )}
       end
 
@@ -149,7 +149,7 @@ describe Datagrid::FormBuilder do
         let(:_filter_options) { { :partials => 'not_existed' } }
         let(:_range) { nil }
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"><span class="separator integer"> - </span><input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
+          '<input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"><span class="separator integer"> - </span><input class="group_id integer_filter to" multiple type="text" name="report[group_id][]">'
         ) }
 
       end
@@ -164,7 +164,7 @@ describe Datagrid::FormBuilder do
           end
         end
         it { should equal_to_dom(
-          'from <input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"> to <input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
+          'from <input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"> to <input class="group_id integer_filter to" multiple type="text" name="report[group_id][]">'
         )}
       end
       context "when deprecated separator is specified" do
@@ -177,7 +177,7 @@ describe Datagrid::FormBuilder do
           end
         end
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"> | <input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
+          '<input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"> | <input class="group_id integer_filter to" multiple type="text" name="report[group_id][]">'
         )}
       end
     end
@@ -191,9 +191,9 @@ describe Datagrid::FormBuilder do
       }
       let(:_range) { [1.5,2.5]}
       it { should equal_to_dom(
-        '<input class="rating float_filter from" multiple name="report[rating][]" size="30" type="text" value="1.5"/>' +
+        '<input class="rating float_filter from" multiple value="1.5" type="text" name="report[rating][]"/>' +
         '<span class="separator float"> - </span>' +
-        '<input class="rating float_filter to" multiple name="report[rating][]" size="30" type="text" value="2.5"/>'
+        '<input class="rating float_filter to" multiple value="2.5" type="text" name="report[rating][]"/>'
       )}
     end
 
@@ -210,9 +210,9 @@ describe Datagrid::FormBuilder do
 
         let(:_range) { ["2012-01-03", nil]}
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>' +
+          '<input class="created_at date_filter from" multiple value="2012-01-03" type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text"/>'
+          '<input class="created_at date_filter to" multiple type="text" name="report[created_at][]"/>'
         )}
         it { should be_html_safe }
       end
@@ -224,18 +224,18 @@ describe Datagrid::FormBuilder do
         end
         let(:_range) { ["2013/01/01", '2013/02/02']}
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="01/01/2013"/>' +
+          '<input class="created_at date_filter from" multiple value="01/01/2013" type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text" value="02/02/2013"/>'
+          '<input class="created_at date_filter to" multiple value="02/02/2013" type="text" name="report[created_at][]"/>'
         )}
       end
       context "with only right bound" do
 
         let(:_range) { [nil, "2012-01-03"]}
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text"/>' +
+          '<input class="created_at date_filter from" multiple type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>'
+          '<input class="created_at date_filter to" multiple value="2012-01-03" type="text"  name="report[created_at][]"/>'
         )}
         it { should be_html_safe }
       end
@@ -243,9 +243,9 @@ describe Datagrid::FormBuilder do
       context "with invalid range value" do
         let(:_range) { Date.parse('2012-01-02')..Date.parse('2012-01-01') }
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="2012-01-02"/>' +
+          '<input class="created_at date_filter from" multiple value="2012-01-02" type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text" value="2012-01-01"/>'
+          '<input class="created_at date_filter to" multiple value="2012-01-01" type="text" name="report[created_at][]"/>'
         )}
       end
       context "with blank range value" do
@@ -256,9 +256,9 @@ describe Datagrid::FormBuilder do
         end
         let(:_range) { [nil, nil] }
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text"/>' +
+          '<input class="created_at date_filter from" multiple type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text"/>'
+          '<input class="created_at date_filter to" multiple type="text" name="report[created_at][]"/>'
         )}
       end
     end
@@ -273,7 +273,7 @@ describe Datagrid::FormBuilder do
         end
       }
       it { should equal_to_dom(
-        '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
+        '<select class="category enum_filter" name="report[category]" id="report_category"><option value=""></option>
        <option value="first">first</option>
        <option value="second">second</option></select>'
       )}
@@ -282,9 +282,14 @@ describe Datagrid::FormBuilder do
         before(:each) do
           skip("not supported by rails < 4.1") if Rails.version < '4.1'
         end
-        let(:_filter_block ) { proc { template.content_tag(:option, 'block option', :value => 'block_value') }}
+        let(:_filter_block ) do
+          proc do
+            template.content_tag(:option, 'block option', :value => 'block_value')
+          end
+        end
         it { should equal_to_dom(
-          '<select class="category enum_filter" id="report_category" name="report[category]"><option value=\"block_value\">block option</option></select>'
+          '<select class="category enum_filter" name="report[category]" id="report_category"><option value=""></option>
+          <option value="block_value">block option</option></select>'
         )}
       end
       context "when first option is selected" do
@@ -292,23 +297,39 @@ describe Datagrid::FormBuilder do
           _grid.category = "first"
         end
         it { should equal_to_dom(
-          '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
-       <option value="first" selected="true">first</option>
+          '<select class="category enum_filter" name="report[category]" id="report_category"><option value=""></option>
+       <option selected value="first">first</option>
        <option value="second">second</option></select>'
         )}
       end
       context "with include_blank option set to false" do
         let(:_filter) { :category_without_include_blank }
         it { should equal_to_dom(
-          '<select class="category_without_include_blank enum_filter" id="report_category_without_include_blank" name="report[category_without_include_blank]">
+          '<select class="category_without_include_blank enum_filter" name="report[category_without_include_blank]" id="report_category_without_include_blank">
          <option value="first">first</option>
          <option value="second">second</option></select>'
         )}
       end
+      context "with dynamic include_blank option" do
+        let(:_grid) do
+          test_report do
+            scope {Entry}
+              filter(:category, :enum, :select => ["first", "second"], :include_blank => proc { "Choose plz" })
+          end
+        end
+        let(:_filter) { :category }
+        it { should equal_to_dom(
+          '<select class="category enum_filter" name="report[category]" id="report_category">
+         <option value="">Choose plz</option>
+         <option value="first">first</option>
+         <option value="second">second</option></select>'
+        )}
+      end
+
       context "with prompt option" do
         let(:_filter) { :category_with_prompt }
         it { should equal_to_dom(
-          '<select class="category_with_prompt enum_filter" id="report_category_with_prompt" name="report[category_with_prompt]"><option value="">My Prompt</option>
+          '<select class="category_with_prompt enum_filter" name="report[category_with_prompt]" id="report_category_with_prompt"><option value="">My Prompt</option>
          <option value="first">first</option>
          <option value="second">second</option></select>'
         )}
@@ -324,8 +345,8 @@ describe Datagrid::FormBuilder do
         if Rails.version >= "4.1"
           it { should equal_to_dom(
             '
-<label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>
-<label class="category enum_filter checkboxes" for="report_category_second"><input id="report_category_second" name="report[category][]" type="checkbox" value="second" />second</label>
+<label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" type="checkbox" value="first" name="report[category][]" />first</label>
+<label class="category enum_filter checkboxes" for="report_category_second"><input id="report_category_second" type="checkbox" value="second" name="report[category][]" />second</label>
             '
           )}
         else
@@ -356,7 +377,7 @@ describe Datagrid::FormBuilder do
       end
       it { should equal_to_dom(
         # hidden is important when default is set to true
-        '<input name="report[disabled]" type="hidden" value="0"><input checked class="disabled boolean_filter" id="report_disabled" name="report[disabled]" type="checkbox" value="1">'
+        '<input name="report[disabled]" type="hidden" value="0"><input class="disabled boolean_filter" type="checkbox" value="1" checked name="report[disabled]" id="report_disabled">'
       )}
     end
     context "with xboolean filter type" do
@@ -368,7 +389,7 @@ describe Datagrid::FormBuilder do
         end
       end
       it { should equal_to_dom(
-        '<select class="disabled extended_boolean_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
+        '<select class="disabled extended_boolean_filter" name="report[disabled]" id="report_disabled"><option value=""></option>
        <option value="YES">Yes</option>
        <option value="NO">No</option></select>'
       )}
@@ -383,7 +404,7 @@ describe Datagrid::FormBuilder do
 
       let(:_filter) { :name }
 
-      it {should equal_to_dom('<input class="name string_filter" id="report_name" name="report[name]" size="30" type="text">')}
+      it {should equal_to_dom('<input class="name string_filter" type="text" name="report[name]" id="report_name">')}
 
       context "when multiple option is set" do
       let(:_grid) do
@@ -395,7 +416,7 @@ describe Datagrid::FormBuilder do
 
       let(:_filter) { :name }
 
-      it {should equal_to_dom('<input class="name string_filter" id="report_name" name="report[name]" size="30" type="text" value="one,two">')}
+      it {should equal_to_dom('<input value="one,two" class="name string_filter" type="text" name="report[name]" id="report_name">')}
       end
     end
 
@@ -412,7 +433,7 @@ describe Datagrid::FormBuilder do
         end
       end
       let(:_filter) { :name }
-      it {should equal_to_dom('<select class="name enum_filter" id="report_name" name="report[name]"></select>')}
+      it {should equal_to_dom('<select class="name enum_filter" name="report[name]" id="report_name"></select>')}
     end
     context "with float filter type" do
       let(:_grid) {
@@ -423,7 +444,7 @@ describe Datagrid::FormBuilder do
       }
       let(:_filter) { :group_id }
       it { should equal_to_dom(
-        '<input class="group_id float_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
+        '<input class="group_id float_filter" type="text" name="report[group_id]" id="report_group_id"/>'
       )}
 
     end
@@ -437,17 +458,10 @@ describe Datagrid::FormBuilder do
       end
       let(:_filter) { :group_id }
       let(:expected_html) do
-        if ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 2
-          <<-HTML
-<select class="group_id enum_filter" id="report_group_id" multiple name="report[group_id][]">
-<option value="hello">hello</option></select>
-          HTML
-        else
-          <<-HTML
-<input name="report[group_id][]" type="hidden" value=""><select class="group_id enum_filter" id="report_group_id" multiple name="report[group_id][]">
+        <<-HTML
+<select class="group_id enum_filter" multiple name="report[group_id][]" id="report_group_id">
 <option value="hello">hello</option></select>
-          HTML
-        end
+        HTML
       end
 
       it { should equal_to_dom(expected_html) }
@@ -467,19 +481,11 @@ describe Datagrid::FormBuilder do
       end
       let(:_filter) { :column_names }
       let(:expected_html) do
-        if ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 2
-          <<-HTML
-<select class="column_names enum_filter" id="report_column_names" multiple name="report[column_names][]"><option value="id" selected>Id</option>
-<option value="name" selected>Name</option>
+        <<-HTML
+<select class="column_names enum_filter" multiple name="report[column_names][]" id="report_column_names"><option selected value="id">Id</option>
+<option selected value="name">Name</option>
 <option value="category">Category</option></select>
-          HTML
-        else
-          <<-HTML
-<input name="report[column_names][]" type="hidden" value=""><select class="column_names enum_filter" id="report_column_names" multiple name="report[column_names][]"><option value="id" selected>Id</option>
-<option value="name" selected>Name</option>
-<option value="category">Category</option></select>
-          HTML
-        end
+        HTML
       end
 
       it { should equal_to_dom(expected_html) }
@@ -499,9 +505,9 @@ describe Datagrid::FormBuilder do
       let(:_filter) { :column_names }
       let(:expected_html) do
         <<DOM
-<label class="column_names enum_filter checkboxes" for="report_column_names_id"><input checked id="report_column_names_id" name="report[column_names][]" type="checkbox" value="id">Id</label>
-<label class="column_names enum_filter checkboxes" for="report_column_names_name"><input checked id="report_column_names_name" name="report[column_names][]" type="checkbox" value="name">Name</label>
-<label class="column_names enum_filter checkboxes" for="report_column_names_category"><input id="report_column_names_category" name="report[column_names][]" type="checkbox" value="category">Category</label>
+<label class="column_names enum_filter checkboxes" for="report_column_names_id"><input id="report_column_names_id" type="checkbox" value="id" checked name="report[column_names][]">Id</label>
+<label class="column_names enum_filter checkboxes" for="report_column_names_name"><input id="report_column_names_name" type="checkbox" value="name" checked name="report[column_names][]">Name</label>
+<label class="column_names enum_filter checkboxes" for="report_column_names_category"><input id="report_column_names_category" type="checkbox" value="category" name="report[column_names][]">Category</label>
 DOM
       end
 
@@ -526,7 +532,7 @@ DOM
       context "with no options" do
         let(:expected_html) do
           <<-HTML
-         <select class="condition dynamic_filter field" id="report_condition" name="report[condition][]"><option value="id">Id</option>
+         <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">Id</option>
          <option value="group_id">Group</option>
          <option value="name">Name</option>
          <option value="category">Category</option>
@@ -536,10 +542,10 @@ DOM
          <option value="confirmed">Confirmed</option>
          <option value="shipping_date">Shipping date</option>
          <option value="created_at">Created at</option>
-         <option value="updated_at">Updated at</option></select><select class="condition dynamic_filter operation" id="report_condition" name="report[condition][]"><option value="=">=</option>
+         <option value="updated_at">Updated at</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="=">=</option>
          <option value="=~">&asymp;</option>
          <option value="&gt;=">&ge;</option>
-         <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" id="report_condition" name="report[condition][]" size="30" type="text">
+         <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value"  name="report[condition][]" type="text" id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}
@@ -551,11 +557,11 @@ DOM
         end
         let(:expected_html) do
           <<-HTML
-            <select class="condition dynamic_filter field" id="report_condition" name="report[condition][]"><option value="id" selected>id</option>
-       <option value="name">name</option></select><select class="condition dynamic_filter operation" id="report_condition" name="report[condition][]"><option value="=">=</option>
+            <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option selected value="id">id</option>
+       <option value="name">name</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="=">=</option>
        <option value="=~">&asymp;</option>
-       <option value="&gt;=" selected>&ge;</option>
-       <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" id="report_condition" name="report[condition][]" size="30" type="text" value="1">
+       <option selected value="&gt;=">&ge;</option>
+       <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" name="report[condition][]" value="1" type="text"  id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}
@@ -567,11 +573,11 @@ DOM
         end
         let(:expected_html) do
           <<-HTML
-        <select class="condition dynamic_filter field" id="report_condition" name="report[condition][]"><option value="id">id</option>
-       <option value="name">name</option></select><select class="condition dynamic_filter operation" id="report_condition" name="report[condition][]"><option value="=">=</option>
+        <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option>
+       <option value="name">name</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="=">=</option>
        <option value="=~">&asymp;</option>
        <option value="&gt;=">&ge;</option>
-       <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" id="report_condition" name="report[condition][]" size="30" type="text">
+       <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}
@@ -584,8 +590,8 @@ DOM
         end
         let(:expected_html) do
           <<-HTML
-          <select class="condition dynamic_filter field" id="report_condition" name="report[condition][]"><option value="id">id</option></select><select class="condition dynamic_filter operation" id="report_condition" name="report[condition][]"><option value="&gt;=">≥</option>
-       <option value="&lt;=">≤</option></select><input class="condition dynamic_filter value" id="report_condition" name="report[condition][]" size="30" type="text">
+          <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="&gt;=">≥</option>
+       <option value="&lt;=">≤</option></select><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}