honkster-acts_as_solr 0.3.6 → 0.3.7

data/VERSION.yml

@@ -2,4 +2,4 @@
 :build: 
 :major: 0
 :minor: 3
-:patch: 6
+:patch: 7

data/lib/acts_as_solr/tasks/solr.rake

@@ -7,8 +7,7 @@ namespace :solr do
     FileUtils.mkdir_p(SOLR_DATA_PATH)
     FileUtils.mkdir_p(SOLR_PIDS_PATH)
     begin
-      n = Net::HTTP.new('127.0.0.1', SOLR_PORT)
-      n.request_head('/').value 
+      get_raw_solr_response
 
     rescue Net::HTTPServerException #responding
       puts "Port #{SOLR_PORT} in use" and return
@@ -19,20 +18,20 @@ namespace :solr do
           #STDERR.close
           exec "java #{SOLR_JVM_OPTIONS} -Dsolr.data.dir=#{SOLR_DATA_PATH} -Djetty.logs=#{SOLR_LOGS_PATH} -Djetty.port=#{SOLR_PORT} -jar start.jar"
         end
-        sleep(5)
         File.open("#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid}
+        wait_for_solr_to_respond
         puts "#{ENV['RAILS_ENV']} Solr started successfully on #{SOLR_PORT}, pid: #{pid}."
       end
     end
   end
-  
+
   desc 'Stops Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
   task :stop do
     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)
-        File.open(file_path, "r") do |f| 
+        File.open(file_path, "r") do |f|
           pid = f.readline
           Process.kill('TERM', pid.to_i)
         end
@@ -44,7 +43,7 @@ namespace :solr do
       end
     end
   end
-  
+
   desc 'Remove Solr index'
   task :destroy_index do
     require File.expand_path("#{File.dirname(__FILE__)}/../../../config/solr_environment")
@@ -55,7 +54,7 @@ namespace :solr do
       puts "Index files removed under " + ENV['RAILS_ENV'] + " environment"
     end
   end
-  
+
   # this task is by Henrik Nyh
   # 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.}
@@ -68,7 +67,7 @@ namespace :solr do
     end
     excludes = env_array_to_constants('EXCEPT')
     includes -= excludes
-    
+
     optimize            = env_to_bool('OPTIMIZE',     true)
     start_server        = env_to_bool('START_SERVER', false)
     clear_first         = env_to_bool('CLEAR',       true)
@@ -79,29 +78,29 @@ namespace :solr do
 
     if start_server
       puts "Starting Solr server..."
-      Rake::Task["solr:start"].invoke 
+      Rake::Task["solr:start"].invoke
     end
-    
+
     # Disable solr_optimize
     module ActsAsSolr::CommonMethods
       def blank() end
       alias_method :deferred_solr_optimize, :solr_optimize
       alias_method :solr_optimize, :blank
     end
-    
-    models = includes.select { |m| m.respond_to?(:rebuild_solr_index) }    
+
+    models = includes.select { |m| m.respond_to?(:rebuild_solr_index) }
     models.each do |model|
-  
+
       if clear_first
         puts "Clearing index for #{model}..."
-        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model}")) 
+        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model}"))
         ActsAsSolr::Post.execute(Solr::Request::Commit.new)
       end
-      
+
       puts "Rebuilding index for #{model}..."
       model.rebuild_solr_index(batch_size)
 
-    end 
+    end
 
     if models.empty?
       puts "There were no models to reindex."
@@ -112,16 +111,16 @@ namespace :solr do
 
     if start_server
       puts "Shutting down Solr server..."
-      Rake::Task["solr:stop"].invoke 
+      Rake::Task["solr:stop"].invoke
     end
-    
+
   end
-  
+
   def env_array_to_constants(env)
     env = ENV[env] || ''
     env.split(/\s*,\s*/).map { |m| m.singularize.camelize.constantize }.uniq
   end
-  
+
   def env_to_bool(env, default)
     env = ENV[env] || ''
     case env
@@ -131,5 +130,28 @@ namespace :solr do
     end
   end
 
-end
+  def wait_for_solr_to_respond
+    tries = 0
+    while !solr_up? && tries < 30 do
+      tries += 1
+      sleep 2
+    end
+    throw "Could not connect to the solr server after #{tries} tries." unless solr_up?
+  end
+
+  def solr_up?
+    begin
+      get_raw_solr_response
+    rescue Errno::ECONNREFUSED #not responding
+      return false
+    rescue Net::HTTPServerException #responding
+      return true
+    end
+  end
 
+  def get_raw_solr_response
+    n = Net::HTTP.new('127.0.0.1', SOLR_PORT)
+    n.request_head('/').value
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -08:00
+date: 2009-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -208,36 +208,36 @@ signing_key:
 specification_version: 3
 summary: "This plugin adds full text search capabilities and many other nifty features from Apache\xEF\xBF\xBDs Solr to any Rails model. I'm currently rearranging the test suite to include a real unit test suite, and adding a few features I need myself."
 test_files: 
-- test/unit/class_methods_shoulda.rb
-- test/unit/parser_instance.rb
-- test/unit/acts_methods_shoulda.rb
-- test/unit/lazy_document_shoulda.rb
-- test/unit/solr_instance.rb
-- test/unit/test_helper.rb
-- test/unit/common_methods_shoulda.rb
-- test/unit/instance_methods_shoulda.rb
-- test/unit/parser_methods_shoulda.rb
-- test/test_helper.rb
+- test/db/connections/mysql/connection.rb
+- test/db/connections/sqlite/connection.rb
+- test/db/migrate/001_create_books.rb
+- test/db/migrate/002_create_movies.rb
+- test/db/migrate/003_create_categories.rb
+- test/db/migrate/004_create_electronics.rb
+- test/db/migrate/005_create_authors.rb
+- test/db/migrate/006_create_postings.rb
+- test/db/migrate/007_create_posts.rb
+- test/db/migrate/008_create_gadgets.rb
 - test/functional/acts_as_solr_test.rb
 - test/functional/association_indexing_test.rb
-- test/functional/multi_solr_search_test.rb
 - test/functional/faceted_search_test.rb
-- test/models/posting.rb
-- test/models/movie.rb
+- test/functional/multi_solr_search_test.rb
 - test/models/author.rb
+- test/models/book.rb
+- test/models/category.rb
 - test/models/electronic.rb
-- test/models/novel.rb
 - test/models/gadget.rb
+- test/models/movie.rb
+- test/models/novel.rb
 - test/models/post.rb
-- test/models/book.rb
-- test/models/category.rb
-- test/db/connections/mysql/connection.rb
-- test/db/connections/sqlite/connection.rb
-- test/db/migrate/006_create_postings.rb
-- test/db/migrate/007_create_posts.rb
-- test/db/migrate/008_create_gadgets.rb
-- test/db/migrate/004_create_electronics.rb
-- test/db/migrate/005_create_authors.rb
-- test/db/migrate/002_create_movies.rb
-- test/db/migrate/003_create_categories.rb
-- test/db/migrate/001_create_books.rb
+- test/models/posting.rb
+- test/test_helper.rb
+- test/unit/acts_methods_shoulda.rb
+- test/unit/class_methods_shoulda.rb
+- test/unit/common_methods_shoulda.rb
+- test/unit/instance_methods_shoulda.rb
+- test/unit/lazy_document_shoulda.rb
+- test/unit/parser_instance.rb
+- test/unit/parser_methods_shoulda.rb
+- test/unit/solr_instance.rb
+- test/unit/test_helper.rb