merb-search 0.1.2 → 0.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'merb-core/tasks/merb'
 spec = Gem::Specification.new do |s|
   s.add_dependency('merb-slices', '~> 1.0.0')
   s.add_dependency('merb-ui', '>= 0.4')
-  s.add_dependency('boss', '>= 0.2')
+  s.add_dependency('boss', '>= 0.3')
   s.author = 'UiPoet'
   s.email = 'dont.tase@me.com'
   s.files = FileList['app/**/*', 'lib/**/*', '[A-Z]*'].to_a
@@ -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.1.2'
+  s.version = '0.2'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/controllers/search.rb

@@ -1,42 +1,21 @@
 class MerbSearch::Search < MerbSearch::Application
-  
-  def index
-
-    render
-
-  end
-  
-  def images
-
-    @query = params[:q] || 'merb'
-    @images = boss.images.new(@query, :count => 12).resultset
-    @news = boss.news.new(@query, :age => '1d', :count => 3).resultset
-    @spelling = boss.web.new(@query).resultset
-    @web = boss.web.new(@query, :count => 3).resultset
 
-    display @images
-
-  end
-  
-  def news
+  def index
 
-    @query = params[:q] || 'merb'
-    @images = boss.images.new(@query, :count => 3).resultset
-    @news = boss.news.new(@query, :age => '1w', :count => 12).resultset
-    @spelling = boss.web.new(@query).resultset
-    @web = boss.web.new(@query, :count => 3).resultset
+    query = params[:q] || 'merb'
 
-    display @news
+    images = boss.images.new(query, :count => 3)
+    @images = images.resultset unless images.count == 0
 
-  end
-  
-  def web
+    news = boss.news.new(query, :age => '1d', :count => 3)
+    @news = news.resultset unless news.count == 0
 
-    @query = params[:q] || 'merb'
-    @images = boss.images.new(@query, :count => 3).resultset
-    @news = boss.news.new(@query, :age => '1d', :count => 3).resultset
-    @spelling = boss.web.new(@query).resultset
-    @web = boss.web.new(@query, :count => 12).resultset
+    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
 
     display @web
 

data/app/views/search/_article.html.erb

@@ -0,0 +1,11 @@
+<%= mui_tray(:inline => true, :title => result.title, :title_url => result.clickurl, :width => '20em') do %>
+  <%= mui_block(:height => '8em', :scroll => true) do %>
+    <%= result.abstract %>
+  <% end =%>
+  <%= mui_block(:subtle => true) do %>
+    <%= result.date %> at <%= result.time %>
+  <% end =%>
+  <%= mui_block(:subtle => true, :truncate => true) do %>
+    <%= result.sourceurl %>
+  <% end =%>
+<% end =%>

data/app/views/search/_image.html.erb

@@ -0,0 +1,13 @@
+<%= mui_tray(:inline => true, :title => result.title, :title_url => result.clickurl, :width => '20em') do %>
+  <%= mui_block(:height => '8em', :scroll => true) do %>
+    <%= mui_link(:url => result.clickurl) do %>
+      <%= mui_image(:height => result.thumbnail_height, :url => result.thumbnail_url, :width => result.thumbnail_width) %>
+    <% end =%>
+  <% end =%>
+  <%= mui_block(:subtle => true) do %>
+    <%= result.date %> | <%= result.format %>
+  <% end =%>
+  <%= mui_block(:subtle => true, :truncate => true) do %>
+    <%= result.refererurl %>
+  <% end =%>
+<% end =%>

data/app/views/search/_page.html.erb

@@ -0,0 +1,11 @@
+<%= mui_tray(:inline => true, :title => result.title, :title_url => result.clickurl, :width => '20em') do %>
+  <%= mui_block(:height => '8em', :scroll => true) do %>
+    <%= result.abstract %>
+  <% end =%>
+  <%= mui_block(:subtle => true) do %>
+    <%= result.date %>
+  <% end =%>
+  <%= mui_block(:subtle => true, :truncate => true) do %>
+    <%= result.dispurl(:wbr => false) %>
+  <% end =%>
+<% end =%>

data/app/views/search/_resultset.html.erb

@@ -0,0 +1,15 @@
+<% if @web %>
+  <% @web.each do |result| %>
+    <%= partial(:page, :result => result) %>
+  <% end %>
+<% end %>
+<% if @images %>
+  <% @images.each do |result| %>
+    <%= partial(:image, :result => result) %>
+  <% end %>
+<% end %>
+<% if @news %>
+  <% @news.each do |result| %>
+    <%= partial(:article, :result => result) %>
+  <% end %>
+<% end %>

data/app/views/search/_spelling.html.erb

@@ -0,0 +1,9 @@
+<% if @spelling %>
+  <%= mui_tray(:inline => true, :title => 'Did you mean...', :width => '20em') do %>
+    <% @spelling.each do |result| %>
+      <%= mui_block do %>
+        <%= mui_link(:title => result.suggestion, :url => "/?q=#{result.query}") %>
+      <% end =%>
+    <% end %>
+  <% end =%>
+<% end %>

data/app/views/search/index.html.erb

@@ -0,0 +1,8 @@
+<%= mui_grid(:cell_valign => 'top', :columns => 2, :width => '100%') do %>
+  <%= mui_cell do %>
+    <%= partial :spelling %>
+  <% end =%>
+  <%= mui_cell do %>
+    <%= partial :resultset %>
+  <% end =%>
+<% end =%>

data/lib/merb-search.rb

@@ -15,9 +15,6 @@ if defined?(Merb::Plugins)
     def self.setup_router(scope)
       scope.to(:controller => 'search') do |s|
         s.match('/').to(:action => 'index').name(:index)
-        s.match('/images').to(:action => 'images').name(:images)
-        s.match('/news').to(:action => 'news').name(:news)
-        s.match('/web').to(:action => 'web').name(:web)
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-search
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: "0.3"
     version: 
 description: 
 email: dont.tase@me.com
@@ -56,8 +56,12 @@ files:
 - app/controllers/search.rb
 - app/views
 - app/views/search
+- app/views/search/_article.html.erb
+- app/views/search/_image.html.erb
+- app/views/search/_page.html.erb
+- app/views/search/_resultset.html.erb
+- app/views/search/_spelling.html.erb
 - app/views/search/index.html.erb
-- app/views/search/web.html.erb
 - lib/merb-search
 - lib/merb-search/merbtasks.rb
 - lib/merb-search/slicetasks.rb

data/app/views/search/web.html.erb

@@ -1,37 +0,0 @@
-<%= mui_grid(:cell_valign => 'top', :columns => 2, :width => '100%') do %>
-  <%= mui_cell do %>
-    <% @web.each do |result| %>
-      <%= mui_tray(:inline => true, :title => result.title, :title_url => result.clickurl, :width => '20em') do %>
-        <%= mui_block(:height => '8em') do %>
-          <%= result.abstract %>
-        <% end =%>
-        <%= mui_block(:subtle => true) do %>
-          <%= result.date %>
-        <% end =%>
-        <%= mui_block(:subtle => true, :truncate => true) do %>
-          <%= result.dispurl(:wbr => false) %>
-        <% end =%>
-      <% end =%>
-    <% end %>
-  <% end =%>
-  <%= mui_cell do %>
-    <%= mui_tray(:title => 'Images', :inline => true, :width => '20em') do %>
-      <%= mui_grid(:columns => 3, :width => '100%') do %>
-        <% @images.each do |result| %>
-          <%= mui_cell do %>
-            <%= mui_link(:url => result.clickurl) do %>
-              <%= mui_image(:height => 60, :url => result.thumbnail_url, :width => 60) %>
-            <% end =%>
-          <% end =%>
-        <% end %>
-      <% end =%>
-    <% end =%>
-    <%= mui_tray(:title => 'News', :inline => true, :width => '20em') do %>
-      <% @news.each do |result| %>
-        <%= mui_block(:width => '200px') do %>
-          <%= mui_link(:title => result.title, :url => result.clickurl) %> <span class="mui_date"><%= result.time %></span>
-        <% end =%>
-      <% end %>
-    <% end =%>
-  <% end =%>
-<% end =%>