acts_as_ferret 0.4.8.rails3 → 0.4.8

data/acts_as_ferret.gemspec

@@ -6,8 +6,7 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 8
-  - rails3
-  version: 0.4.8.rails3
+  version: 0.4.8
 platform: ruby
 authors: 
 - Jens Kraemer

data/config/ferret_server.yml

@@ -2,8 +2,8 @@
 # host: where to reach the DRb server (used by application processes to contact the server)
 # port: which port the server should listen on
 # socket: where the DRb server should create the socket (absolute path), this setting overrides host:port configuration
-# pid_file: location of the server's pid file (relative to Rails.root)
-# log_file: log file (default: Rails.root/log/ferret_server.log
+# pid_file: location of the server's pid file (relative to RAILS_ROOT)
+# log_file: log file (default: RAILS_ROOT/log/ferret_server.log
 # log_level: log level for the server's logger
 production:
   host: localhost

data/lib/act_methods.rb

@@ -26,7 +26,7 @@ module ActsAsFerret #:nodoc:
     #      to determine if it should be indexed or not.
     #
     # index_dir:: declares the directory where to put the index for this class.
-    #             The default is Rails.root/index/Rails.env/CLASSNAME. 
+    #             The default is RAILS_ROOT/index/RAILS_ENV/CLASSNAME. 
     #             The index directory will be created if it doesn't exist.
     #
     # reindex_batch_size:: reindexing is done in batches of this size, default is 1000

data/lib/acts_as_ferret.rb

@@ -82,7 +82,7 @@ require 'rdig_adapter'
 #                    whatever reason.
 #
 # remote:: Set this to false to force acts_as_ferret into local (non-DRb) mode even if
-#          config/ferret_server.yml contains a section for the current Rails.env
+#          config/ferret_server.yml contains a section for the current RAILS_ENV
 #          Usually you won't need to touch this option - just configure DRb for
 #          production mode in ferret_server.yml.
 #
@@ -107,7 +107,7 @@ module ActsAsFerret
   @@index_using_classes = {}
   def self.index_using_classes; @@index_using_classes end
 
-  @@logger = Logger.new "#{Rails.root || '.'}/log/acts_as_ferret.log"
+  @@logger = Logger.new "#{RAILS_ROOT}/log/acts_as_ferret.log"
   @@logger.level = ActiveRecord::Base.logger.level rescue Logger::DEBUG
   mattr_accessor :logger
 
@@ -255,7 +255,7 @@ module ActsAsFerret
 
   def self.load_config
     # using require_dependency to make the reloading in dev mode work.
-    require_dependency "#{Rails.root}/config/aaf.rb"
+    require_dependency "#{RAILS_ROOT}/config/aaf.rb"
     ActsAsFerret::logger.info "loaded configuration file aaf.rb"
   rescue LoadError
   ensure
@@ -518,10 +518,10 @@ module ActsAsFerret
 
   
   # make sure the default index base dir exists. by default, all indexes are created
-  # under Rails.root/index/Rails.env
+  # under RAILS_ROOT/index/RAILS_ENV
   def self.init_index_basedir
-    index_base = "#{Rails.root || '.'}/index"
-    @@index_dir = "#{index_base}/#{Rails.env}"
+    index_base = "#{RAILS_ROOT}/index"
+    @@index_dir = "#{index_base}/#{RAILS_ENV}"
   end
   
   mattr_accessor :index_dir

data/lib/ferret_server.rb

@@ -14,9 +14,9 @@ module ActsAsFerret
       DEFAULTS = {
         'host'      => 'localhost',
         'port'      => '9009',
-        'cf'        => "#{Rails.root}/config/ferret_server.yml",
-        'pid_file'  => "#{Rails.root}/log/ferret_server.pid",
-        'log_file'  => "#{Rails.root}/log/ferret_server.log",
+        'cf'        => "#{RAILS_ROOT}/config/ferret_server.yml",
+        'pid_file'  => "#{RAILS_ROOT}/log/ferret_server.pid",
+        'log_file'  => "#{RAILS_ROOT}/log/ferret_server.log",
         'log_level' => 'debug',
         'socket'    => nil,
         'script'    => nil
@@ -27,8 +27,8 @@ module ActsAsFerret
       def initialize (file=DEFAULTS['cf'])
         @everything = YAML.load(ERB.new(IO.read(file)).result)
         raise "malformed ferret server config" unless @everything.is_a?(Hash)
-        @config = DEFAULTS.merge(@everything[Rails.env] || {})
-        if @everything[Rails.env]
+        @config = DEFAULTS.merge(@everything[RAILS_ENV] || {})
+        if @everything[RAILS_ENV]
           @config['uri'] = socket.nil? ? "druby://#{host}:#{port}" : "drbunix:#{socket}"
         end
       end
@@ -46,7 +46,7 @@ module ActsAsFerret
     # search requests from models declared to 'acts_as_ferret :remote => true'
     #
     # Usage: 
-    # - modify Rails.root/config/ferret_server.yml to suit your needs. 
+    # - modify RAILS_ROOT/config/ferret_server.yml to suit your needs. 
     # - environments for which no section in the config file exists will use 
     #   the index locally (good for unit tests/development mode)
     # - run script/ferret_server to start the server:
@@ -73,7 +73,7 @@ module ActsAsFerret
         ActiveRecord::Base.logger = @logger = Logger.new(@cfg.log_file)
         ActiveRecord::Base.logger.level = Logger.const_get(@cfg.log_level.upcase) rescue Logger::DEBUG
         if @cfg.script
-          path = File.join(Rails.root, @cfg.script) 
+          path = File.join(RAILS_ROOT, @cfg.script) 
           load path
           @logger.info "loaded custom startup script from #{path}"
         end
@@ -82,14 +82,14 @@ module ActsAsFerret
       ################################################################################
       # start the server as a daemon process
       def start
-        raise "ferret_server not configured for #{Rails.env}" unless (@cfg.uri rescue nil)
+        raise "ferret_server not configured for #{RAILS_ENV}" unless (@cfg.uri rescue nil)
         platform_daemon { run_drb_service }
       end
 
       ################################################################################
       # run the server and block until it exits
       def run
-        raise "ferret_server not configured for #{Rails.env}" unless (@cfg.uri rescue nil)
+        raise "ferret_server not configured for #{RAILS_ENV}" unless (@cfg.uri rescue nil)
         run_drb_service
       end
 

data/lib/server_manager.rb

@@ -17,11 +17,11 @@ OptionParser.new do |optparser|
     exit
   end
   
-  optparser.on('-R', '--root=PATH', 'Set Rails.root to the given string') do |r|
+  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|
+  optparser.on('-e', '--environment=NAME', 'Set RAILS_ENV to the given string') do |e|
     $ferret_server_options['environment'] = e
   end
 
@@ -53,12 +53,12 @@ begin
   ENV['FERRET_USE_LOCAL_INDEX'] = 'true'
   ENV['RAILS_ENV'] = $ferret_server_options['environment']
   # determine RAILS_ROOT unless already set
-  Rails.root = determine_rails_root
+  RAILS_ROOT = determine_rails_root unless defined?(RAILS_ROOT)
   
   begin
-    require File.join(Rails.root, 'config', 'environment')
+    require File.join(RAILS_ROOT, 'config', 'environment')
   rescue LoadError
-    puts "Unable to find Rails environment.rb in any of these locations:\n#{possible_rails_roots.join("\n")}\nPlease use the --root option of ferret_server to point it to your Rails.root."
+    puts "Unable to find Rails environment.rb in any of these locations:\n#{possible_rails_roots.join("\n")}\nPlease use the --root option of ferret_server to point it to your RAILS_ROOT."
     raise $!
   end
 

data/lib/unix_daemon.rb

@@ -13,7 +13,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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_ferret
 version: !ruby/object:Gem::Version 
-  hash: -428173559
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 4
   - 8
-  - rails3
-  version: 0.4.8.rails3
+  version: 0.4.8
 platform: ruby
 authors: 
 - Jens Kraemer