active_scaffold-sequel 0.6.0 → 0.6.1

data/lib/active_scaffold/actions/search.rb

@@ -1,6 +1,7 @@
 module ActiveScaffold::Actions
   module Search
     include ActiveScaffold::Actions::CommonSearch
+
     def self.included(base)
       base.before_filter :search_authorized_filter, :only => :show_search
       base.before_filter :store_search_params_into_session, :only => [:index]
@@ -13,14 +14,17 @@ module ActiveScaffold::Actions
     end
 
     protected
+
     def search_respond_to_html
       render(:action => "search")
     end
+
     def search_respond_to_js
       render(:partial => "search")
     end
+
     def do_search
-      query = search_params.to_s.strip rescue ''
+      query = search_params.to_s
       unless query.empty?
         columns = active_scaffold_config.search.columns
         text_search = active_scaffold_config.search.text_search
@@ -37,10 +41,12 @@ module ActiveScaffold::Actions
     end
 
     private
+
     def search_authorized_filter
       link = active_scaffold_config.search.link || active_scaffold_config.search.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
+
     def search_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
     end

data/lib/active_scaffold/finder.rb

@@ -9,9 +9,13 @@ module ActiveScaffold
         return unless columns.length > 0
         like_pattern = like_pattern(text_search)
         tokens = [tokens] if tokens.is_a? String
-        obj = active_scaffold_config.model.new  # for typecasting purposes
 
-        tokens.collect do |token|
+        # for typecasting purposes
+        obj = active_scaffold_config.model.new
+        orig_raise_on_typecast_failure = active_scaffold_config.model.raise_on_typecast_failure
+        active_scaffold_config.model.raise_on_typecast_failure = true
+
+        result = tokens.collect do |token|
           pattern = like_pattern.sub('?', token)
           columns.collect do |column|
             if column.column.nil? or column.column[:type] == :string
@@ -24,6 +28,11 @@ module ActiveScaffold
             end
           end.compact.inject {|a,b| (a | b)}
         end.inject {|a,b| (a & b)}
+
+        # restore original setting
+        active_scaffold_config.model.raise_on_typecast_failure = orig_raise_on_typecast_failure
+
+        result
       end
 
       # Generates an SQL condition for the given ActiveScaffold column based on

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold-sequel
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda