wice_grid_mongoid 6.0.3 → 6.0.4

data/VERSION

@@ -1 +1 @@
-6.0.3
+6.0.4

data/lib/filter_conditions_generators.rb

@@ -93,6 +93,7 @@ module Wice
     @@handled_type[Integer] = self
     @@handled_type[Float]   = self
 #    @@handled_type[BigDecimal] = self
+    VALID_NUMBER_RE = /(\d+)((G|M|K)B?)?/i
 
     def  generate_conditions(opts)   #:nodoc:
       unless opts.kind_of? Hash
@@ -100,16 +101,29 @@ module Wice
         return false
       end
 
-      if !opts[:fr] || !(opts[:fr] =~ /\d/) || !opts[:to] || !(opts[:to] =~ /\d/)
+      if !opts[:fr] || !(opts[:fr] =~ VALID_NUMBER_RE) || !opts[:to] || !(opts[:to] =~ VALID_NUMBER_RE)
         Wice.log "invalid parameters for the grid integer filter - either range limits are not supplied or they are not numeric"
         return false
       end
-
-      @criteria.where(@field.name.to_sym.gt => opts[:fr].to_i)
-      @criteria.where(@field.name.to_sym.lt => opts[:to].to_i)
+      from = parse_number(opts[:fr])
+      to = parse_number(opts[:to])
+      @criteria.where(@field.name.to_sym.gt => from)
+      @criteria.where(@field.name.to_sym.lt => to)
 
       return true
     end
+    
+    private
+    def parse_number(num_str)
+      match_data = VALID_NUMBER_RE.match(num_str)
+      num = match_data[1].to_i
+      num = case match_data[3].downcase
+            when 'g': num * 1024*1024*1024
+            when 'm': num * 1024*1024
+            when 'k': num * 1024
+            end if match_data.size > 3
+      num
+    end
   end
 
   class FilterConditionsGeneratorDate < FilterConditionsGenerator  #:nodoc:

data/lib/grid_renderer.rb

@@ -294,6 +294,8 @@ module Wice
         :filter_all_label           => Defaults::CUSTOM_FILTER_ALL_LABEL,
         :helper_style               => Defaults::HELPER_STYLE,
         :icon                       => nil,
+        :th_class                   => nil,
+        :subtitle                   => nil,
         :in_csv                     => true,
         :in_html                    => true,
         :model_class                => nil,

data/lib/helpers/wice_grid_view_helpers.rb

@@ -284,13 +284,13 @@ module Wice
         end
 
         if column.attribute_name && column.allow_ordering
-
-          css_class = grid.filtered_by?(column) ? 'active_filter' : nil
-
+          css_class = []
+          css_class << 'active_filter' if grid.filtered_by?(column)
+          css_class << column.th_class if column.th_class
           direction = 'asc'
           link_style = nil
           if grid.ordered_by?(column)
-            css_class = css_class.nil? ? 'sorted' : css_class + ' sorted'
+            css_class << 'sorted'
             link_style = grid.order_direction
             direction = 'desc' if grid.order_direction == 'asc'
           end
@@ -298,6 +298,8 @@ module Wice
           col_link = link_to(column_name,
                              rendering.column_link(column, direction, params, options[:extra_request_parameters]),
                              :class => link_style)
+          col_link << content_tag(:p, column.subtitle) if column.subtitle
+          css_class = css_class.join(' ')
           content << content_tag(:th, col_link, Hash.make_hash(:class, css_class))
           column.css_class = css_class
         else

data/lib/view_columns.rb

@@ -8,7 +8,7 @@ module Wice
     include ActionView::Helpers::AssetTagHelper
 
     # fields defined from the options parameter
-    FIELDS = [:attribute_name, :column_name, :icon, :td_html_attrs, :no_filter, :model_class, :allow_multiple_selection,
+    FIELDS = [:attribute_name, :column_name, :icon, :subtitle, :th_class,  :td_html_attrs, :no_filter, :model_class, :allow_multiple_selection,
               :in_html, :in_csv, :helper_style, :table_alias, :custom_order, :detach_with_id, :allow_ordering, :auto_reload]
 
     attr_accessor *FIELDS

data/wice_grid_mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.0.3"
+  s.version = "6.0.4"
 
   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: 41
+  hash: 39
   prerelease: false
   segments: 
   - 6
   - 0
-  - 3
-  version: 6.0.3
+  - 4
+  version: 6.0.4
 platform: ruby
 authors: 
 - Yuri Leikind