fancygrid 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/fancygrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fancygrid}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Gr\303\244fenstein"]
-  s.date = %q{2011-08-21}
+  s.date = %q{2011-08-23}
   s.description = %q{Enables easy table rendering in rails applications}
   s.email = %q{giniedp@online.de}
   s.extra_rdoc_files = [

data/lib/fancygrid/grid.rb

@@ -1,3 +1,5 @@
+require "active_support/hash_with_indifferent_access"
+
 module Fancygrid#:nodoc:
   
   class Grid < Fancygrid::Node
@@ -63,6 +65,9 @@ module Fancygrid#:nodoc:
     # Specifies the search options for search input fields
     attr_accessor :search_formats
     
+    # Specifies what operators the simple search has to ose for specific columns
+    attr_accessor :simple_search_operators
+    
     
     
     
@@ -86,6 +91,7 @@ module Fancygrid#:nodoc:
       self.search_type      = Fancygrid.default_search_type
       self.search_operators = Fancygrid.search_operators
       self.search_formats   = {}
+      self.simple_search_operators = ActiveSupport::HashWithIndifferentAccess.new({})
       
       if Fancygrid.use_grid_name_as_cells_template
         self.template = File.join(Fancygrid.cells_template_directory.to_s, name.to_s)
@@ -170,7 +176,7 @@ module Fancygrid#:nodoc:
         :operator => params[:operator]
       }
       
-      generator = Fancygrid::QueryGenerator.new(url_options)
+      generator = Fancygrid::QueryGenerator.new(url_options, self)
       generator.parse_options(options)
       yield(generator) if block_given?
       
@@ -361,7 +367,13 @@ module Fancygrid#:nodoc:
       end
     end
     
-
+    def simple_search_operator table, column
+      return simple_search_operators if simple_search_operators.is_a? Symbol
+      opts = (simple_search_operators || {})
+      opts = opts[table] || {}
+      return opts if opts.is_a? Symbol
+      opts[column]
+    end
     
     # Builds the javascript options for the javascript part of fancygrid
     def js_options

data/lib/fancygrid/query_generator.rb

@@ -8,13 +8,14 @@ module Fancygrid
       :like, :is_null, :is_not_null, :is_true, :is_not_true, :is_false, :is_not_false, :in, :not_in
     ]
     
-    attr_accessor :query
+    attr_accessor :query, :fancygrid
 
-    def initialize(options=nil)
+    def initialize(options=nil, grid=nil)
       options ||= {}
       options = ActiveSupport::HashWithIndifferentAccess.new(options)
       
       self.query = {}
+      self.fancygrid = grid
       
       self.select(options[:select])
       self.apply_pagination(options[:pagination])
@@ -104,7 +105,8 @@ module Fancygrid
               # }
               #
             unless value.blank?
-              { :column => "#{table}.#{column}", :operator => :like, :value => value } 
+              op = (fancygrid and fancygrid.simple_search_operator(table, column) or :like).to_s
+              { :column => "#{table}.#{column}", :operator => op, :value => value } 
             else 
               nil
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancygrid
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Alexander Gr\xC3\xA4fenstein"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency