acts_as_solr_reloaded 1.3.0 → 1.4.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-Dir["#{File.dirname(__FILE__)}/lib/acts_as_solr/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
 
 desc "Default Task"
 task :default => [:test]

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/acts_as_solr/parser_methods.rb

@@ -119,6 +119,7 @@ module ActsAsSolr #:nodoc:
       configuration = {
         :format => :objects
       }
+      results.update(:spellcheck => solr_data.data['spellcheck']) unless solr_data.nil?
       results.update(:facets => {'facet_fields' => []}) if options[:facets]
       return SearchResults.new(results) if (solr_data.nil? || solr_data.total_hits == 0)
 

data/lib/acts_as_solr/search_results.rb

@@ -62,6 +62,10 @@ module ActsAsSolr #:nodoc:
     def highlights
         @solr_data[:highlights]
     end
+    
+    def suggest
+      @solr_data[:spellcheck]['suggestions']['collation'].match(/\((.+)\) /)[1]
+    end
 
     alias docs results
     alias records results

data/lib/solr/request/standard.rb

@@ -14,7 +14,7 @@ class Solr::Request::Standard < Solr::Request::Select
 
   VALID_PARAMS = [:query, :sort, :default_field, :operator, :start, :rows, :shards, :date_facets,
     :filter_queries, :field_list, :debug_query, :explain_other, :facets, :highlighting, :mlt, :radius, 
-    :latitude, :longitude]
+    :latitude, :longitude, :spellcheck]
   
   def initialize(params)
     super(params[:radius].nil? ? 'standard' : 'geo')
@@ -400,6 +400,9 @@ class Solr::Request::Standard < Solr::Request::Select
       hash["mlt.boost"] = @params[:mlt][:boost]
     end
     
+    hash[:spellcheck] = true
+    hash['spellcheck.collate'] = true
+    
     hash.merge(super.to_hash)
   end
 

data/lib/{acts_as_solr/tasks → tasks}/solr.rake

@@ -2,7 +2,7 @@ namespace :solr do
 
   desc 'Starts Solr. Options accepted: RAILS_ENV=your_env, PORT=XX. Defaults to development if none.'
   task :start => :environment do
-    require File.expand_path("#{File.dirname(__FILE__)}/../../../config/solr_environment")
+    require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
     FileUtils.mkdir_p(SOLR_LOGS_PATH)
     FileUtils.mkdir_p(SOLR_DATA_PATH)
     FileUtils.mkdir_p(SOLR_PIDS_PATH)
@@ -13,7 +13,9 @@ namespace :solr do
     rescue Net::HTTPServerException #responding
       puts "Port #{SOLR_PORT} in use" and return
 
-    rescue Errno::ECONNREFUSED, Errno::EBADF #not responding
+    rescue Errno::ECONNREFUSED, Errno::EBADF, NoMethodError #not responding
+      # there's an issue with Net::HTTP.request where @socket is nil and raises a NoMethodError
+      # http://redmine.ruby-lang.org/issues/show/2708
       Dir.chdir(SOLR_PATH) do
         cmd = "java #{SOLR_JVM_OPTIONS} -Djetty.logs=\"#{SOLR_LOGS_PATH}\" -Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -Djetty.port=#{SOLR_PORT} -jar start.jar"
         puts "Executing: " + cmd
@@ -35,7 +37,7 @@ namespace :solr do
   
   desc 'Stops Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
   task :stop=> :environment do
-    require File.expand_path("#{File.dirname(__FILE__)}/../../../config/solr_environment")
+    require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
     fork do
       file_path = "#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid"
       if File.exists?(file_path)
@@ -54,7 +56,7 @@ namespace :solr do
   
   desc 'Remove Solr index'
   task :destroy_index => :environment do
-    require File.expand_path("#{File.dirname(__FILE__)}/../../../config/solr_environment")
+    require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
     raise "In production mode.  I'm not going to delete the index, sorry." if ENV['RAILS_ENV'] == "production"
     if File.exists?("#{SOLR_DATA_PATH}")
       Dir["#{SOLR_DATA_PATH}/index/*"].each{|f| File.unlink(f) if File.exists?(f)}
@@ -67,7 +69,7 @@ namespace :solr do
   # http://henrik.nyh.se/2007/06/rake-task-to-reindex-models-for-acts_as_solr
   desc %{Reindexes data for all acts_as_solr models. Clears index first to get rid of orphaned records and optimizes index afterwards. RAILS_ENV=your_env to set environment. ONLY=book,person,magazine to only reindex those models; EXCEPT=book,magazine to exclude those models. START_SERVER=true to solr:start before and solr:stop after. BATCH=123 to post/commit in batches of that size: default is 300. CLEAR=false to not clear the index first; OPTIMIZE=false to not optimize the index afterwards.}
   task :reindex => :environment do
-    require File.expand_path("#{File.dirname(__FILE__)}/../../../config/solr_environment")
+    require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
 
     includes = env_array_to_constants('ONLY')
     if includes.empty?

data/test/functional/acts_as_solr_test.rb

@@ -461,6 +461,10 @@ class ActsAsSolrTest < Test::Unit::TestCase
     expected = {"name"=>["<em>Ruby</em> for Dummies"]}
     assert_equal expected, records.highlights.values.first
   end
+  
+  def test_spellcheck
+    assert_equal "ruby for dummies", Book.search("rubi for dumies").suggest
+  end
 
   def test_mongo_mappers_documents_are_found
     Document.new(:name => "mapper").save

data/test/unit/parser_methods_shoulda.rb

@@ -242,7 +242,20 @@ class ParserMethodsTest < Test::Unit::TestCase
       }
         @parser.parse_query "foo", :operator => :or
       end
-
+      
+      should "activate spellcheck" do
+        ActsAsSolr::Post.expects(:execute).with {|request, core|
+          request.to_hash[:spellcheck] == true
+        }
+        @parser.parse_query "foo"
+      end
+      
+      should "activate spellcheck collation" do
+        ActsAsSolr::Post.expects(:execute).with {|request, core|
+          request.to_hash['spellcheck.collate'] == true
+        }
+        @parser.parse_query "foo"
+      end
 
       context "with the around option" do
         should "set the qt as geo" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_solr_reloaded
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Diego Carrion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 -02:00
+date: 2010-02-25 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -50,9 +50,6 @@ files:
 - lib/acts_as_solr/search_results.rb
 - lib/acts_as_solr/solr_fixtures.rb
 - lib/acts_as_solr/tasks.rb
-- lib/acts_as_solr/tasks/database.rake
-- lib/acts_as_solr/tasks/solr.rake
-- lib/acts_as_solr/tasks/test.rake
 - lib/acts_as_solr_reloaded.rb
 - lib/solr.rb
 - lib/solr/connection.rb
@@ -99,6 +96,9 @@ files:
 - lib/solr/solrtasks.rb
 - lib/solr/util.rb
 - lib/solr/xml.rb
+- lib/tasks/database.rake
+- lib/tasks/solr.rake
+- lib/tasks/test.rake
 - test/config/solr.yml
 - test/db/connections/mysql/connection.rb
 - test/db/connections/sqlite/connection.rb