searchlogic 1.6.6 → 2.1.0

data/Manifest.txt

@@ -1,158 +0,0 @@
-CHANGELOG.rdoc
-MIT-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-TODO.rdoc
-init.rb
-lib/searchlogic.rb
-lib/searchlogic/active_record/associations.rb
-lib/searchlogic/active_record/base.rb
-lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb
-lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb
-lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb
-lib/searchlogic/condition/base.rb
-lib/searchlogic/condition/begins_with.rb
-lib/searchlogic/condition/blank.rb
-lib/searchlogic/condition/child_of.rb
-lib/searchlogic/condition/descendant_of.rb
-lib/searchlogic/condition/ends_with.rb
-lib/searchlogic/condition/equals.rb
-lib/searchlogic/condition/greater_than.rb
-lib/searchlogic/condition/greater_than_or_equal_to.rb
-lib/searchlogic/condition/inclusive_descendant_of.rb
-lib/searchlogic/condition/keywords.rb
-lib/searchlogic/condition/less_than.rb
-lib/searchlogic/condition/less_than_or_equal_to.rb
-lib/searchlogic/condition/like.rb
-lib/searchlogic/condition/nested_set.rb
-lib/searchlogic/condition/nil.rb
-lib/searchlogic/condition/not_begin_with.rb
-lib/searchlogic/condition/not_blank.rb
-lib/searchlogic/condition/not_end_with.rb
-lib/searchlogic/condition/not_equal.rb
-lib/searchlogic/condition/not_have_keywords.rb
-lib/searchlogic/condition/not_like.rb
-lib/searchlogic/condition/not_nil.rb
-lib/searchlogic/condition/sibling_of.rb
-lib/searchlogic/conditions/any_or_all.rb
-lib/searchlogic/conditions/base.rb
-lib/searchlogic/conditions/groups.rb
-lib/searchlogic/conditions/magic_methods.rb
-lib/searchlogic/conditions/multiparameter_attributes.rb
-lib/searchlogic/conditions/protection.rb
-lib/searchlogic/config.rb
-lib/searchlogic/config/helpers.rb
-lib/searchlogic/config/search.rb
-lib/searchlogic/core_ext/hash.rb
-lib/searchlogic/core_ext/object.rb
-lib/searchlogic/helpers/control_types/link.rb
-lib/searchlogic/helpers/control_types/links.rb
-lib/searchlogic/helpers/control_types/remote_link.rb
-lib/searchlogic/helpers/control_types/remote_links.rb
-lib/searchlogic/helpers/control_types/remote_select.rb
-lib/searchlogic/helpers/control_types/select.rb
-lib/searchlogic/helpers/form.rb
-lib/searchlogic/helpers/utilities.rb
-lib/searchlogic/modifiers/absolute.rb
-lib/searchlogic/modifiers/acos.rb
-lib/searchlogic/modifiers/asin.rb
-lib/searchlogic/modifiers/atan.rb
-lib/searchlogic/modifiers/avg.rb
-lib/searchlogic/modifiers/base.rb
-lib/searchlogic/modifiers/ceil.rb
-lib/searchlogic/modifiers/char_length.rb
-lib/searchlogic/modifiers/cos.rb
-lib/searchlogic/modifiers/cot.rb
-lib/searchlogic/modifiers/count.rb
-lib/searchlogic/modifiers/day_of_month.rb
-lib/searchlogic/modifiers/day_of_week.rb
-lib/searchlogic/modifiers/day_of_year.rb
-lib/searchlogic/modifiers/degrees.rb
-lib/searchlogic/modifiers/exp.rb
-lib/searchlogic/modifiers/floor.rb
-lib/searchlogic/modifiers/hex.rb
-lib/searchlogic/modifiers/hour.rb
-lib/searchlogic/modifiers/log.rb
-lib/searchlogic/modifiers/log10.rb
-lib/searchlogic/modifiers/log2.rb
-lib/searchlogic/modifiers/lower.rb
-lib/searchlogic/modifiers/ltrim.rb
-lib/searchlogic/modifiers/md5.rb
-lib/searchlogic/modifiers/microseconds.rb
-lib/searchlogic/modifiers/milliseconds.rb
-lib/searchlogic/modifiers/minute.rb
-lib/searchlogic/modifiers/month.rb
-lib/searchlogic/modifiers/octal.rb
-lib/searchlogic/modifiers/radians.rb
-lib/searchlogic/modifiers/round.rb
-lib/searchlogic/modifiers/rtrim.rb
-lib/searchlogic/modifiers/second.rb
-lib/searchlogic/modifiers/sign.rb
-lib/searchlogic/modifiers/sin.rb
-lib/searchlogic/modifiers/square_root.rb
-lib/searchlogic/modifiers/sum.rb
-lib/searchlogic/modifiers/tan.rb
-lib/searchlogic/modifiers/trim.rb
-lib/searchlogic/modifiers/upper.rb
-lib/searchlogic/modifiers/week.rb
-lib/searchlogic/modifiers/year.rb
-lib/searchlogic/search/base.rb
-lib/searchlogic/search/conditions.rb
-lib/searchlogic/search/ordering.rb
-lib/searchlogic/search/pagination.rb
-lib/searchlogic/search/protection.rb
-lib/searchlogic/search/searching.rb
-lib/searchlogic/shared/utilities.rb
-lib/searchlogic/shared/virtual_classes.rb
-lib/searchlogic/version.rb
-test/active_record_tests/associations_test.rb
-test/active_record_tests/base_test.rb
-test/condition_tests/base_test.rb
-test/condition_tests/begins_with_test.rb
-test/condition_tests/blank_test.rb
-test/condition_tests/child_of_test.rb
-test/condition_tests/descendant_of_test.rb
-test/condition_tests/ends_with_test.rb
-test/condition_tests/equals_test.rb
-test/condition_tests/greater_than_or_equal_to_test.rb
-test/condition_tests/greater_than_test.rb
-test/condition_tests/inclusive_descendant_of_test.rb
-test/condition_tests/keywords_test.rb
-test/condition_tests/less_than_or_equal_to_test.rb
-test/condition_tests/less_than_test.rb
-test/condition_tests/like_test.rb
-test/condition_tests/nil_test.rb
-test/condition_tests/not_begin_with_test.rb
-test/condition_tests/not_blank_test.rb
-test/condition_tests/not_end_with_test.rb
-test/condition_tests/not_equal_test.rb
-test/condition_tests/not_have_keywords_test.rb
-test/condition_tests/not_like_test.rb
-test/condition_tests/not_nil_test.rb
-test/condition_tests/sibling_of_test.rb
-test/conditions_tests/any_or_all_test.rb
-test/conditions_tests/base_test.rb
-test/conditions_tests/groups_test.rb
-test/conditions_tests/magic_methods_test.rb
-test/conditions_tests/multiparameter_attributes_test.rb
-test/conditions_tests/protection_test.rb
-test/config_test.rb
-test/fixtures/accounts.yml
-test/fixtures/animals.yml
-test/fixtures/orders.yml
-test/fixtures/user_groups.yml
-test/fixtures/users.yml
-test/libs/awesome_nested_set.rb
-test/libs/awesome_nested_set/.autotest
-test/libs/awesome_nested_set/compatability.rb
-test/libs/awesome_nested_set/helper.rb
-test/libs/awesome_nested_set/named_scope.rb
-test/libs/rexml_fix.rb
-test/modifier_tests/day_of_month_test.rb
-test/search_tests/base_test.rb
-test/search_tests/conditions_test.rb
-test/search_tests/ordering_test.rb
-test/search_tests/pagination_test.rb
-test/search_tests/protection_test.rb
-test/test_helper.rb

data/TODO.rdoc

@@ -1,4 +0,0 @@
-= To Do
-
-1. Perform "more efficient" checks: year_of_created_at = 2008 and month_of_created_at = 8. Should result in a "BETWEEN" statement utilizing the column indexes. Thanks Georg for letting me know about this.
-2. Solve conflicts between scope joins and joins in the search (for old versions of AR). Also solve conflicts between joins and includes.

data/lib/searchlogic/active_record/associations.rb

@@ -1,52 +0,0 @@
-module Searchlogic
-  module ActiveRecord
-    # = Searchlogic ActiveRecord Associations
-    #
-    # These methods hook into ActiveRecords association methods and add in searchlogic functionality.
-    module Associations
-      module AssociationCollection
-        # This needs to be implemented because AR doesn't leverage scopes with this method like it probably should
-        def find_with_searchlogic(*args)
-          options = args.extract_options!
-          args << filter_options_with_searchlogic(options)
-          find_without_searchlogic(*args)
-        end
-      end
-      
-      module HasManyAssociation
-        def count_with_searchlogic(*args)
-          options = args.extract_options!
-          args << filter_options_with_searchlogic(options)
-          count_without_searchlogic(*args)
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Associations::AssociationCollection.class_eval do
-  if respond_to?(:find)
-    include Searchlogic::ActiveRecord::Associations::AssociationCollection
-    alias_method_chain :find, :searchlogic
-  end
-end
-
-ActiveRecord::Associations::HasManyAssociation.class_eval do
-  include Searchlogic::ActiveRecord::Associations::HasManyAssociation
-  alias_method_chain :count, :searchlogic
-  
-  # Older versions of AR have find in here, not in AssociationCollection
-  include Searchlogic::ActiveRecord::Associations::AssociationCollection
-  alias_method_chain :find, :searchlogic
-end
-
-ActiveRecord::Associations::ClassMethods::InnerJoinDependency::InnerJoinAssociation.class_eval do
-  private
-    # Inner joins impose limitations on queries. They can be quicker but you can't do OR conditions when conditions
-    # overlap from the base model to any of its associations. Also, inner joins won't allow you to order by an association
-    # attribute. What if the association is optional? All of those records are ommitted. It just doesn't make sense to default
-    # to inner joins when providing this as a "convenience" when searching. So let's change it.
-    def join_type
-      "LEFT OUTER JOIN"
-    end
-end

data/lib/searchlogic/active_record/base.rb

@@ -1,224 +0,0 @@
-module Searchlogic
-  # == Searchlogic ActiveRecord
-  #
-  # Hooks into ActiveRecord to add all of the searchlogic functionality into your models. Only uses what is publically available, doesn't dig into internals, and
-  # searchlogic only gets involved when needed.
-  module ActiveRecord
-    # = Searchlogic ActiveRecord Base
-    # Adds in base level functionality to ActiveRecord
-    module Base
-      # This is an alias method chain. It hook into ActiveRecord's "calculate" method and checks to see if Searchlogic should get involved.
-      def calculate_with_searchlogic(*args)
-        options = args.extract_options!
-        options = filter_options_with_searchlogic(options, false)
-        args << options
-        calculate_without_searchlogic(*args)
-      end
-      
-      # This is an alias method chain. It hooks into ActiveRecord's "find" method and checks to see if Searchlogic should get involved.
-      def find_with_searchlogic(*args)
-        options = args.extract_options!
-        options = filter_options_with_searchlogic(options)
-        args << options
-        find_without_searchlogic(*args)
-      end
-      
-      # This is an alias method chain. It hooks into ActiveRecord's scopes and checks to see if Searchlogic should get involved. Allowing you to use all of Searchlogics conditions and tools
-      # in scopes as well.
-      #
-      # === Examples
-      #
-      # Named scopes:
-      #
-      #   named_scope :top_expensive, :conditions => {:total_gt => 1_000_000}, :per_page => 10
-      #   named_scope :top_expensive_ordered, :conditions => {:total_gt => 1_000_000}, :per_page => 10, :order_by => {:user => :first_name}
-      #
-      # Good ole' regular scopes:
-      #
-      #   with_scope(:find => {:conditions => {:total_gt => 1_000_000}, :per_page => 10}) do
-      #     find(:all)
-      #   end
-      #
-      #   with_scope(:find => {:conditions => {:total_gt => 1_000_000}, :per_page => 10}) do
-      #     build_search
-      #   end
-      def with_scope_with_searchlogic(method_scoping = {}, action = :merge, &block)
-        method_scoping[:find] = filter_options_with_searchlogic(method_scoping[:find]) if method_scoping[:find]
-        with_scope_without_searchlogic(method_scoping, action, &block)
-      end
-      
-      # This is a special method that Searchlogic adds in. It returns a new search object on the model. So you can search via an object.
-      #
-      # <b>This method is "protected". Meaning it checks the passed options for SQL injections. So trying to write raw SQL in *any* of the option will result in a raised exception. It's safe to pass a params object when instantiating.</b>
-      #
-      # This method has an alias "new_search"
-      #
-      # === Examples
-      #
-      #   search = User.new_search
-      #   search.conditions.first_name_contains = "Ben"
-      #   search.per_page = 20
-      #   search.page = 2
-      #   search.order_by = {:user_group => :name}
-      #   search.all # can call any search method: first, find(:all), find(:first), sum("id"), etc...
-      def build_search(options = {}, &block)
-        search = searchlogic_search
-        search.protect = true
-        search.options = options
-        yield search if block_given?
-        search
-      end
-      
-      # See build_search. This is the same method but *without* protection. Do *NOT* pass in a params object to this method.
-      #
-      # This also has an alias "new_search!"
-      def build_search!(options = {}, &block)
-        search = searchlogic_search(options)
-        yield search if block_given?
-        search
-      end
-      
-      # Similar to ActiveRecord's attr_protected, but for conditions. It will block any conditions in this array that are being mass assigned. Mass assignments are:
-      #
-      # === Examples
-      #
-      # search = User.new_search(:conditions => {:first_name_like => "Ben", :email_contains => "binarylogic.com"})
-      # search.options = {:conditions => {:first_name_like => "Ben", :email_contains => "binarylogic.com"}}
-      #
-      # If first_name_like is in the list of conditions_protected then it will be removed from the hash.
-      def conditions_protected(*conditions)
-        write_inheritable_attribute(:conditions_protected, Set.new(conditions.map(&:to_s)) + (protected_conditions || []))
-      end
-
-      def protected_conditions # :nodoc:
-        read_inheritable_attribute(:conditions_protected)
-      end
-      
-      # This is the reverse of conditions_protected. You can specify conditions here and *only* these conditions will be allowed in mass assignment. Any condition not specified here will be blocked.
-      def conditions_accessible(*conditions)
-        write_inheritable_attribute(:conditions_accessible, Set.new(conditions.map(&:to_s)) + (accessible_conditions || []))
-      end
-
-      def accessible_conditions # :nodoc:
-        read_inheritable_attribute(:conditions_accessible)
-      end
-    
-      private
-        def construct_finder_sql_with_included_associations_with_searchlogic(*args)
-          sql = construct_finder_sql_with_included_associations_without_searchlogic(*args)
-          remove_duplicate_joins(sql)
-        end
-        
-        def construct_finder_sql_with_searchlogic(*args)
-          sql = construct_finder_sql_without_searchlogic(*args)
-          remove_duplicate_joins(sql)
-        end
-        
-        def construct_calculation_sql_with_searchlogic(*args)
-          sql = construct_calculation_sql_without_searchlogic(*args)
-          remove_duplicate_joins(sql)
-        end
-        
-        def remove_duplicate_joins(sql)
-          join_expr = /(LEFT OUTER JOIN|INNER JOIN)/i
-          sql_parts = sql.split(join_expr)
-          if !sql_parts.empty?
-            last_parts = sql_parts.pop.split(/ (?!ON|AS)([A-Z]+) /)
-            sql_parts += last_parts
-            is_join_statement = false
-            cleaned_parts = []
-            sql_parts.each do |part|
-              part = part.strip
-              if is_join_statement
-                if !includes_join?(cleaned_parts, part)
-                  cleaned_parts << part
-                else
-                  cleaned_parts.pop
-                end
-              else
-                cleaned_parts << part
-              end
-              is_join_statement = part =~ join_expr
-            end
-            sql = cleaned_parts.join(" ")
-          end
-          sql
-        end
-        
-        def includes_join?(cleaned_parts, part)
-          cleaned_parts.each do |cleaned_part|
-            a = cleaned_part.gsub("`", "")
-            b = part.gsub("`", "")
-            return true if a == b
-            return true if a == b.gsub(/([a-z\._]*) = ([a-z\._]*)/, '\2 = \1')
-          end
-          false
-        end
-        
-        def filter_options_with_searchlogic(options = {}, searching = true)
-          return options unless Searchlogic::Search::Base.needed?(self, options)
-          search = Searchlogic::Search::Base.create_virtual_class(self).new # call explicitly to avoid merging the scopes into the search
-          search.acting_as_filter = true
-          search.scope = scope(:find)
-          conditions = options.delete(:conditions) || options.delete("conditions") || {}
-          if conditions
-            case conditions
-            when Hash
-              conditions.each { |condition, value| search.conditions.send("#{condition}=", value) } # explicitly call to enforce blanks
-            else
-              search.conditions = conditions
-            end
-          end
-          search.options = options
-          search.sanitize(searching)
-        end
-        
-        def searchlogic_search(options = {})
-          scope = {}
-          current_scope = scope(:find) && scope(:find).deep_dup
-          if current_scope
-            [:conditions, :include, :joins].each do |option|
-              value = current_scope.delete(option)
-              next if value.blank?
-              scope[option] = value
-            end
-            
-            # Delete nil values in the scope, for some reason habtm relationships like to pass :limit => nil
-            new_scope = {}
-            current_scope.each { |k, v| new_scope[k] = v unless v.nil? }
-            current_scope = new_scope
-          end
-          search = Searchlogic::Search::Base.create_virtual_class(self).new
-          search.scope = scope
-          search.options = current_scope
-          search.options = options
-          search
-        end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:extend, Searchlogic::ActiveRecord::Base)
-
-module ActiveRecord #:nodoc: all
-  class Base
-    class << self
-      alias_method_chain :calculate, :searchlogic
-      alias_method_chain :construct_finder_sql, :searchlogic
-      alias_method_chain :construct_finder_sql_with_included_associations, :searchlogic
-      alias_method_chain :construct_calculation_sql, :searchlogic
-      alias_method_chain :find, :searchlogic
-      alias_method_chain :with_scope, :searchlogic
-      alias_method :new_search, :build_search
-      alias_method :new_search!, :build_search!
-      
-      def valid_find_options
-        VALID_FIND_OPTIONS
-      end
-      
-      def valid_calculations_options
-        Calculations::CALCULATIONS_OPTIONS
-      end
-    end
-  end
-end

