freelancing-god-thinking-sphinx 1.1.10 → 1.1.11

data/README.textile

@@ -122,3 +122,5 @@ Since I first released this library, there's been quite a few people who have su
 * Martin Emde
 * David Wennergren
 * Mark Lane
+* Eric Lindvall
+* Lawrence Pit

data/lib/thinking_sphinx/collection.rb

@@ -46,6 +46,7 @@ module ThinkingSphinx
       ids = matches.collect { |match| match[:attributes]["sphinx_internal_id"] }
       instances = ids.length > 0 ? klass.find(
         :all,
+        :joins      => options[:joins],
         :conditions => {klass.primary_key.to_sym => ids},
         :include    => (options[:include] || index_options[:include]),
         :select     => (options[:select]  || index_options[:select]),

data/lib/thinking_sphinx/configuration.rb

@@ -31,8 +31,10 @@ module ThinkingSphinx
   # fashion to database.yml - using the following keys: config_file,
   # searchd_log_file, query_log_file, pid_file, searchd_file_path, port,
   # allow_star, enable_star, min_prefix_len, min_infix_len, mem_limit,
-  # max_matches, # morphology, charset_type, charset_table, ignore_chars,
-  # html_strip, # html_remove_elements. I think you've got the idea.
+  # max_matches, morphology, charset_type, charset_table, ignore_chars,
+  # html_strip, html_remove_elements, delayed_job_priority.
+  #
+  # I think you've got the idea.
   # 
   # Each setting in the YAML file is optional - so only put in the ones you
   # want to change.
@@ -55,7 +57,8 @@ module ThinkingSphinx
         
     attr_accessor :config_file, :searchd_log_file, :query_log_file,
       :pid_file, :searchd_file_path, :address, :port, :allow_star,
-      :database_yml_file, :app_root, :bin_path, :model_directories
+      :database_yml_file, :app_root, :bin_path, :model_directories,
+      :delayed_job_priority
     
     attr_accessor :source_options, :index_options
     
@@ -87,6 +90,7 @@ module ThinkingSphinx
       self.bin_path             = ""
       self.model_directories    = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
+      self.delayed_job_priority = 0
       
       self.source_options  = {}
       self.index_options   = {

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -9,13 +9,15 @@ module ThinkingSphinx
     class DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
       def index(model, instance = nil)
         ThinkingSphinx::Deltas::Job.enqueue(
-          ThinkingSphinx::Deltas::DeltaJob.new(delta_index_name(model))
+          ThinkingSphinx::Deltas::DeltaJob.new(delta_index_name(model)),
+          ThinkingSphinx::Configuration.instance.delayed_job_priority
         )
         
         Delayed::Job.enqueue(
           ThinkingSphinx::Deltas::FlagAsDeletedJob.new(
             core_index_name(model), instance.sphinx_document_id
-          )
+          ),
+          ThinkingSphinx::Configuration.instance.delayed_job_priority
         ) if instance
         
         true

data/lib/thinking_sphinx.rb

@@ -36,7 +36,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 10
+    Tiny  = 11
     
     String = [Major, Minor, Tiny].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-09 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: []