acts_as_flexigrid 0.0.3 → 0.0.4

data/lib/acts_as_flexigrid/version.rb

@@ -1,3 +1,3 @@
 module ActsAsFlexigrid
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/acts_as_flexigrid.rb

@@ -11,10 +11,19 @@ module ActsAsFlexigrid
 
     scope :flexigrid_where, lambda { |type, query|
       if type and type.strip.present? and query and query.strip.present?
-        where("#{quoted_table_name}.#{connection.quote_column_name(type.strip)} LIKE :val", {:val => "%#{query.strip}%"})
+        method_name = "#{type}_flexigrid_where"
+        if self.respond_to?(method_name)
+          self.send(method_name, query)
+        else
+          any_flexigrid_where(type, query)
+        end
       end
     }
 
+    scope :any_flexigrid_where, lambda { |type, query|
+      where("#{quoted_table_name}.#{connection.quote_column_name(type.strip)} LIKE :val", {:val => "%#{query.strip}%"})
+    }
+
     scope :flexigrid_order, lambda { |name, order|
       if name.present? and order.present?
         order = order.downcase == "asc" ? "asc" : "desc"

data/spec/fake_app.rb

@@ -13,6 +13,10 @@ ActiveRecord::Base.establish_connection('test')
 
 class User < ActiveRecord::Base
   include ActsAsFlexigrid
+
+  scope :age_flexigrid_where, lambda { |query|
+    where(:age => query)
+  }
 end
 
 class CreateAllTables < ActiveRecord::Migration

data/spec/models/acts_as_flexigrid_spec.rb

@@ -49,6 +49,10 @@ describe ActsAsFlexigrid do
     it "should return quated sql" do
       User.flexigrid_where("name", "001").to_sql.should == "SELECT \"users\".* FROM \"users\" WHERE (\"users\".\"name\" LIKE '%001%')"
     end
+
+    describe "defined type specific where" do
+      User.flexigrid_where('age', "10").to_sql.should == "SELECT \"users\".* FROM \"users\" WHERE \"users\".\"age\" = '10'"
+    end
   end
 
   describe ".flexigrid_order" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_flexigrid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000 +09:00
+date: 2011-09-29 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154174840 !ruby/object:Gem::Requirement
+  requirement: &2161613700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154174840
+  version_requirements: *2161613700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2154174280 !ruby/object:Gem::Requirement
+  requirement: &2161613060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154174280
+  version_requirements: *2161613060
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2154173720 !ruby/object:Gem::Requirement
+  requirement: &2161612400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154173720
+  version_requirements: *2161612400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154173020 !ruby/object:Gem::Requirement
+  requirement: &2161611840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154173020
+  version_requirements: *2161611840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2154172140 !ruby/object:Gem::Requirement
+  requirement: &2161611360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154172140
+  version_requirements: *2161611360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154167320 !ruby/object:Gem::Requirement
+  requirement: &2161610880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154167320
+  version_requirements: *2161610880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154166720 !ruby/object:Gem::Requirement
+  requirement: &2161610380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154166720
+  version_requirements: *2161610380
 description: acts_as_flexigrid is ActiveRecord plugin for Flexigrid
 email:
 - matsumura.aki@gmail.com