searchlogic 2.5.10 → 2.5.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    searchlogic (2.5.9)
+    searchlogic (2.5.10)
       activerecord (~> 2.3.12)
       activesupport (~> 2.3.12)
 

data/lib/searchlogic/search/ordering.rb

@@ -3,11 +3,11 @@ module Searchlogic
     module Ordering
       # Returns the column we are currently ordering by
       def ordering_by
-        @ordering_by ||= order && order.to_s.gsub(/^(ascend|descend)_by_/, '')
+        @ordering_by ||= order && order.to_s.match(/^(ascend|descend)_by_(.*)$/).try(:[], 2)
       end
 
       def ordering_direction
-        @ordering_direction ||= order && order.to_s.match(/^(ascend|descend)_by_ass/).try(:[], 1)
+        @ordering_direction ||= order && order.to_s.match(/^(ascend|descend)_by_/).try(:[], 1)
       end
     end
   end

data/lib/searchlogic/version.rb

@@ -1,3 +1,3 @@
 module Searchlogic
-  VERSION = "2.5.10"
+  VERSION = "2.5.11"
 end

data/spec/searchlogic/named_scopes/ordering_spec.rb

@@ -5,12 +5,12 @@ describe Searchlogic::NamedScopes::Ordering do
     %w(bjohnson thunt).each { |username| User.create(:username => username) }
     User.ascend_by_username.all.should == User.all(:order => "username ASC")
   end
-  
+
   it "should have descending" do
     %w(bjohnson thunt).each { |username| User.create(:username => username) }
     User.descend_by_username.all.should == User.all(:order => "username DESC")
   end
-  
+
   it "should have order" do
     User.order("ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
   end
@@ -21,7 +21,7 @@ describe Searchlogic::NamedScopes::Ordering do
     User.named_scope(:ascend_by_custom, :order => "username ASC, name DESC")
     User.order("ascend_by_custom").proxy_options.should == User.ascend_by_custom.proxy_options
   end
-  
+
   it "should have priorty to columns over conflicting association columns" do
     Company.ascend_by_users_count
   end

data/spec/searchlogic/search_spec.rb

@@ -372,6 +372,23 @@ describe Searchlogic::Search do
     end
   end
 
+  context "#ordering_direction" do
+    it "should return nil if we aren't ordering" do
+      search = User.search
+      search.ordering_direction.should be_nil
+    end
+
+    it "should return the column name for ascending" do
+      search = User.search(:order => "ascend_by_ticket_request_event_occurs_at")
+      search.ordering_direction.should == "ascend"
+    end
+
+    it "should return the column name for descending" do
+      search = User.search(:order => "descend_by_ticket_request_event_occurs_at")
+      search.ordering_direction.should == "descend"
+    end
+  end
+
   context "#method_missing" do
     context "setting" do
       it "should call named scopes for conditions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlogic
 version: !ruby/object:Gem::Version
-  version: 2.5.10
+  version: 2.5.11
   prerelease: 
 platform: ruby
 authors: