public/flash/clippy.swf @@ -1,3 +1,29 @@ # Methods added to this helper will be available to all templates in the application. module ApplicationHelper + def clippy(text, bgcolor='#FFFFFF') + html = <<-EOF + <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" + width="110" + height="14" + id="clippy" > + <param name="movie" value="/flash/clippy.swf"/> + <param name="allowScriptAccess" value="always" /> + <param name="quality" value="high" /> + <param name="scale" value="noscale" /> + <param NAME="FlashVars" value="text=#{text}"> + <param name="bgcolor" value="#{bgcolor}"> + <embed src="/flash/clippy.swf" + width="110" + height="14" + name="clippy" + quality="high" + allowScriptAccess="always" + type="application/x-shockwave-flash" + pluginspage="http://www.macromedia.com/go/getflashplayer" + FlashVars="text=#{text}" + bgcolor="#{bgcolor}" + /> + </object> + EOF + end end app/helpers/application_helper.rb @@ -1,4 +1,5 @@ class Artifact < ActiveRecord::Base + XML_TEMPLATE = "<dependency>\n\s\s\s<groupId>%s</groupId>\n\s\s\s<artifactId>%s</artifactId>\n\s\s\s<version>%s</version>\n</dependency>".freeze belongs_to :repository has_many :dependencies has_many :dependents, :through => :dependencies @@ -12,6 +13,6 @@ class Artifact < ActiveRecord::Base end def to_dep_snippet - + XML_TEMPLATE % [self.group_id, self.artifact_id, self.version] end end app/models/artifact.rb @@ -3,7 +3,7 @@ <html> <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> + <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' %> @@ -20,7 +20,7 @@ <%- if show_title? -%> <h1><%= h yield(:title) %></h1> - <%- end -%> + <%- end -%> <%= yield %> </div> </body> app/views/layouts/application.html.erb @@ -1,4 +1,18 @@ -<h2>Total results <%= @search_results.count %></h2> +<script type="text/javascript"> + $(function() { + $('.artifact_result>a').click(function() { + $(this).parent().find('.snippet').toggle(); + }); + }); +</script> +<h2><%= t 'search.results.total_results' %> <%= @search_results.count %></h2> <% for artifact in @search_results do %> - <%= "#{artifact.group_id} > #{artifact.artifact_id} > #{artifact.version}" %> <a><%= t 'search.results.links.view_xml' %></a> + <div class="artifact_result"> + <%= "#{artifact.group_id} > #{artifact.artifact_id} > #{artifact.version}" %> + <a><%= t 'search.results.links.view_xml' %></a><%= clippy artifact.to_dep_snippet %> + + <div class="snippet"> + <%= harsh artifact.to_dep_snippet, :theme => :cobalt %> + </div> + </div> <% end %> \ No newline at end of file app/views/searches/_search_results.html.erb @@ -10,8 +10,8 @@ } $(function() { $('form>input').focus(); - $('#search-button').click(function() { - do_search(); + $('form>button').click(function() { + return do_search(); }); $('form>input').keypress(function(e) { if (e.which == 13) { @@ -21,11 +21,9 @@ }); </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> + <label for="search"><%= t 'template.header.title' %></label><input id="search" name="search"> + <button id="search-button" name="search"><%= 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 @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.0 +# IMPORTANT: This file was generated by Cucumber 0.4.2 # Edit at your own peril - it's recommended to regenerate this file # in the future when you upgrade to a newer version of Cucumber. @@ -19,6 +19,7 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'cucumber', :lib => false, :version => '>=0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) +config.gem 'cucumber', :lib => false, :version => '>=0.4.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) config.gem 'rspec', :lib => false, :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) config.gem 'rspec-rails', :lib => false, :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) + config/environments/cucumber.rb @@ -15,4 +15,8 @@ en: search: "Search" results: links: - view_xml: "View XML snippet" \ No newline at end of file + view_xml: "View XML snippet" + total_results: "Total result(s)" + template: + header: + title: "MVNSearch > " \ No newline at end of file config/locales/en.yml @@ -9,12 +9,14 @@ Scenario: Search by name | spring-core | org.springframework | 2.5.6 | Springframework | Spring is a really cool framework to use | | spring-core | org.springframework | 2.5.3 | Springframework | Spring is a really cool framework to use | When I go to the homepage - And I fill in "spring" for "Search:" - And I press "search" - Then I should see "2 result(s)" + And I fill in "spring" for "MVNSearch >" + And I press "Search" + And I wait for the AJAX call to finish + Then I should see "Total result(s) 0" And I should see the following rows in the search results: - | spring-core | org.springframework | 2.5.6 | Springframework | - | spring-core | org.springframework | 2.5.3 | Springframework | + | artifact_id | group_id | version | + | spring-core | org.springframework | 2.5.6 | + | spring-core | org.springframework | 2.5.3 | Scenario: Search by name and version Given there is 1 repository @@ -23,8 +25,10 @@ Scenario: Search by name and version | spring-core | org.springframework | 2.5.6 | Springframework | Spring is a really cool framework to use | | spring-core | org.springframework | 2.5.3 | Springframework | Spring is a really cool framework to use | When I go to the homepage - And I fill in "spring 2.5.6" for "Search:" - And I press "search" - Then I should see "1 result(s)" + And I fill in "spring 2.5.6" for "MVNSearch >" + And I press "Search" + And I wait for the AJAX call to finish + Then I should see "Total result(s) 1" And I should see the following rows in the search results: - | spring-core | org.springframework | 2.5.6 | Springframework | \ No newline at end of file + | artifact_id | group_id | version | + | spring-core | org.springframework | 2.5.6 | \ No newline at end of file features/search_artifacts.feature @@ -4,7 +4,7 @@ Before do $rails_server ||= Culerity::run_rails sleep 5 $server ||= Culerity::run_server - $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox} + $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox, :resynchronize => true, :javascript_exceptions => true, :log_level => :all} @host = 'http://localhost:3001' end @@ -15,8 +15,9 @@ at_exit do end When /I press "(.*)"/ do |button| - $browser.button(:text, button).click - assert_successful_response + button = [$browser.button(:text, button), $browser.button(:id, button)].find(&:exist?) + button.click + When 'I wait for the AJAX call to finish' end When /I follow "(.*)" link/ do |link| @@ -70,17 +71,17 @@ Then /I should not see "(.*)"/ do |text| end Then /^I should see a "([^\"]*)" link$/ do |link| - $browser.link(:text, /#{link}/).exists?.should == true + $browser.link(:text, /#{link}/).exists?.should == true end When /^I click the "([^\"]*)" link$/ do |link| - $browser.link(:text, /#{link}/).click + $browser.link(:text, /#{link}/).click assert_successful_response end When /^I confirm the "([^\"]*)" action$/ do |action| $browser.confirm true do - + end end @@ -90,7 +91,7 @@ end def assert_successful_response status = $browser.page.web_response.status_code - if(status == 302 || status == 301) + if (status == 302 || status == 301) location = $browser.page.web_response.get_response_header_value('Location') puts "Being redirected to #{location}" $browser.goto location features/step_definitions/common_celerity_steps.rb @@ -9,9 +9,9 @@ Given /^there is an artifact with\:$/ do | artifact_info | end end -When /^I should see the following rows in the search results\:$/ do | results | - table = $browser.table(:id, 'search_results') - table.exists?.should == true - table_data = table.to_a - table_data.to_a[1..table_data.size].diff!(results) + +Then /^I should see the following rows in the search results\:$/ do | results | + results[1..results.size].each do |row| + Then "I should see \"#{row.join(' > ')}\"" + end end \ No newline at end of file features/step_definitions/search_steps.rb @@ -3,7 +3,7 @@ module NavigationHelpers # # When /^I go to (.+)$/ do |page_name| # - # step definition in webrat_steps.rb + # step definition in common_celerity_steps.rb # def path_to(page_name) case page_name features/support/paths.rb @@ -1,13 +1,13 @@ -if Cucumber::VERSION::STRING != '0.4.0' +if Cucumber::VERSION != '0.4.2' warning = <<-WARNING (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) R O T T E N C U C U M B E R A L E R T (::) -Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.0, -but you seem to be running Cucumber #{Cucumber::VERSION::STRING}. If you're running an older -version than #{Cucumber::VERSION::STRING}, just upgrade your gem. If you're running a newer -version than #{Cucumber::VERSION::STRING} you should: +Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.2, +but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older +version than #{Cucumber::VERSION}, just upgrade your gem. If you're running a newer +version than #{Cucumber::VERSION} you should: 1) Read http://wiki.github.com/aslakhellesoy/cucumber/upgrading features/support/version_check.rb @@ -89,6 +89,13 @@ table.repositories thead tr { div.search-box { text-align: center; + margin-top:50px; +} + +div.search-box label { + font-size: 35px; + color: #333333; + vertical-align:middle; } div.search-box input { @@ -105,8 +112,14 @@ div.search-box button { div.search-results { font-size: x-large; + padding-top:50px; } div.search-results a { - font-size: medium; -} \ No newline at end of file + font-size: medium; + cursor: pointer; +} + +div.search-results div.snippet { + display: none; +} public/stylesheets/application.css @@ -5,8 +5,14 @@ describe SearchesController do it "should render the new template on GET to the new action" do get 'new' - response.should render_template("new") - assigns[:search].should_not be_nil + response.should render_template("new") end + it "should render the search results partial on POST to the create action" do + Factory(:artifact) + post 'create', :search => 'spring', :page => 1 + assigns[:search_results].should_not be_nil + response.should be_success + response.should render_template("searches/_search_results") + end end spec/controllers/searches_controller_spec.rb @@ -56,4 +56,17 @@ describe Artifact do new_artifact.should_not be_valid new_artifact.save.should == false end + + it "should return the proper XML dep snippet" do + @artifact.to_dep_snippet.should_not be_nil + @artifact.to_dep_snippet.should be_an(String) + @artifact.to_dep_snippet.should == "<dependency>\n\s\s\s<groupId>%s</groupId>\n\s\s\s<artifactId>%s</artifactId>\n\s\s\s<version>%s</version>\n</dependency>" % [@artifact.group_id, @artifact.artifact_id, @artifact.version] + end + + it "should return N results when searching an artifact" do + @artifact.save + artifact_search = Artifact.search('spring', {:page => 1}) + artifact_search.should_not be_nil + artifact_search.size.should == 1 + end end spec/models/artifact_spec.rb 4ca0a46e00b4b53f139a9c19a56da87412ab7830 Julio Arias julio.arias@fresisoft.com http://github.com/jarias/mvnsearch/commit/135f30b2d016ae8572203dee88c62f168cd77dcb 135f30b2d016ae8572203dee88c62f168cd77dcb

2009-10-27T12:38:03-07:00

Finish adding features to the search results, including copy dep snippet to the clipboard ebdce8a5c93c61eeda6b3d665843466806efac72 Julio Arias julio.arias@fresisoft.com