thinking-sphinx 3.1.1 → 3.1.2

data/spec/acceptance/indexing_spec.rb

@@ -24,4 +24,13 @@ describe 'Indexing', :live => true do
 
     FileUtils.rm path
   end
+
+  it "cleans up temp files even when an exception is raised" do
+    FileUtils.mkdir_p Rails.root.join('db/sphinx/test')
+
+    index 'article_core'
+
+    file = Rails.root.join('db/sphinx/test/ts-article_core.tmp')
+    File.exist?(file).should be_false
+  end
 end

data/spec/acceptance/specifying_sql_spec.rb

@@ -57,7 +57,7 @@ describe 'specifying SQL for index definitions' do
     index.render
 
     query = index.sources.first.sql_query
-    query.should match(/GROUP BY .articles.\..id., .articles.\..title., .articles.\..id., lat/)
+    query.should match(/GROUP BY .articles.\..id., .?articles.?\..title., .?articles.?\..id., lat/)
   end
 
   it "handles WHERE clauses" do

data/spec/acceptance/sphinx_scopes_spec.rb

@@ -66,4 +66,13 @@ describe 'Sphinx scopes', :live => true do
 
     Book.by_query('gods').count.should == 2
   end
+
+  it 'raises an exception when trying to modify a populated request' do
+    request = Book.by_query('gods')
+    request.count
+
+    expect { request.search('foo') }.to raise_error(
+      ThinkingSphinx::PopulatedResultsError
+    )
+  end
 end

data/spec/internal/app/indices/user_index.rb

@@ -2,4 +2,6 @@ ThinkingSphinx::Index.define :user, :with => :active_record do
   indexes name
 
   has articles.taggings.tag_id, :as => :tag_ids, :facet => true
+
+  set_property :big_document_ids => true
 end

data/spec/thinking_sphinx/active_record/base_spec.rb

@@ -108,10 +108,12 @@ describe ThinkingSphinx::ActiveRecord::Base do
   end
 
   describe '.search_count' do
-    let(:search) { double('search', :options => {}, :total_entries => 12) }
+    let(:search) { double('search', :options => {}, :total_entries => 12,
+      :populated? => false) }
 
     before :each do
       ThinkingSphinx.stub :search => search
+      FileUtils.stub :mkdir_p => true
     end
 
     it "returns the search object's total entries count" do

data/spec/thinking_sphinx/active_record/index_spec.rb

@@ -144,6 +144,10 @@ describe ThinkingSphinx::ActiveRecord::Index do
 
   describe '#morphology' do
     context 'with a render' do
+      before :each do
+        FileUtils.stub :mkdir_p => true
+      end
+
       it "defaults to nil" do
         begin
           index.render
@@ -195,6 +199,10 @@ describe ThinkingSphinx::ActiveRecord::Index do
   end
 
   describe '#render' do
+    before :each do
+      FileUtils.stub :mkdir_p => true
+    end
+
     it "interprets the provided definition" do
       index.should_receive(:interpret_definition!).at_least(:once)
 

data/spec/thinking_sphinx/active_record/interpreter_spec.rb

@@ -5,7 +5,7 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     ThinkingSphinx::ActiveRecord::Interpreter.new index, block
   }
   let(:model)   { double('model') }
-  let(:index)   { double('index', :append_source => source) }
+  let(:index)   { double('index', :append_source => source, :options => {}) }
   let(:source)  {
     Struct.new(:attributes, :fields, :associations, :groupings, :conditions).
       new([], [], [], [], [])
@@ -251,6 +251,12 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
       source.class.stub :settings => [:mysql_ssl_cert]
     end
 
+    it 'saves other settings as index options' do
+      instance.set_property :field_weights => {:name => 10}
+
+      index.options[:field_weights].should == {:name => 10}
+    end
+
     context 'index settings' do
       it "sets the provided setting" do
         index.should_receive(:morphology=).with('stem_en')

data/spec/thinking_sphinx/active_record/polymorpher_spec.rb

@@ -23,6 +23,10 @@ describe ThinkingSphinx::ActiveRecord::Polymorpher do
       ThinkingSphinx::ActiveRecord::FilteredReflection.
         stub(:clone_with_filter).
         and_return(article_reflection, animal_reflection)
+
+      if ActiveRecord::Reflection.respond_to?(:add_reflection)
+        ActiveRecord::Reflection.stub :add_reflection
+      end
     end
 
     it "creates a new reflection for each class" do
@@ -42,10 +46,19 @@ describe ThinkingSphinx::ActiveRecord::Polymorpher do
     end
 
     it "adds the new reflections to the end-of-stack model" do
-      polymorpher.morph!
+      if ActiveRecord::Reflection.respond_to?(:add_reflection)
+        ActiveRecord::Reflection.should_receive(:add_reflection).
+          with(model, :foo_article, article_reflection)
+        ActiveRecord::Reflection.should_receive(:add_reflection).
+          with(model, :foo_animal, animal_reflection)
+
+        polymorpher.morph!
+      else
+        polymorpher.morph!
 
-      model.reflections[:foo_article].should == article_reflection
-      model.reflections[:foo_animal].should  == animal_reflection
+        expect(model.reflections[:foo_article]).to eq(article_reflection)
+        expect(model.reflections[:foo_animal]).to eq(animal_reflection)
+      end
     end
 
     it "rebases each field" do

data/spec/thinking_sphinx/configuration_spec.rb

@@ -322,6 +322,24 @@ describe ThinkingSphinx::Configuration do
 
       config.render_to_file
     end
+
+    it "creates a directory at the binlog_path" do
+      FileUtils.stub :mkdir_p => true
+      config.stub :searchd => double(:binlog_path => '/path/to/binlog')
+
+      FileUtils.should_receive(:mkdir_p).with('/path/to/binlog')
+
+      config.render_to_file
+    end
+
+    it "skips creating a directory when the binlog_path is blank" do
+      FileUtils.stub :mkdir_p => true
+      config.stub :searchd => double(:binlog_path => '')
+
+      FileUtils.should_not_receive(:mkdir_p)
+
+      config.render_to_file
+    end
   end
 
   describe '#searchd' do

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -26,12 +26,12 @@ describe ThinkingSphinx::FacetSearch do
   DumbSearch = ::Struct.new(:query, :options) do
     def raw
       [{
-        'sphinx_internal_class' => 'Foo',
-        'price_bracket'         => 3,
-        'tag_ids'               => '1,2',
-        'category_id'           => 11,
-        'sphinx_internal_count' => 5,
-        'sphinx_internal_group' => 2
+        'sphinx_internal_class'                    => 'Foo',
+        'price_bracket'                            => 3,
+        'tag_ids'                                  => '1,2',
+        'category_id'                              => 11,
+        ThinkingSphinx::SphinxQL.count[:column]    => 5,
+        ThinkingSphinx::SphinxQL.group_by[:column] => 2
       }]
     end
   end

data/spec/thinking_sphinx/masks/scopes_mask_spec.rb

@@ -5,9 +5,14 @@ end
 require 'thinking_sphinx/masks/scopes_mask'
 
 describe ThinkingSphinx::Masks::ScopesMask do
-  let(:search) { double('search', :options => {}, :per_page => 20) }
+  let(:search) { double('search', :options => {}, :per_page => 20,
+    :populated? => false) }
   let(:mask)   { ThinkingSphinx::Masks::ScopesMask.new search }
 
+  before :each do
+    FileUtils.stub :mkdir_p => true
+  end
+
   describe '#search' do
     it "replaces the query if one is supplied" do
       search.should_receive(:query=).with('bar')

data/spec/thinking_sphinx/panes/weight_pane_spec.rb

@@ -12,7 +12,7 @@ describe ThinkingSphinx::Panes::WeightPane do
 
   describe '#weight' do
     it "returns the object's weight by default" do
-      raw[ThinkingSphinx::SphinxQL.weight] = 101
+      raw[ThinkingSphinx::SphinxQL.weight[:column]] = 101
 
       pane.weight.should == 101
     end

data/spec/thinking_sphinx/rake_interface_spec.rb

@@ -9,7 +9,7 @@ describe ThinkingSphinx::RakeInterface do
     interface.stub(:puts => nil)
   end
 
-  describe '#clear' do
+  describe '#clear_all' do
     let(:controller) { double 'controller' }
 
     before :each do
@@ -25,13 +25,50 @@ describe ThinkingSphinx::RakeInterface do
     it "removes the directory for the index files" do
       FileUtils.should_receive(:rm_r).with('/path/to/indices')
 
-      interface.clear
+      interface.clear_all
     end
 
     it "removes the directory for the binlog files" do
       FileUtils.should_receive(:rm_r).with('/path/to/binlog')
 
-      interface.clear
+      interface.clear_all
+    end
+  end
+
+  describe '#clear_real_time' do
+    let(:controller) { double 'controller' }
+    let(:index)      {
+      double(:type => 'rt', :render => true, :path => '/path/to/my/index')
+    }
+
+    before :each do
+      configuration.stub(
+        :indices => [double(:type => 'plain'), index],
+        :searchd => double(:binlog_path => '/path/to/binlog')
+      )
+
+      Dir.stub :[] => ['foo.a', 'foo.b']
+      FileUtils.stub :rm_r => true, :rm => true
+      File.stub :exists? => true
+    end
+
+    it 'finds each file for real-time indices' do
+      Dir.should_receive(:[]).with('/path/to/my/index.*').and_return([])
+
+      interface.clear_real_time
+    end
+
+    it "removes each file for real-time indices" do
+      FileUtils.should_receive(:rm).with('foo.a')
+      FileUtils.should_receive(:rm).with('foo.b')
+
+      interface.clear_real_time
+    end
+
+    it "removes the directory for the binlog files" do
+      FileUtils.should_receive(:rm_r).with('/path/to/binlog')
+
+      interface.clear_real_time
     end
   end
 
@@ -195,4 +232,26 @@ describe ThinkingSphinx::RakeInterface do
       interface.stop
     end
   end
+
+  describe '#status' do
+    let(:controller) { double('controller') }
+
+    it "reports when the daemon is running" do
+      controller.stub :running? => true
+
+      interface.should_receive(:puts).
+        with('The Sphinx daemon searchd is currently running.')
+
+      interface.status
+    end
+
+    it "reports when the daemon is not running" do
+      controller.stub :running? => false
+
+      interface.should_receive(:puts).
+        with('The Sphinx daemon searchd is not currently running.')
+
+      interface.status
+    end
+  end
 end

data/spec/thinking_sphinx/real_time/callbacks/real_time_callbacks_spec.rb

@@ -4,7 +4,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
   let(:callbacks)  {
     ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks.new :article
   }
-  let(:instance)   { double('instance', :id => 12) }
+  let(:instance)   { double('instance', :id => 12, :persisted? => true) }
   let(:config)     { double('config', :indices_for_references => [index],
     :settings => {}) }
   let(:index)      { double('index', :name => 'my_index', :is_a? => true,
@@ -58,7 +58,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
         )
       }
       let(:instance)   { double('instance', :id => 12, :user => user) }
-      let(:user)       { double('user', :id => 13) }
+      let(:user)       { double('user', :id => 13, :persisted? => true) }
 
       it "creates an insert statement with all fields and attributes" do
         Riddle::Query::Insert.should_receive(:new).
@@ -89,8 +89,42 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
       }
       let(:instance)   { double('instance', :id => 12,
         :readers => [user_a, user_b]) }
-      let(:user_a)     { double('user', :id => 13) }
-      let(:user_b)     { double('user', :id => 14) }
+      let(:user_a)     { double('user', :id => 13, :persisted? => true) }
+      let(:user_b)     { double('user', :id => 14, :persisted? => true) }
+
+      it "creates insert statements with all fields and attributes" do
+        Riddle::Query::Insert.should_receive(:new).twice.
+          with('my_index', ['id', 'name', 'created_at'], [123, 'Foo', time]).
+          and_return(insert)
+
+        callbacks.after_save instance
+      end
+
+      it "gets the document id for each reader" do
+        index.should_receive(:document_id_for_key).with(13).and_return(123)
+        index.should_receive(:document_id_for_key).with(14).and_return(123)
+
+        callbacks.after_save instance
+      end
+
+      it "translates values for each reader" do
+        field.should_receive(:translate).with(user_a).and_return('Foo')
+        field.should_receive(:translate).with(user_b).and_return('Foo')
+
+        callbacks.after_save instance
+      end
+    end
+
+    context 'with a block instead of a path' do
+      let(:callbacks)  {
+        ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks.new(
+          :article
+        ) { |object| object.readers }
+      }
+      let(:instance)   { double('instance', :id => 12,
+        :readers => [user_a, user_b]) }
+      let(:user_a)     { double('user', :id => 13, :persisted? => true) }
+      let(:user_b)     { double('user', :id => 14, :persisted? => true) }
 
       it "creates insert statements with all fields and attributes" do
         Riddle::Query::Insert.should_receive(:new).twice.

data/spec/thinking_sphinx/real_time/index_spec.rb

@@ -138,6 +138,10 @@ describe ThinkingSphinx::RealTime::Index do
   end
 
   describe '#render' do
+    before :each do
+      FileUtils.stub :mkdir_p => true
+    end
+
     it "interprets the provided definition" do
       index.should_receive(:interpret_definition!).at_least(:once)
 

data/spec/thinking_sphinx/real_time/interpreter_spec.rb

@@ -5,7 +5,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
     ThinkingSphinx::RealTime::Interpreter.new index, block
   }
   let(:model)   { double('model') }
-  let(:index)   { Struct.new(:attributes, :fields).new([], []) }
+  let(:index)   { Struct.new(:attributes, :fields, :options).new([], [], {}) }
   let(:block)   { Proc.new { } }
 
   describe '.translate!' do
@@ -172,6 +172,12 @@ describe ThinkingSphinx::RealTime::Interpreter do
       index.class.stub :settings => [:morphology]
     end
 
+    it 'saves other settings as index options' do
+      instance.set_property :field_weights => {:name => 10}
+
+      index.options[:field_weights].should == {:name => 10}
+    end
+
     context 'index settings' do
       it "sets the provided setting" do
         index.should_receive(:morphology=).with('stem_en')

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.1.1'
+  s.version     = '3.1.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -196,6 +196,7 @@ files:
 - lib/thinking_sphinx/active_record/filtered_reflection.rb
 - lib/thinking_sphinx/active_record/index.rb
 - lib/thinking_sphinx/active_record/interpreter.rb
+- lib/thinking_sphinx/active_record/join_association.rb
 - lib/thinking_sphinx/active_record/log_subscriber.rb
 - lib/thinking_sphinx/active_record/polymorpher.rb
 - lib/thinking_sphinx/active_record/property.rb
@@ -241,6 +242,9 @@ files:
 - lib/thinking_sphinx/frameworks.rb
 - lib/thinking_sphinx/frameworks/plain.rb
 - lib/thinking_sphinx/frameworks/rails.rb
+- lib/thinking_sphinx/guard.rb
+- lib/thinking_sphinx/guard/file.rb
+- lib/thinking_sphinx/guard/files.rb
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/index_set.rb
 - lib/thinking_sphinx/logger.rb
@@ -435,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.2.0
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord