datagrid 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/datagrid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]

data/lib/datagrid/filters/composite_filters.rb

@@ -16,10 +16,10 @@ module Datagrid
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
 
-          filter(from_options[:name] || :"from_#{field}", :date) do |date|
+          filter(from_options[:name] || :"from_#{field}", :date, from_options) do |date|
             driver.greater_equal(self, field, date)
           end
-          filter(to_options[:name] || :"to_#{field}", :date) do |date|
+          filter(to_options[:name] || :"to_#{field}", :date, to_options) do |date|
             driver.less_equal(self, field, date)
           end
         end
@@ -27,10 +27,10 @@ module Datagrid
         def integer_range_filters(field, from_options = {}, to_options = {})
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
-          filter(from_options[:name] || :"from_#{field}", :integer) do |value|
+          filter(from_options[:name] || :"from_#{field}", :integer, from_options) do |value|
             driver.greater_equal(self, field, value)
           end
-          filter(to_options[:name] || :"to_#{field}", :integer) do |value|
+          filter(to_options[:name] || :"to_#{field}", :integer, to_options) do |value|
             driver.less_equal(self, field, value)
           end
         end

data/spec/datagrid/filters/composite_filters_spec.rb

@@ -16,6 +16,14 @@ describe Datagrid::Filters::CompositeFilters do
       assets.should include(e2)
       assets.should_not include(e1, e3)
     end
+
+    it "should support options" do
+      report = test_report do
+        report = date_range_filters(:shipping_date, {:default => 10.days.ago.to_date}, {:default => Date.today})
+      end
+      report.from_shipping_date.should == 10.days.ago.to_date
+      report.to_shipping_date.should == Date.today
+    end
   end
   
   describe ".integer_range_filters" do
@@ -32,5 +40,12 @@ describe Datagrid::Filters::CompositeFilters do
       assets.should include(e2)
       assets.should_not include(e1, e3)
     end
+    it "should support options" do
+      report = test_report do
+        report = integer_range_filters(:group_id, {:default => 0}, {:default => 100})
+      end
+      report.from_group_id.should == 0
+      report.to_group_id.should == 100
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75484050 !ruby/object:Gem::Requirement
+  requirement: &78305030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *75484050
+  version_requirements: *78305030
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75483760 !ruby/object:Gem::Requirement
+  requirement: &78304740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75483760
+  version_requirements: *78304740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75483430 !ruby/object:Gem::Requirement
+  requirement: &78304410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *75483430
+  version_requirements: *78304410
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &75483070 !ruby/object:Gem::Requirement
+  requirement: &78304050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *75483070
+  version_requirements: *78304050
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &75482550 !ruby/object:Gem::Requirement
+  requirement: &78303520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75482550
+  version_requirements: *78303520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &75481780 !ruby/object:Gem::Requirement
+  requirement: &78302760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75481780
+  version_requirements: *78302760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75481530 !ruby/object:Gem::Requirement
+  requirement: &78302520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *75481530
+  version_requirements: *78302520
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &75481140 !ruby/object:Gem::Requirement
+  requirement: &78302120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75481140
+  version_requirements: *78302120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &75480800 !ruby/object:Gem::Requirement
+  requirement: &78301780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75480800
+  version_requirements: *78301780
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &75480480 !ruby/object:Gem::Requirement
+  requirement: &78301460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75480480
+  version_requirements: *78301460
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &75480110 !ruby/object:Gem::Requirement
+  requirement: &78301090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 2.3.15
   type: :development
   prerelease: false
-  version_requirements: *75480110
+  version_requirements: *78301090
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &75479780 !ruby/object:Gem::Requirement
+  requirement: &78300760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *75479780
+  version_requirements: *78300760
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &75479190 !ruby/object:Gem::Requirement
+  requirement: &78300170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +153,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *75479190
+  version_requirements: *78300170
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &75478930 !ruby/object:Gem::Requirement
+  requirement: &78299910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +164,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *75478930
+  version_requirements: *78299910
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &75478570 !ruby/object:Gem::Requirement
+  requirement: &78299560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75478570
+  version_requirements: *78299560
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -141785713
+      hash: -972605005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: