wice_grid_mongoid 6.2.1 → 6.2.2

data/VERSION

@@ -1 +1 @@
-6.2.1
+6.2.2

data/lib/filter_conditions_generators.rb

@@ -15,43 +15,44 @@ module Wice
     end
   end
 
-#   class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
-
-#     def generate_conditions(opts)   #:nodoc:
-#       if opts.empty?
-#         Wice.log "empty parameters for the grid custom filter"
-#         return false
-#       end
-#       opts = (opts.kind_of?(Array) && opts.size == 1) ? opts[0] : opts
-
-#       if opts.kind_of?(Array)
-#         opts_with_special_values, normal_opts = opts.partition{|v| ::Wice::GridTools.special_value(v)}
-
-#         conditions_ar = if normal_opts.size > 0
-#           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
-#         else
-#           []
-#         end
-
-#         if opts_with_special_values.size > 0
-#           special_conditions = opts_with_special_values.collect{|v| " #{@field.alias_or_table_name(table_alias)}.#{@field.name} is " + v}.join(' or ')
-#           if conditions_ar.size > 0
-#             conditions_ar[0] = " (#{conditions_ar[0]} or #{special_conditions} ) "
-#           else
-#             conditions_ar = " ( #{special_conditions} ) "
-#           end
-#         end
-#         conditions_ar
-#       else
-#         if ::Wice::GridTools.special_value(opts)
-#           " #{@field.alias_or_table_name(table_alias)}.#{@field.name} is " + opts
-#         else
-#           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} = ?", opts]
-#         end
-#       end
-#     end
-
-#   end
+  class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #: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
+      #       end
+      #       opts = (opts.kind_of?(Array) && opts.size == 1) ? opts[0] : opts
+
+      #       if opts.kind_of?(Array)
+      #         opts_with_special_values, normal_opts = opts.partition{|v| ::Wice::GridTools.special_value(v)}
+
+      #         conditions_ar = if normal_opts.size > 0
+      #           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
+      #         else
+      #           []
+      #         end
+
+      #         if opts_with_special_values.size > 0
+      #           special_conditions = opts_with_special_values.collect{|v| " #{@field.alias_or_table_name(table_alias)}.#{@field.name} is " + v}.join(' or ')
+      #           if conditions_ar.size > 0
+      #             conditions_ar[0] = " (#{conditions_ar[0]} or #{special_conditions} ) "
+      #           else
+      #             conditions_ar = " ( #{special_conditions} ) "
+      #           end
+      #         end
+      #         conditions_ar
+      #       else
+      #         if ::Wice::GridTools.special_value(opts)
+      #           " #{@field.alias_or_table_name(table_alias)}.#{@field.name} is " + opts
+      #         else
+      #           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} = ?", opts]
+      #         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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.2.1"
+  s.version = "6.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind", "Aleksandr Furmanov"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wice_grid_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 6
   - 2
-  - 1
-  version: 6.2.1
+  - 2
+  version: 6.2.2
 platform: ruby
 authors: 
 - Yuri Leikind