thinking-sphinx 3.0.0 → 3.0.1

data/spec/thinking_sphinx/errors_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::SphinxError do
+  describe '.new_from_mysql' do
+    let(:error) { double 'error', :message => 'index foo: unknown error',
+      :backtrace => ['foo', 'bar'] }
+
+    it "translates syntax errors" do
+      error.stub :message => 'index foo: syntax error: something is wrong'
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        should be_a(ThinkingSphinx::SyntaxError)
+    end
+
+    it "translates parse errors" do
+      error.stub :message => 'index foo: parse error: something is wrong'
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        should be_a(ThinkingSphinx::ParseError)
+    end
+
+    it "defaults to sphinx errors" do
+      error.stub :message => 'index foo: unknown error: something is wrong'
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        should be_a(ThinkingSphinx::SphinxError)
+    end
+
+    it "keeps the original error's backtrace" do
+      error.stub :message => 'index foo: unknown error: something is wrong'
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        backtrace.should == error.backtrace
+    end
+  end
+end

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -108,6 +108,31 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       middleware.call [context]
     end
 
+    it "quotes namespaced models in the class name condition" do
+      db_connection = double('db connection', :select_values => [],
+        :schema_cache => double('cache', :table_exists? => false))
+      supermodel = Class.new(ActiveRecord::Base) do
+        def self.name; 'Animals::Cat'; end
+        def self.inheritance_column; 'type'; end
+      end
+      supermodel.stub :connection => db_connection, :column_names => ['type']
+      submodel   = Class.new(supermodel) do
+        def self.name; 'Animals::Lion'; end
+        def self.inheritance_column; 'type'; end
+        def self.table_name; 'cats'; end
+      end
+      submodel.stub :connection => db_connection, :column_names => ['type'],
+        :descendants => []
+
+      search.options[:classes] = [submodel]
+
+      ThinkingSphinx::Search::Query.should_receive(:new).with(anything,
+        hash_including(:sphinx_internal_class_name => '("Animals::Lion")'), anything).
+        and_return(query)
+
+      middleware.call [context]
+    end
+
     it "does not query the database for subclasses if :skip_sti is set to true" do
       model = double('model', :connection => double,
         :ancestors => [ActiveRecord::Base], :name => 'Animal')

data/spec/thinking_sphinx/search/glaze_spec.rb

@@ -43,6 +43,9 @@ describe ThinkingSphinx::Search::Glaze do
     end
 
     it "raises the method missing error otherwise" do
+      object.stub :respond_to? => false
+      object.stub(:baz).and_raise(NoMethodError)
+
       lambda { glaze.baz }.should raise_error(NoMethodError)
     end
   end

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.0.0'
+  s.version     = '3.0.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -175,6 +175,7 @@ files:
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
 - lib/thinking-sphinx.rb
+- lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/active_record/association.rb
@@ -194,9 +195,11 @@ files:
 - lib/thinking_sphinx/active_record/database_adapters/mysql_adapter.rb
 - lib/thinking_sphinx/active_record/database_adapters/postgresql_adapter.rb
 - lib/thinking_sphinx/active_record/field.rb
+- 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/log_subscriber.rb
+- lib/thinking_sphinx/active_record/polymorpher.rb
 - lib/thinking_sphinx/active_record/property.rb
 - lib/thinking_sphinx/active_record/property_query.rb
 - lib/thinking_sphinx/active_record/property_sql_presenter.rb
@@ -205,6 +208,7 @@ files:
 - lib/thinking_sphinx/active_record/sql_source/template.rb
 - lib/thinking_sphinx/batched_search.rb
 - lib/thinking_sphinx/callbacks.rb
+- lib/thinking_sphinx/capistrano.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/configuration/consistent_ids.rb
 - lib/thinking_sphinx/configuration/defaults.rb
@@ -216,6 +220,7 @@ files:
 - lib/thinking_sphinx/core/property.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/errors.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
 - lib/thinking_sphinx/facet_search.rb
@@ -313,8 +318,10 @@ files:
 - spec/internal/app/models/book.rb
 - spec/internal/app/models/city.rb
 - spec/internal/app/models/colour.rb
+- spec/internal/app/models/event.rb
 - spec/internal/app/models/flightless_bird.rb
 - spec/internal/app/models/genre.rb
+- spec/internal/app/models/hardcover.rb
 - spec/internal/app/models/mammal.rb
 - spec/internal/app/models/product.rb
 - spec/internal/app/models/tag.rb
@@ -340,14 +347,18 @@ files:
 - spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters_spec.rb
 - spec/thinking_sphinx/active_record/field_spec.rb
+- spec/thinking_sphinx/active_record/filtered_reflection_spec.rb
 - spec/thinking_sphinx/active_record/index_spec.rb
 - spec/thinking_sphinx/active_record/interpreter_spec.rb
+- spec/thinking_sphinx/active_record/polymorpher_spec.rb
 - spec/thinking_sphinx/active_record/property_sql_presenter_spec.rb
 - spec/thinking_sphinx/active_record/sql_builder_spec.rb
 - spec/thinking_sphinx/active_record/sql_source_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb
 - spec/thinking_sphinx/deltas_spec.rb
+- spec/thinking_sphinx/errors_spec.rb
 - spec/thinking_sphinx/excerpter_spec.rb
 - spec/thinking_sphinx/facet_search_spec.rb
 - spec/thinking_sphinx/index_set_spec.rb
@@ -389,12 +400,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -122546704410277760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -122546704410277760
 requirements: []
 rubyforge_project: thinking-sphinx
 rubygems_version: 1.8.23
@@ -447,8 +464,10 @@ test_files:
 - spec/internal/app/models/book.rb
 - spec/internal/app/models/city.rb
 - spec/internal/app/models/colour.rb
+- spec/internal/app/models/event.rb
 - spec/internal/app/models/flightless_bird.rb
 - spec/internal/app/models/genre.rb
+- spec/internal/app/models/hardcover.rb
 - spec/internal/app/models/mammal.rb
 - spec/internal/app/models/product.rb
 - spec/internal/app/models/tag.rb
@@ -474,14 +493,18 @@ test_files:
 - spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters_spec.rb
 - spec/thinking_sphinx/active_record/field_spec.rb
+- spec/thinking_sphinx/active_record/filtered_reflection_spec.rb
 - spec/thinking_sphinx/active_record/index_spec.rb
 - spec/thinking_sphinx/active_record/interpreter_spec.rb
+- spec/thinking_sphinx/active_record/polymorpher_spec.rb
 - spec/thinking_sphinx/active_record/property_sql_presenter_spec.rb
 - spec/thinking_sphinx/active_record/sql_builder_spec.rb
 - spec/thinking_sphinx/active_record/sql_source_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb
 - spec/thinking_sphinx/deltas_spec.rb
+- spec/thinking_sphinx/errors_spec.rb
 - spec/thinking_sphinx/excerpter_spec.rb
 - spec/thinking_sphinx/facet_search_spec.rb
 - spec/thinking_sphinx/index_set_spec.rb
@@ -510,4 +533,3 @@ test_files:
 - spec/thinking_sphinx/search/query_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: