thinking-sphinx 3.1.2 → 3.1.3

data/spec/thinking_sphinx/middlewares/inquirer_spec.rb

@@ -47,5 +47,24 @@ describe ThinkingSphinx::Middlewares::Inquirer do
 
       context[:results].should == [:raw]
     end
+
+    context "with mysql2 result" do
+      class FakeResult
+        include Enumerable
+        def each; [{"fake" => "value"}].each { |m| yield m }; end
+      end
+
+      let(:batch_inquirer) { double('batcher', :append_query => true,
+        :results => [
+          FakeResult.new, [{'Variable_name' => 'meta', 'Value' => 'value'}]
+        ])
+      }
+
+      it "converts the results into an array" do
+        middleware.call [context]
+
+        context[:results].should be_a Array
+      end
+    end
   end
 end

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -28,12 +28,13 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
   let(:sphinx_sql)    { double('sphinx_sql', :from => true, :offset => true,
     :limit => true, :where => true, :matching => true, :values => true) }
   let(:query)         { double('query') }
-  let(:configuration) { double('configuration', :settings => {}) }
+  let(:configuration) { double('configuration', :settings => {},
+    index_set_class: set_class) }
+  let(:set_class)     { double(:new => index_set) }
 
   before :each do
     stub_const 'Riddle::Query::Select', double(:new => sphinx_sql)
     stub_const 'ThinkingSphinx::Search::Query', double(:new => query)
-    stub_const 'ThinkingSphinx::IndexSet', double(:new => index_set)
 
     context.stub :search => search, :configuration => configuration
   end
@@ -58,8 +59,9 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       search.options[:indices] = ['user_core']
       index_set.first.stub :reference => :user
 
-      ThinkingSphinx::IndexSet.should_receive(:new).
-        with([klass], ['user_core']).and_return(index_set)
+      set_class.should_receive(:new).
+        with(:classes => [klass], :indices => ['user_core']).
+        and_return(index_set)
 
       middleware.call [context]
     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.1.2'
+  s.version     = '3.1.3'
   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.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,6 +170,7 @@ files:
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -193,7 +194,7 @@ 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/filter_reflection.rb
 - lib/thinking_sphinx/active_record/index.rb
 - lib/thinking_sphinx/active_record/interpreter.rb
 - lib/thinking_sphinx/active_record/join_association.rb
@@ -314,6 +315,7 @@ files:
 - spec/acceptance/search_counts_spec.rb
 - spec/acceptance/search_for_just_ids_spec.rb
 - spec/acceptance/searching_across_models_spec.rb
+- spec/acceptance/searching_across_schemas_spec.rb
 - spec/acceptance/searching_on_fields_spec.rb
 - spec/acceptance/searching_with_filters_spec.rb
 - spec/acceptance/searching_with_sti_spec.rb
@@ -331,6 +333,7 @@ files:
 - spec/internal/app/indices/admin_person_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
+- spec/internal/app/indices/bird_index.rb
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
@@ -363,6 +366,7 @@ files:
 - spec/internal/db/schema.rb
 - spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
+- spec/support/multi_schema.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
 - spec/thinking_sphinx/active_record/attribute/type_spec.rb
@@ -376,7 +380,7 @@ 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/filter_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
@@ -439,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -461,6 +465,7 @@ test_files:
 - spec/acceptance/search_counts_spec.rb
 - spec/acceptance/search_for_just_ids_spec.rb
 - spec/acceptance/searching_across_models_spec.rb
+- spec/acceptance/searching_across_schemas_spec.rb
 - spec/acceptance/searching_on_fields_spec.rb
 - spec/acceptance/searching_with_filters_spec.rb
 - spec/acceptance/searching_with_sti_spec.rb
@@ -478,6 +483,7 @@ test_files:
 - spec/internal/app/indices/admin_person_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
+- spec/internal/app/indices/bird_index.rb
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
@@ -510,6 +516,7 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
+- spec/support/multi_schema.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
 - spec/thinking_sphinx/active_record/attribute/type_spec.rb
@@ -523,7 +530,7 @@ 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/filter_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

data/lib/thinking_sphinx/active_record/filtered_reflection.rb

@@ -1,75 +0,0 @@
-class ThinkingSphinx::ActiveRecord::FilteredReflection <
-  ActiveRecord::Reflection::AssociationReflection
-
-  class Filter
-    attr_reader :reflection, :class_name
-
-    delegate :foreign_type, :active_record, :to => :reflection
-
-    def initialize(reflection, class_name)
-      @reflection, @class_name = reflection, class_name
-      @options = reflection.options.clone
-    end
-
-    def options
-      @options.delete :polymorphic
-      @options[:class_name]    = class_name
-      @options[:foreign_key] ||= "#{reflection.name}_id"
-      @options[:foreign_type]  = reflection.foreign_type
-
-      if reflection.respond_to?(:scope)
-        @options[:sphinx_internal_filtered] = true
-        return @options
-      end
-
-      case @options[:conditions]
-      when nil
-        @options[:conditions] = condition
-      when Array
-        @options[:conditions] << condition
-      when Hash
-        @options[:conditions].merge!(reflection.foreign_type => @options[:class_name])
-      else
-        @options[:conditions] << " AND #{condition}"
-      end
-
-      @options
-    end
-
-    def scope
-      if ::Joiner::Joins.instance_methods.include?(:join_association_class)
-        return nil
-      end
-
-      lambda { |association|
-        reflection = association.reflection
-        klass      = reflection.class_name.constantize
-        where(
-          association.parent.aliased_table_name.to_sym =>
-          {reflection.foreign_type => klass.base_class.name}
-        )
-      }
-    end
-
-    private
-
-    def condition
-      "::ts_join_alias::.#{quoted_foreign_type} = '#{class_name}'"
-    end
-
-    def quoted_foreign_type
-      active_record.connection.quote_column_name foreign_type
-    end
-  end
-
-  def self.clone_with_filter(reflection, name, class_name)
-    filter = Filter.new(reflection, class_name)
-
-    if reflection.respond_to?(:scope)
-      new reflection.macro, name, filter.scope, filter.options,
-        reflection.active_record
-    else
-      new reflection.macro, name, filter.options, reflection.active_record
-    end
-  end
-end

data/spec/thinking_sphinx/active_record/filtered_reflection_spec.rb

@@ -1,141 +0,0 @@
-require 'spec_helper'
-
-describe ThinkingSphinx::ActiveRecord::FilteredReflection do
-  describe '.clone_with_filter' do
-    let(:reflection) { double('Reflection', :macro => :has_some,
-      :options => options, :active_record => double, :name => 'baz',
-      :foreign_type => :foo_type) }
-    let(:options)    { {:polymorphic => true} }
-    let(:filtered_reflection) { double }
-
-    before :each do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.stub(
-        :new => filtered_reflection
-      )
-
-      reflection.active_record.stub_chain(:connection, :quote_column_name).
-        and_return('"foo_type"')
-    end
-
-    it "uses the existing reflection's macro" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new).
-        with(:has_some, anything, anything, anything)
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "uses the supplied name" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new).
-        with(anything, 'foo_bar', anything, anything)
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "uses the existing reflection's parent" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new).
-        with(anything, anything, anything, reflection.active_record)
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "removes the polymorphic setting from the options" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:polymorphic].should be_nil
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "adds the class name option" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:class_name].should == 'Bar'
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "sets the foreign key if necessary" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:foreign_key].should == 'baz_id'
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "respects supplied foreign keys" do
-      options[:foreign_key] = 'qux_id'
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:foreign_key].should == 'qux_id'
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "sets conditions if there are none" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:conditions].should == "::ts_join_alias::.\"foo_type\" = 'Bar'"
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "appends to the conditions array" do
-      options[:conditions] = ['existing']
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:conditions].should == ['existing', "::ts_join_alias::.\"foo_type\" = 'Bar'"]
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "extends the conditions hash" do
-      options[:conditions] = {:x => :y}
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:conditions].should == {:x => :y, :foo_type => 'Bar'}
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "appends to the conditions string" do
-      options[:conditions] = 'existing'
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.should_receive(:new) do |macro, name, options, parent|
-        options[:conditions].should == "existing AND ::ts_join_alias::.\"foo_type\" = 'Bar'"
-      end
-
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end
-
-    it "returns the new reflection" do
-      ThinkingSphinx::ActiveRecord::FilteredReflection.clone_with_filter(
-        reflection, 'foo_bar', 'Bar'
-      ).should == filtered_reflection
-    end
-  end
-end