searchlogic 2.1.3 → 2.1.4

data/CHANGELOG.rdoc

@@ -1,6 +1,8 @@
 == 2.1.3
 
 * Added a no conflic resolution for other libraries already using the "search" method. If you have a conflict, use "searchlogic".
+* Put the hidden order field in a div, to be valid XHTML.
+* Add ActiveRecordConsistency module to help AR remove duplicate joins easier.
 
 == 2.1.2 released 2009-07-04
 

data/VERSION.yml

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

data/lib/searchlogic/active_record_consistency.rb

@@ -0,0 +1,27 @@
+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.split("  ") }.flatten.uniq
+    end
+  end
+end
+
+module ActiveRecord # :nodoc: all
+  class Base
+    class << self
+      include Searchlogic::ActiveRecordConsistency
+    end
+  end
+end

data/lib/searchlogic/rails_helpers.rb

@@ -59,7 +59,7 @@ module Searchlogic
     def fields_for(*args, &block)
       if search_obj = args.find { |arg| arg.is_a?(Searchlogic::Search) }
         args.unshift(:search) if args.first == search_obj
-        concat(hidden_field_tag("#{args.first}[order]", search_obj.order) + "\n")
+        concat(content_tag("div", hidden_field_tag("#{args.first}[order]", search_obj.order)) + "\n")
         super
       else
         super

data/lib/searchlogic.rb

@@ -1,5 +1,6 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
+require "searchlogic/active_record_consistency"
 require "searchlogic/named_scopes/conditions"
 require "searchlogic/named_scopes/ordering"
 require "searchlogic/named_scopes/associations"

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   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-10}
+  s.date = %q{2009-07-12}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "init.rb",
      "lib/searchlogic.rb",
+     "lib/searchlogic/active_record_consistency.rb",
      "lib/searchlogic/core_ext/object.rb",
      "lib/searchlogic/core_ext/proc.rb",
      "lib/searchlogic/named_scopes/alias_scope.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -04:00
+date: 2009-07-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - VERSION.yml
 - init.rb
 - lib/searchlogic.rb
+- lib/searchlogic/active_record_consistency.rb
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb