config/sphinx.yml public/javascripts/jquery.js @@ -1,3 +1,5 @@ +config/*.sphinx.conf +db/sphinx/ .idea/ tmp/ log/ .gitignore @@ -10,6 +10,12 @@ require 'rake/rdoctask' require 'tasks/rails' begin + require 'thinking_sphinx/tasks' +rescue LoadError + STDERR.puts "Run `rake gems:install` to install thinking_sphinx" +end + +begin require 'delayed/tasks' rescue LoadError STDERR.puts "Run `rake gems:install` to install delayed_job" Rakefile @@ -8,9 +8,13 @@ class Artifact < ActiveRecord::Base 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 + define_index do + indexes name + indexes artifact_id + indexes group_id + indexes description + indexes version, :sortable => true + end def to_dep_snippet XML_TEMPLATE % [self.group_id, self.artifact_id, self.version] app/models/artifact.rb @@ -17,12 +17,13 @@ Rails::Initializer.run do |config| # Specify gems that this application depends on and have them installed with rake gems:install config.gem 'inherited_resources', :version => '0.9.2' 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 'nokogiri', :version => '1.4.0' + config.gem 'rufus-scheduler', :lib => 'rufus/scheduler', :version => '2.0.2' config.gem 'factory_girl', :version => '1.2.3' config.gem 'will_paginate', :version => '2.3.11' config.gem 'searchlogic', :version => '2.3.5' config.gem 'faker', :version => '0.3.1' + config.gem 'thinking-sphinx', :lib => 'thinking_sphinx', :version => '1.2.12' # 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 @@ -12,11 +12,11 @@ Scenario: Search by name 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" + Then I should see "Total result(s) 2" And I should see the following rows in the search results: - | artifact_id | group_id | version | - | spring-core | org.springframework | 2.5.6 | - | spring-core | org.springframework | 2.5.3 | + | group_id | artifact_id | version | + | org.springframework | spring-core | 2.5.6 | + | org.springframework | spring-core | 2.5.3 | Scenario: Search by name and version Given there is 1 repository @@ -30,5 +30,5 @@ Scenario: Search by name and version 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: - | artifact_id | group_id | version | - | spring-core | org.springframework | 2.5.6 | \ No newline at end of file + | group_id | artifact_id | version | + | org.springframework | spring-core | 2.5.6 | \ No newline at end of file features/search_artifacts.feature @@ -1,23 +1,5 @@ -require 'culerity' - -Before do - $rails_server ||= Culerity::run_rails - sleep 5 - $server ||= Culerity::run_server - $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox, :resynchronize => true, :javascript_exceptions => true, :log_level => :all} - @host = 'http://localhost:3001' -end - -at_exit do - $browser.exit if $browser - $server.exit_server if $server - Process.kill(6, $rails_server.pid.to_i) if $rails_server -end - When /I press "(.*)"/ do |button| - button = [$browser.button(:text, button), $browser.button(:id, button)].find(&:exist?) - button.click - When 'I wait for the AJAX call to finish' + $browser.button(:text, /#{button}/).click end When /I follow "(.*)" link/ do |link| @@ -54,9 +36,9 @@ When /I wait for the AJAX call to finish/ do $browser.wait end -Then /I should see "(.*)"/ do |text| +Then /I should see "(.*)"/ do |text| # if we simply check for the browser.html content we don't find content that has been added dynamically, e.g. after an ajax call - div = $browser.div(:text, /#{text}/) + div = $browser.div(:text, /#{Regexp.escape(text)}/) begin div.html rescue features/step_definitions/common_celerity_steps.rb @@ -1,17 +1,20 @@ Given /^there is an artifact with\:$/ do | artifact_info | + ThinkingSphinx::Configuration.instance.controller.stop Artifact.transaction do + Artifact.destroy_all artifact_info.hashes.each do |info| - Artifact.destroy_all a = Artifact.new(info) a.repository = Repository.first a.save end end - + ThinkingSphinx::Configuration.instance.controller.index + ThinkingSphinx::Configuration.instance.controller.start end Then /^I should see the following rows in the search results\:$/ do | results | - results[1..results.size].each do |row| + raw_data = results.raw + raw_data[1..raw_data.size].each do |row| Then "I should see \"#{row.join(' > ')}\"" end end \ No newline at end of file features/step_definitions/search_steps.rb @@ -36,3 +36,31 @@ require 'cucumber' # Comment out the next line if you don't want Cucumber Unicode support require 'cucumber/formatter/unicode' require 'cucumber/rails/rspec' + +ThinkingSphinx::Configuration.instance.build +FileUtils.mkdir_p ThinkingSphinx::Configuration.instance.searchd_file_path + +if RUBY_PLATFORM =~ /java/ + require "celerity" +else + require "culerity" +end + +Before do + if RUBY_PLATFORM =~ /java/ + $browser = Celerity::Browser.new :resynchronize => true + else + sleep 5 + $rails_server ||= Culerity::run_rails + $server ||= Culerity::run_server + $browser = Culerity::RemoteBrowserProxy.new $server, :resynchronize => true + end + @host = 'http://localhost:3001' +end + +at_exit do + ThinkingSphinx::Configuration.instance.controller.stop + $browser.exit if $browser + $server.exit_server if $server + Process.kill(6, $rails_server.pid.to_i) if $rails_server +end \ No newline at end of file features/support/env.rb @@ -127,6 +127,7 @@ div.search-results p { div.search-results h2 { margin-bottom: 0; + font-size:35px; } div.search-results div.snippet { public/stylesheets/application.css @@ -9,7 +9,8 @@ describe SearchesController do end it "should render the search results partial on POST to the create action" do - Factory(:artifact) + a = Factory(:artifact) + Artifact.stubs(:search).returns([a]) post 'create', :search => 'spring', :page => 1 assigns[:search_results].should_not be_nil response.should be_success spec/controllers/searches_controller_spec.rb @@ -61,12 +61,5 @@ describe Artifact 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 end spec/models/artifact_spec.rb aee20ba1c6adaf1e1232131055bd9d7536774c51 Julio Arias julio.arias@fresisoft.com http://github.com/jarias/mvnsearch/commit/3b52381faa8cffc49bb86d05a719d5cef4c26db8 3b52381faa8cffc49bb86d05a719d5cef4c26db8 2009-10-31T14:45:58-07:00 2009-10-31T14:45:58-07:00 Added thinking sphinx for full text searching ( This means no Heroku :( ) Fixed cucumber step "I should see ..." cause it wasn't scaping regexp characters cf671a4baeef651a1fd479d98f7543db758b71f1 Julio Arias julio.arias@fresisoft.com