data/lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb

@@ -1,176 +0,0 @@
-module Searchlogic
-  module ActiveRecord
-    module ConnectionAdapters # :nodoc: all
-      module MysqlAdapter
-        # Date / time functions
-        def microseconds_sql(column_name)
-          "MICROSECOND(#{column_name})"
-        end
-        
-        def milliseconds_sql(column_name)
-          "(MICROSECOND(#{column_name}) / 1000)"
-        end
-        
-        def second_sql(column_name)
-          "SECOND(#{column_name})"
-        end
-        
-        def minute_sql(column_name)
-          "MINUTE(#{column_name})"
-        end
-        
-        def hour_sql(column_name)
-          "HOUR(#{column_name})"
-        end
-        
-        def day_of_week_sql(column_name)
-          "DAYOFWEEK(#{column_name})"
-        end
-        
-        def day_of_month_sql(column_name)
-          "DAYOFMONTH(#{column_name})"
-        end
-        
-        def day_of_year_sql(column_name)
-          "DAYOFYEAR(#{column_name})"
-        end
-        
-        def week_sql(column_name)
-          "WEEK(#{column_name}, 2)"
-        end
-        
-        def month_sql(column_name)
-          "MONTH(#{column_name})"
-        end
-        
-        def year_sql(column_name)
-          "YEAR(#{column_name})"
-        end
-        
-        # String functions
-        def char_length_sql(column_name)
-          "CHAR_LENGTH(#{column_name})"
-        end
-        
-        def lower_sql(column_name)
-          "LOWER(#{column_name})"
-        end
-        
-        def ltrim_sql(column_name)
-          "LTRIM(#{column_name})"
-        end
-        
-        def md5_sql(column_name)
-          "MD5(#{column_name})"
-        end
-        
-        def rtrim_sql(column_name)
-          "RTRIM(#{column_name})"
-        end
-        
-        def trim_sql(column_name)
-          "TRIM(#{column_name})"
-        end
-        
-        def upper_sql(column_name)
-          "UPPER(#{column_name})"
-        end
-        
-        # Number functions
-        def absolute_sql(column_name)
-          "ABS(#{column_name})"
-        end
-        
-        def acos_sql(column_name)
-          "ACOS(#{column_name})"
-        end
-        
-        def asin_sql(column_name)
-          "ASIN(#{column_name})"
-        end
-        
-        def atan_sql(column_name)
-          "ATAN(#{column_name})"
-        end
-        
-        def avg_sql(column_name)
-          "AVG(#{column_name})"
-        end
-        
-        def ceil_sql(column_name)
-          "CEIL(#{column_name})"
-        end
-        
-        def cos_sql(column_name)
-          "COS(#{column_name})"
-        end
-        
-        def cot_sql(column_name)
-          "COT(#{column_name})"
-        end
-        
-        def degrees_sql(column_name)
-          "DEGREES(#{column_name})"
-        end
-        
-        def exp_sql(column_name)
-          "EXP(#{column_name})"
-        end
-        
-        def floor_sql(column_name)
-          "FLOOR(#{column_name})"
-        end
-        
-        def hex_sql(column_name)
-          "HEX(#{column_name})"
-        end
-        
-        def ln_sql(column_name)
-          "LN(#{column_name})"
-        end
-        
-        def log_sql(column_name)
-          "LOG(#{column_name})"
-        end
-        
-        def log2_sql(column_name)
-          "LOG2(#{column_name})"
-        end
-        
-        def log10_sql(column_name)
-          "LOG10(#{column_name})"
-        end
-        
-        def octal_sql(column_name)
-          "OCT(#{column_name})"
-        end
-        
-        def radians_sql(column_name)
-          "RADIANS(#{column_name})"
-        end
-        
-        def round_sql(column_name)
-          "ROUND(#{column_name})"
-        end
-        
-        def sign_sql(column_name)
-          "SIGN(#{column_name})"
-        end
-        
-        def sin_sql(column_name)
-          "SIN(#{column_name})"
-        end
-        
-        def square_root_sql(column_name)
-          "SQRT(#{column_name})"
-        end
-        
-        def tan_sql(column_name)
-          "TAN(#{column_name})"
-        end
-      end
-    end
-  end
-end
-
-::ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, Searchlogic::ActiveRecord::ConnectionAdapters::MysqlAdapter)