@@ -1,4 +1,9 @@ -class SearchesController < InheritedResources::Base - actions :new, :create - respond_to :html +class SearchesController < ApplicationController + def new + end + + def create + @search_results = Artifact.search(params[:search], :page => params[:page]) + render :partial => 'searches/search_results' + end end app/controllers/searches_controller.rb @@ -6,4 +6,12 @@ class Artifact < ActiveRecord::Base validates_presence_of :artifact_id, :group_id, :version, :repository validates_associated :repository validates_uniqueness_of :artifact_id, :scope => [:group_id, :version, :repository_id] + + def self.search(query, options = {}) + Artifact.artifact_id_or_group_id_or_description_like(query).paginate(options) + end + + def to_dep_snippet + + end end app/models/artifact.rb @@ -1,22 +1,27 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> - <head> - <title><%= h(yield(:title) || "Untitled") %></title> - <%= stylesheet_link_tag 'application' %> - <%= yield(:head) %> - </head> - <body> - <div id="container"> - <%- flash.each do |name, msg| -%> - <%= content_tag :div, msg, :id => "flash_#{name}" %> - <%- end -%> - - <%- if show_title? -%> - <h1><%=h yield(:title) %></h1> - <%- end -%> - - <%= yield %> - </div> - </body> +<head xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <title><%= h(yield(:title) || "Untitled") %></title> + <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript"></script> + <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen,projection' %> + <%= stylesheet_link_tag 'blueprint/print', :media => 'print' %> + <%= stylesheet_link_tag 'application', 'harsh/cobalt' %> +  + <%= yield(:head) %> +</head> +<body> +<div id="container"> + <%- flash.each do |name, msg| -%> + <%= content_tag :div, msg, :id => "flash_#{name}" %> + <%- end -%> + + <%- if show_title? -%> + <h1><%= h yield(:title) %></h1> + <%- end -%> + <%= yield %> +</div> +</body> </html> app/views/layouts/application.html.erb @@ -0,0 +1,31 @@ +<% content_for :title, "Maven 2 repository browser" %> +<script type="text/javascript"> + function do_search() { + var search_data = $('#search-form').serialize(); + var url = '<%= searches_url %>'; + $.post(url, search_data, function(data, textStatus) { + $('.search-results').html(data); + }); + return false; + } + $(function() { + $('form>input').focus(); + $('#search-button').click(function() { + do_search(); + }); + $('form>input').keypress(function(e) { + if (e.which == 13) { + return do_search(); + } + }); + }); +</script> +<div class="search-box"> + <h2>Search more in a single place</h2> + + <form id="search-form" action=""> + <input name="search"> + <button id="search-button"><%= t 'search.new.buttons.search' %></button> + </form> +</div> +<div class="search-results"></div> \ No newline at end of file app/views/searches/new.html.erb @@ -19,7 +19,9 @@ Rails::Initializer.run do |config| config.gem 'delayed_job', :version => '1.8.4' config.gem 'nokogiri', :version => '1.3.3' config.gem 'rufus-scheduler', :lib => 'rufus/scheduler', :version => '2.0.1' - config.gem "factory_girl", :version => '1.2.2' + config.gem 'factory_girl', :version => '1.2.3' + config.gem 'will_paginate', :version => '2.3.11' + config.gem 'searchlogic', :version => '2.3.5' # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named config/environment.rb @@ -8,4 +8,11 @@ en: name: "Name" id: "Identifier" url: "URL" - delete: "Are you sure?" \ No newline at end of file + delete: "Are you sure?" + search: + new: + buttons: + search: "Search" + results: + links: + view_xml: "View XML snippet" \ No newline at end of file config/locales/en.yml @@ -1,4 +1,5 @@ ActionController::Routing::Routes.draw do |map| + map.root :controller => 'searches', :action => 'new' map.resources :repositories map.resources :searches #map.connect ':controller/:action/:id' config/routes.rb @@ -1,30 +1,22 @@ body { - background-color: #4B7399; - font-family: Verdana, Helvetica, Arial, serif; - font-size: 14px; -} - -a img { - border: none; -} - -a { - color: #0000FF; -} - -.clear { - clear: both; - height: 0; - overflow: hidden; + background-color: #ccccff; } #container { width: 75%; + min-height: 200px; margin: 20px auto 0; background-color: #FFF; padding: 20px 40px; - border: solid 1px black; + border: solid 5px #9999ff; +} +a img { + border: none; +} + +a { + color: #9999ff; } #flash_notice, #flash_error { @@ -93,4 +85,28 @@ table.repositories thead tr { .centerText { text-align: center; +} + +div.search-box { + text-align: center; +} + +div.search-box input { + height: 30px; + width: 300px; + vertical-align: middle; + font-size: x-large; +} + +div.search-box button { + font-size: x-large; + vertical-align: middle; +} + +div.search-results { + font-size: x-large; +} + +div.search-results a { + font-size: medium; } \ No newline at end of file public/stylesheets/application.css 7eac66ae13d4787601139bacf41d655c7754b277 Julio Arias julio.arias@fresisoft.com http://github.com/jarias/mvnsearch/commit/d4ac5eafccd139f0f6eade998b4d5ff7ee89aed0 d4ac5eafccd139f0f6eade998b4d5ff7ee89aed0

2009-10-20T21:26:43-07:00

Added initial search functionality using searchlogic cee0cafd54a4828d6eb0dded1b29fb998f891f64 Julio Arias julio.arias@fresisoft.com