joost-searchlogic 2.1.7.1 → 2.2.3.1

data/CHANGELOG.rdoc

@@ -1,5 +1,52 @@
+<<<<<<< HEAD:CHANGELOG.rdoc
 == 2.1.7
 
+=======
+== 2.2.3 released 2009-07-31
+
+* Fixed bug when an associations named scope joins is a string or an array of strings, the joins we add in automatically should also be a string, not a symbol.
+
+== 2.2.2 released 2009-07-31
+
+* Fix bug to give priority to local columns.
+
+== 2.2.1 released 2009-07-30
+
+* Use ::ActiveRecord instead of ActiveRecord to avoid a name conflict since ActiveRecord is a module within Searchlogic.
+
+== 2.2.0 released 2009-07-30
+
+* Refactored association code to be much simpler and rely on recursion. This allows the underlying class to do most of the work. This also allows calling any named scopes through any level of associations.
+
+== 2.1.13 released 2009-07-29
+
+* Applied bug fix from http://github.com/skanev/searchlogic to make #order work with association ordering.
+* Applied bug fix to allow for custom ordering conditions.
+
+== 2.1.12 released 2009-07-28
+
+* Fixed bug when dealing with scopes that return nil.
+
+== 2.1.11 released 2009-07-28
+
+* Reworked how alias conditions are created on the fly, uses scope(:find) instead of proxy_options to create the scope. This allows using association alias named scopes.
+
+== 2.1.10 released 2009-07-28
+
+* Ignore polymorphic associations when dynamically creating conditions on associations.
+
+== 2.1.9 released 2009-07-28
+
+* Fixed bug when cloning with no scope
+* Allow the call of foreign pre-existing named scopes instead of those generated by searchlogic. Allows you to call named scopes on associations that you define yourself.
+
+== 2.1.8 released 2009-07-15
+
+* Added support for not_like, not_begin_with, not_end_with, and not_null
+
+== 2.1.7 released 2009-07-14
+
+>>>>>>> searchlogic/master:CHANGELOG.rdoc
 * Add support for time zones in the Search class when type casting to Time objects.
 
 == 2.1.6 released 2009-07-13

data/README.rdoc

@@ -9,8 +9,6 @@ Changes made:
 
 = Searchlogic
 
-<b>Searchlogic has been <em>completely</em> rewritten for v2. It is much simpler and has taken an entirely new approach. To give you an idea, v1 had ~2300 lines of code, v2 has ~420 lines of code.</b>
-
 Searchlogic provides common named scopes and object based searching for ActiveRecord.
 
 == Helpful links
@@ -94,7 +92,7 @@ You also get named scopes for any of your associations:
   User.ascend_by_order_total
   User.descend_by_orders_line_items_price
 
-Again these are just named scopes. You can chain them together, call methods off of them, etc. What's great about these named scopes is that they do NOT use the :include option, making them <em>much</em> faster. Instead they create a INNER JOIN and pass it to the :joins option, which is great for performance. To prove my point here is a quick benchmark from an application I am working on:
+Again these are just named scopes. You can chain them together, call methods off of them, etc. What's great about these named scopes is that they do NOT use the :include option, making them <em>much</em> faster. Instead they leverage the :joins option, which is great for performance. To prove my point here is a quick benchmark from an application I am working on:
 
   Benchmark.bm do |x|
     x.report { 10.times { Event.tickets_id_gt(10).all(:include => :tickets) } }
@@ -108,7 +106,7 @@ If you want to use the :include option, just specify it:
 
   User.orders_line_items_price_greater_than(20).all(:include => {:orders => :line_items})
 
-Obviously, only do this if you want to actually use the included objects.
+Obviously, only do this if you want to actually use the included objects. Including objects into a query can be helpful with performance, especially when solving an N+1 query problem.
 
 == Make searching and ordering data in your application trivial
 
@@ -201,7 +199,7 @@ Now just throw it in your form:
     = f.check_box :four_year_olds
     = f.submit
 
-What's great about this is that you can do just about anything you want. If Searchlogic doesn't provide a named scope for that crazy edge case that you need, just create your own named scope. The sky is the limit.
+This really allows Searchlogic to extend beyond what it provides internally. If Searchlogic doesn't provide a named scope for that crazy edge case that you need, just create your own named scope and use it. The sky is the limit.
 
 == Use any or all
 
@@ -224,7 +222,7 @@ If you don't like will_paginate, use another solution, or roll your own. Paginat
 
 == Conflicts with other gems
 
-You will notice searchlogic wants to create a method called "search". So do other libraries like thinking sphinx, etc. So searchlogic has a no conflict resolution. If the "search" method is already taken the method will be called "searchlogic" instead. So instead of
+You will notice searchlogic wants to create a method called "search". So do other libraries like thinking-sphinx, etc. So searchlogic has a no conflict resolution. If the "search" method is already taken the method will be called "searchlogic" instead. So instead of
 
   User.search
 

data/Rakefile

@@ -6,6 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "searchlogic"
     gem.summary = "Searchlogic provides common named scopes and object based searching for ActiveRecord."
+    gem.description = "Searchlogic provides common named scopes and object based searching for ActiveRecord."
     gem.email = "bjohnson@binarylogic.com"
     gem.homepage = "http://github.com/binarylogic/searchlogic"
     gem.authors = ["Ben Johnson of Binary Logic"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 3
 :major: 2
-:minor: 1
 :patch: 7

data/lib/searchlogic.rb

@@ -1,6 +1,7 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
-require "searchlogic/active_record_consistency"
+require "searchlogic/active_record/consistency"
+require "searchlogic/active_record/named_scopes"
 require "searchlogic/named_scopes/conditions"
 require "searchlogic/named_scopes/ordering"
 require "searchlogic/named_scopes/association_conditions"
@@ -10,6 +11,17 @@ require "searchlogic/search"
 
 Proc.send(:include, Searchlogic::CoreExt::Proc)
 Object.send(:include, Searchlogic::CoreExt::Object)
+
+module ActiveRecord # :nodoc: all
+  class Base
+    class << self
+      include Searchlogic::ActiveRecord::Consistency
+    end
+  end
+end
+
+ActiveRecord::Base.extend(Searchlogic::ActiveRecord::NamedScopes)
+
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Conditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Ordering)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationConditions)

data/lib/searchlogic/active_record/consistency.rb

@@ -0,0 +1,22 @@
+module Searchlogic
+  module ActiveRecord
+    # Active Record is pretty inconsistent with how their SQL is constructed. This
+    # method attempts to close the gap between the various inconsistencies.
+    module Consistency
+      def self.included(klass)
+        klass.class_eval do
+          alias_method_chain :merge_joins, :searchlogic
+        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
+      # the merge_joins method to delete duplicates.
+      def merge_joins_with_searchlogic(*args)
+        joins = merge_joins_without_searchlogic(*args)
+        joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
+      end
+    end
+  end
+end

data/lib/searchlogic/active_record/named_scopes.rb

@@ -0,0 +1,51 @@
+module Searchlogic
+  module ActiveRecord
+    # Adds methods that give extra information about a classes named scopes.
+    module NamedScopes
+      # Retrieves the options passed when creating the respective named scope. Ex:
+      #
+      #   named_scope :whatever, :conditions => {:column => value}
+      #
+      # This method will return:
+      #
+      #   :conditions => {:column => value}
+      #
+      # ActiveRecord hides this internally in a Proc, so we have to try and pull it out with this
+      # method.
+      def named_scope_options(name)
+        key = scopes.key?(name.to_sym) ? name.to_sym : primary_condition_name(name)
+        
+        if 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:
+      #
+      #   User.named_scope :age_is_4, :conditions => {:age => 4}
+      #   User.search(:age_is_4 => false) == User.all
+      #   User.search(:age_is_4 => true) == User.all(:conditions => {:age => 4})
+      #
+      # We also use it when trying to "copy" the underlying named scope for association
+      # conditions. This way our aliased scope accepts the same number of parameters for
+      # the underlying scope.
+      def named_scope_arity(name)
+        options = named_scope_options(name)
+        options.respond_to?(:arity) ? options.arity : nil
+      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
+      # that duplicate joins will be removed when chaining scopes together that
+      # use the same join.
+      def inner_joins(association_name)
+        ::ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, association_name, nil).join_associations.collect { |assoc| assoc.association_join }
+      end
+    end
+  end
+end

data/lib/searchlogic/core_ext/object.rb

@@ -27,8 +27,10 @@ module Searchlogic
       #
       #   named_scope :id_gt, searchlogic_lambda(:integer) { |value| {:conditions => ["id > ?", value]} }
       #
-      # If you are wanting a string, you don't have to do anything, because Searchlogic assumes you are want a string.
-      # If you want something else, you need to specify it as I did in the above example.
+      # If you are wanting a string, you don't have to do anything, because Searchlogic assumes you want a string.
+      # If you want something else, you need to specify it as I did in the above example. Comments are appreciated
+      # on this, if you know of a better solution please let me know. But this is the best I could come up with,
+      # without being intrusive and altering default behavior.
       def searchlogic_lambda(type = :string, &block)
         proc = lambda(&block)
         proc.searchlogic_arg_type = type

data/lib/searchlogic/named_scopes/alias_scope.rb

@@ -48,6 +48,7 @@ module Searchlogic
       end
       
       def alias_scope?(name) # :nodoc:
+        return false if name.blank?
         alias_scopes.key?(name.to_sym)
       end
       

data/lib/searchlogic/named_scopes/conditions.rb

@@ -13,17 +13,22 @@ module Searchlogic
       
       WILDCARD_CONDITIONS = {
         :like => [:contains, :includes],
+        :not_like => [],
         :begins_with => [:bw],
+        :not_begin_with => [:does_not_begin_with],
         :ends_with => [:ew],
+        :not_end_with => [:does_not_end_with]
       }
       
       BOOLEAN_CONDITIONS = {
         :null => [:nil],
+        :not_null => [:not_nil],
         :empty => []
       }
       
       CONDITIONS = {}
       
+      # Add any / all variations to every comparison and wildcard condition
       COMPARISON_CONDITIONS.merge(WILDCARD_CONDITIONS).each do |condition, aliases|
         CONDITIONS[condition] = aliases
         CONDITIONS["#{condition}_any".to_sym] = aliases.collect { |a| "#{a}_any".to_sym }
@@ -35,41 +40,6 @@ module Searchlogic
       PRIMARY_CONDITIONS = CONDITIONS.keys
       ALIAS_CONDITIONS = CONDITIONS.values.flatten
       
-      # Retrieves the options passed when creating the respective named scope. Ex:
-      #
-      #   named_scope :whatever, :conditions => {:column => value}
-      #
-      # This method will return:
-      #
-      #   :conditions => {:column => value}
-      #
-      # ActiveRecord hides this internally, so we have to try and pull it out with this
-      # method.
-      def named_scope_options(name)
-        key = scopes.key?(name.to_sym) ? name.to_sym : primary_condition_name(name)
-        
-        if key
-          eval("options", scopes[key])
-        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:
-      #
-      #   User.named_scope :age_is_4, :conditions => {:age => 4}
-      #   User.search(:age_is_4 => false) == User.all
-      #   User.search(:age_is_4 => true) == User.all(:conditions => {:age => 4})
-      #
-      # We also use it when trying to "copy" the underlying named scope for association
-      # conditions.
-      def named_scope_arity(name)
-        options = named_scope_options(name)
-        options.respond_to?(:arity) ? options.arity : nil
-      end
-      
       # Returns the primary condition for the given alias. Ex:
       #
       #   primary_condition(:gt) => :greater_than
@@ -84,10 +54,12 @@ module Searchlogic
       #   primary_condition_name(:id_gt) => :id_greater_than
       #   primary_condition_name(:id_greater_than) => :id_greater_than
       def primary_condition_name(name)
-        if primary_condition?(name)
-          name.to_sym
-        elsif details = alias_condition_details(name)
-          "#{details[:column]}_#{primary_condition(details[:condition])}".to_sym
+        if details = condition_details(name)
+          if PRIMARY_CONDITIONS.include?(name.to_sym)
+            name
+          else
+            "#{details[:column]}_#{primary_condition(details[:condition])}".to_sym
+          end
         else
           nil
         end
@@ -116,26 +88,39 @@ module Searchlogic
       end
       
       private
+        def local_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?
+        end
+        
         def method_missing(name, *args, &block)
-          if details = primary_condition_details(name)
-            create_primary_condition(details[:column], details[:condition])
-            send(name, *args)
-          elsif details = alias_condition_details(name)
-            create_alias_condition(details[:column], details[:condition], args)
+          if details = condition_details(name)
+            create_condition(details[:column], details[:condition], args)
             send(name, *args)
           else
             super
           end
         end
         
-        def primary_condition_details(name)
-          if name.to_s =~ /^(#{column_names.join("|")})_(#{PRIMARY_CONDITIONS.join("|")})$/
+        def condition_details(name)
+          if name.to_s =~ /^(#{column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
             {:column => $1, :condition => $2}
           end
         end
         
+        def create_condition(column, condition, args)
+          if PRIMARY_CONDITIONS.include?(condition.to_sym)
+            create_primary_condition(column, condition)
+          elsif ALIAS_CONDITIONS.include?(condition.to_sym)
+            create_alias_condition(column, condition, args)
+          end
+        end
+        
         def create_primary_condition(column, condition)
           column_type = columns_hash[column.to_s].type
+          match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+          
           scope_options = case condition.to_s
           when /^equals/
             scope_options(condition, column_type, "#{table_name}.#{column} = ?")
@@ -150,13 +135,21 @@ module Searchlogic
           when /^greater_than/
             scope_options(condition, column_type, "#{table_name}.#{column} > ?")
           when /^like/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :like)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :like)
+          when /^not_like/
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :like)
           when /^begins_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :begins_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :begins_with)
+          when /^not_begin_with/
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :begins_with)
           when /^ends_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :ends_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :ends_with)
+          when /^not_end_with/
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :ends_with)
           when "null"
             {:conditions => "#{table_name}.#{column} IS NULL"}
+          when "not_null"
+            {:conditions => "#{table_name}.#{column} IS NOT NULL"}
           when "empty"
             {:conditions => "#{table_name}.#{column} = ''"}
           end
@@ -202,12 +195,6 @@ module Searchlogic
           end
         end
         
-        def alias_condition_details(name)
-          if name.to_s =~ /^(#{column_names.join("|")})_(#{ALIAS_CONDITIONS.join("|")})$/
-            {:column => $1, :condition => $2}
-          end
-        end
-        
         def create_alias_condition(column, condition, args)
           primary_condition = primary_condition(condition)
           alias_name = "#{column}_#{condition}"

data/lib/searchlogic/named_scopes/ordering.rb

@@ -9,27 +9,27 @@ module Searchlogic
       def primary_condition_name(name) # :nodoc
         if result = super
           result
-        elsif order_condition?(name)
+        elsif ordering_condition?(name)
           name.to_sym
         else
           nil
         end
       end
       
-      def order_condition?(name) # :nodoc:
-        !order_condition_details(name).nil?
-      end
-      
       private
+        def ordering_condition?(name) # :nodoc:
+          !ordering_condition_details(name).nil?
+        end
+        
         def method_missing(name, *args, &block)
           if name == :order
             named_scope name, lambda { |scope_name|
-              return {} if !order_condition?(scope_name)
+              return {} if !condition?(scope_name)
               send(scope_name).proxy_options
             }
             send(name, *args)
-          elsif details = order_condition_details(name)
-            create_order_conditions(details[:column])
+          elsif details = ordering_condition_details(name)
+            create_ordering_conditions(details[:column])
             send(name, *args)
           else
             super
@@ -44,7 +44,7 @@ module Searchlogic
           end
         end
         
-        def create_order_conditions(column)
+        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"})
         end

data/lib/searchlogic/rails_helpers.rb

@@ -19,6 +19,7 @@ module ActionView
     # * <tt>:as</tt> - the text used in the link, defaults to whatever is passed to :by
     # * <tt>:ascend_scope</tt> - what scope to call for ascending the data, defaults to "ascend_by_:by"
     # * <tt>:descend_scope</tt> - what scope to call for descending the data, defaults to "descend_by_:by"
+    # * <tt>:params</tt> - hash with additional params which will be added to generated url
     # * <tt>:params_scope</tt> - the name of the params key to scope the order condition by, defaults to :search
     # * <tt>:default_scope</tt> - either :asc or :desc, defaults to ascend_scope
     # * <tt>:arrow</tt> - set to true if you want an ascii arrow showing the ordering
@@ -45,7 +46,10 @@ module ActionView
       else
         new_scope = (options[:default_scope] == :desc) ? options[:descend_scope] : options[:ascend_scope]
       end
-      link_to options[:as], url_for(options[:params_scope] => search.conditions.merge( { :order => new_scope } ) ), html_options
+      url_options = {
+        options[:params_scope] => search.conditions.merge( { :order => new_scope } )
+      }.deep_merge(options[:params] || {})
+      link_to options[:as], url_for(url_options), html_options
     end
 
     # Automatically makes the form method :get if a Searchlogic::Search and sets
@@ -73,4 +77,4 @@ module ActionView
     end
 
   end
-end
+end

data/lib/searchlogic/search.rb

@@ -17,7 +17,7 @@ module Searchlogic
   class Search
     # Responsible for adding a "search" method into your models.
     module Implementation
-      # Additional method, gets aliases as "search" if that method
+      # Additional method, gets aliased as "search" if that method
       # is available. A lot of other libraries like to use "search"
       # as well, so if you have a conflict like this, you can use
       # this method directly.
@@ -51,7 +51,7 @@ module Searchlogic
     end
     
     def clone
-      self.class.new(klass, current_scope.clone, conditions.clone)
+      self.class.new(klass, current_scope && current_scope.clone, conditions.clone)
     end
     
     # Returns a hash of the current conditions set.
@@ -141,11 +141,11 @@ module Searchlogic
         else
           # Let's leverage ActiveRecord's type casting, so that casting is consistent
           # with the other models.
-          column_for_type_cast = ActiveRecord::ConnectionAdapters::Column.new("", nil)
+          column_for_type_cast = ::ActiveRecord::ConnectionAdapters::Column.new("", nil)
           column_for_type_cast.instance_variable_set(:@type, type)
           value = column_for_type_cast.type_cast(value)
           Time.zone && value.is_a?(Time) ? value.in_time_zone : value
         end
       end
   end
-end
+end

data/searchlogic.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.7.1"
+  s.version = "2.2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-07-13}
+  s.date = %q{2009-07-31}
+  s.description = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -21,7 +22,8 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "init.rb",
      "lib/searchlogic.rb",
-     "lib/searchlogic/active_record_consistency.rb",
+     "lib/searchlogic/active_record/consistency.rb",
+     "lib/searchlogic/active_record/named_scopes.rb",
      "lib/searchlogic/core_ext/object.rb",
      "lib/searchlogic/core_ext/proc.rb",
      "lib/searchlogic/named_scopes/alias_scope.rb",
@@ -47,7 +49,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{searchlogic}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
   s.test_files = [
     "spec/core_ext/object_spec.rb",

data/spec/named_scopes/alias_scope_spec.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "AliasScope" do
+  before(:each) do
+    User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+  end
+  
   it "should allow alias scopes" do
     User.create(:username => "bjohnson")
     User.create(:username => "thunt")

data/spec/named_scopes/association_conditions_spec.rb

@@ -9,11 +9,35 @@ describe "Association Conditions" do
     Company.users_orders_total_greater_than(10).proxy_options.should == Order.total_greater_than(10).proxy_options.merge(:joins => {:users => :orders})
   end
   
-  it "should not allowed named scopes on non existent association columns" do
+  it "should allow the use of foreign pre-existing named scopes" do
+    User.named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
+    Company.users_uname("bjohnson").proxy_options.should == User.uname("bjohnson").proxy_options.merge(:joins => :users)
+  end
+  
+  it "should allow the use of deep foreign pre-existing named scopes" do
+    Order.named_scope :big_id, :conditions => "orders.id > 100"
+    Company.users_orders_big_id.proxy_options.should == Order.big_id.proxy_options.merge(:joins => {:users => :orders})
+  end
+  
+  it "should allow the use of foreign pre-existing alias scopes" do
+    User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+    Company.users_username_has("bjohnson").proxy_options.should == User.username_has("bjohnson").proxy_options.merge(:joins => :users)
+  end
+  
+  it "should not raise errors for scopes that don't return anything" do
+    User.alias_scope :blank_scope, lambda { |value| }
+    Company.users_blank_scope("bjohnson").proxy_options.should == {:joins => :users}
+  end
+  
+  it "should ignore polymorphic associations" do
+    lambda { Fee.owner_created_at_gt(Time.now) }.should raise_error(NoMethodError)
+  end
+  
+  it "should not allow named scopes on non existent association columns" do
     lambda { User.users_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   
-  it "should not allowed named scopes on non existent deep association columns" do
+  it "should not allow named scopes on non existent deep association columns" do
     lambda { User.users_orders_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   
@@ -101,4 +125,9 @@ describe "Association Conditions" do
     order = user.orders.create(:total => 20, :taxes => 3)
     Company.users_orders_taxes_lt(50).ascend_by_users_orders_total.all(:include => {:users => :orders}).should == Company.all
   end
+  
+  it "should automatically add string joins if the association condition is using strings" do
+    User.named_scope(:orders_big_id, :joins => User.inner_joins(:orders))
+    Company.users_orders_big_id.proxy_options.should == {:joins=>[" INNER JOIN \"users\" ON users.company_id = companies.id ", " INNER JOIN \"orders\" ON orders.user_id = users.id "]}
+  end
 end

data/spec/named_scopes/conditions_spec.rb

@@ -49,15 +49,30 @@ describe "Conditions" do
       User.username_like("john").all.should == User.find_all_by_username("bjohnson")
     end
     
+    it "should have not like" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_like("john").all.should == User.find_all_by_username("thunt")
+    end
+    
     it "should have begins with" do
       %w(bjohnson thunt).each { |username| User.create(:username => username) }
       User.username_begins_with("bj").all.should == User.find_all_by_username("bjohnson")
     end
     
+    it "should have not begin with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_begin_with("bj").all.should == User.find_all_by_username("thunt")
+    end
+    
     it "should have ends with" do
       %w(bjohnson thunt).each { |username| User.create(:username => username) }
       User.username_ends_with("son").all.should == User.find_all_by_username("bjohnson")
     end
+    
+    it "should have not end with" do
+      %w(bjohnson thunt).each { |username| User.create(:username => username) }
+      User.username_not_end_with("son").all.should == User.find_all_by_username("thunt")
+    end
   end
   
   context "boolean conditions" do
@@ -66,6 +81,11 @@ describe "Conditions" do
       User.username_null.all.should == User.find_all_by_username(nil)
     end
     
+    it "should have not null" do
+      ["bjohnson", nil].each { |username| User.create(:username => username) }
+      User.username_not_null.all.should == User.find_all_by_username("bjohnson")
+    end
+    
     it "should have empty" do
       ["bjohnson", ""].each { |username| User.create(:username => username) }
       User.username_empty.all.should == User.find_all_by_username("")
@@ -183,9 +203,6 @@ describe "Conditions" do
     end
     
     it "should have is_not" do
-      # This is matching "not" first. How do you give priority in a regex? Because it's matching the
-      # 'not' condition and thinking the column is 'age_is'.
-      pending
       User.age_is_not(5).proxy_options.should == User.age_does_not_equal(5).proxy_options
     end
     

data/spec/search_spec.rb

@@ -40,6 +40,16 @@ describe "Search" do
     search1.all.should == [user2]
   end
   
+  it "should clone properly without scope" do
+    user1 = User.create(:age => 5)
+    user2 = User.create(:age => 25)
+    search1 = User.search(:age_gt => 10)
+    search2 = search1.clone
+    search2.age_gt = 1
+    search2.all.should == User.all
+    search1.all.should == [user2]
+  end
+  
   it "should delete the condition" do
     search = User.search(:username_like => "bjohnson")
     search.delete("username_like")
@@ -99,6 +109,20 @@ describe "Search" do
       search.orders_total_gt.should == 10
     end
     
+    it "should allow setting pre-existing association conditions" do
+      User.named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
+      search = Company.search
+      search.users_uname = "bjohnson"
+      search.users_uname.should == "bjohnson"
+    end
+    
+    it "should allow setting pre-existing association alias conditions" do
+      User.alias_scope :username_has, lambda { |value| User.username_like(value) }
+      search = Company.search
+      search.users_username_has = "bjohnson"
+      search.users_username_has.should == "bjohnson"
+    end
+    
     it "should allow using custom conditions" do
       User.named_scope(:four_year_olds, { :conditions => { :age => 4 } })
       search = User.search
@@ -136,6 +160,11 @@ describe "Search" do
       lambda { search.unknown = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
     end
     
+    it "should not allow setting conditions on sensitive methods" do
+      search = User.search
+      lambda { search.destroy = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
+    end
+    
     it "should not use the ruby implementation of the id method" do
       search = User.search
       search.id.should be_nil
@@ -292,4 +321,4 @@ describe "Search" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -26,6 +26,12 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :age
   end
   
+  create_table :carts do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.integer :user_id
+  end
+  
   create_table :orders do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -35,6 +41,14 @@ ActiveRecord::Schema.define(:version => 1) do
     t.float :total
   end
   
+  create_table :fees do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.string :owner_type
+    t.integer :owner_id
+    t.float :cost
+  end
+  
   create_table :line_items do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -56,7 +70,6 @@ Spec::Runner.configure do |config|
     class User < ActiveRecord::Base
       belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
-      alias_scope :username_has, lambda { |value| username_like(value) }
     end
     
     class Order < ActiveRecord::Base
@@ -64,6 +77,10 @@ Spec::Runner.configure do |config|
       has_many :line_items, :dependent => :destroy
     end
     
+    class Fee < ActiveRecord::Base
+      belongs_to :owner, :polymorphic => true
+    end
+    
     class LineItem < ActiveRecord::Base
       belongs_to :order
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joost-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.7.1
+  version: 2.2.3.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: 
+description: Searchlogic provides common named scopes and object based searching for ActiveRecord.
 email: bjohnson@binarylogic.com
 executables: []
 
@@ -40,7 +40,8 @@ files:
 - VERSION.yml
 - init.rb
 - lib/searchlogic.rb
-- lib/searchlogic/active_record_consistency.rb
+- lib/searchlogic/active_record/consistency.rb
+- lib/searchlogic/active_record/named_scopes.rb
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb
@@ -63,6 +64,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/binarylogic/searchlogic
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Searchlogic provides common named scopes and object based searching for ActiveRecord.

data/lib/searchlogic/active_record_consistency.rb

@@ -1,27 +0,0 @@
-module Searchlogic
-  # Active Record is pretty inconsistent with how their SQL is constructed. This
-  # method attempts to close the gap between the various inconsistencies.
-  module ActiveRecordConsistency
-    def self.included(klass)
-      klass.class_eval do
-        alias_method_chain :merge_joins, :searchlogic
-      end
-    end
-    
-    # In AR multiple joins are sometimes in a single join query, and other time they
-    # are not. The merge_joins method in AR should account for this, but it doesn't.
-    # This fixes that problem.
-    def merge_joins_with_searchlogic(*args)
-      joins = merge_joins_without_searchlogic(*args)
-      joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
-    end
-  end
-end
-
-module ActiveRecord # :nodoc: all
-  class Base
-    class << self
-      include Searchlogic::ActiveRecordConsistency
-    end
-  end
-end