searchlogic 2.1.5 → 2.1.6

data/CHANGELOG.rdoc

@@ -1,12 +1,19 @@
-== 2.1.4
+== 2.1.6 released 2009-07-13
 
-* Check for the existence of id before undefining it.
+* Fix bug when trying to set conditions on conflicting column names with associations. Ex: User.has_many :orders, User.order_count_gt(10) would raise an exception because it was trying to set conditions on the count column for the orders table.
+
+== 2.1.5 released 2009-07-12
+
+* Check for the existence of id before undefining it, fixes bug in ruby 1.9
+
+== 2.1.4 released 2009-07-12
+
+* Add ActiveRecordConsistency module to help AR remove duplicate joins easier.
 
 == 2.1.3 released 2009-07-12
 
 * 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: 5
+:patch: 6

data/lib/searchlogic.rb

@@ -3,7 +3,8 @@ 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"
+require "searchlogic/named_scopes/association_conditions"
+require "searchlogic/named_scopes/association_ordering"
 require "searchlogic/named_scopes/alias_scope"
 require "searchlogic/search"
 
@@ -11,7 +12,8 @@ Proc.send(:include, Searchlogic::CoreExt::Proc)
 Object.send(:include, Searchlogic::CoreExt::Object)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Conditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Ordering)
-ActiveRecord::Base.extend(Searchlogic::NamedScopes::Associations)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationConditions)
+ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationOrdering)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AliasScope)
 ActiveRecord::Base.extend(Searchlogic::Search::Implementation)
 

data/lib/searchlogic/named_scopes/{associations.rb → association_conditions.rb}

@@ -1,7 +1,7 @@
 module Searchlogic
   module NamedScopes
     # Handles dynamically creating named scopes for associations.
-    module Associations
+    module AssociationConditions
       def condition?(name) # :nodoc:
         super || association_condition?(name) || association_alias_condition?(name)
       end
@@ -43,9 +43,6 @@ module Searchlogic
           elsif details = association_alias_condition_details(name)
             create_association_alias_condition(details[:association], details[:column], details[:condition], args)
             send(name, *args)
-          elsif details = association_ordering_condition_details(name)
-            create_association_ordering_condition(details[:association], details[:order_as], details[:column], args)
-            send(name, *args)
           else
             super
           end
@@ -53,7 +50,7 @@ module Searchlogic
         
         def association_condition_details(name)
           associations = reflect_on_all_associations.collect { |assoc| assoc.name }
