searchlogic 2.4.32 → 2.5.19

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9f864b236c2dc4226146369b7231f7d83d895e35
+  data.tar.gz: 0b59222c85aa6367414d20842c9845146b21e42c
+SHA512:
+  metadata.gz: a7b667cbce3a1ebd1e278a3f1a232a52c208b6d0f21456db2a58006ebe1e4cab8ec01c559b331a9d6210effea033023aa72694fb088dc492d179ebb8deb406be
+  data.tar.gz: 898cc067511831ac102fd3004dd2726466a03fcf5a77ff7cf0be9c2e03f70377d5e7b3823a1cc7a00f705ab2b35951b7a199e17291d254de1c5af70fb578a5e7

data/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+*.log
+pkg/*
+coverage/*
+doc/*
+benchmarks/*
+*.gem

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/Appraisals

@@ -0,0 +1,6 @@
+[9,10,11,12,14].each do |i|
+  appraise "ar2.3.#{i}" do
+    gem 'activerecord', "2.3.#{i}"
+  end
+end
+

data/Gemfile

@@ -1,10 +1,2 @@
-source :rubygems
-
-gem 'activerecord', '~> 2.3.11'
-
-group :test do
-  gem 'jeweler'
-  gem 'ruby-debug19'
-  gem 'rspec', '1.3.1'
-  gem 'sqlite3'
-end
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -1,38 +1,38 @@
+PATH
+  remote: .
+  specs:
+    searchlogic (2.5.17)
+      activerecord (~> 2.3.12)
+      activesupport (~> 2.3.12)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activerecord (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    appraisal (0.4.1)
+      bundler
       rake
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    rake (0.8.7)
-    rspec (1.3.1)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
+    coderay (1.1.0)
+    method_source (0.8.2)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.1.1)
+    rspec (1.3.2)
+    slop (3.4.7)
+    sqlite3 (1.3.8)
+    timecop (0.5.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.11)
-  jeweler
-  rspec (= 1.3.1)
-  ruby-debug19
+  appraisal (= 0.4.1)
+  pry
+  rspec (~> 1.3.1)
+  searchlogic!
   sqlite3
+  timecop (~> 0.5.9.1)

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Searchlogic makes using ActiveRecord named scopes easier and less repetitive. It helps keep your code DRY, clean, and simple.
 
+The specs pass with ActiveRecord 2.3.9 - 2.3.14 on Ruby 1.9.3-p125, 1.9.2-p318, and 1.8.7-p358
+
 == Helpful links
 
 * <b>Documentation:</b> http://rdoc.info/projects/binarylogic/searchlogic

data/Rakefile

@@ -1,26 +1,9 @@
-require 'rubygems'
-require 'rake'
-require 'bundler'
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 Bundler.setup
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "searchlogic"
-    gem.summary = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
-    gem.description = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
-    gem.email = "bjohnson@binarylogic.com"
-    gem.homepage = "http://github.com/binarylogic/searchlogic"
-    gem.authors = ["Ben Johnson of Binary Logic"]
-    gem.add_bundler_dependencies
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
+require 'appraisal'
 require 'spec/rake/spectask'
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']

data/gemfiles/ar2.3.10.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "activerecord", "2.3.10"
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.10.gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: /Users/john/code/searchlogic
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    appraisal (0.4.1)
+      bundler
+      rake
+    rake (0.9.2.2)
+    rspec (1.3.2)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.10)
+  appraisal (= 0.4.1)
+  rspec (~> 1.3.1)
+  searchlogic!
+  sqlite3

data/gemfiles/ar2.3.11.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "activerecord", "2.3.11"
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.11.gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: /Users/john/code/searchlogic
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.11)
+      activesupport (= 2.3.11)
+    activesupport (2.3.11)
+    appraisal (0.4.1)
+      bundler
+      rake
+    rake (0.9.2.2)
+    rspec (1.3.2)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.11)
+  appraisal (= 0.4.1)
+  rspec (~> 1.3.1)
+  searchlogic!
+  sqlite3

data/gemfiles/ar2.3.12.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "activerecord", "2.3.12"
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.12.gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: /Users/john/code/searchlogic
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
+    appraisal (0.4.1)
+      bundler
+      rake
+    rake (0.9.2.2)
+    rspec (1.3.2)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.12)
+  appraisal (= 0.4.1)
+  rspec (~> 1.3.1)
+  searchlogic!
+  sqlite3

data/gemfiles/ar2.3.14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "activerecord", "2.3.14"
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.14.gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: /Users/john/code/searchlogic
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    appraisal (0.4.1)
+      bundler
+      rake
+    rake (0.9.2.2)
+    rspec (1.3.2)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.14)
+  appraisal (= 0.4.1)
+  rspec (~> 1.3.1)
+  searchlogic!
+  sqlite3

data/gemfiles/ar2.3.9.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "activerecord", "2.3.9"
+
+gemspec :path=>"../"

data/gemfiles/ar2.3.9.gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: /Users/john/code/searchlogic
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.9)
+      activesupport (= 2.3.9)
+    activesupport (2.3.9)
+    appraisal (0.4.1)
+      bundler
+      rake
+    rake (0.9.2.2)
+    rspec (1.3.2)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.9)
+  appraisal (= 0.4.1)
+  rspec (~> 1.3.1)
+  searchlogic!
+  sqlite3

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,30 @@
+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|
+          
+          class << h
+            attr_accessor :active_record_class
+          end
+          h.active_record_class = self
+          
+          h.instance_eval <<-eval
+            def include?(key)
+              result = super
+              return result if result
+              active_record_class.respond_to?(key)
+              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

@@ -8,7 +8,7 @@ module Searchlogic
       # or represents a named scope procedure. Ex:
       #
       #   class User
-      #     def teenager
+      #     def self.teenager
       #       age_gte(13).age_lte(19)
       #     end
       #   end
@@ -33,11 +33,11 @@ module Searchlogic
       # is a safe method.
       def alias_scope(name, options = nil)
         alias_scopes[name.to_sym] = options
-        (class << self; self end).instance_eval do
+        (class << self; self; end).instance_eval do
           define_method name do |*args|
             case options
             when Symbol
-              send(options)
+              send(options, *args)
             else
               options.call(*args)
             end
@@ -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 name with 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
 
@@ -31,7 +32,7 @@ module Searchlogic
           poly_type = nil
           condition = nil
 
-          if name_with_condition.to_s =~ /^(#{non_poly_assocs.collect(&:name).join("|")})_(\w+)$/
+          if name_with_condition.to_s =~ /^(#{non_poly_assocs.collect(&:name).join("|")})_(\w+)$/ && non_poly_assocs.present?
             association_name = $1
             condition = $2
           elsif name_with_condition.to_s =~ /^(#{poly_assocs.collect(&:name).join("|")})_(\w+?)_type_(\w+)$/
@@ -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
+          if !arity
             # 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