datagrid 1.3.7 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5c31c4749036fb87065560c115eedfd90a4c26
-  data.tar.gz: afe23674ce0a6092e9a38aef5755327a934d942b
+  metadata.gz: 6d1827360a3a33795e420d9c086607e2934ff3a8
+  data.tar.gz: 34e08edcc7adcb354dfd7d6b24b19c8a34134c19
 SHA512:
-  metadata.gz: 3fc66b0df7f1c502250b47dad4d1f92b56b155d2d4a89e5a04d8fb706565c2438d35b0a84a0776cf7ef93b7221e93b79e69591576d931bfe3bde8cab111db8af
-  data.tar.gz: f174e306b193df406d8bd519f7de01f91da7d37431ec7b898ef1bbab6150265054a82de1d256015efd3281d19940f42d689927d41a081ff72226e992f8185d19
+  metadata.gz: d1d458c0938739371e2cf3dd5d16e5c9601dea0f9a6c62b439c542aa8a14d6a84e90c76e7447b03306a51eec91eddb05d97fe454c1020dd25748c89b093cc8fa
+  data.tar.gz: bd86f70ec51fcf427b33c1b3380b4c4eaf9d7c8e3070ce74606354dace36e973ca5befe383f3cc7c397ebe4e8418d8e568e2cea1621d9372195321295ed5b7f5

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.3.9

data/app/views/datagrid/_form.html.erb

@@ -2,7 +2,7 @@
   <% grid.filters.each do |filter| %>
     <div class="datagrid-filter filter">
       <%= f.datagrid_label filter %>
-      <%= f.datagrid_filter filter %>
+      <%= f.datagrid_filter filter, partials: options[:partials] %>
     </div>
   <% end %>
   <div class="datagrid-actions">

data/datagrid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.3.7 ruby lib
+# stub: datagrid 1.3.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.7"
+  s.version = "1.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2015-03-25"
+  s.date = "2015-05-11"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Readme.markdown",
     "VERSION",
-    "app/assets/stylesheets/datagrid.css.sass",
+    "app/assets/stylesheets/datagrid.sass",
     "app/views/datagrid/_enum_checkboxes.html.erb",
     "app/views/datagrid/_form.html.erb",
     "app/views/datagrid/_head.html.erb",
@@ -98,13 +98,13 @@ Gem::Specification.new do |s|
     "spec/datagrid/helper_spec.rb",
     "spec/datagrid/ordering_spec.rb",
     "spec/datagrid/scaffold_spec.rb",
+    "spec/datagrid/stylesheet_spec.rb",
     "spec/datagrid/utils_spec.rb",
     "spec/datagrid_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/active_record.rb",
     "spec/support/configuration.rb",
-    "spec/support/locale/deprecated_range_format.yml",
-    "spec/support/locale/deprecated_range_separator.yml",
+    "spec/support/i18n_helpers.rb",
     "spec/support/matchers.rb",
     "spec/support/mongo_mapper.rb",
     "spec/support/mongoid.rb",
@@ -115,6 +115,9 @@ Gem::Specification.new do |s|
     "spec/support/test_partials/client/datagrid/_order_for.html.erb",
     "spec/support/test_partials/client/datagrid/_row.html.erb",
     "spec/support/test_partials/client/datagrid/_table.html.erb",
+    "spec/support/test_partials/custom_checkboxes/_enum_checkboxes.html.erb",
+    "spec/support/test_partials/custom_form/_form.html.erb",
+    "spec/support/test_partials/custom_range/_range_filter.html.erb",
     "templates/controller.rb.erb",
     "templates/grid.rb.erb",
     "templates/index.html.erb"

data/lib/datagrid/columns/column.rb

@@ -56,8 +56,7 @@ class Datagrid::Columns::Column
   end
 
   def header
-    self.options[:header] ||
-      I18n.translate(self.name, :scope => "datagrid.#{self.grid_class.param_name}.columns", :default => self.name.to_s.humanize )
+    self.options[:header] || Datagrid::Utils.translate_from_namespace(:columns, grid_class, name)
   end
 
   def order

data/lib/datagrid/filters.rb

@@ -151,6 +151,16 @@ module Datagrid
         apply_filters(scope, filters.map{|f| filter_by_name(f)})
       end
 
+      # Returns select options for specific filter or filter name
+      # If given filter doesn't support select options raises `ArgumentError`
+      def select_options(filter)
+        filter = filter_by_name(filter)
+        unless filter.class.included_modules.include?(::Datagrid::Filters::SelectOptions)
+          raise ::Datagrid::ArgumentError, "#{filter.name} with type #{FILTER_TYPES.invert[filter.class].inspect} can not have select options"
+        end
+        filter.select(self)
+      end
+
       protected
 
       def apply_filters(current_scope, filters)

data/lib/datagrid/filters/base_filter.rb

@@ -49,8 +49,7 @@ class Datagrid::Filters::BaseFilter #:nodoc:
   end
 
   def header
-    options[:header] ||
-      I18n.translate(self.name, :scope => "datagrid.#{grid_class.param_name}.filters", :default => self.name.to_s.humanize)
+    options[:header] || Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
   end
 
   def default
@@ -100,6 +99,10 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     end
   end
 
+  def supports_range?
+    self.class.ancestors.include?(::Datagrid::Filters::RangedFilter)
+  end
+
   def format(value)
     value.nil? ? nil : value.to_s
   end

data/lib/datagrid/filters/date_filter.rb

@@ -2,7 +2,7 @@ require "datagrid/filters/ranged_filter"
 
 class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
 
-  include RangedFilter
+  include Datagrid::Filters::RangedFilter
 
   def apply(grid_object, scope, value)
     if value.is_a?(Range)

data/lib/datagrid/filters/date_time_filter.rb

@@ -2,7 +2,7 @@ require "datagrid/filters/ranged_filter"
 
 class Datagrid::Filters::DateTimeFilter < Datagrid::Filters::BaseFilter
 
-  include RangedFilter
+  include Datagrid::Filters::RangedFilter
 
   def parse(value)
     Datagrid::Utils.parse_datetime(value)

data/lib/datagrid/filters/float_filter.rb

@@ -1,6 +1,6 @@
 class Datagrid::Filters::FloatFilter < Datagrid::Filters::BaseFilter
 
-  include RangedFilter
+  include Datagrid::Filters::RangedFilter
 
   def parse(value)
     return nil if value.blank?

data/lib/datagrid/filters/integer_filter.rb

@@ -2,7 +2,7 @@ require "datagrid/filters/ranged_filter"
 
 class Datagrid::Filters::IntegerFilter < Datagrid::Filters::BaseFilter
 
-  include RangedFilter
+  include Datagrid::Filters::RangedFilter
 
   def parse(value)
     return nil if value.blank?

data/lib/datagrid/filters/ranged_filter.rb

@@ -1,4 +1,4 @@
-module RangedFilter
+module Datagrid::Filters::RangedFilter
   
 
   def initialize(grid, name, options, &block)

data/lib/datagrid/form_builder.rb

@@ -7,6 +7,8 @@ module Datagrid
     def datagrid_filter(filter_or_attribute, options = {}, &block)
       filter = datagrid_get_filter(filter_or_attribute)
       options = add_html_classes(options, filter.name, datagrid_filter_html_class(filter))
+      # Prevent partials option from appearing in HTML attributes
+      options.delete(:partials) unless supports_partial?(filter)
       self.send(filter.form_builder_helper_name, filter, options, &block)
     end
 
@@ -48,18 +50,17 @@ module Datagrid
     end
 
     def datagrid_enum_filter(attribute_or_filter, options = {}, &block)
-      options = options.clone
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.checkboxes?
+        partial = partial_path(options, 'enum_checkboxes')
         options = add_html_classes(options, 'checkboxes')
-        partials_path = options.delete(:partials) || 'datagrid' 
-        elements = filter.select(object).map do |element|
+        elements = object.select_options(filter).map do |element|
           text, value = @template.send(:option_text_and_value, element)
           checked = enum_checkbox_checked?(filter, value)
           [value, text, checked]
         end
         @template.render(
-          :partial => File.join(partials_path, 'enum_checkboxes'),
+          :partial => partial,
           :locals => {
             :elements => elements, 
             :form => self, 
@@ -73,7 +74,7 @@ module Datagrid
         end
         select(
           filter.name, 
-          filter.select(object) || [],
+          object.select_options(filter) || [],
           {:include_blank => filter.include_blank,
            :prompt => filter.prompt,
            :include_hidden => false},
@@ -95,7 +96,7 @@ module Datagrid
 
     def datagrid_integer_filter(attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
-      if filter.multiple? && self.object[filter.name].blank?
+      if filter.multiple? && object[filter.name].blank?
         options[:value] = ""
       end
       datagrid_range_filter(:integer, filter, options)
@@ -108,7 +109,7 @@ module Datagrid
       options = options.merge(:name => input_name)
       field_input = select(
         filter.name,
-        filter.select(object) || [],
+        object.select_options(filter) || [],
         {
           :include_blank => filter.include_blank,
           :prompt => filter.prompt,
@@ -129,6 +130,7 @@ module Datagrid
     def datagrid_range_filter(type, attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.range?
+        partial = partial_path(options, 'range_filter')
         options = options.merge(:multiple => true)
 
 
@@ -151,7 +153,7 @@ module Datagrid
           I18n.t(format_key, :from_input => from_input, :to_input => to_input).html_safe
         else
           # More flexible way to render via partial
-          @template.render :partial => 'datagrid/range_filter', :locals => {
+          @template.render :partial => partial, :locals => {
             :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
           }
         end
@@ -214,8 +216,22 @@ module Datagrid
       Datagrid::Utils.add_html_classes(options, *classes)
     end
 
-    class Error < StandardError
+    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 
+        if @template.lookup_context.template_exists?(partial_name, [], true)
+          return partial_name
+        end
+      end
+      File.join('datagrid', name)
     end
 
+    def supports_partial?(filter)
+      (filter.supports_range? && filter.range?) || (filter.type == :enum && filter.checkboxes?)
+    end
+
+    class Error < StandardError
+    end
   end
 end

data/lib/datagrid/rspec.rb

@@ -45,7 +45,7 @@ shared_examples_for "Datagrid" do
           when :integer
             1
           when :enum
-            select = filter.select(subject)
+            select = subject.select_options(filter)
             select.first.try(:last)
           else
             raise "unknown filter type: #{filter.class}"

data/lib/datagrid/utils.rb

@@ -12,6 +12,20 @@ module Datagrid
         TRUTH.include?(value)
       end
 
+      def translate_from_namespace(namespace, grid_class, key)
+        deprecated_key = :"datagrid.#{grid_class.param_name}.#{namespace}.#{key}"
+        live_key = :"datagrid.#{grid_class.model_name.i18n_key}.#{namespace}.#{key}"
+        i18n_key = grid_class.model_name.i18n_key.to_s
+
+        if grid_class.param_name != i18n_key && I18n.exists?(deprecated_key)
+          Datagrid::Utils.warn_once(
+            "Deprecated translation namespace 'datagrid.#{grid_class.param_name}' for #{grid_class}. Use 'datagrid.#{i18n_key}' instead."
+          )
+          return I18n.t(deprecated_key)
+        end
+        I18n.t(live_key, default: key.to_s.humanize).presence
+      end
+
       def warn_once(message, delay = 5)
         @warnings ||= {}
         timestamp = @warnings[message]

data/spec/datagrid/columns_spec.rb

@@ -23,13 +23,70 @@ describe Datagrid::Columns do
     let(:date) { Date.new(2013, 8, 1) }
 
     it "should have data columns without html columns" do
-      expect(subject.data_columns.size).to eq(subject.columns.size - 1)
+      grid = test_report do
+        scope {Entry}
+        column(:name)
+        column(:action, :html => true) do 
+          'dummy'
+        end
+      end
+      expect(grid.data_columns.map(&:name)).to eq([:name])
+      expect(grid.html_columns.map(&:name)).to eq([:name, :action])
     end
     it "should build rows of data" do
-      expect(subject.rows).to eq([[date, "Pop", "Star", "admin", "ROTTWEILER"]])
+      grid = test_report do
+        scope {Entry}
+        column(:name)
+        column(:action, :html => true) do 
+          'dummy'
+        end
+      end
+      expect(grid.rows).to eq([["Star"]])
+    end
+    it  "should generate header without html columns" do
+      grid = test_report do
+        scope {Entry}
+        column(:name)
+        column(:action, :html => true) do 
+          'dummy'
+        end
+      end
+      expect(grid.header).to eq(["Name"])
     end
-    it  "should generate header" do
-      expect(subject.header).to eq(["Shipping date", "Group", "Name", "Access level", "Pet"])
+
+    describe "translations" do
+      
+      module ::Ns45
+        class TranslatedReport
+          include Datagrid
+          scope { Entry }
+          column(:name)
+        end
+      end
+      it "translates column with deprecated namespace" do
+        silence_warnings do
+          store_translations(:en, datagrid: {ns45_translated_report: {columns: {name: "Navn"}}}) do
+            expect(Ns45::TranslatedReport.new.header.first).to eq("Navn")
+          end
+        end
+      end
+
+      it "translates column with namespace" do
+        store_translations(:en, datagrid: {:"ns45/translated_report" => {columns: {name: "Navn"}}}) do
+          expect(Ns45::TranslatedReport.new.header.first).to eq("Navn")
+        end
+      end
+
+      it "translates column without namespace" do
+        class Report27
+          include Datagrid
+          scope {Entry}
+          column(:name)
+        end
+        store_translations(:en, datagrid: {:"report27" => {columns: {name: "Nombre"}}}) do
+          expect(Report27.new.header.first).to eq("Nombre")
+        end
+      end
     end
 
     it "should return html_columns" do

data/spec/datagrid/drivers/active_record_spec.rb

@@ -6,7 +6,7 @@ describe Datagrid::Drivers::ActiveRecord do
     subject { described_class }
 
     it {should be_match(Entry)}
-    it {should be_match(Entry.scoped)}
+    it {should be_match(Entry.where(:id => 1))}
     it {should_not be_match(MongoidEntry)}
   end
 
@@ -17,7 +17,7 @@ describe Datagrid::Drivers::ActiveRecord do
   end
 
   it "should support append_column_queries" do
-    scope = subject.append_column_queries(Entry.scoped, [Datagrid::Columns::Column.new(SimpleReport, :sum_group_id, 'sum(entries.group_id)')])
+    scope = subject.append_column_queries(Entry.where({}), [Datagrid::Columns::Column.new(test_report_class, :sum_group_id, 'sum(entries.group_id)')])
     expect(scope.to_sql.strip).to eq('SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries"')
   end
 end

data/spec/datagrid/drivers/mongo_mapper_spec.rb

@@ -9,7 +9,7 @@ describe Datagrid::Drivers::MongoMapper, :mongomapper 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.scoped)}
+    it {should_not be_match(Entry.where(:id => 1))}
 
   end
   describe "api" do

data/spec/datagrid/drivers/mongoid_spec.rb

@@ -8,7 +8,7 @@ describe Datagrid::Drivers::Mongoid, :mongoid do
 
     it {should be_match(MongoidEntry)}
     it {should be_match(MongoidEntry.scoped)}
-    it {should_not be_match(Entry.scoped)}
+    it {should_not be_match(Entry.where(:id => 1))}
 
   end
   describe "api" do

data/spec/datagrid/filters/date_time_filter_spec.rb

@@ -5,11 +5,16 @@ describe Datagrid::Filters::DateTimeFilter do
     describe "with orm #{orm}", orm => true do
       describe "timestamp to timestamp conversion" do
         let(:klass) { klass }
-        subject do
+
+        let(:grid) do
           test_report(:created_at => _created_at) do
             scope { klass }
             filter(:created_at, :datetime, :range => true)
-          end.assets.to_a
+          end
+        end
+
+        subject do
+          grid.assets.to_a
         end
 
         def entry_dated(date)

data/spec/datagrid/filters_spec.rb

@@ -204,4 +204,52 @@ describe Datagrid::Filters do
       expect(object.type).to eq(:integer)
     end
   end
+
+  describe "tranlations" do
+    
+    module ::Ns46
+      class TranslatedReport
+        include Datagrid
+        scope { Entry }
+        filter(:name)
+      end
+    end
+    it "translates filter with deprecated namespace" do
+      grid = Ns46::TranslatedReport.new
+      silence_warnings do
+        store_translations(:en, datagrid: {ns46_translated_report: {filters: {name: "Navn"}}}) do
+          expect(grid.filters.map(&:header)).to eq(["Navn"])
+        end
+      end
+    end
+
+    it "translates filter with namespace" do
+      grid = Ns46::TranslatedReport.new
+      store_translations(:en, datagrid: {:"ns46/translated_report" => {filters: {name: "Navn"}}}) do
+        expect(grid.filters.map(&:header)).to eq(["Navn"])
+      end
+    end
+
+  end
+
+
+  describe "#select_options" do
+    it "should return select options" do
+      grid = test_report do
+        scope {Entry}
+        filter(:id, :enum, select: [1,2,3])
+      end
+      expect(grid.select_options(:id)).to eq([1,2,3])
+    end
+
+    it "should raise ArgumentError for filter without options" do
+      grid = test_report do
+        scope {Entry}
+        filter(:id, :integer)
+      end
+      expect {
+        grid.select_options(:id)
+      }.to raise_error(Datagrid::ArgumentError)
+    end
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -58,6 +58,13 @@ describe Datagrid::FormBuilder do
       it { should equal_to_dom(
         '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
       )}
+
+      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"/>'
+        )}
+      end
     end
 
     context "with date filter type" do
@@ -130,16 +137,31 @@ describe Datagrid::FormBuilder do
         )}
       end
 
+      context "with custom partials option and template exists" do
+        let(:_filter_options) { { :partials => 'custom_range' } }
+        let(:_range) { nil }
+        it { should equal_to_dom(
+          "custom_range_partial"
+        ) }
+      end
+
+      context "when custom partial doesn't exist" 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">'
+        ) }
+        
+      end
+
       context "when deprecated format translation specified" do
         let(:_range) { nil }
         around(:each) do |example|
-          I18n.load_path << File.expand_path('../../support/locale/deprecated_range_format.yml', __FILE__)
-          I18n.reload!
-          silence_warnings do
-            example.run
+          store_translations(:en, datagrid: {filters: {integer: {range_format: "from %{from_input} to %{to_input}"}}}) do
+            silence_warnings do
+              example.run
+            end
           end
-          I18n.load_path.pop
-          I18n.reload!
         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">'
@@ -148,14 +170,11 @@ describe Datagrid::FormBuilder do
       context "when deprecated separator is specified" do
         let(:_range) { nil }
         around(:each) do |example|
-          I18n.load_path << File.expand_path('../../support/locale/deprecated_range_separator.yml', __FILE__)
-          I18n.reload!
-          silence_warnings do
-            example.run
+          store_translations(:en, datagrid: {filters: {integer: {range_separator: " | "}}}) do
+            silence_warnings do
+              example.run
+            end
           end
-          I18n.load_path.pop
-          I18n.reload!
-
         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">'
@@ -319,6 +338,11 @@ describe Datagrid::FormBuilder do
 
 
         end
+
+        context "when partials option passed and partial exists" do
+          let(:_filter_options) { {partials: 'custom_checkboxes'} }
+          it { should equal_to_dom('custom_enum_checkboxes') }
+        end
       end
     end
 

data/spec/datagrid/helper_spec.rb

@@ -455,6 +455,29 @@ describe Datagrid::Helper do
         "form.datagrid-form input[name='g[id]']" => 1,
       )
     end
+
+    it "takes default partials if custom doesn't exist" do
+      class PartialDefaultGrid
+        include Datagrid
+        scope {Entry}
+        filter(:id, :integer, :range => true)
+        filter(:group_id, :enum, :multiple => true, :checkboxes => true, :select => [1,2])
+        def param_name
+          'g'
+        end
+      end
+      rendered_form = subject.datagrid_form_for(PartialDefaultGrid.new, {
+        :url => '',
+        :partials => 'custom_form'
+      })
+      expect(rendered_form).to include 'form_partial_test'
+      expect(rendered_form).to match_css_pattern([
+        'input.integer_filter.from',
+        'input.integer_filter.to',
+        ".enum_filter input[value='1']",
+        ".enum_filter input[value='2']",
+      ])
+    end
   end
 
 

data/spec/datagrid/stylesheet_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe "Datagrid stylesheet" do
+
+  pending "should work correctly" do
+    Rails.application.assets.find_asset("datagrid")
+  end
+end

data/spec/datagrid_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 require "datagrid/rspec"
 
 
-describe SimpleReport do
+describe Datagrid do
   
-  it_should_behave_like 'Datagrid'
+  describe SimpleReport do
+    it_should_behave_like 'Datagrid'
+  end
   
   let(:group) { Group.create!(:name => "Pop") }
   

data/spec/spec_helper.rb

@@ -31,6 +31,8 @@ require "logger"
 
 class DatagridTest < Rails::Application
 
+  config.eager_load = false
+
 end
 
 if I18n.respond_to?(:enforce_available_locales)

data/spec/support/i18n_helpers.rb

@@ -0,0 +1,7 @@
+def store_translations(locale, translations, &block)
+  I18n.backend.store_translations locale, translations
+  yield
+ensure
+  I18n.reload!
+  I18n.backend.send :init_translations
+end

data/spec/support/matchers.rb

@@ -42,6 +42,11 @@ end
 class CssPattern
   def initialize(pattern)
     @css_pattern = pattern
+    unless @css_pattern.is_a?(Hash)
+      @css_pattern = Array(@css_pattern).map do |key|
+        [key, 1]
+      end
+    end
   end
 
   def error!(message)

data/spec/support/simple_report.rb

@@ -33,7 +33,7 @@ class SimpleReport
   filter(:confirmed, :boolean)
 
   filter(:name) do |value|
-    self.scoped(:conditions => {:name => value})
+    self.where(:name => value)
   end
 
   column(:group, :order => "groups.name") do
@@ -61,3 +61,4 @@ class SimpleReport
   end
 
 end
+

data/spec/support/test_partials/custom_checkboxes/_enum_checkboxes.html.erb

@@ -0,0 +1 @@
+custom_enum_checkboxes

data/spec/support/test_partials/custom_form/_form.html.erb

@@ -0,0 +1,7 @@
+<%= form_for grid, options do |f| -%>
+  <p>form_partial_test</p>
+  <% grid.filters.each do |filter| %>
+    <%= f.datagrid_label filter %>
+    <%= f.datagrid_filter filter, partials: options[:partials] %>
+  <% end %>
+<% end -%>

data/spec/support/test_partials/custom_range/_range_filter.html.erb

@@ -0,0 +1 @@
+custom_range_partial

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.9
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,7 +195,7 @@ files:
 - Rakefile
 - Readme.markdown
 - VERSION
-- app/assets/stylesheets/datagrid.css.sass
+- app/assets/stylesheets/datagrid.sass
 - app/views/datagrid/_enum_checkboxes.html.erb
 - app/views/datagrid/_form.html.erb
 - app/views/datagrid/_head.html.erb
@@ -266,13 +266,13 @@ files:
 - spec/datagrid/helper_spec.rb
 - spec/datagrid/ordering_spec.rb
 - spec/datagrid/scaffold_spec.rb
+- spec/datagrid/stylesheet_spec.rb
 - spec/datagrid/utils_spec.rb
 - spec/datagrid_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/configuration.rb
-- spec/support/locale/deprecated_range_format.yml
-- spec/support/locale/deprecated_range_separator.yml
+- spec/support/i18n_helpers.rb
 - spec/support/matchers.rb
 - spec/support/mongo_mapper.rb
 - spec/support/mongoid.rb
@@ -283,6 +283,9 @@ files:
 - spec/support/test_partials/client/datagrid/_order_for.html.erb
 - spec/support/test_partials/client/datagrid/_row.html.erb
 - spec/support/test_partials/client/datagrid/_table.html.erb
+- spec/support/test_partials/custom_checkboxes/_enum_checkboxes.html.erb
+- spec/support/test_partials/custom_form/_form.html.erb
+- spec/support/test_partials/custom_range/_range_filter.html.erb
 - templates/controller.rb.erb
 - templates/grid.rb.erb
 - templates/index.html.erb

data/spec/support/locale/deprecated_range_format.yml

@@ -1,7 +0,0 @@
-en:
-  datagrid:
-    filters:
-      integer:
-        range_format:
-          "from %{from_input} to %{to_input}"
-

data/spec/support/locale/deprecated_range_separator.yml

@@ -1,5 +0,0 @@
-en:
-  datagrid:
-    filters:
-      integer:
-        range_separator: " | "