has_searcher 0.0.6.1 → 0.0.7

data/lib/app/models/search.rb

@@ -13,6 +13,12 @@ class Search < ActiveRecord::Base
     end
   end
 
+  def pagination
+    @paginatation ||= {}
+    @paginatation.merge! :per_page => per_page if respond_to? :per_page
+    @paginatation
+  end
+
   delegate :results, :to => :search
 
   def result_ids
@@ -26,7 +32,7 @@ class Search < ActiveRecord::Base
         search.keywords keywords if search_columns.delete("keywords")
         search_columns.each do | column |
           value = normalize(column)
-          if column_for_attribute(column).type == :text
+          if column_for_attribute(column).type == :text && self.class.serialized_attributes[column] != Array
             if fuzzy?(value)
               search.adjust_solr_params do |params|
                 params[:q] = value.split(/ /).map{ |value| "#{column}_text:#{value}"}.join(' ')
@@ -35,9 +41,17 @@ class Search < ActiveRecord::Base
               search.keywords value, :fields => column
             end
           else
-            search.with column, value
+            case column
+            when /_lt$/
+              search.with(column[0..-4]).less_than(value)
+            when /_gt$/
+              search.with(column[0..-4]).greater_than(value)
+            else
+              search.with column, value
+            end
           end
         end
+        search.order_by order_by if respond_to?(:order_by) && order_by.present?
         search.paginate pagination if pagination.try(:any?)
       end
     end
@@ -47,7 +61,7 @@ class Search < ActiveRecord::Base
     end
 
     def search_columns
-      @search_columns ||= self.class.column_names.select{ |column| normalize(column).present? }
+      @search_columns ||= (self.class.column_names - %w[per_page order_by]).select{ |column| normalize(column).present? }
     end
 
     def normalize(column)

data/lib/has_searcher/version.rb

@@ -1,3 +1,3 @@
 module HasSearcher
-  VERSION = "0.0.6.1"
+  VERSION = "0.0.7"
 end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  - 1
-  version: 0.0.6.1
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dmitry Lihachev
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 +07:00
+date: 2011-05-16 00:00:00 +07:00
 default_executable: 
 dependencies: []