rails-simple-search 0.9.6 → 0.9.7

data/lib/rails-simple-search.rb

@@ -1,3 +1,5 @@
+require_relative 'sql_handler'
+
 module RailsSimpleSearch
   DEFAULT_CONFIG = { :exact_match => [], 
                      :paginate => true, 
@@ -17,12 +19,20 @@ module RailsSimpleSearch
     end
  
     def initialize(model_class, criteria={}, config={})
-      @model_class = (model_class.is_a?(Symbol) || model_class.is_a?(String))? model_class.to_s.camelize.constantize : model_class
-      @table_name = @model_class.table_name
-      @criteria = criteria.nil? ? {} : criteria
-      sanitize_criteria
+      @criteria = sanitize_criteria(criteria)
       @config = DEFAULT_CONFIG.merge(config)
-      @joins = {}
+
+      @model_class = (model_class.is_a?(Symbol) || model_class.is_a?(String))? model_class.to_s.camelize.constantize : model_class
+      load_database_handler(@model_class)
+      init
+    end
+
+    def load_database_handler(model_class)
+      if model_class.ancestors.include?(ActiveRecord::Base)
+        RailsSimpleSearch::Base.send(:include, RailsSimpleSearch::SqlHandler)
+      else
+        raise("RailsSimpleSearch only supports ActiveRecord for now")
+      end
     end
   
     def count
@@ -37,50 +47,16 @@ module RailsSimpleSearch
       (1..pages).to_a
     end
 
-    def add_conditions(h={})
-      @criteria.merge!(h)
-    end
-
     def order=(str)
       @order = str
     end
   
-    def conditions
-      run_criteria
-      @conditions
-    end
-
-    def joins
-      run_criteria
-      @joins_str
-    end
-
-    def run
-      run_criteria
-      if @config[:paginate]
-        @count = @model_class.count({:select => "distinct #{@model_class.table_name}.#{@model_class.primary_key}", 
-                                     :conditions => @conditions,
-                                     :joins => @joins_str }
-                 )
-        offset = [((@page || 0) - 1) * @config[:per_page], 0].max
-        limit = @config[:per_page]
-      else
-        offset = @config[:offset]
-        limit = @config[:limit]
-      end
-
-      execute_hash = {:select => "distinct #{@model_class.table_name}.*", 
-                      :conditions => @conditions,
-                      :joins => @joins_str, 
-                      :offset => offset,
-                      :limit => limit
-      }
-      execute_hash[:order] = @order if @order
-      @model_class.all(execute_hash)
+    def add_conditions(h={})
+      @criteria.merge!(h)
     end
-
-    private
   
+    private 
+
     def method_missing(method, *args)
       method_str = method.to_s
       if method_str =~ /^([^=]+)=$/
@@ -89,31 +65,6 @@ module RailsSimpleSearch
         @criteria[method_str]
       end
     end
-  
-    def make_joins
-      @joins_str = ''
-      joins = @joins.values
-      joins.sort! {|a,b| a[0] <=> b[0]}
-      joins.each do |j|
-        table = j[1]
-        constrain = j[2]
-        @joins_str << " inner join  #{table} on #{constrain}" 
-      end
-    end
-  
-    def run_criteria
-      return unless @conditions.nil? 
-      @criteria.each do |key, value|
-        if @config[:page_name].to_s == key.to_s
-          @page = value.to_i
-          @criteria[key] = @page
-        else
-          parse_attribute(key, value)
-        end
-      end
-
-      make_joins
-    end
 
     def parse_field_name(name)
       result = {}
@@ -132,87 +83,16 @@ module RailsSimpleSearch
       end
       result
     end
-
-
-    def insert_condition(base_class, attribute, field, value)
-      name_hash = parse_field_name(field)
-      field = name_hash[:field_name]
-      operator = name_hash[:operator]
-
-      table = base_class.table_name
-      key = "#{table}.#{field}"
-  
-      @conditions ||= []
-      column = base_class.columns_hash[field.to_s]
-
-      if !column.text? && value.is_a?(String)
-        value = column.type_cast(value)
-        @criteria[attribute] = value 
-      end
-
-      if value.nil?
-        verb = 'is'
-      elsif operator
-        verb = operator
-      elsif column.text? && ! @config[:exact_match].include?((@table_name == table)? field : key)
-        verb = 'like'
-        value = "%#{value}%"
-      else
-        verb = '='
-      end
-
-      if @conditions.size < 1
-        @conditions[0] = "#{key} #{verb} ?"
-        @conditions[1] = value
-      else
-        @conditions[0] += " and #{key} #{verb} ?"
-        @conditions << value
-      end
-    end     
-  
-    def insert_join(base_class, asso_ref)
-      base_table = base_class.table_name
-      asso_table = asso_ref.klass.table_name
-      
-      @join_count ||= 0
-      unless base_table == asso_table
-        if @joins[asso_table].nil?
-          @join_count += 1
-          if asso_ref.belongs_to?
-            @joins[asso_table] =[@join_count, asso_table, "#{base_table}.#{asso_ref.foreign_key} = #{asso_table}.#{asso_ref.klass.primary_key}"]
-          else
-            @joins[asso_table] = [@join_count, asso_table, "#{base_table}.#{base_class.primary_key} = #{asso_table}.#{asso_ref.foreign_key}"]
-          end
-        end
-      end
-    end
-  
-    def parse_attribute(attribute, value)
-      unless attribute =~ /\./
-        field = attribute
-        insert_condition(@model_class, attribute, field, value)
-        return
-      end 
-
-      association_fields = attribute.split(/\./)
-      field = association_fields.pop
-
-      base_class = @model_class
-      while (association_fields.size > 0) 
-        association_fields[0] = base_class.reflect_on_association(association_fields[0].to_sym)
-        insert_join(base_class, association_fields[0])
-        base_class = association_fields.shift.klass
-      end
-
-      insert_condition(base_class, attribute, field, value)
-    end
   
-    def sanitize_criteria
-      @criteria.keys.each do |key|
-        if @criteria[key].nil? || @criteria[key].blank?
-          @criteria.delete(key)
+    def sanitize_criteria(criteria)
+      criteria = criteria || {}
+      c = {}
+      criteria.each do |key, value|
+        unless value.blank?
+          c[key] = value
         end
       end
+      c
     end
   end
 end

data/lib/sql_handler.rb

@@ -0,0 +1,146 @@
+module RailsSimpleSearch
+  module SqlHandler  
+
+    def init
+      @table_name = @model_class.table_name
+      @joins = {}
+    end
+
+    def conditions
+      run_criteria
+      @conditions
+    end
+
+    def joins
+      run_criteria
+      @joins_str
+    end
+
+    def run
+      run_criteria
+      if @config[:paginate]
+        @count = @model_class.count({:select => "distinct #{@model_class.table_name}.#{@model_class.primary_key}", 
+                                     :conditions => @conditions,
+                                     :joins => @joins_str }
+                 )
+        offset = [((@page || 0) - 1) * @config[:per_page], 0].max
+        limit = @config[:per_page]
+      else
+        offset = @config[:offset]
+        limit = @config[:limit]
+      end
+
+      execute_hash = {:select => "distinct #{@model_class.table_name}.*", 
+                      :conditions => @conditions,
+                      :joins => @joins_str, 
+                      :offset => offset,
+                      :limit => limit
+      }
+      execute_hash[:order] = @order if @order
+      @model_class.all(execute_hash)
+    end
+
+    private
+  
+    def make_joins
+      @joins_str = ''
+      joins = @joins.values
+      joins.sort! {|a,b| a[0] <=> b[0]}
+      joins.each do |j|
+        table = j[1]
+        constrain = j[2]
+        @joins_str << " inner join  #{table} on #{constrain}" 
+      end
+    end
+  
+    def run_criteria
+      return unless @conditions.nil? 
+      @criteria.each do |key, value|
+        if @config[:page_name].to_s == key.to_s
+          @page = value.to_i
+          @criteria[key] = @page
+        else
+          parse_attribute(key, value)
+        end
+      end
+
+      make_joins
+    end
+
+    def insert_condition(base_class, attribute, field, value)
+      name_hash = parse_field_name(field)
+      field = name_hash[:field_name]
+      operator = name_hash[:operator]
+
+      table = base_class.table_name
+      key = "#{table}.#{field}"
+  
+      @conditions ||= []
+      column = base_class.columns_hash[field.to_s]
+
+      if !column.text? && value.is_a?(String)
+        value = column.type_cast(value)
+        @criteria[attribute] = value 
+      end
+
+      if value.nil?
+        verb = 'is'
+      elsif operator
+        verb = operator
+      elsif column.text? && ! @config[:exact_match].include?((@table_name == table)? field : key)
+        verb = 'like'
+        value = "%#{value}%"
+      else
+        verb = '='
+      end
+
+      if @conditions.size < 1
+        @conditions[0] = "#{key} #{verb} ?"
+        @conditions[1] = value
+      else
+        @conditions[0] += " and #{key} #{verb} ?"
+        @conditions << value
+      end
+    end     
+  
+    def insert_join(base_class, asso_ref)
+      base_table = base_class.table_name
+      asso_table = asso_ref.klass.table_name
+      
+      @join_count ||= 0
+      unless base_table == asso_table
+        if @joins[asso_table].nil?
+          @join_count += 1
+          if asso_ref.belongs_to?
+            @joins[asso_table] =[@join_count, asso_table, "#{base_table}.#{asso_ref.foreign_key} = #{asso_table}.#{asso_ref.klass.primary_key}"]
+          else
+            join_cond = "#{base_table}.#{base_class.primary_key} = #{asso_table}.#{asso_ref.foreign_key}"
+            join_cond = "#{asso_table}.#{asso_ref.type} = '#{base_class.name}' and #{join_cond}" if asso_ref.type
+            @joins[asso_table] = [@join_count, asso_table, join_cond]
+          end
+        end
+      end
+    end
+  
+    def parse_attribute(attribute, value)
+      unless attribute =~ /\./
+        field = attribute
+        insert_condition(@model_class, attribute, field, value)
+        return
+      end 
+
+      association_fields = attribute.split(/\./)
+      field = association_fields.pop
+
+      base_class = @model_class
+      while (association_fields.size > 0) 
+        association_fields[0] = base_class.reflect_on_association(association_fields[0].to_sym)
+        insert_join(base_class, association_fields[0])
+        base_class = association_fields.shift.klass
+      end
+
+      insert_condition(base_class, attribute, field, value)
+    end
+  
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - lib/rails-simple-search.rb
+- lib/sql_handler.rb
 homepage: http://github.com/yzhanginwa/rails-simple-search
 licenses: []
 post_install_message: 
@@ -45,3 +46,4 @@ signing_key:
 specification_version: 3
 summary: A very simple and light get to quick build search function in rails
 test_files: []
+has_rdoc: