aq1018-searchlogic 2.4.16 → 2.4.17

data/.gitignore

@@ -4,3 +4,4 @@ pkg/*
 coverage/*
 doc/*
 benchmarks/*
+*.gem

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :build: 
 :minor: 4
-:patch: 16
+:patch: 17

data/lib/searchlogic/active_record/association_proxy_overrides.rb

@@ -3,49 +3,16 @@ module Searchlogic
     module AssociationProxyOverrides
       def self.included(klass)
         klass.class_eval do
-          alias_method_chain :send, :preload_searchlogic_or_conditions
-          alias_method_chain :send, :preload_searchlogic_conditions
-          alias_method_chain :send, :preload_searchlogic_ordering
-        end
-      end
-      
-      def send_with_preload_searchlogic_conditions(name, *args, &block)
-        if details=condition_details(name)
-          create_condition(details[:column], details[:condition], args)
-          send_without_preload_searchlogic_conditions(name, *args)
-        elsif boolean_condition?(name)
-          column = name.to_s.gsub(/^not_/, "")
-          named_scope name, :conditions => {column => (name.to_s =~ /^not_/).nil?}
-          send_without_preload_searchlogic_conditions(name)
-        else
-          send_without_preload_searchlogic_conditions(name, *args, &block)
-        end
-      end
-      
-      def send_with_preload_searchlogic_ordering(name, *args, &block)
-        if name == :order
-          named_scope name, lambda { |scope_name|
-            return {} if !condition?(scope_name)
-            send_without_preload_searchlogic_ordering(scope_name).proxy_options
-          }
-          send_without_preload_searchlogic_ordering(name, *args)
-        elsif details = ordering_condition_details(name)
-          create_ordering_conditions(details[:column])
-          send_without_preload_searchlogic_ordering(name, *args)
-        else
-          send_without_preload_searchlogic_ordering(name, *args, &block)
-        end
-      end
-      
-      def send_with_preload_searchlogic_or_conditions(name, *args, &block)
-        if conditions = or_conditions(name)
-          create_or_condition(conditions, args)
-          proxy_reflection.klass.class_eval do
-            (class << self; self; end).class_eval { alias_method name, conditions.join("_or_") } if !respond_to?(name)
+          
+          def send(method, *args)
+            begin
+              super
+            rescue NoMethodError => e  
+              load_target
+              @target.send(method, *args)
+            end
           end
-          send_without_preload_searchlogic_or_conditions(name, *args)
-        else
-          send_without_preload_searchlogic_or_conditions(name, *args, &block)
+          
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 4
-  - 16
-  version: 2.4.16
+  - 17
+  version: 2.4.17
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 +08:00
+date: 2010-04-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,6 @@ files:
 - lib/searchlogic/rails_helpers.rb
 - lib/searchlogic/search.rb
 - rails/init.rb
-- searchlogic.gemspec
 - spec/active_record/association_proxy_override_spec.rb
 - spec/active_record/consistency_spec.rb
 - spec/core_ext/object_spec.rb

data/searchlogic.gemspec

@@ -1,89 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{searchlogic}
-  s.version = "2.4.15"
-
-  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{2010-04-08}
-  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
-  s.email = %q{bjohnson@binarylogic.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "init.rb",
-     "lib/searchlogic.rb",
-     "lib/searchlogic/active_record/association_proxy_overrides.rb",
-     "lib/searchlogic/active_record/consistency.rb",
-     "lib/searchlogic/active_record/named_scope_tools.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/or_conditions.rb",
-     "lib/searchlogic/named_scopes/ordering.rb",
-     "lib/searchlogic/rails_helpers.rb",
-     "lib/searchlogic/search.rb",
-     "rails/init.rb",
-     "searchlogic.gemspec",
-     "spec/active_record/association_proxy_override_spec.rb",
-     "spec/active_record/consistency_spec.rb",
-     "spec/core_ext/object_spec.rb",
-     "spec/core_ext/proc_spec.rb",
-     "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/association_conditions_spec.rb",
-     "spec/named_scopes/association_ordering_spec.rb",
-     "spec/named_scopes/conditions_spec.rb",
-     "spec/named_scopes/or_conditions_spec.rb",
-     "spec/named_scopes/ordering_spec.rb",
-     "spec/search_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/binarylogic/searchlogic}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{searchlogic}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
-  s.test_files = [
-    "spec/active_record/association_proxy_override_spec.rb",
-     "spec/active_record/consistency_spec.rb",
-     "spec/core_ext/object_spec.rb",
-     "spec/core_ext/proc_spec.rb",
-     "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/association_conditions_spec.rb",
-     "spec/named_scopes/association_ordering_spec.rb",
-     "spec/named_scopes/conditions_spec.rb",
-     "spec/named_scopes/or_conditions_spec.rb",
-     "spec/named_scopes/ordering_spec.rb",
-     "spec/search_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-  end
-end
-