-          if name.to_s =~ /^(#{associations.join("|")})_(\w+)_(#{Conditions::PRIMARY_CONDITIONS.join("|")})$/
+          if !local_condition?(name) && name.to_s =~ /^(#{associations.join("|")})_(\w+)_(#{Conditions::PRIMARY_CONDITIONS.join("|")})$/
             {:association => $1, :column => $2, :condition => $3}
           end
         end
@@ -64,7 +61,7 @@ module Searchlogic
         
         def association_alias_condition_details(name)
           associations = reflect_on_all_associations.collect { |assoc| assoc.name }
-          if name.to_s =~ /^(#{associations.join("|")})_(\w+)_(#{Conditions::ALIAS_CONDITIONS.join("|")})$/
+          if !local_condition?(name) && name.to_s =~ /^(#{associations.join("|")})_(\w+)_(#{Conditions::ALIAS_CONDITIONS.join("|")})$/
             {:association => $1, :column => $2, :condition => $3}
           end
         end
@@ -77,17 +74,6 @@ module Searchlogic
           (class << self; self; end).class_eval { alias_method alias_name, primary_name }
         end
         
-        def association_ordering_condition_details(name)
-          associations = reflect_on_all_associations.collect { |assoc| assoc.name }
-          if name.to_s =~ /^(ascend|descend)_by_(#{associations.join("|")})_(\w+)$/
-            {:order_as => $1, :association => $2, :column => $3}
-          end
-        end
-        
-        def create_association_ordering_condition(association_name, order_as, column, args)
-          named_scope("#{order_as}_by_#{association_name}_#{column}", association_condition_options(association_name, "#{order_as}_by_#{column}", args))
-        end
-        
         def association_condition_options(association_name, association_condition, args)
           association = reflect_on_association(association_name.to_sym)
           scope = association.klass.send(association_condition, *args)

data/lib/searchlogic/named_scopes/association_ordering.rb

@@ -0,0 +1,27 @@
+module Searchlogic
+  module NamedScopes
+    # Handles dynamically creating named scopes for associations.
+    module AssociationOrdering
+      private
+        def method_missing(name, *args, &block)
+          if details = association_ordering_condition_details(name)
+            create_association_ordering_condition(details[:association], details[:order_as], details[:column], args)
+            send(name, *args)
+          else
+            super
+          end
+        end
+        
+        def association_ordering_condition_details(name)
+          associations = reflect_on_all_associations.collect { |assoc| assoc.name }
+          if !local_condition?(name) && name.to_s =~ /^(ascend|descend)_by_(#{associations.join("|")})_(\w+)$/
+            {:order_as => $1, :association => $2, :column => $3}
+          end
+        end
+        
+        def create_association_ordering_condition(association_name, order_as, column, args)
+          named_scope("#{order_as}_by_#{association_name}_#{column}", association_condition_options(association_name, "#{order_as}_by_#{column}", args))
+        end
+    end
+  end
+end

data/lib/searchlogic/named_scopes/conditions.rb

@@ -95,6 +95,11 @@ module Searchlogic
       
       # Is the name of the method a valid condition that can be dynamically created?
       def condition?(name)
+        local_condition?(name)
+      end
+      
+      # Is the condition for a local column, not an association
+      def local_condition?(name)
         primary_condition?(name) || alias_condition?(name)
       end
       

data/lib/searchlogic/named_scopes/ordering.rb

@@ -2,7 +2,7 @@ module Searchlogic
   module NamedScopes
     # Handles dynamically creating named scopes for orderin by columns.
     module Ordering
-      def condition?(name) # :nodoc:
+      def local_condition?(name) # :nodoc:
         super || order_condition?(name)
       end
       
@@ -37,7 +37,7 @@ module Searchlogic
         end
         
         def order_condition_details(name)
-          if name.to_s =~ /^(ascend|descend)_by_(\w+)$/
+          if name.to_s =~ /^(ascend|descend)_by_(#{column_names.join("|")})$/
             {:order_as => $1, :column => $2}
           elsif name.to_s =~ /^order$/
             {}

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.5"
+  s.version = "2.1.6"
 
   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-12}
+  s.date = %q{2009-07-13}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
      "lib/searchlogic/core_ext/object.rb",
      "lib/searchlogic/core_ext/proc.rb",
      "lib/searchlogic/named_scopes/alias_scope.rb",
-     "lib/searchlogic/named_scopes/associations.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/ordering.rb",
      "lib/searchlogic/rails_helpers.rb",
@@ -35,7 +36,8 @@ Gem::Specification.new do |s|
      "spec/core_ext/object_spec.rb",
      "spec/core_ext/proc_spec.rb",
      "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/associations_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/ordering_spec.rb",
      "spec/search_spec.rb",
@@ -51,7 +53,8 @@ Gem::Specification.new do |s|
     "spec/core_ext/object_spec.rb",
      "spec/core_ext/proc_spec.rb",
      "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/associations_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/ordering_spec.rb",
      "spec/search_spec.rb",

data/spec/named_scopes/{associations_spec.rb → association_conditions_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-describe "Associations" do
+describe "Association Conditions" do
   it "should create a named scope" do
     Company.users_username_like("bjohnson").proxy_options.should == User.username_like("bjohnson").proxy_options.merge(:joins => :users)
   end
@@ -50,22 +50,6 @@ describe "Associations" do
     Company.users_orders_total_gt(10).proxy_options.should == Order.total_gt(10).proxy_options.merge(:joins => {:users => :orders})
   end
   
-  it "should allow ascending" do
-    Company.ascend_by_users_username.proxy_options.should == User.ascend_by_username.proxy_options.merge(:joins => :users)
-  end
-  
-  it "should allow descending" do
-    Company.descend_by_users_username.proxy_options.should == User.descend_by_username.proxy_options.merge(:joins => :users)
-  end
-  
-  it "should allow deep ascending" do
-    Company.ascend_by_users_orders_total.proxy_options.should == Order.ascend_by_total.proxy_options.merge(:joins => {:users => :orders})
-  end
-  
-  it "should allow deep descending" do
-    Company.descend_by_users_orders_total.proxy_options.should == Order.descend_by_total.proxy_options.merge(:joins => {:users => :orders})
-  end
-  
   it "should include optional associations" do
     pending # this is a problem with using inner joins and left outer joins
     Company.create

data/spec/named_scopes/association_ordering_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe "Association Ordering" do
+  it "should allow ascending" do
+    Company.ascend_by_users_username.proxy_options.should == User.ascend_by_username.proxy_options.merge(:joins => :users)
+  end
+  
+  it "should allow descending" do
+    Company.descend_by_users_username.proxy_options.should == User.descend_by_username.proxy_options.merge(:joins => :users)
+  end
+  
+  it "should allow deep ascending" do
+    Company.ascend_by_users_orders_total.proxy_options.should == Order.ascend_by_total.proxy_options.merge(:joins => {:users => :orders})
+  end
+  
+  it "should allow deep descending" do
+    Company.descend_by_users_orders_total.proxy_options.should == Order.descend_by_total.proxy_options.merge(:joins => {:users => :orders})
+  end
+end

data/spec/named_scopes/conditions_spec.rb

@@ -250,4 +250,8 @@ describe "Conditions" do
       Order.named_scope_options(:total_gt).searchlogic_arg_type.should == :float
     end
   end
+  
+  it "should have priorty to columns over conflicting association conditions" do
+    Company.users_count_gt(10)
+  end
 end

data/spec/named_scopes/ordering_spec.rb

@@ -20,4 +20,8 @@ describe "Ordering" do
   it "should have order" do
     User.order("ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
   end
+  
+  it "should have priorty to columns over conflicting association columns" do
+    Company.ascend_by_users_count
+  end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
     t.datetime :created_at
     t.datetime :updated_at
+    t.integer :users_count, :default => 0
   end
   
   create_table :users do |t|
@@ -50,7 +51,7 @@ Spec::Runner.configure do |config|
     end
     
     class User < ActiveRecord::Base
-      belongs_to :company
+      belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
       alias_scope :username_has, lambda { |value| username_like(value) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -04:00
+date: 2009-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,8 @@ files:
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb
-- lib/searchlogic/named_scopes/associations.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/ordering.rb
 - lib/searchlogic/rails_helpers.rb
@@ -54,7 +55,8 @@ files:
 - spec/core_ext/object_spec.rb
 - spec/core_ext/proc_spec.rb
 - spec/named_scopes/alias_scope_spec.rb
-- spec/named_scopes/associations_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/ordering_spec.rb
 - spec/search_spec.rb
@@ -91,7 +93,8 @@ test_files:
 - spec/core_ext/object_spec.rb
 - spec/core_ext/proc_spec.rb
 - spec/named_scopes/alias_scope_spec.rb
-- spec/named_scopes/associations_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/ordering_spec.rb
 - spec/search_spec.rb