search_scope 0.1.7 → 0.1.8

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('search_scope', '0.1.7') do |p|
+Echoe.new('search_scope', '0.1.8') do |p|
   p.description    = "Simplify searching a model by defining custom named_scopes."
   p.project        = 'search-scope'
   p.url            = "http://rubyforge.org/projects/search-scope"

data/init.rb

@@ -1 +1 @@
-require 'search_score'
+require 'search_scope'

data/lib/search_scope.rb

@@ -1,22 +1,36 @@
 module SearchScope
 
   class SortScope
-    attr_reader :name, :label, :order, :include_model
-    def initialize(name, label, order, include_model)
-      @name, @label, @order, @include_model = name, label, order, include_model
+    attr_reader :name, :label, :order, :reverse, :include_model
+    def initialize(name, label, order, reverse, include_model)
+      @name, @label, @order, @reverse, @include_model = name, label, order, reverse, include_model
     end
   end
 
   def sort_search_by(name, options={})
     options[:label] ||= name.to_s.titleize
-    options[:order] ||= "#{table_name}.#{name.to_s}"
+    if options[:order].blank?
+      #this sets up the default order and reverse options. After the first one is set, the rest use the first sort option as sheir secondary order
+      options[:order] = "#{table_name}.#{name.to_s}"
+      options[:reverse] = "#{table_name}.#{name.to_s} DESC"
+      if sort_choices.first
+        options[:order] += ", #{sort_choices.first.order}"
+        options[:reverse] += ", #{sort_choices.first.order}"
+        #this gives you a comma separated string of includes if they exist
+        options[:include_model] = [options[:include_model],sort_choices.first.include_model].compact.join ',' if sort_choices.first.include_model
+      end
+    end
+    options[:order], options[:reverse] = options[:reverse], options[:order] if options[:reverse_orders]
+    
+    # puts "***(#{self.name}).sort_search_by :#{name}, #{options.inspect}"
+    
     raise "you must supply a Symbol for a name to new_sortable_by (#{name.inspect})" unless name.is_a? Symbol
     return if sort_choices_hash.keys.include? name.to_s
     #the first sort added becomes the default sorting for all searches
     @default_sort_choice ||= name
     #TODO put this back and get rid of the return above once I figure out how to reset the class vars when the class is reloaded
     # raise "there is already a sortable defined for the name (#{name.inspect}" if sort_choices_hash.keys.include? name.to_s
-    sort_choices_hash[name] = SortScope.new(name, options[:label], options[:order], options[:include])
+    sort_choices_hash[name] = SortScope.new(name, options[:label], options[:order], options[:reverse], options[:include])
     sort_choices << sort_choices_hash[name]
   end
   
@@ -60,11 +74,17 @@ module SearchScope
     @quick_search_scopes ||= []
   end
 
-  def sort_search_by_options(sort_by)
+  def sort_search_by_options(sort_by, reverse=nil)
+    if reverse.nil? || reverse.empty?
+      reverse = false
+    else
+      reverse = ! %w{ false no f n }.include?(reverse)
+    end
     choices_hash = sort_choices_hash[sort_by]
     return {} unless choices_hash
+    raise "There is no :reverse option specified for sort_search_by #{sort_by.inspect} (#{name})" if reverse && choices_hash.reverse.blank?
     hash = { 
-      :order    => choices_hash.order, 
+      :order    => reverse ? choices_hash.reverse : choices_hash.order, 
       :include  => choices_hash.include_model,
     }
     hash
@@ -149,7 +169,7 @@ module SearchScope
 
     params[:sort_by] ||= default_sort_choice
     if params[:sort_by]
-      aggregate_scope = aggregate_scope.scoped sort_search_by_options(params[:sort_by])
+      aggregate_scope = aggregate_scope.scoped sort_search_by_options(params[:sort_by], params[:sort_reverse])
     end
     if paginate
       aggregate_scope.paginate(:all, :page => params[:page])

data/search_scope.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{search_scope}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Owens"]
-  s.date = %q{2009-01-07}
+  s.date = %q{2009-01-20}
   s.description = %q{Simplify searching a model by defining custom named_scopes.}
   s.email = %q{ryan@infoether.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/search_scope.rb", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: search_scope
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ryan Owens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -05:00
+date: 2009-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: []