wice_grid_mongoid 6.0.5 → 6.0.6

data/VERSION

@@ -1 +1 @@
-6.0.5
+6.0.6

data/lib/filter_conditions_generators.rb

@@ -83,6 +83,13 @@ module Wice
         Wice.log "invalid parameters for the grid string filter - empty string"
         return false
       end
+      if string_fragment.starts_with?('/')
+        string_fragment = string_fragment[1..-1]
+      else
+        special_chars = '|()[]{}+\^$*?.'
+        string_fragment = string_fragment.gsub( /([\|\(\)\[\]\{\}\+\^\\\$\*\?\.])/ )  { |s| '\\' + s}
+      end
+        
       @criteria.where(@field.name.to_s => /#{string_fragment}/)
       return true
     end
@@ -121,7 +128,7 @@ module Wice
             when 'g': num * 1024*1024*1024
             when 'm': num * 1024*1024
             when 'k': num * 1024
-            end if match_data.size > 3
+            end if match_data[3]
       num
     end
   end

data/lib/helpers/wice_grid_view_helpers.rb

@@ -750,7 +750,7 @@ module Wice
 
     def pagination_info(grid, allow_showing_all_records)  #:nodoc:
       found = grid.resultset.count
-      total = grid.extra_filter.count
+      total = grid.extra_filter ? grid.extra_filter.count : grid.klass.count
       shown = [found, grid.status[:per_page].to_i].min
       summary = ""
       summary << "Shown: #{shown}"

data/test/blueprint.rb

@@ -10,6 +10,7 @@ User.blueprint do
   last_login { Time.parse('1980-01-01 11:00')}
   computers_number { 1 }
   archived { false }
+  storage_limit { 10*1024*1024*1024 }
 end
 
 Computer.blueprint do

data/test/rails_mongoid_test.rb

@@ -8,8 +8,8 @@ describe UsersController do
       @aa = User.make(:first_name => 'aabbcc', :year => Time.parse('1980-01-01'), :archived => true)
       @bb = User.make(:first_name => 'bbccdd', :year => Time.parse('1990-01-01'), :last_login => Time.parse('2010-01-01 4pm'))
       @cc = User.make(:first_name => 'ccddee', :year => Time.parse('2000-01-01'), :computers_number => 3)
-      Computer.make(:user_id => @aa.id, :name => "aa_host_1")
-      Computer.make(:user_id => @aa.id, :name => "aa_host_2")
+      @c1 = Computer.make(:user_id => @aa.id, :name => "aa_host_1")
+      @c2 = Computer.make(:user_id => @aa.id, :name => "aa_host_2")
     end
     
     it "should render grid as table" do
@@ -77,7 +77,43 @@ describe UsersController do
       first_name_column = all('tbody td[1]').map(&:text)
       first_name_column.size.should == 1
     end
+    
+    it "should be possible to use K,M,G,KB,MB,GB in Integer filters" do
+      UsersController.columns do |grid| 
+        grid.column :column_name => 'Storage Limit', :attribute_name => 'storage_limit'
+      end
+      
+      visit '/users?grid[f][storage_limit][fr]=1K&grid[f][storage_limit][to]=5K'
+      first_name_column = all('tbody td[1]').map(&:text)
+      first_name_column.size.should == 0
+      
+      visit '/users?grid[f][storage_limit][fr]=1Mb&grid[f][storage_limit][to]=200M'
+      first_name_column = all('tbody td[1]').map(&:text)
+      first_name_column.size.should == 0
+
+      visit '/users?grid[f][storage_limit][fr]=500mb&grid[f][storage_limit][to]=20G'
+      first_name_column = all('tbody td[1]').map(&:text)
+      first_name_column.size.should == 3
+    end
 
+    it "should be possible to use '/' for String fields to indicate regexp" do
+      UsersController.columns do |grid|
+        grid.column :column_name => 'First Name', :attribute_name => 'first_name' 
+      end
+      visit '/users'
+      filter_string = '/c.*e'
+      fill_in "grid[f][first_name]", :with => filter_string
+      visit "/users?grid[f][first_name][v]=#{URI.escape(filter_string)}&grid[f][first_name][n]=#{URI.escape(filter_string)}"
+      first_name_column = all('tbody td[1]').map(&:text)
+      first_name_column.size.should == 1
+      
+      filter_string = 'c.*e'
+      fill_in "grid[f][first_name]", :with => filter_string
+      visit "/users?grid[f][first_name][v]=#{URI.escape(filter_string)}&grid[f][first_name][n]=#{URI.escape(filter_string)}"
+      first_name_column = all('tbody td[1]').map(&:text)
+      first_name_column.size.should == 0
+    end
+    
     it "should be possible to see Boolean filters and use them" do
       UsersController.columns do |grid| 
         grid.column :column_name => 'Archived', :attribute_name => 'archived'

data/test/rails_test_app.rb

@@ -24,6 +24,7 @@ class User
   field :last_login, :type => Time
   field :computers_number, :type => Integer
   field :archived, :type => Boolean
+  field :storage_limit, :type => Integer
 
   def self.merge_conditions(*conditions)
     ""

data/wice_grid_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.0.5"
+  s.version = "6.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind", "Aleksandr Furmanov"]
-  s.date = %q{2010-12-10}
+  s.date = %q{2010-12-13}
   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: 37
+  hash: 35
   prerelease: false
   segments: 
   - 6
   - 0
-  - 5
-  version: 6.0.5
+  - 6
+  version: 6.0.6
 platform: ruby
 authors: 
 - Yuri Leikind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -08:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: []