searchlogic 2.4.32 → 2.5.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
-:minor: 4
-:patch: 32
+:minor: 5
+:patch: 0
 :build: 

data/lib/searchlogic/active_record/consistency.rb

@@ -10,7 +10,7 @@ module Searchlogic
           alias_method_chain :merge_joins, :merged_duplicates
         end
       end
-      
+
       # In AR multiple joins are sometimes in a single join query, and other times they
       # are not. The merge_joins method in AR should account for this, but it doesn't.
       # This fixes that problem. This way there is one join per string, which allows
@@ -19,7 +19,7 @@ module Searchlogic
         joins = merge_joins_without_singularity(*args)
         joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
       end
-      
+
       # This method ensures that the order of the conditions in the joins are the same.
       # The strings of the joins MUST be exactly the same for AR to remove the duplicates.
       # AR is not consistent in this approach, resulting in duplicate joins errors when
@@ -38,8 +38,8 @@ module Searchlogic
           end
         end.uniq
       end
-      
-      
+
+
       def merge_joins_with_merged_duplicates(*args)
         args << "" if !Thread.current["searchlogic_delegation"]
         joins = merge_joins_without_merged_duplicates(*args)

data/lib/searchlogic/active_record/named_scope_tools.rb

@@ -14,14 +14,14 @@ module Searchlogic
       # method.
       def named_scope_options(name)
         key = scopes.key?(name.to_sym) ? name.to_sym : condition_scope_name(name)
-        
-        if key
+
+        if key && scopes[key]
           eval("options", scopes[key].binding)
         else
           nil
         end
       end
-      
+
       # The arity for a named scope's proc is important, because we use the arity
       # to determine if the condition should be ignored when calling the search method.
       # If the condition is false and the arity is 0, then we skip it all together. Ex:
@@ -37,7 +37,7 @@ module Searchlogic
         options = named_scope_options(name)
         options.respond_to?(:arity) ? options.arity : nil
       end
-      
+
       # When searchlogic calls a named_scope on a foreigh model it will execute that scope and then call scope(:find).
       # When we get these options we want this to be in an exclusive scope, especially if we are calling a condition on
       # the same originating model:
@@ -58,7 +58,7 @@ module Searchlogic
         with_exclusive_scope(&block)
         Thread.current["searchlogic_delegation"] = old
       end
-      
+
       # A convenience method for creating inner join sql to that your inner joins
       # are consistent with how Active Record creates them. Basically a tool for
       # you to use when writing your own named scopes. This way you know for sure
@@ -71,7 +71,7 @@ module Searchlogic
       def inner_joins(association_name)
         ::ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, association_name, nil).join_associations.collect { |assoc| assoc.association_join }
       end
-      
+
       # A convenience methods to create a join on a polymorphic associations target.
       # Ex:
       #
@@ -91,7 +91,7 @@ module Searchlogic
         "INNER JOIN #{options[:target_table]} ON #{options[:target_table]}.id = #{options[:on_table_name]}.#{options[:as]}_id AND " +
           "#{options[:on_table_name]}.#{options[:as]}_type = #{postgres ? "E" : ""}'#{target.to_s.camelize}'"
       end
-      
+
       # See inner_joins. Does the same thing except creates LEFT OUTER joins.
       def left_outer_joins(association_name)
         ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, association_name, nil).join_associations.collect { |assoc| assoc.association_join }

data/lib/searchlogic/active_record/scope.rb

@@ -0,0 +1,22 @@
+module Searchlogic
+  module ActiveRecord
+    # The internals to ActiveRecord like to do scopes.include?(scope_name). And this is how they check for the existence
+    # of scopes, which is terrible. The problem is that searchlogic scopes are dynamically created. So the only solution
+    # is to override the include? method for the scopes hash, try to create the named scope, and then check it again.
+    # This shouldn't effect performance because once its created it never gets called again. I also cache failed names
+    # so we don't try to create them again.
+    module Scope
+      def scopes
+        read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {}.tap do |h|
+          h.instance_eval <<-eval
+            def include?(key)
+              result = super
+              return result if result
+              super
+            end
+          eval
+        end)
+      end
+    end
+  end
+end

data/lib/searchlogic/core_ext/proc.rb

@@ -4,7 +4,7 @@ module Searchlogic
       def self.included(klass)
         klass.class_eval do
           attr_accessor :searchlogic_options
-          
+
           def searchlogic_options
             @searchlogic_options ||= {}
             @searchlogic_options[:type] ||= :string

data/lib/searchlogic/named_scopes/alias_scope.rb

@@ -45,23 +45,24 @@ module Searchlogic
         end
       end
       alias_method :scope_procedure, :alias_scope
-      
-      def alias_scopes # :nodoc:
-        read_inheritable_attribute(:alias_scopes) || write_inheritable_attribute(:alias_scopes, {})
-      end
-      
-      def alias_scope?(name) # :nodoc:
-        return false if name.blank?
-        alias_scopes.key?(name.to_sym)
-      end
-      
+
       def condition?(name) # :nodoc:
         super || alias_scope?(name)
       end
-      
+
       def named_scope_options(name) # :nodoc:
         super || alias_scopes[name.to_sym]
       end
+
+      private
+        def alias_scopes # :nodoc:
+          read_inheritable_attribute(:alias_scopes) || write_inheritable_attribute(:alias_scopes, {})
+        end
+
+        def alias_scope?(name) # :nodoc:
+          return false if name.blank?
+          alias_scopes.key?(name.to_sym)
+        end
     end
   end
 end

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -11,12 +11,13 @@ module Searchlogic
           !association_condition_details(name).nil? unless name.to_s.downcase.match("_or_")
         end
 
-        def method_missing(name, *args, &block)
-          if !local_condition?(name) && details = association_condition_details(name)
-            create_association_condition(details[:association], details[:condition], args, details[:poly_class])
-            send(name, *args)
-          else
-            super
+        # We need to try and create other conditions first so that we give priority to conflicting names.
+        # Such as having a column names the exact same name as an association condition.
+        def create_condition(name)
+          if result = super
+            result
+          elsif details = association_condition_details(name)
+            create_association_condition(details[:association], details[:condition], details[:poly_class])
           end
         end
 
@@ -51,27 +52,27 @@ module Searchlogic
           end
         end
 
-        def create_association_condition(association, condition_name, args, poly_class = nil)
+        def create_association_condition(association, condition_name, poly_class = nil)
           name = [association.name, poly_class && "#{poly_class.name.underscore}_type", condition_name].compact.join("_")
-          named_scope(name, association_condition_options(association, condition_name, args, poly_class))
+          named_scope(name, association_condition_options(association, condition_name, poly_class))
         end
 
-        def association_condition_options(association, association_condition, args, poly_class = nil)
+        def association_condition_options(association, association_condition, poly_class = nil)
           klass = poly_class ? poly_class : association.klass
-          scope = klass.send(association_condition, *args)
-          scope_options = klass.named_scope_options(association_condition)
+          raise ArgumentError.new("The #{klass} class does not respond to the #{association_condition} scope") if !klass.respond_to?(association_condition)
           arity = klass.named_scope_arity(association_condition)
 
           if !arity || arity == 0
             # The underlying condition doesn't require any parameters, so let's just create a simple
             # named scope that is based on a hash.
             options = {}
-            in_searchlogic_delegation { options = scope.scope(:find) }
+            in_searchlogic_delegation { options = klass.send(association_condition).scope(:find) }
             prepare_named_scope_options(options, association, poly_class)
             options
           else
-            proc_args = arity_args(arity)
+            scope_options = klass.named_scope_options(association_condition)
             scope_options = scope_options.respond_to?(:searchlogic_options) ? scope_options.searchlogic_options.clone : {}
+            proc_args = arity_args(arity)
             arg_type = scope_options.delete(:type) || :string
 
             eval <<-"end_eval"
@@ -83,7 +84,6 @@ module Searchlogic
                   options = scope.scope(:find) if scope
                 end
 
-
                 prepare_named_scope_options(options, association, poly_class)
                 options
               }

data/lib/searchlogic/named_scopes/association_ordering.rb

@@ -13,21 +13,20 @@ module Searchlogic
       def condition?(name) # :nodoc:
         super || association_ordering_condition?(name)
       end
-      
+
       private
         def association_ordering_condition?(name)
           !association_ordering_condition_details(name).nil?
         end
-        
-        def method_missing(name, *args, &block)
+
+        def create_condition(name)
           if details = association_ordering_condition_details(name)
-            create_association_ordering_condition(details[:association], details[:order_as], details[:condition], args)
-            send(name, *args)
+            create_association_ordering_condition(details[:association], details[:order_as], details[:condition])
           else
             super
           end
         end
-        
+
         def association_ordering_condition_details(name)
           associations = reflect_on_all_associations
           association_names = associations.collect { |assoc| assoc.name }
@@ -35,8 +34,8 @@ module Searchlogic
             {:order_as => $1, :association => associations.find { |a| a.name == $2.to_sym }, :condition => $3}
           end
         end
-        
-        def create_association_ordering_condition(association, order_as, condition, args)
+
+        def create_association_ordering_condition(association, order_as, condition)
          cond = condition
          poly_class = nil
          if condition =~ /^(\w+)_type_(\w+)$/
@@ -44,7 +43,7 @@ module Searchlogic
            cond = $2
            poly_class = poly_type.camelcase.constantize if poly_type
          end
-         named_scope("#{order_as}_by_#{association.name}_#{condition}", association_condition_options(association, "#{order_as}_by_#{cond}", args, poly_class))
+         named_scope("#{order_as}_by_#{association.name}_#{condition}", association_condition_options(association, "#{order_as}_by_#{cond}", poly_class))
         end
     end
   end

data/lib/searchlogic/named_scopes/base.rb

@@ -0,0 +1,16 @@
+module Searchlogic
+  module NamedScopes
+    module Base
+      def condition?(name)
+        existing_condition?(name)
+      end
+
+      private
+        def existing_condition?(name)
+          return false if name.blank?
+          @valid_scope_names ||= scopes.keys.reject { |k| k == :scoped }
+          @valid_scope_names.include?(name.to_sym)
+        end
+    end
+  end
+end

data/lib/searchlogic/named_scopes/{conditions.rb → column_conditions.rb}

@@ -8,7 +8,7 @@ module Searchlogic
     # Notice the constants in this class, they define which conditions Searchlogic provides.
     #
     # See the README for a more detailed explanation.
-    module Conditions
+    module ColumnConditions
       COMPARISON_CONDITIONS = {
         :equals => [:is, :eq],
         :does_not_equal => [:not_equal_to, :is_not, :not, :ne],
@@ -54,14 +54,19 @@ module Searchlogic
 
       # Is the name of the method a valid condition that can be dynamically created?
       def condition?(name)
-        local_condition?(name)
+        super || column_condition?(name)
+      end
+
+      # We want to return true for any conditions that can be called, and while we're at it. We might as well
+      # create the condition so we don't have to do it again.
+      def respond_to?(*args)
+        super || (self != ::ActiveRecord::Base && !create_condition(args.first).blank?)
       end
 
       private
-        def local_condition?(name)
+        def column_condition?(name)
           return false if name.blank?
-          scope_names = scopes.keys.reject { |k| k == :scoped }
-          scope_names.include?(name.to_sym) || !condition_details(name).nil? || boolean_condition?(name)
+          !condition_details(name).nil? || boolean_condition?(name)
         end
 
         def boolean_condition?(name)
@@ -70,13 +75,8 @@ module Searchlogic
         end
 
         def method_missing(name, *args, &block)
-          if details = condition_details(name)
-            create_condition(details[:column], details[:condition], args)
-            send(name, *args)
-          elsif boolean_condition?(name)
-            column = name.to_s.gsub(/^not_/, "")
-            named_scope name, :conditions => {column => (name.to_s =~ /^not_/).nil?}
-            send(name)
+          if create_condition(name)
+            send(name, *args, &block)
           else
             super
           end
@@ -91,11 +91,21 @@ module Searchlogic
           end
         end
 
-        def create_condition(column_name, condition, args)
-          if PRIMARY_CONDITIONS.include?(condition.to_sym)
-            create_primary_condition(column_name, condition)
-          elsif ALIAS_CONDITIONS.include?(condition.to_sym)
-            create_alias_condition(column_name, condition, args)
+        def create_condition(name)
+          @conditions_already_tried ||= []
+          return nil if @conditions_already_tried.include?(name.to_s)
+          @conditions_already_tried << name.to_s
+
+          if details = condition_details(name)
+            if PRIMARY_CONDITIONS.include?(details[:condition].to_sym)
+              create_primary_condition(details[:column], details[:condition])
+            elsif ALIAS_CONDITIONS.include?(details[:condition].to_sym)
+              create_alias_condition(details[:column], details[:condition])
+            end
+
+          elsif boolean_condition?(name)
+            column = name.to_s.gsub(/^not_/, "")
+            named_scope name, :conditions => {column => (name.to_s =~ /^not_/).nil?}
           end
         end
 
@@ -107,7 +117,7 @@ module Searchlogic
 
           scope_options = case condition.to_s
           when /^equals/
-            scope_options(condition, column, lambda { |a| attribute_condition("#{table_name}.#{column.name}", a) }, :skip_conversion => skip_conversion)
+            scope_options(condition, column, "#{table_name}.#{column.name} = ?", :skip_conversion => skip_conversion)
           when /^does_not_equal/
             scope_options(condition, column, "#{table_name}.#{column.name} != ?", :skip_conversion => skip_conversion)
           when /^less_than_or_equal_to/
@@ -172,9 +182,9 @@ module Searchlogic
                   values.flatten!
                   values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
 
-                  scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join_word)
+                  scope_sql = values.collect { |value| sql }.join(join_word)
 
-                  {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+                  {:conditions => [scope_sql, *values]}
                 end
               else
                 {}
@@ -184,9 +194,7 @@ module Searchlogic
             searchlogic_lambda(column.type, :skip_conversion => options[:skip_conversion]) { |*values|
               values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
 
-              scope_sql = sql.is_a?(Proc) ? sql.call(*values) : sql
-
-              {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+              {:conditions => [sql, *values]}
             }
           end
         end
@@ -204,12 +212,13 @@ module Searchlogic
           end
         end
 
-        def create_alias_condition(column_name, condition, args)
+        def create_alias_condition(column_name, condition)
           primary_condition = primary_condition(condition)
           alias_name = "#{column_name}_#{condition}"
           primary_name = "#{column_name}_#{primary_condition}"
-          send(primary_name, *args) # go back to method_missing and make sure we create the method
-          (class << self; self; end).class_eval { alias_method alias_name, primary_name }
+          if respond_to?(primary_name)
+            (class << self; self; end).class_eval { alias_method alias_name, primary_name }
+          end
         end
 
         # Returns the primary condition for the given alias. Ex:

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -5,30 +5,30 @@ module Searchlogic
     module OrConditions
       class NoConditionSpecifiedError < StandardError; end
       class UnknownConditionError < StandardError; end
-      
+
       def condition?(name) # :nodoc:
         super || or_condition?(name)
       end
-      
+
       def named_scope_options(name) # :nodoc:
         super || super(or_conditions(name).try(:join, "_or_"))
       end
-      
+
       private
         def or_condition?(name)
           !or_conditions(name).nil?
         end
-        
-        def method_missing(name, *args, &block)
+
+        def create_condition(name)
           if conditions = or_conditions(name)
-            create_or_condition(conditions, args)
-            (class << self; self; end).class_eval { alias_method name, conditions.join("_or_") } if !respond_to?(name)
-            send(name, *args)
+            create_or_condition(conditions)
+            alias_name = conditions.join("_or_")
+            (class << self; self; end).class_eval { alias_method name, conditions.join("_or_") } if name != alias_name
           else
             super
           end
         end
-        
+
         def or_conditions(name)
           # First determine if we should even work on the name, we want to be as quick as possible
           # with this.
@@ -41,7 +41,7 @@ module Searchlogic
             end
           end
         end
-        
+
         def split_or_condition(name)
           parts = name.to_s.split("_or_")
           new_parts = []
@@ -54,7 +54,7 @@ module Searchlogic
           end
           new_parts
         end
-        
+
         # The purpose of this method is to convert the method name parts into actual condition names.
         #
         # Example:
@@ -81,7 +81,7 @@ module Searchlogic
               path = full_association_path(part, last_condition, association_details[:association])
               conditions << "#{path[:path].join("_").to_sym}_#{path[:column]}_#{path[:condition]}"
               last_condition = path[:condition] || nil
-            elsif local_condition?(part)
+            elsif column_condition?(part)
               # We are a custom scope
               conditions << part
             elsif column_names.include?(part)
@@ -90,13 +90,13 @@ module Searchlogic
                 raise NoConditionSpecifiedError.new("The '#{part}' column doesn't know which condition to use, if you use an exact column " +
                   "name you need to specify a condition sometime after (ex: id_or_created_at_lt), where id would use the 'lt' condition.")
               end
-              
+
               conditions << "#{part}_#{last_condition}"
             else
               raise UnknownConditionError.new("The condition '#{part}' is not a valid condition, we could not find any scopes that match this.")
             end
           end
-          
+
           conditions.reverse
         end
 
@@ -116,8 +116,8 @@ module Searchlogic
             end
             { :path => path, :column => part, :condition => last_condition }
         end
-        
-        def create_or_condition(scopes, args)
+
+        def create_or_condition(scopes)
           scopes_options = scopes.collect { |scope, *args| send(scope, *args).proxy_options }
           # We're using first scope to determine column's type
           scope = named_scope_options(scopes.first)
@@ -126,7 +126,7 @@ module Searchlogic
             merge_scopes_with_or(scopes.collect { |scope| clone.send(scope, *args) })
           }
         end
-        
+
         def merge_scopes_with_or(scopes)
           scopes_options = scopes.collect { |scope| scope.scope(:find) }
           conditions = scopes_options.reject { |o| o[:conditions].nil? }.collect { |o| sanitize_sql(o[:conditions]) }

data/lib/searchlogic/named_scopes/ordering.rb

@@ -10,27 +10,25 @@ module Searchlogic
       def condition?(name) # :nodoc:
         super || ordering_condition?(name)
       end
-      
+
       private
         def ordering_condition?(name) # :nodoc:
           !ordering_condition_details(name).nil?
         end
-        
-        def method_missing(name, *args, &block)
+
+        def create_condition(name)
           if name == :order
             named_scope name, lambda { |scope_name|
               return {} if !condition?(scope_name)
               send(scope_name).proxy_options
             }
-            send(name, *args)
           elsif details = ordering_condition_details(name)
             create_ordering_conditions(details[:column])
-            send(name, *args)
           else
             super
           end
         end
-        
+
         def ordering_condition_details(name)
           if name.to_s =~ /^(ascend|descend)_by_(#{column_names.join("|")})$/
             {:order_as => $1, :column => $2}
@@ -38,7 +36,7 @@ module Searchlogic
             {}
           end
         end
-        
+
         def create_ordering_conditions(column)
           named_scope("ascend_by_#{column}".to_sym, {:order => "#{table_name}.#{column} ASC"})
           named_scope("descend_by_#{column}".to_sym, {:order => "#{table_name}.#{column} DESC"})

data/lib/searchlogic/search/conditions.rb

@@ -31,13 +31,13 @@ module Searchlogic
         end
         self
       end
-      
+
       private
         # This is here as a hook to allow people to modify the order in which the conditions are called, for whatever reason.
         def conditions_array
           @conditions.to_a
         end
-        
+
         def write_condition(name, value)
           @conditions[name] = value
         end
@@ -49,7 +49,7 @@ module Searchlogic
         def mass_conditions
           @mass_conditions ||= {}
         end
-        
+
         def ignore_value?(value)
           (value.is_a?(String) && value.blank?) || (value.is_a?(Array) && value.empty?)
         end

data/lib/searchlogic/search/to_yaml.rb

@@ -7,7 +7,7 @@ module Searchlogic
           include InstanceMethods
         end
       end
-      
+
       module InstanceMethods
         def to_yaml( opts = {} )
           YAML::quick_emit( self, opts ) do |out|
@@ -18,7 +18,7 @@ module Searchlogic
             end
           end
         end
-        
+
         def yaml_initialize(taguri, attributes = {})
           self.klass = attributes["class_name"].constantize
           self.current_scope = attributes["current_scope"]

data/lib/searchlogic.rb

@@ -1,9 +1,10 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
-require "searchlogic/active_record/association_proxy"
 require "searchlogic/active_record/consistency"
 require "searchlogic/active_record/named_scope_tools"
-require "searchlogic/named_scopes/conditions"
+require "searchlogic/active_record/scope"
+require "searchlogic/named_scopes/base"
+require "searchlogic/named_scopes/column_conditions"
 require "searchlogic/named_scopes/ordering"
 require "searchlogic/named_scopes/association_conditions"
 require "searchlogic/named_scopes/association_ordering"
@@ -24,19 +25,15 @@ Proc.send(:include, Searchlogic::CoreExt::Proc)
 Object.send(:include, Searchlogic::CoreExt::Object)
 
 module ActiveRecord # :nodoc: all
-  module Associations
-    class AssociationProxy
-      include Searchlogic::ActiveRecord::AssociationProxy
-    end
-  end
-
   class Base
     class << self; include Searchlogic::ActiveRecord::Consistency; end
   end
 end
 
+ActiveRecord::Base.extend(Searchlogic::ActiveRecord::Scope)
 ActiveRecord::Base.extend(Searchlogic::ActiveRecord::NamedScopeTools)
-ActiveRecord::Base.extend(Searchlogic::NamedScopes::Conditions)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::Base)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::ColumnConditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationConditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationOrdering)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Ordering)

data/searchlogic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.32"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
@@ -25,15 +25,16 @@ Gem::Specification.new do |s|
     "VERSION.yml",
     "init.rb",
     "lib/searchlogic.rb",
-    "lib/searchlogic/active_record/association_proxy.rb",
     "lib/searchlogic/active_record/consistency.rb",
     "lib/searchlogic/active_record/named_scope_tools.rb",
+    "lib/searchlogic/active_record/scope.rb",
     "lib/searchlogic/core_ext/object.rb",
     "lib/searchlogic/core_ext/proc.rb",
     "lib/searchlogic/named_scopes/alias_scope.rb",
     "lib/searchlogic/named_scopes/association_conditions.rb",
     "lib/searchlogic/named_scopes/association_ordering.rb",
-    "lib/searchlogic/named_scopes/conditions.rb",
+    "lib/searchlogic/named_scopes/base.rb",
+    "lib/searchlogic/named_scopes/column_conditions.rb",
     "lib/searchlogic/named_scopes/or_conditions.rb",
     "lib/searchlogic/named_scopes/ordering.rb",
     "lib/searchlogic/rails_helpers.rb",
@@ -56,7 +57,7 @@ Gem::Specification.new do |s|
     "spec/searchlogic/named_scopes/alias_scope_spec.rb",
     "spec/searchlogic/named_scopes/association_conditions_spec.rb",
     "spec/searchlogic/named_scopes/association_ordering_spec.rb",
-    "spec/searchlogic/named_scopes/conditions_spec.rb",
+    "spec/searchlogic/named_scopes/column_conditions_spec.rb",
     "spec/searchlogic/named_scopes/or_conditions_spec.rb",
     "spec/searchlogic/named_scopes/ordering_spec.rb",
     "spec/searchlogic/search_spec.rb",
@@ -74,7 +75,7 @@ Gem::Specification.new do |s|
     "spec/searchlogic/named_scopes/alias_scope_spec.rb",
     "spec/searchlogic/named_scopes/association_conditions_spec.rb",
     "spec/searchlogic/named_scopes/association_ordering_spec.rb",
-    "spec/searchlogic/named_scopes/conditions_spec.rb",
+    "spec/searchlogic/named_scopes/column_conditions_spec.rb",
     "spec/searchlogic/named_scopes/or_conditions_spec.rb",
     "spec/searchlogic/named_scopes/ordering_spec.rb",
     "spec/searchlogic/search_spec.rb",

data/spec/searchlogic/named_scopes/alias_scope_spec.rb

@@ -18,6 +18,6 @@ describe Searchlogic::NamedScopes::AliasScope do
   end
   
   it "should inherit alias scopes from superclasses" do
-    Class.new(User).alias_scope?("username_has").should be_true
+    Class.new(User).condition?("username_has").should be_true
   end
 end

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -209,5 +209,12 @@ describe Searchlogic::NamedScopes::AssociationConditions do
     user.orders.count.should == 1
     user.orders.shipped_on_not_null.shipped_on_greater_than(2.days.ago).count.should == 1
   end
-
+  
+  it "should allow chained dynamic scopes without losing association scope conditions" do
+    user = User.create
+    order1 = Order.create :user => user, :shipped_on => Time.now, :total => 2
+    order2 = Order.create :shipped_on => Time.now, :total => 2
+    user.orders.id_equals(order1.id).count.should == 1
+    user.orders.id_equals(order1.id).total_equals(2).count.should == 1
+  end
 end

data/spec/searchlogic/named_scopes/{conditions_spec.rb → column_conditions_spec.rb}

@@ -1,9 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe Searchlogic::NamedScopes::Conditions do
+describe Searchlogic::NamedScopes::ColumnConditions do
   it "should be dynamically created and then cached" do
-    User.should_not respond_to(:age_less_than)
+    User.scopes.key?(:age_less_than).should == false
     User.age_less_than(5)
+    User.scopes.key?(:age_less_than).should == true
+  end
+  
+  it "should respond to the scope" do
     User.should respond_to(:age_less_than)
   end
   
@@ -15,8 +19,6 @@ describe Searchlogic::NamedScopes::Conditions do
     it "should have equals" do
       (5..7).each { |age| User.create(:age => age) }
       User.age_equals(6).all.should == User.find_all_by_age(6)
-      User.age_equals(5..6).all.should == User.find_all_by_age(5..6)
-      User.age_equals([5, 7]).all.should == User.find_all_by_age([5, 7])
     end
     
     it "should have does not equal" do

data/spec/searchlogic/named_scopes/ordering_spec.rb

@@ -1,12 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Searchlogic::NamedScopes::Ordering do
-  it "should be dynamically created and then cached" do
-    User.should_not respond_to(:ascend_by_username)
-    User.ascend_by_username
-    User.should respond_to(:ascend_by_username)
-  end
-  
   it "should have ascending" do
     %w(bjohnson thunt).each { |username| User.create(:username => username) }
     User.ascend_by_username.all.should == User.all(:order => "username ASC")

metadata

@@ -2,7 +2,7 @@
 name: searchlogic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.32
+  version: 2.5.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -53,15 +53,16 @@ files:
 - VERSION.yml
 - init.rb
 - lib/searchlogic.rb
-- lib/searchlogic/active_record/association_proxy.rb
 - lib/searchlogic/active_record/consistency.rb
 - lib/searchlogic/active_record/named_scope_tools.rb
+- lib/searchlogic/active_record/scope.rb
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb
 - lib/searchlogic/named_scopes/association_conditions.rb
 - lib/searchlogic/named_scopes/association_ordering.rb
-- lib/searchlogic/named_scopes/conditions.rb
+- lib/searchlogic/named_scopes/base.rb
+- lib/searchlogic/named_scopes/column_conditions.rb
 - lib/searchlogic/named_scopes/or_conditions.rb
 - lib/searchlogic/named_scopes/ordering.rb
 - lib/searchlogic/rails_helpers.rb
@@ -84,7 +85,7 @@ files:
 - spec/searchlogic/named_scopes/alias_scope_spec.rb
 - spec/searchlogic/named_scopes/association_conditions_spec.rb
 - spec/searchlogic/named_scopes/association_ordering_spec.rb
-- spec/searchlogic/named_scopes/conditions_spec.rb
+- spec/searchlogic/named_scopes/column_conditions_spec.rb
 - spec/searchlogic/named_scopes/or_conditions_spec.rb
 - spec/searchlogic/named_scopes/ordering_spec.rb
 - spec/searchlogic/search_spec.rb
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3829860769572842136
+      hash: -2184682576118207105
       segments: 
       - 0
       version: "0"
@@ -128,7 +129,7 @@ test_files:
 - spec/searchlogic/named_scopes/alias_scope_spec.rb
 - spec/searchlogic/named_scopes/association_conditions_spec.rb
 - spec/searchlogic/named_scopes/association_ordering_spec.rb
-- spec/searchlogic/named_scopes/conditions_spec.rb
+- spec/searchlogic/named_scopes/column_conditions_spec.rb
 - spec/searchlogic/named_scopes/or_conditions_spec.rb
 - spec/searchlogic/named_scopes/ordering_spec.rb
 - spec/searchlogic/search_spec.rb

data/lib/searchlogic/active_record/association_proxy.rb

@@ -1,20 +0,0 @@
-module Searchlogic
-  module ActiveRecord
-    module AssociationProxy
-      def self.included(klass)
-        klass.class_eval do
-          alias_method_chain :send, :searchlogic
-        end
-      end
-
-      def send_with_searchlogic(method, *args, &block)
-        # create the scope if it doesn't exist yet, then delegate back to the original method
-        if !proxy_respond_to?(method) && proxy_reflection.macro != :belongs_to && !proxy_reflection.options[:polymorphic] && proxy_reflection.klass.condition?(method)
-          proxy_reflection.klass.send(method, *args, &block)
-        end
-
-        send_without_searchlogic(method, *args, &block)
-      end
-    end
-  end
-end