wice_grid_mongoid 6.0.9 → 6.0.10

data/VERSION

@@ -1 +1 @@
-6.0.9
+6.0.10

data/lib/filter_conditions_generators.rb

@@ -14,9 +14,10 @@ module Wice
     end
   end
 
-#   class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
+  class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
 
-#     def generate_conditions(opts)   #:nodoc:
+    def generate_conditions(opts)   #:nodoc:
+      return false # should be implemented
 #       if opts.empty?
 #         Wice.log "empty parameters for the grid custom filter"
 #         return false
@@ -48,9 +49,8 @@ module Wice
 #           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} = ?", opts]
 #         end
 #       end
-#     end
-
-#   end
+     end
+  end
 
   class FilterConditionsGeneratorBoolean < FilterConditionsGenerator  #:nodoc:
     @@handled_type[Boolean] = self

data/lib/mongoid_field.rb

@@ -10,15 +10,30 @@ module Wice
       # Preprocess incoming parameters for datetime, if what's coming in is
       # a datetime (with custom_filter it can be anything else, and not
       # the datetime hash {"fr" => ..., "to" => ...})
-      if (self.type == Time) && request_params.is_a?(Hash)
-        ["fr", "to"].each do |sym|
-          if request_params[sym]
-            if request_params[sym].is_a?(String)
-              request_params[sym] = Time.parse(Wice::Defaults::DATETIME_PARSER.call(request_params[sym]).to_s)
-            elsif request_params[sym].is_a?(Hash)
-              request_params[sym] = Time.parse(::Wice::GridTools.params_2_datetime(request_params[sym]).to_s)
+      if (self.type == Time) 
+        if request_params.is_a?(Hash)
+          ["fr", "to"].each do |sym|
+            if request_params[sym]
+              if request_params[sym].is_a?(String)
+                request_params[sym] = Time.parse(Wice::Defaults::DATETIME_PARSER.call(request_params[sym]).to_s)
+              elsif request_params[sym].is_a?(Hash)
+                request_params[sym] = Time.parse(::Wice::GridTools.params_2_datetime(request_params[sym]).to_s)
+              end
             end
           end
+        elsif request_params.is_a?(Array) && request_params.size == 1
+          ago = request_params.first
+          today = Time.now.beginning_of_day
+          agos = {'1 day' => today - 24.hours,
+            '1 week' => today - 7.days,
+            '1 month' => today - 1.month,
+            'ever' => Time.parse("2000-01-01")}
+          if agos.keys.include?(ago)
+            request_params = {}
+            #regular filtering viea 'fr', 'to' field
+            request_params[:fr] = agos[ago] 
+            custom_filter_active = nil
+          end
         end
       end
 

data/wice_grid_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.0.9"
+  s.version = "6.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind", "Aleksandr Furmanov"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-01-28}
   s.description = %q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
   s.email = %q{aleksandr.furmanov@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wice_grid_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 6
   - 0
-  - 9
-  version: 6.0.9
+  - 10
+  version: 6.0.10
 platform: ruby
 authors: 
 - Yuri Leikind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: []