dpickett-thinking-sphinx 1.1.12 → 1.1.23

data/spec/unit/thinking_sphinx_spec.rb

@@ -51,6 +51,22 @@ describe ThinkingSphinx do
     ThinkingSphinx.updates_enabled?.should be_true
   end
   
+  it "should always say Sphinx is running if flagged as being on a remote machine" do
+    ThinkingSphinx.remote_sphinx = true
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => false)
+    
+    ThinkingSphinx.sphinx_running?.should be_true
+  end
+  
+  it "should actually pay attention to Sphinx if not on a remote machine" do
+    ThinkingSphinx.remote_sphinx = false
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => false)
+    ThinkingSphinx.sphinx_running?.should be_false
+    
+    ThinkingSphinx.stub_method(:sphinx_running_by_pid? => true)
+    ThinkingSphinx.sphinx_running?.should be_true
+  end
+  
   describe "use_group_by_shortcut? method" do
     before :each do
       adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
@@ -105,12 +121,14 @@ describe ThinkingSphinx do
     
     describe "if not using MySQL" do
       before :each do
-        adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :PostgreSQLAdapter
+        adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
         unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
           pending "No PostgreSQL"
           return
         end
-        @connection = ::ActiveRecord::ConnectionAdapters.const_get(adapter).stub_instance(
+        
+        @connection = stub(adapter).as_null_object
+        @connection.stub!(
           :select_all => true,
           :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
         )
@@ -124,9 +142,9 @@ describe ThinkingSphinx do
       end
     
       it "should not call select_all" do
-        ThinkingSphinx.use_group_by_shortcut?
+        @connection.should_not_receive(:select_all)
         
-        @connection.should_not have_received(:select_all)
+        ThinkingSphinx.use_group_by_shortcut?
       end
     end
   end

data/tasks/distribution.rb

@@ -27,6 +27,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "thinking-sphinx"
   s.test_files        = FileList["spec/**/*_spec.rb"]
   s.files             = FileList[
+    "rails/*.rb",
     "lib/**/*.rb",
     "LICENCE",
     "README.textile",
@@ -34,6 +35,24 @@ spec = Gem::Specification.new do |s|
     "tasks/**/*.rake",
     "vendor/**/*"
   ]
+  s.post_install_message = <<-MESSAGE
+With the release of Thinking Sphinx 1.1.18, there is one important change to
+note: previously, the default morphology for indexing was 'stem_en'. The new
+default is nil, to avoid any unexpected behavior. If you wish to keep the old
+value though, you will need to add the following settings to your
+config/sphinx.yml file:
+
+development:
+  morphology: stem_en
+test:
+  morphology: stem_en
+production:
+  morphology: stem_en
+
+To understand morphologies/stemmers better, visit the following link:
+http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+
+MESSAGE
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 4
+    Release = 5
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

data/vendor/riddle/lib/riddle/configuration/section.rb

@@ -30,7 +30,13 @@ module Riddle
       
       def setting_to_array(setting)
         value = send(setting)
-        value.is_a?(Array) ? value : [value]
+        case value
+        when Array      then value
+        when TrueClass  then [1]
+        when FalseClass then [0]
+        else
+          [value]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dpickett-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.12
+  version: 1.1.23
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- rails/init.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb
@@ -52,7 +53,11 @@ files:
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/property.rb
 - lib/thinking_sphinx/rails_additions.rb
+- lib/thinking_sphinx/search/facets.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/source/internal_properties.rb
+- lib/thinking_sphinx/source/sql.rb
+- lib/thinking_sphinx/source.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
@@ -117,10 +122,27 @@ files:
 - spec/unit/thinking_sphinx/index_spec.rb
 - spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
+- spec/unit/thinking_sphinx/source_spec.rb
 - spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
-post_install_message: 
+post_install_message: |+
+  With the release of Thinking Sphinx 1.1.18, there is one important change to
+  note: previously, the default morphology for indexing was 'stem_en'. The new
+  default is nil, to avoid any unexpected behavior. If you wish to keep the old
+  value though, you will need to add the following settings to your
+  config/sphinx.yml file:
+  
+  development:
+    morphology: stem_en
+  test:
+    morphology: stem_en
+  production:
+    morphology: stem_en
+  
+  To understand morphologies/stemmers better, visit the following link:
+  http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+  
 rdoc_options: 
 - --title
 - Thinking Sphinx -- Rails/Merb Sphinx Plugin
@@ -164,4 +186,5 @@ test_files:
 - spec/unit/thinking_sphinx/index_spec.rb
 - spec/unit/thinking_sphinx/rails_additions_spec.rb
 - spec/unit/thinking_sphinx/search_spec.rb
+- spec/unit/thinking_sphinx/source_spec.rb
 - spec/unit/thinking_sphinx_spec.rb