* Applied bug fix from http://github.com/skanev/searchlogic to make #…

…order work with association ordering.

CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 2.1.13
+
+* Applied bug fix from http://github.com/skanev/searchlogic to make #order work with association ordering.
+
 == 2.1.12 released 2009-07-28
 
 * Fixed bug when dealing with scopes that return nil.

lib/searchlogic/named_scopes/association_ordering.rb

@@ -2,6 +2,10 @@ module Searchlogic
   module NamedScopes
     # Handles dynamically creating named scopes for associations.
     module AssociationOrdering
+      def association_ordering_condition?(name)
+        !association_ordering_condition_details(name).nil?
+      end
+
       private
         def method_missing(name, *args, &block)
           if details = association_ordering_condition_details(name)

lib/searchlogic/named_scopes/ordering.rb

@@ -24,7 +24,7 @@ def order_condition?(name) # :nodoc:
         def method_missing(name, *args, &block)
           if name == :order
             named_scope name, lambda { |scope_name|
-              return {} if !order_condition?(scope_name)
+              return {} if !order_condition?(scope_name) && !association_ordering_condition?(scope_name)
               send(scope_name).proxy_options
             }
             send(name, *args)

spec/named_scopes/association_ordering_spec.rb

@@ -20,4 +20,8 @@
   it "should ascend with a belongs to" do
     User.ascend_by_company_name.proxy_options.should == Company.ascend_by_name.proxy_options.merge(:joins => :company)
   end
+
+  it "should work through #order" do
+    Company.order('ascend_by_users_username').proxy_options.should == Company.ascend_by_users_username.proxy_options
+  end
 end