search_scope 0.1.4 → 0.1.5

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('search_scope', '0.1.4') do |p|
+Echoe.new('search_scope', '0.1.5') 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/lib/search_scope.rb

@@ -12,6 +12,8 @@ module SearchScope
     options[:order] ||= name.to_s
     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])
@@ -41,6 +43,10 @@ module SearchScope
     @search_scope_keys ||= []
   end
   
+  def default_sort_choice
+    @default_sort_choice
+  end
+
   def sort_choices
     @sort_choices ||= []
   end
@@ -76,7 +82,6 @@ module SearchScope
         scopes << [key, term]
       end
     end
-    # scopes << [:sort_search_scope, options[:sort_by]] if options[:sort_by]
     scopes
   end
   
@@ -133,6 +138,8 @@ module SearchScope
     unless params[:quick_search].blank?
       aggregate_scope = aggregate_scope.scoped quick_search_scope_options(params[:quick_search])
     end
+
+    params[:sort_by] ||= default_sort_choice
     if params[:sort_by]
       aggregate_scope = aggregate_scope.scoped sort_search_by_options(params[:sort_by])
     end

data/search_scope.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{search_scope}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   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-06}
+  s.date = %q{2009-01-07}
   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.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ryan Owens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -05:00
+date: 2009-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: []