searchlogic 2.3.3 → 2.3.4

data/VERSION.yml

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

data/lib/searchlogic/active_record/consistency.rb

@@ -15,7 +15,17 @@ module Searchlogic
       # 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
+        joins = joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
+        joins = joins.collect do |j|
+          if j.is_a?(String)
+            j.gsub(/(.*) ON (.*) = (.*)/) do |m|
+              sorted = [$2,$3].sort
+              "#{$1} ON #{sorted[0]} = #{sorted[1]}"
+            end
+          else
+            j
+          end
+        end
       end
     end
   end

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.3"
+  s.version = "2.3.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-09-02}
+  s.date = %q{2009-09-12}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/named_scopes/association_conditions_spec.rb

@@ -131,4 +131,11 @@ describe "Association Conditions" 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
+
+  it "should order the join statements ascending by the fieldnames so that we don't get double joins where the only difference is that the order of the fields is different" do
+    company = Company.create
+    user = company.users.create(:company_id => company.id)
+    company.users.company_id_eq(company.id).should == [user]
+  end
+
 end

data/spec/named_scopes/conditions_spec.rb

@@ -292,4 +292,10 @@ describe "Conditions" do
     User.company_id_null.count.should == 1
     User.company_id_not_null.count.should == 0
   end
+  
+  it "should fix bug for issue 26" do
+    count1 = User.id_ne(10).username_not_like("root").count
+    count2 = User.id_ne(10).username_not_like("root").count
+    count1.should == count2
+  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'activerecord'
 ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.configurations = true
 
 ActiveRecord::Schema.verbose = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -05:00
+date: 2009-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency