acts_as_ferret 0.4.8.2 → 0.5

data/lib/{unix_daemon.rb → acts_as_ferret/server/unix_daemon.rb}

@@ -1,8 +1,6 @@
-################################################################################
 module ActsAsFerret
-  module Remote
+  module Server
 
-    ################################################################################
     # methods for becoming a daemon on Unix-like operating systems
     module UnixDaemon
 
@@ -13,7 +11,7 @@ module ActsAsFerret
           trap("TERM") { exit(0) }
           sess_id = Process.setsid
           STDIN.reopen("/dev/null")
-          STDOUT.reopen("#{RAILS_ROOT}/log/ferret_server.out", "a")
+          STDOUT.reopen("#{Rails.root}/log/ferret_server.out", "a")
           STDERR.reopen(STDOUT)
           block.call
         end

data/lib/acts_as_ferret/version.rb

@@ -0,0 +1,3 @@
+module ActsAsFerret
+  VERSION = '0.5'
+end

data/recipes/aaf_recipes.rb

@@ -46,15 +46,13 @@ namespace :ferret do
   desc "Stop the Ferret DRb server"
   task :stop, :roles => :app do
     rails_env = fetch(:rails_env, 'production')
-    ruby = fetch(:ruby, '/usr/bin/env ruby')
-    run "cd #{current_path}; #{ruby} script/ferret_server -e #{rails_env} stop || true"
+    run "cd #{current_path}; script/ferret_server -e #{rails_env} stop || true"
   end
 
   desc "Start the Ferret DRb server"
   task :start, :roles => :app do
     rails_env = fetch(:rails_env, 'production')
-    ruby = fetch(:ruby, '/usr/bin/env ruby')
-    run "cd #{current_path}; #{ruby} script/ferret_server -e #{rails_env} start"
+    run "cd #{current_path}; script/ferret_server -e #{rails_env} start"
   end
 
   desc "Restart the Ferret DRb server"

data/script/ferret_server

@@ -2,11 +2,77 @@
 
 FERRET_SERVER = File.expand_path(__FILE__)
 
+require 'optparse'
+
+$ferret_server_options = {
+  'environment' => nil,
+  'debug'       => nil,
+  'root'        => nil
+}
+
+OptionParser.new do |optparser|
+  optparser.banner = "Usage: #{FERRET_SERVER} [options] {start|stop|run}"
+
+  optparser.on('-h', '--help', "This message") do
+    puts optparser
+    exit
+  end
+  
+  optparser.on('-R', '--root=PATH', 'Set Rails.root to the given string') do |r|
+    $ferret_server_options['root'] = r
+  end
+
+  optparser.on('-e', '--environment=NAME', 'Set Rails.env to the given string') do |e|
+    $ferret_server_options['environment'] = e
+  end
+
+  optparser.on('--debug', 'Include full stack traces on exceptions') do
+    $ferret_server_options['debug'] = true
+  end
+
+  $ferret_server_action = optparser.permute!(ARGV)
+  (puts optparser; exit(1)) unless $ferret_server_action.size == 1
+
+  $ferret_server_action = $ferret_server_action.first
+  (puts optparser; exit(1)) unless %w(start stop run).include?($ferret_server_action)
+end
+
+################################################################################
+
+def determine_rails_root
+  possible_rails_roots = [
+    $ferret_server_options['root'],
+    (defined?(FERRET_SERVER) ? File.join(File.dirname(FERRET_SERVER), '..') : nil),
+    File.join(File.dirname(__FILE__), *(['..']*4)),
+    '.'
+  ].compact
+  # take the first dir where environment.rb can be found
+  possible_rails_roots.find{ |dir| File.readable?(File.join(dir, 'config', 'application.rb')) }
+end
+
 begin
-  require File.join(File.dirname(__FILE__), '../vendor/plugins/acts_as_ferret/lib/server_manager')
-rescue LoadError
-  # try the gem
-  require 'rubygems'
-  gem 'acts_as_ferret'
-  require 'server_manager'
+  ENV['FERRET_USE_LOCAL_INDEX'] = 'true'
+  if env = $ferret_server_options['environment']
+    ENV['RAILS_ENV'] = env
+  end
+  
+  # determine RAILS_ROOT unless already set
+  root = File.expand_path(determine_rails_root)
+  
+  begin
+    require File.join(root, 'config', 'application')
+  rescue
+    puts "Error booting your rails app at #{root}: #{$!}\n#{$!.backtrace.join("\n")}"
+    raise $!
+  end
+  
+  puts "Rails.root: #{Rails.root}"
+  puts "Rails.env: #{Rails.env}"
+
+  require 'acts_as_ferret/server/server'
+  ActsAsFerret::Server::Server.new.send($ferret_server_action)
+rescue Exception => e
+  $stderr.puts(e.message)
+  $stderr.puts(e.backtrace.join("\n")) if $ferret_server_options['debug']
+  exit(1)
 end

data/tasks/ferret.rake

@@ -6,17 +6,21 @@ namespace :ferret do
   # INDEXES="my_model shared" rake ferret:rebuild
   desc "Rebuild a Ferret index. Specify what model to rebuild with the INDEXES environment variable."
   task :rebuild => :environment do
-    indexes = ENV['INDEXES'].split
-    indexes.each do |index_name|
-      start = 1.minute.ago
-      ActsAsFerret::rebuild_index index_name
-      idx = ActsAsFerret::get_index index_name
-      # update records that have changed since the rebuild started
-      idx.index_definition[:registered_models].each do |m|
-        m.records_modified_since(start).each do |object|
-          object.ferret_update
+    if ENV['INDEXES']
+      indexes = ENV['INDEXES'].split
+      indexes.each do |index_name|
+        start = 1.minute.ago
+        ActsAsFerret::rebuild_index index_name
+        idx = ActsAsFerret::get_index index_name
+        # update records that have changed since the rebuild started
+        idx.index_definition[:registered_models].each do |m|
+          m.records_modified_since(start).each do |object|
+            object.ferret_update
+          end
         end
       end
+    else
+      puts "set the INDEXES environment variable to the index names you want to rebuild:\nINDEXES=\"my_index another_index\" rake ferret:rebuild"
     end
   end
 end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_ferret
 version: !ruby/object:Gem::Version 
-  version: 0.4.8.2
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -9,19 +13,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +02:00
+date: 2010-09-07 00:00:00 +02:00
 default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jk-ferret
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 11
+        - 8
         version: 0.11.8
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id002
 description: Rails plugin that adds powerful full text search capabilities to ActiveRecord models.
 email: jk@jkraemer.net
 executables: 
@@ -32,6 +55,8 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- README
+- LICENSE
 - bin/aaf_install
 - config/ferret_server.yml
 - doc/README.win32
@@ -161,38 +186,32 @@ files:
 - doc/demo/vendor/plugins/will_paginate/test/pagination_test.rb
 - doc/monit-example
 - recipes/aaf_recipes.rb
-- script/ferret_daemon
 - script/ferret_server
-- script/ferret_service
 - tasks/ferret.rake
-- lib/act_methods.rb
+- lib/acts_as_ferret/act_methods.rb
+- lib/acts_as_ferret/blank_slate.rb
+- lib/acts_as_ferret/bulk_indexer.rb
+- lib/acts_as_ferret/class_methods.rb
+- lib/acts_as_ferret/ferret_extensions.rb
+- lib/acts_as_ferret/ferret_find_methods.rb
+- lib/acts_as_ferret/ferret_result.rb
+- lib/acts_as_ferret/index.rb
+- lib/acts_as_ferret/instance_methods.rb
+- lib/acts_as_ferret/local_index.rb
+- lib/acts_as_ferret/more_like_this.rb
+- lib/acts_as_ferret/multi_index.rb
+- lib/acts_as_ferret/railtie.rb
+- lib/acts_as_ferret/rdig_adapter.rb
+- lib/acts_as_ferret/remote_functions.rb
+- lib/acts_as_ferret/remote_index.rb
+- lib/acts_as_ferret/remote_multi_index.rb
+- lib/acts_as_ferret/search_results.rb
+- lib/acts_as_ferret/server/config.rb
+- lib/acts_as_ferret/server/server.rb
+- lib/acts_as_ferret/server/unix_daemon.rb
+- lib/acts_as_ferret/version.rb
+- lib/acts_as_ferret/without_ar.rb
 - lib/acts_as_ferret.rb
-- lib/ar_mysql_auto_reconnect_patch.rb
-- lib/blank_slate.rb
-- lib/bulk_indexer.rb
-- lib/class_methods.rb
-- lib/ferret_extensions.rb
-- lib/ferret_find_methods.rb
-- lib/ferret_result.rb
-- lib/ferret_server.rb
-- lib/index.rb
-- lib/instance_methods.rb
-- lib/local_index.rb
-- lib/more_like_this.rb
-- lib/multi_index.rb
-- lib/rdig_adapter.rb
-- lib/remote_functions.rb
-- lib/remote_index.rb
-- lib/remote_multi_index.rb
-- lib/search_results.rb
-- lib/server_manager.rb
-- lib/unix_daemon.rb
-- lib/without_ar.rb
-- acts_as_ferret.gemspec
-- init.rb
-- install.rb
-- README
-- LICENSE
 has_rdoc: true
 homepage: http://github.com/jkraemer/acts_as_ferret
 licenses: []
@@ -200,24 +219,34 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
+- --title
+- ActsAsFeret - Ferret powered full text search for Rails
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: acts_as_ferret
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: acts_as_ferret - Ferret based full text search for any ActiveRecord model

data/acts_as_ferret.gemspec

@@ -1,59 +0,0 @@
-Gem::Specification.new do |s|
-
-	s.name = 'acts_as_ferret'
-	s.version = '0.4.8.2'
-	s.authors = ['Jens Kraemer']
-	s.summary = 'acts_as_ferret - Ferret based full text search for any ActiveRecord model'
-	s.description = 'Rails plugin that adds powerful full text search capabilities to ActiveRecord models.'
-	s.email = 'jk@jkraemer.net'
-	s.homepage = 'http://github.com/jkraemer/acts_as_ferret'
-	s.rubyforge_project = 'acts_as_ferret'
-	
-	s.bindir = 'bin'
-	s.executables = ['aaf_install']
-	s.default_executable = 'aaf_install'
-  s.require_paths = ["lib"]
-	
-	
-	s.platform = Gem::Platform::RUBY 
-  s.required_ruby_version = '>=1.8.6'
-	s.rubygems_version = '1.3.6'
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-    
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency('jk-ferret', [">= 0.11.8"])
-    else
-      s.add_dependency('jk-ferret', [">= 0.11.8"])
-    end
-  else
-    s.add_dependency('jk-ferret', [">= 0.11.8"])
-  end
-  
-
-	s.has_rdoc = true
-  s.rdoc_options = ["--charset=UTF-8"]
-	s.extra_rdoc_files = [
-		'LICENSE',
-		'README'
-	]
-	s.test_files = Dir['test/**/*rb']
-	s.files = [
-		'bin/*',
-		'config/*',
-		'doc/**/*',
-		'recipes/*',
-		'script/*',
-		'tasks/*',
-		'lib/**/*rb'
-	].map{|p| Dir[p]}.flatten +
-	[
-		'acts_as_ferret.gemspec',
-		'init.rb',
-		'install.rb',
-		'README',
-		'LICENSE',
-	]
-	
-end

data/init.rb

@@ -1,24 +0,0 @@
-# Copyright (c) 2006 Kasper Weibel Nielsen-Refs, Thomas Lockney, Jens Krämer
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require 'acts_as_ferret'
-
-config.after_initialize { ActsAsFerret::load_config }
-config.to_prepare       { ActsAsFerret::load_config }

data/install.rb

@@ -1,18 +0,0 @@
-# acts_as_ferret install script
-require 'fileutils'
-
-def install(file)
-  puts "Installing: #{file}"
-  target = File.join(File.dirname(__FILE__), '..', '..', '..', file)
-  if File.exists?(target)
-    puts "target #{target} already exists, skipping"
-  else
-    FileUtils.cp File.join(File.dirname(__FILE__), file), target
-  end
-end
-
-install File.join( 'script', 'ferret_server' )
-install File.join( 'config', 'ferret_server.yml' )
-
-puts IO.read(File.join(File.dirname(__FILE__), 'README'))
-

data/lib/ar_mysql_auto_reconnect_patch.rb

@@ -1,41 +0,0 @@
-# Source: http://pastie.caboo.se/154842
-#
-# in /etc/my.cnf on the MySQL server, you can set the interactive-timeout parameter,
-# for example, 12 hours = 28800 sec
-# interactive-timeout=28800
-
-# in ActiveRecord, setting the verification_timeout to something less than
-# the interactive-timeout parameter; 14400 sec = 6 hours
-ActiveRecord::Base.verification_timeout = 14400
-ActiveRecord::Base.establish_connection
-
-# Below is a monkey patch for keeping ActiveRecord connections alive.
-# http://www.sparecycles.org/2007/7/2/saying-goodbye-to-lost-connections-in-rails
-
-module ActiveRecord
-  module ConnectionAdapters
-    class MysqlAdapter
-      def execute(sql, name = nil) #:nodoc:
-        reconnect_lost_connections = true
-        begin
-          log(sql, name) { @connection.query(sql) }
-        rescue ActiveRecord::StatementInvalid => exception
-          if reconnect_lost_connections and exception.message =~ /(Lost connection to MySQL server during query
-|MySQL server has gone away)/
-            reconnect_lost_connections = false
-            reconnect!
-            retry
-          elsif exception.message.split(":").first =~ /Packets out of order/
-            raise ActiveRecord::StatementInvalid, "'Packets out of order' error was received from the database.
- Please update your mysql bindings (gem install mysql) and read http://dev.mysql.com/doc/mysql/en/password-hash
-ing.html for more information.  If you're on Windows, use the Instant Rails installer to get the updated mysql 
-bindings." 
-          else
-            raise
-          end
-        end
-      end
-    end
-  end
-end
-