has_searcher 0.0.2 → 0.0.3

data/lib/has_searcher/base.rb

@@ -3,6 +3,7 @@ class HasSearcher::Base < ::ApplicationController
     base.class_eval do
       include HasSearcher::Helpers
       helper_method :searcher_for
+      helper_method :searcher
     end
 
   end

data/lib/has_searcher/helpers.rb

@@ -2,6 +2,10 @@ module HasSearcher::Helpers
 
   protected
 
+    def searcher
+      @searcher ||= searcher_for(resource_instance_name)
+    end
+
     def searcher_for(name)
       instance_variable_get("@#{searcher_name(name)}") ||
           instance_variable_set("@#{searcher_name(name)}", create_searcher(searcher_name(name)))
@@ -16,13 +20,14 @@ module HasSearcher::Helpers
     def create_searcher(searcher_name)
       begin
         searcher_clazz = searcher_name.classify.constantize
-        searcher_clazz.new(params[searcher_name]) do | searcher |
-          searcher_clazz.column_names.each do | column_name |
-            searcher[column_name] ||= params[column_name]
-          end
-        end
       rescue NameError
+        return
       end
-    end
+      searcher_clazz.new(params[searcher_name]) do | searcher |
+        searcher_clazz.column_names.each do | column_name |
+          searcher.send("#{column_name}=", params[column_name]) if searcher.send(column_name).blank?
+        end
+      end
+   end
 
 end

data/lib/has_searcher/version.rb

@@ -1,3 +1,3 @@
 module HasSearcher
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dmitry Lihachev
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +07:00
+date: 2011-04-18 00:00:00 +07:00
 default_executable: 
 dependencies: []