search_scope 0.1.8 → 0.1.9

data/README

@@ -1,6 +1,3 @@
-export PATH=$PATH:/opt/local/bin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
-
-
 = search_scope
 
 Rails gem for simplify searching a model by defining custom named_scopes.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('search_scope', '0.1.8') do |p|
+Echoe.new('search_scope', '0.1.9') 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

@@ -111,6 +111,10 @@ module SearchScope
     scopes
   end
   
+  def get_named_scope_from_object(object, scope, *args)
+    scope = object.send(scope, *args)
+  end
+
   def get_search_scope_from_object(object, scope, *args)
     scope_name = "search_#{scope}".intern 
     scope = object.send(scope_name, *args)
@@ -163,6 +167,9 @@ module SearchScope
         raise "unsupported type for search scope: #{scope.inspect}"
       end
     end
+    #TODO add filter_scopes here as well
+    aggregate_scope = aggregate_named_scope(aggregate_scope, params)
+    
     unless params[:quick_search].blank?
       aggregate_scope = aggregate_scope.scoped quick_search_scope_options(params[:quick_search], params[:split_terms])
     end
@@ -177,6 +184,16 @@ module SearchScope
       aggregate_scope.find(:all)
     end
   end
+  
+  #you supply an additional :named_scope. Just one for now. And it can't take a param yet. 
+  #(to enable this, we'd have to have something like :named_scope => [:scope_name, arg1, arg2]) at which point I'd rather just use filters
+  #TODO I may want to add the ability to pass a comma separated string..  but not yet
+  def aggregate_named_scope(aggregate_scope, params)
+    named_scope = params.delete :named_scope
+    return aggregate_scope if named_scope.blank?
+    raise "the :named_scope param currently only supports a single symbol and no args." unless named_scope.is_a? Symbol
+    aggregate_scope = get_named_scope_from_object(aggregate_scope, named_scope)
+  end
 
   #this is for use with will_paginate
   def paginate_search(params={})

data/search_scope.gemspec

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