searchlogic 2.4.7 → 2.4.8

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 4
 :build: 
-:patch: 7
+:patch: 8

data/lib/searchlogic/active_record/consistency.rb

@@ -5,7 +5,9 @@ module Searchlogic
     module Consistency
       def self.included(klass)
         klass.class_eval do
-          alias_method_chain :merge_joins, :searchlogic
+          alias_method_chain :merge_joins, :singularity
+          alias_method_chain :merge_joins, :consistent_conditions
+          alias_method_chain :merge_joins, :merged_duplicates
         end
       end
       
@@ -13,11 +15,19 @@ module Searchlogic
       # 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 = joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
-        joins = joins.collect do |j|
-          if j.is_a?(String) && !j =~ / (AND|OR) /i
+      def merge_joins_with_singularity(*args)
+        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
+      # combining scopes.
+      def merge_joins_with_consistent_conditions(*args)
+        joins = merge_joins_without_consistent_conditions(*args)
+        joins.collect do |j|
+          if j.is_a?(String) && (j =~ / (AND|OR) /i).nil?
             j.gsub(/(.*) ON (.*) = (.*)/) do |m|
               sorted = [$2,$3].sort
               "#{$1} ON #{sorted[0]} = #{sorted[1]}"
@@ -25,7 +35,13 @@ module Searchlogic
           else
             j
           end
-        end
+        end.uniq
+      end
+      
+      
+      def merge_joins_with_merged_duplicates(*args)
+        args << ""
+        joins = merge_joins_without_merged_duplicates(*args)
       end
     end
   end

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -65,7 +65,10 @@ module Searchlogic
           if !arity || arity == 0
             # The underlying condition doesn't require any parameters, so let's just create a simple
             # named scope that is based on a hash.
-            options = scope.scope(:find)
+            options = {}
+            with_exclusive_scope do
+              options = scope.scope(:find)
+            end
             prepare_named_scope_options(options, association, poly_class)
             options
           else
@@ -74,8 +77,11 @@ module Searchlogic
             
             eval <<-"end_eval"
               searchlogic_lambda(:#{arg_type}) { |#{proc_args.join(",")}|
-                scope = klass.send(association_condition, #{proc_args.join(",")})
-                options = scope ? scope.scope(:find) : {}
+                options = {}
+                with_exclusive_scope do
+                  scope = klass.send(association_condition, #{proc_args.join(",")})
+                  options = scope ? scope.scope(:find) : {}
+                end
                 prepare_named_scope_options(options, association, poly_class)
                 options
               }

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.7"
+  s.version = "2.4.8"
 
   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-02-02}
+  s.date = %q{2010-02-06}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/searchlogic/search.rb",
      "rails/init.rb",
      "searchlogic.gemspec",
+     "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",
@@ -57,7 +58,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.test_files = [
-    "spec/core_ext/object_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",

data/spec/active_record/consistency_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe "Consistency" do
+  it "should merege joins with consistent conditions" do
+    user_group = UserGroup.create
+    user_group.users.user_groups_name_like("name").user_groups_id_gt(10).scope(:find)[:joins].should == [
+      "INNER JOIN \"user_groups_users\" ON \"user_groups_users\".user_id = \"users\".id",
+      "INNER JOIN \"user_groups\" ON \"user_groups\".id = \"user_groups_users\".user_group_id"
+    ]
+  end
+  
+  it "should limit join iterations to each scope and merge the joins if duplicates exist" do
+    pending
+    #Company.named_scope :name_like, lambda { |a| {:conditions => ["companies.name = ?", a], :joins => {:users => :company}} }
+    #Company.named_scope :name1_like, lambda { |a| {:conditions => ["companies.description = ?", a], :joins => {:users => :company}} }
+    #Company.named_scope :name2_like, lambda { |a| User.company_id_equals(2).proxy_options }
+    
+    #Company.name_like("a").name1_like("b").name2_like("c").count
+    
+    Company.users_company_name_like("name").users_company_description_like("description").users_company_created_at_after(Time.now).scope(:find).should == {}
+  end
+end

data/spec/named_scopes/association_conditions_spec.rb

@@ -84,19 +84,28 @@ describe "Association Conditions" do
     Company.ascend_by_users_orders_total.all.should == Company.all
   end
   
+  it "should implement exclusive scoping" do
+    scope = Company.users_company_name_like("name").users_company_description_like("description")
+    scope.scope(:find)[:joins].should == [{:users => :company}]
+    lambda { scope.all }.should_not raise_error
+  end
+  
   it "should not create the same join twice" do
-    company = Company.create
-    user = company.users.create
-    order = user.orders.create(:total => 20, :taxes => 3)
-    Company.users_orders_total_gt(10).users_orders_taxes_lt(5).ascend_by_users_orders_total.all.should == Company.all
+    scope = Company.users_orders_total_gt(10).users_orders_taxes_lt(5).ascend_by_users_orders_total
+    scope.scope(:find)[:joins].should == [{:users => :orders}]
+    lambda { scope.count }.should_not raise_error
   end
   
   it "should not create the same join twice when traveling through the duplicate join" do
-    Company.users_username_like("bjohnson").users_orders_total_gt(100).all.should == Company.all
+    scope = Company.users_username_like("bjohnson").users_orders_total_gt(100)
+    scope.scope(:find)[:joins].should == [{:users => :orders}, :users]
+    lambda { scope.count }.should_not raise_error
   end
   
-  it "should not create the same join twice when traveling through the duplicate join 2" do
-    Company.users_orders_total_gt(100).users_orders_line_items_price_gt(20).all.should == Company.all
+  it "should not create the same join twice when traveling through the deep duplicate join" do
+    scope = Company.users_orders_total_gt(100).users_orders_line_items_price_gt(20)
+    scope.scope(:find)[:joins].should == [{:users => {:orders => :line_items}}, {:users => :orders}]
+    lambda { scope.all }.should_not raise_error
   end
   
   it "should allow the use of :include when a join was created" do

data/spec/spec_helper.rb

@@ -24,6 +24,15 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :users_count, :default => 0
   end
   
+  create_table :user_groups do |t|
+    t.string :name
+  end
+  
+  create_table :user_groups_users, :id => false do |t|
+    t.integer :user_group_id, :null => false
+    t.integer :user_id, :null => false
+  end
+  
   create_table :users do |t|
     t.datetime :created_at
     t.datetime :updated_at
@@ -76,13 +85,19 @@ Spec::Runner.configure do |config|
     end
     
     class Company < ActiveRecord::Base
+      has_many :orders, :through => :users
       has_many :users, :dependent => :destroy
     end
     
+    class UserGroup < ActiveRecord::Base
+      has_and_belongs_to_many :users
+    end
+    
     class User < ActiveRecord::Base
       belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
       has_many :orders_big, :class_name => 'Order', :conditions => 'total > 100'
+      has_and_belongs_to_many :user_groups
     end
     
     class Order < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -05:00
+date: 2010-02-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/searchlogic/search.rb
 - rails/init.rb
 - searchlogic.gemspec
+- 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
@@ -93,6 +94,7 @@ signing_key:
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 test_files: 
+- 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