newellista-searchlogic 2.0.5 → 2.0.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
 :minor: 0
-:patch: 5
+:patch: 6

data/lib/searchlogic/rails_helpers.rb

@@ -20,10 +20,14 @@ module Searchlogic
       options[:ascend_scope] ||= "ascend_by_#{options[:by]}"
       options[:descend_scope] ||= "descend_by_#{options[:by]}"
       
-      ascending = search.order.to_s == options[:ascend_scope]
-
-      tri_state = options[:tri_state].to_s == "true"
-      new_scope = ascending ? options[:descend_scope] : ( tri_state ? "" : options[:ascend_scope] )
+      if options[:tri_state].to_s == "true"
+        new_scope = "" if search.order.empty?
+        new_scope = options[ :descend_scope ] if search.order.to_s == options[ :ascend_scope ]
+        new_scope ||= options[ :ascend_scope ]
+      else
+        ascending = search.order.to_s == options[:ascend_scope]
+        new_scope = ascending ? options[:descend_scope] : options[:ascend_scope]
+      end
       
       selected = [options[:ascend_scope], options[:descend_scope]].include?(search.order.to_s)
       if selected

data/searchlogic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newellista-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic