merb-search 0.2 → 0.2.1

data/Rakefile

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
   s.name = 'merb-search'
   s.rubyforge_project = 'uipoet'
   s.summary = 'Search for Merb'
-  s.version = '0.2'
+  s.version = '0.2.1'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/controllers/search.rb

@@ -2,22 +2,24 @@ class MerbSearch::Search < MerbSearch::Application
 
   def index
 
-    query = params[:q] || 'merb'
+    if @query = params[:q] and !@query.blank?
 
-    images = boss.images.new(query, :count => 3)
-    @images = images.resultset unless images.count == 0
-
-    news = boss.news.new(query, :age => '1d', :count => 3)
-    @news = news.resultset unless news.count == 0
-
-    spelling = boss.spelling.new(query)
-    @spelling = spelling.resultset unless spelling.count == 0
-    
-    web_count = 12 - (images.count + news.count)
-    web = boss.web.new(query, :count => web_count)
-    @web = web.resultset unless web.count == 0
+      images = boss.images.new(@query, :count => 3)
+      @images = images.resultset unless images.count == 0
+  
+      news = boss.news.new(@query, :age => '1d', :count => 3)
+      @news = news.resultset unless news.count == 0
+  
+      spelling = boss.spelling.new(@query)
+      @spelling = spelling.resultset unless spelling.count == 0
+      
+      web_count = 12 - (images.count + news.count)
+      web = boss.web.new(@query, :count => web_count)
+      @web = web.resultset unless web.count == 0
+      
+    end
 
-    display @web
+    render
 
   end
   

data/app/helpers/search_helper.rb

@@ -0,0 +1,3 @@
+module Merb::MerbSearch::SearchHelper
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-search
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2008-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,8 @@ files:
 - app/controllers
 - app/controllers/application.rb
 - app/controllers/search.rb
+- app/helpers
+- app/helpers/search_helper.rb
 - app/views
 - app/views/search
 - app/views/search/_article.html.erb