datagrid 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2013-05-15"
+  s.date = "2013-05-20"
   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 = [
@@ -84,6 +84,7 @@ Gem::Specification.new do |s|
     "spec/datagrid_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/active_record.rb",
+    "spec/support/configuration.rb",
     "spec/support/matchers.rb",
     "spec/support/mongo_mapper.rb",
     "spec/support/mongoid.rb",

data/lib/datagrid/filters.rb

@@ -58,7 +58,7 @@ module Datagrid
         self.filters << filter
 
         datagrid_attribute(attribute) do |value|
-          filter.format_values(value)
+          filter.parse_values(value)
         end
 
       end

data/lib/datagrid/filters/base_filter.rb

@@ -12,8 +12,8 @@ class Datagrid::Filters::BaseFilter
     self.block = block || default_filter_block
   end
 
-  def format(value)
-    raise NotImplementedError, "#format(value) suppose to be overwritten"
+  def parse(value)
+    raise NotImplementedError, "#parse(value) suppose to be overwritten"
   end
 
   def apply(grid_object, scope, value)
@@ -31,13 +31,13 @@ class Datagrid::Filters::BaseFilter
     result
   end
 
-  def format_values(value)
+  def parse_values(value)
     if !self.multiple && value.is_a?(Array)
       raise Datagrid::ArgumentError, "#{grid}##{name} filter can not accept Array argument. Use :multiple option."
     end
     values = Array.wrap(value)
     values.map! do |v|
-      self.format(v)
+      self.parse(v)
     end
     self.multiple ? values : values.first
   end
@@ -88,6 +88,10 @@ class Datagrid::Filters::BaseFilter
     end
   end
 
+  def format(value)
+    value.nil? ? nil : value.to_s
+  end
+
   protected
 
   def default_filter_where(driver, scope, value)

data/lib/datagrid/filters/boolean_filter.rb

@@ -1,7 +1,7 @@
 require "datagrid/utils"
 class Datagrid::Filters::BooleanFilter < Datagrid::Filters::BaseFilter
 
-  def format(value)
+  def parse(value)
     Datagrid::Utils.booleanize(value)
   end
 

data/lib/datagrid/filters/date_filter.rb

@@ -11,15 +11,13 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
     super(grid_object, scope, value)
   end
 
-  def format(value)
+  def parse(value)
     return nil if value.blank?
     return value if value.is_a?(Range)
-    if formats = Datagrid.configuration.date_formats
-      Array(formats).each do |format|
-        begin
-          return Date.strptime(value, format)
-        rescue ArgumentError
-        end
+    formats.each do |format|
+      begin
+        return Date.strptime(value, format)
+      rescue ArgumentError
       end
     end
     return value.to_date if value.respond_to?(:to_date)
@@ -29,5 +27,16 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
     nil
   end
 
+  def formats
+    Array(Datagrid.configuration.date_formats)
+  end
+
+  def format(value)
+    if formats.any?
+      value.strftime(formats.first)
+    else
+      super
+    end
+  end
 end
 

data/lib/datagrid/filters/default_filter.rb

@@ -1,5 +1,5 @@
 class Datagrid::Filters::DefaultFilter < Datagrid::Filters::BaseFilter
-  def format(value)
+  def parse(value)
     value
   end
 end

data/lib/datagrid/filters/enum_filter.rb

@@ -5,7 +5,7 @@ class Datagrid::Filters::EnumFilter < Datagrid::Filters::BaseFilter
     raise Datagrid::ConfigurationError, ":select option not specified" unless options[:select]
   end
 
-  def format(value)
+  def parse(value)
     return nil if self.strict && !select.include?(value)
     value
   end

data/lib/datagrid/filters/float_filter.rb

@@ -1,5 +1,5 @@
 class Datagrid::Filters::FloatFilter < Datagrid::Filters::BaseFilter
-  def format(value)
+  def parse(value)
     return nil if value.blank?
     value.to_f
   end

data/lib/datagrid/filters/integer_filter.rb

@@ -4,7 +4,7 @@ class Datagrid::Filters::IntegerFilter < Datagrid::Filters::BaseFilter
 
   include RangedFilter
 
-  def format(value)
+  def parse(value)
     return nil if value.blank?
     return value if value.is_a?(Range)
     value.to_i

data/lib/datagrid/filters/ranged_filter.rb

@@ -8,7 +8,7 @@ module RangedFilter
     end
   end
 
-  def format_values(value)
+  def parse_values(value)
     result = super(value)
     if range? 
       if result.is_a?(Array)
@@ -18,7 +18,12 @@ module RangedFilter
         when 1
           result.first
         when 2
-          result
+          if result.first && result.last && result.first > result.last
+            # If wrong range is given - reverse it to be always valid
+            result.reverse
+          else
+            result
+          end
         else
           raise ArgumentError, "Can not create a date range from array of more than two: #{result.inspect}"
         end

data/lib/datagrid/filters/string_filter.rb

@@ -1,5 +1,5 @@
 class Datagrid::Filters::StringFilter < Datagrid::Filters::BaseFilter
-  def format(value)
+  def parse(value)
     value.nil? ? nil : value.to_s
   end
 end

data/lib/datagrid/form_builder.rb

@@ -52,22 +52,39 @@ module Datagrid
       if filter.range?
         options = options.merge(:multiple => true)
 
-        from_options = Datagrid::Utils.add_html_classes(options, "from")
-        from_value = object[filter.name].try(:first)
 
-        to_options = Datagrid::Utils.add_html_classes(options, "to")
-        to_value = object[filter.name].try(:last)
+        from_options = datagrid_range_filter_options(object, filter, :from, options)
+        to_options = datagrid_range_filter_options(object, filter, :to, options) 
         # 2 inputs: "from date" and "to date" to specify a range
         [
-          text_field(filter.name, from_options.merge!(:value => from_value)),
+          text_field(filter.name, from_options),
           I18n.t("datagrid.misc.#{type}_range_separator", :default => "<span class=\"separator #{type}\"> - </span>"),
-          text_field(filter.name, to_options.merge!(:value => to_value))
+          text_field(filter.name, to_options)
         ].join.html_safe
       else
         text_field(filter.name, options)
       end
     end
 
+
+    def datagrid_range_filter_options(object, filter, type, options)
+      type_method_map = {:from => :first, :to => :last}
+      options = Datagrid::Utils.add_html_classes(options, type)
+      options[:value] = filter.format(object[filter.name].try(type_method_map[type]))
+      # In case of datagrid ranged filter 
+      # from and to input will have same id
+      options[:id] = if !options.key?(:id) 
+         # Rails provides it's own default id for all inputs
+         # In order to prevent that we assign no id by default 
+        options[:id] = nil
+      elsif options[:id].present?
+        # If the id was given we prefix it
+        # with from_ and to_ accordingly
+        options[:id] = [type, options[:id]].join("_")
+      end
+      options
+    end
+
     def datagrid_string_filter(attribute_or_filter, options = {})
       datagrid_default_filter(attribute_or_filter, options)
     end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -94,19 +94,20 @@ describe Datagrid::Filters::DateFilter do
   end
   
   it "should have configurable date format" do
-    begin
-      Datagrid.configure do |config|
-        config.date_formats = "%m/%d/%Y"
-      end
+    with_date_format do
       report = test_report(:created_at => "10/01/2013") do
         scope  {Entry}
         filter(:created_at, :date)
       end
       report.created_at.should == Date.new(2013,10,01)
-    ensure
-      Datagrid.configure do |config|
-        config.date_formats = nil
-      end
     end
   end
+
+  it "should automatically reverse Array if first more than last" do
+    report = test_report(:created_at => ["2013-01-01", "2012-01-01"]) do
+      scope  {Entry}
+      filter(:created_at, :date, :range => true)
+    end
+    report.created_at.should == [Date.new(2012, 01, 01), Date.new(2013, 01, 01)]
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -25,7 +25,8 @@ describe Datagrid::FormBuilder do
       end
     end
 
-    subject { view.datagrid_filter(_filter)}
+    subject { view.datagrid_filter(_filter, _filter_options)}
+    let(:_filter_options) { {} }
     context "with default filter type" do
       let(:_grid) {
         test_report do
@@ -72,23 +73,31 @@ describe Datagrid::FormBuilder do
           filter(:group_id, :integer, :range => true)
         end
       }
+      context "when datagrid_filter options has id" 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"/>' +
+          '<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"/>'
+        )}
+      end
       context "with only left bound" do
         
         let(:_range) { [10, nil]}
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" id="report_group_id" multiple name="report[group_id][]" size="30" type="text" value="10"/>' +
+          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text" value="10"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" id="report_group_id" 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"/>'
         )}
         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" id="report_group_id" multiple name="report[group_id][]" size="30" type="text"/>' +
+          '<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" id="report_group_id" multiple name="report[group_id][]" size="30" type="text" value="10"/>'
+          '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text" value="10"/>'
         )}
         it { should be_html_safe }
       end
@@ -96,9 +105,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" id="report_group_id" multiple name="report[group_id][]" size="30" type="text" value="2"/>' +
+          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text" value="2"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" id="report_group_id" multiple name="report[group_id][]" size="30" type="text" value="1"/>'
+          '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text" value="1"/>'
         )}
       end
     end
@@ -116,19 +125,32 @@ describe Datagrid::FormBuilder do
         
         let(:_range) { ["2012-01-03", nil]}
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" id="report_created_at" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>' +
+          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" id="report_created_at" multiple name="report[created_at][]" size="30" type="text"/>'
+          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text"/>'
         )}
         it { should be_html_safe }
       end
+      context "when special date format specified" do
+        around(:each) do |example|
+          with_date_format do
+            example.run
+          end
+        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"/>' +
+          '<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"/>'
+        )}
+      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" id="report_created_at" multiple name="report[created_at][]" size="30" type="text"/>' +
+          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" id="report_created_at" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>'
+          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>'
         )}
         it { should be_html_safe }
       end
@@ -136,9 +158,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" id="report_created_at" multiple name="report[created_at][]" size="30" type="text" value="2012-01-02"/>' +
+          '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="2012-01-02"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" id="report_created_at" multiple name="report[created_at][]" size="30" type="text" value="2012-01-01"/>'
+          '<input class="created_at date_filter to" multiple name="report[created_at][]" size="30" type="text" value="2012-01-01"/>'
         )}
       end
     end

data/spec/support/configuration.rb

@@ -0,0 +1,12 @@
+def with_date_format(format = "%m/%d/%Y")
+  begin
+    Datagrid.configure do |config|
+      config.date_formats = format
+    end
+    yield
+  ensure
+    Datagrid.configure do |config|
+      config.date_formats = nil
+    end
+  end
+end

data/spec/support/matchers.rb

@@ -44,7 +44,7 @@ class EqualToDom
   end
 
   def failure_message
-    "Expected dom #{@matcher} to match #{@expectation}, but it wasn't"
+    "Expected dom \n#{@matcher}\n to match \n#{@expectation}\n, but it wasn't"
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,6 +311,7 @@ files:
 - spec/datagrid_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- spec/support/configuration.rb
 - spec/support/matchers.rb
 - spec/support/mongo_mapper.rb
 - spec/support/mongoid.rb
@@ -334,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2130335005317540436
+      hash: -1396287359807292106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: