kazjote-searchlogic 2.1.9.1 → 2.1.9.3

data/lib/searchlogic/named_scopes/ordering.rb

@@ -5,7 +5,7 @@ module Searchlogic
       def local_condition?(name) # :nodoc:
         super || order_condition?(name)
       end
-
+      
       def primary_condition_name(name) # :nodoc
         if result = super
           result
@@ -15,18 +15,16 @@ module Searchlogic
           nil
         end
       end
-
+      
       def order_condition?(name) # :nodoc:
         !order_condition_details(name).nil?
       end
-
+      
       private
         def method_missing(name, *args, &block)
-          if name == :order_by
-            return @searchlogic_order_condition if args.empty?
+          if name == :order
             named_scope name, lambda { |scope_name|
               return {} if !order_condition?(scope_name)
-              @searchlogic_order_condition = scope_name
               send(scope_name).proxy_options
             }
             send(name, *args)
@@ -37,7 +35,7 @@ module Searchlogic
             super
           end
         end
-
+        
         def order_condition_details(name)
           if name.to_s =~ /^(ascend|descend)_by_(#{column_names.join("|")})$/
             {:order_as => $1, :column => $2}
@@ -45,12 +43,11 @@ module Searchlogic
             {}
           end
         end
-
+        
         def create_order_conditions(column)
           named_scope("ascend_by_#{column}".to_sym, {:order => "#{table_name}.#{column} ASC"})
           named_scope("descend_by_#{column}".to_sym, {:order => "#{table_name}.#{column} DESC"})
         end
     end
   end
-end
-
+end

data/lib/searchlogic/rails_helpers.rb

@@ -23,9 +23,9 @@ module Searchlogic
       options[:as] ||= options[:by].to_s.humanize
       options[:ascend_scope] ||= "ascend_by_#{options[:by]}"
       options[:descend_scope] ||= "descend_by_#{options[:by]}"
-      ascending = search.order_by.to_s == options[:ascend_scope]
+      ascending = search.order.to_s == options[:ascend_scope]
       new_scope = ascending ? options[:descend_scope] : options[:ascend_scope]
-      selected = [options[:ascend_scope], options[:descend_scope]].include?(search.order_by.to_s)
+      selected = [options[:ascend_scope], options[:descend_scope]].include?(search.order.to_s)
       if selected
         css_classes = html_options[:class] ? html_options[:class].split(" ") : []
         if ascending
@@ -38,7 +38,7 @@ module Searchlogic
         html_options[:class] = css_classes.join(" ")
       end
       url_options = {
-        options[:params_scope] => search.conditions.merge( { :order_by => new_scope } )
+        options[:params_scope] => search.conditions.merge( { :order => new_scope } )
       }.deep_merge(options[:params] || {})
       link_to options[:as], url_for(url_options), html_options
     end
@@ -62,7 +62,7 @@ module Searchlogic
     def fields_for(*args, &block)
       if search_obj = args.find { |arg| arg.is_a?(Searchlogic::Search) }
         args.unshift(:search) if args.first == search_obj
-        concat(content_tag("div", hidden_field_tag("#{args.first}[order_by]", search_obj.order)) + "\n")
+        concat(content_tag("div", hidden_field_tag("#{args.first}[order]", search_obj.order)) + "\n")
         super
       else
         super

data/lib/searchlogic/search.rb

@@ -25,7 +25,7 @@ module Searchlogic
         Search.new(self, scope(:find), conditions)
       end
     end
-
+    
     # Is an invalid condition is used this error will be raised. Ex:
     #
     #   User.search(:unkown => true)
@@ -37,10 +37,10 @@ module Searchlogic
         super(msg)
       end
     end
-
+    
     attr_accessor :klass, :current_scope, :conditions
     undef :id if respond_to?(:id)
-
+    
     # Creates a new search object for the given class. Ex:
     #
     #   Searchlogic::Search.new(User, {}, {:username_like => "bjohnson"})
@@ -49,16 +49,16 @@ module Searchlogic
       self.current_scope = current_scope
       self.conditions = conditions if conditions.is_a?(Hash)
     end
-
+    
     def clone
       self.class.new(klass, current_scope && current_scope.clone, conditions.clone)
     end
-
+    
     # Returns a hash of the current conditions set.
     def conditions
       @conditions ||= {}
     end
-
+    
     # Accepts a hash of conditions.
     def conditions=(values)
       values.each do |condition, value|
@@ -67,7 +67,7 @@ module Searchlogic
         send("#{condition}=", value)
       end
     end
-
+    
     # Delete a condition from the search. Since conditions map to named scopes,
     # if a named scope accepts a parameter there is no way to actually delete
     # the scope if you do not want it anymore. A nil value might be meaningful
@@ -76,13 +76,13 @@ module Searchlogic
       names.each { |name| @conditions.delete(name.to_sym) }
       self
     end
-
+    
     private
       def method_missing(name, *args, &block)
         if name.to_s =~ /(\w+)=$/
           condition = $1.to_sym
           scope_name = normalize_scope_name($1)
-          if scope?(scope_name) || scope_name == :order_by
+          if scope?(scope_name)
             conditions[condition] = type_cast(args.first, cast_type(scope_name))
           else
             raise UnknownConditionError.new(name)
@@ -100,7 +100,7 @@ module Searchlogic
             scope_name = normalize_scope_name(scope_name)
             klass.send(scope_name, value) if !klass.respond_to?(scope_name)
             arity = klass.named_scope_arity(scope_name)
-
+            
             if !arity || arity == 0
               if value == true
                 scope.send(scope_name)
@@ -114,15 +114,15 @@ module Searchlogic
           scope.send(name, *args, &block)
         end
       end
-
+      
       def normalize_scope_name(scope_name)
         klass.column_names.include?(scope_name.to_s) ? "#{scope_name}_equals".to_sym : scope_name.to_sym
       end
-
+      
       def scope?(scope_name)
         klass.scopes.key?(scope_name) || klass.condition?(scope_name)
       end
-
+      
       def cast_type(name)
         klass.send(name, nil) if !klass.respond_to?(name) # We need to set up the named scope if it doesn't exist, so we can get a value for named_ssope_options
         named_scope_options = klass.named_scope_options(name)
@@ -133,7 +133,7 @@ module Searchlogic
           named_scope_options.respond_to?(:searchlogic_arg_type) ? named_scope_options.searchlogic_arg_type : :string
         end
       end
-
+      
       def type_cast(value, type)
         case value
         when Array
@@ -148,5 +148,4 @@ module Searchlogic
         end
       end
   end
-end
-
+end

data/searchlogic.gemspec

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

data/spec/named_scopes/ordering_spec.rb

@@ -6,23 +6,22 @@ describe "Ordering" do
     User.ascend_by_username
     User.should respond_to(:ascend_by_username)
   end
-
+  
   it "should have ascending" 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_by("ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
+    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/search_spec.rb

@@ -299,15 +299,7 @@ describe "Search" do
     end
 
     it "should recognize the order condition" do
-      User.search(:order_by => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
-    end
-
-    it "should return actual ordering condition" do
-      User.search(:order_by => "ascend_by_username").order_by.should == "ascend_by_username"
-    end
-
-    it "should return nil when no actual ordering condition" do
-      User.search.order_by.should == nil
+      User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
   end
 end

metadata

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