acts_as_ferret 0.4.8.1 → 0.4.8.2

data/README

@@ -19,9 +19,13 @@ http://github.com/jkraemer/acts_as_ferret/tree/master .
 
 === Set up your Rails > 2.1 project to use the acts_as_ferret gem.
 
-Add this to your project's config/environment.rb:
+Add this to your project's config/environment.rb (inside the Rails::Initializer.run block):
 
-<tt>config.gem 'acts_as_ferret', :version => '~> 0.4.8'</tt>
+<tt>
+  config.gem 'acts_as_ferret', :version => '~> 0.4.8'
+  config.after_initialize { ActsAsFerret::load_config }
+  config.to_prepare       { ActsAsFerret::load_config }  
+</tt>
 
 With the gem installed, change into your RAILS_ROOT and run the supplied aaf_install script.
 This will copy rake tasks, capistrano recipes and the ferret server config and startup script

data/acts_as_ferret.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
 	s.name = 'acts_as_ferret'
-	s.version = '0.4.8.1'
+	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.'
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
     
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency('ferret', [">= 0.11.6"])
+      s.add_runtime_dependency('jk-ferret', [">= 0.11.8"])
     else
-      s.add_dependency('ferret', [">= 0.11.6"])
+      s.add_dependency('jk-ferret', [">= 0.11.8"])
     end
   else
-    s.add_dependency('ferret', [">= 0.11.6"])
+    s.add_dependency('jk-ferret', [">= 0.11.8"])
   end
   
 

data/lib/acts_as_ferret.rb

@@ -456,6 +456,8 @@ module ActsAsFerret
     # get objects for each model
     id_arrays.each do |model, id_array|
       next if id_array.empty?
+      # logger.debug "id array from index: #{id_array.inspect}"
+      
       model_class = model.constantize
 
       # merge conditions
@@ -484,7 +486,9 @@ module ActsAsFerret
     
     # order results as they were found by ferret, unless an AR :order
     # option was given
+    # logger.debug "unsorted result: #{result.map{|a| "#{a.id} / #{a.title} / #{a.ferret_rank}"}.inspect}"
     result.sort! { |a, b| a.ferret_rank <=> b.ferret_rank } unless find_options[:order]
+    # logger.debug "sorted result: #{result.map{|a| "#{a.id} / #{a.ferret_rank}"}.inspect}"
     return result
   end
   

data/lib/ferret_extensions.rb

@@ -94,6 +94,20 @@ module Ferret
         flush()
       end      
     end
+
+    # search for the first document with +arg+ in the +id+ field and return it's internal document number. 
+    # The +id+ field is either :id or whatever you set
+    # :id_field parameter to when you create the Index object.
+    def doc_number(id)
+      @dir.synchronize do
+        ensure_reader_open()
+        term_doc_enum = @reader.term_docs_for(@id_field, id.to_s)
+        return term_doc_enum.next? ? term_doc_enum.doc : nil
+      end
+    end
+    
+    private
+    
     
     # If +docs+ is a Hash or an Array then a batch delete will be performed.
     # If +docs+ is an Array then it will be considered an array of +id+'s. If
@@ -134,17 +148,7 @@ module Ferret
       end
       return self
     end
-
-    # search for the first document with +arg+ in the +id+ field and return it's internal document number. 
-    # The +id+ field is either :id or whatever you set
-    # :id_field parameter to when you create the Index object.
-    def doc_number(id)
-      @dir.synchronize do
-        ensure_reader_open()
-        term_doc_enum = @reader.term_docs_for(@id_field, id.to_s)
-        return term_doc_enum.next? ? term_doc_enum.doc : nil
-      end
-    end
+    
   end
 
   # add marshalling support to SortFields
@@ -175,7 +179,7 @@ module Ferret
       # we exclude the last <DOC> sorting as it is appended by new anyway
       if string =~ /^Sort\[(.*?)(<DOC>(!)?)?\]$/
         sort_fields = $1.split(',').map do |value| 
-        value.strip!
+          value.strip!
           Ferret::Search::SortField._load value unless value.blank?
         end
         new sort_fields.compact

data/lib/local_index.rb

@@ -73,9 +73,6 @@ module ActsAsFerret
               reader.tokenized_fields unless options[:tokenized_fields]
           return qp.parse query
         else
-          # work around ferret bug in #process_query (doesn't ensure the
-          # reader is open)
-          ferret_index.send(:ensure_reader_open)
           return ferret_index.process_query(query)
         end
       end

data/lib/rdig_adapter.rb

@@ -1,6 +1,7 @@
 begin
   require 'rdig'
 rescue LoadError
+  puts "RDig gem not found, searching and indexing static pages won't work."
 end
 require 'digest/md5'
 

data/recipes/aaf_recipes.rb

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

metadata

@@ -1,14 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_ferret
 version: !ruby/object:Gem::Version 
-  hash: 77
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 8
-  - 1
-  version: 0.4.8.1
+  version: 0.4.8.2
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -16,25 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-10-26 00:00:00 +02:00
 default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ferret
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  name: jk-ferret
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 11
-        - 6
-        version: 0.11.6
-  type: :runtime
-  version_requirements: *id001
+        version: 0.11.8
+    version: 
 description: Rails plugin that adds powerful full text search capabilities to ActiveRecord models.
 email: jk@jkraemer.net
 executables: 
@@ -216,29 +203,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
       version: 1.8.6
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: acts_as_ferret
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: acts_as_ferret - Ferret based full text search for any ActiveRecord model