thinking-sphinx 3.0.6 → 3.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: joiner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +167,9 @@ files:
 - README.textile
 - Rakefile
 - gemfiles/.gitignore
-- gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -163,7 +177,6 @@ files:
 - lib/thinking_sphinx/active_record/association.rb
 - lib/thinking_sphinx/active_record/association_proxy.rb
 - lib/thinking_sphinx/active_record/association_proxy/attribute_finder.rb
-- lib/thinking_sphinx/active_record/associations.rb
 - lib/thinking_sphinx/active_record/attribute.rb
 - lib/thinking_sphinx/active_record/attribute/sphinx_presenter.rb
 - lib/thinking_sphinx/active_record/attribute/type.rb
@@ -173,6 +186,7 @@ files:
 - lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb
 - lib/thinking_sphinx/active_record/column.rb
+- lib/thinking_sphinx/active_record/column_sql_presenter.rb
 - lib/thinking_sphinx/active_record/database_adapters.rb
 - lib/thinking_sphinx/active_record/database_adapters/abstract_adapter.rb
 - lib/thinking_sphinx/active_record/database_adapters/mysql_adapter.rb
@@ -195,11 +209,15 @@ files:
 - lib/thinking_sphinx/batched_search.rb
 - lib/thinking_sphinx/callbacks.rb
 - lib/thinking_sphinx/capistrano.rb
+- lib/thinking_sphinx/capistrano/v2.rb
+- lib/thinking_sphinx/capistrano/v3.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/configuration/consistent_ids.rb
 - lib/thinking_sphinx/configuration/defaults.rb
+- lib/thinking_sphinx/configuration/distributed_indices.rb
 - lib/thinking_sphinx/configuration/minimum_fields.rb
 - lib/thinking_sphinx/connection.rb
+- lib/thinking_sphinx/controller.rb
 - lib/thinking_sphinx/core.rb
 - lib/thinking_sphinx/core/field.rb
 - lib/thinking_sphinx/core/index.rb
@@ -211,6 +229,8 @@ files:
 - lib/thinking_sphinx/deltas/default_delta.rb
 - lib/thinking_sphinx/deltas/delete_job.rb
 - lib/thinking_sphinx/deltas/index_job.rb
+- lib/thinking_sphinx/distributed.rb
+- lib/thinking_sphinx/distributed/index.rb
 - lib/thinking_sphinx/errors.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -242,6 +262,7 @@ files:
 - lib/thinking_sphinx/panes/distance_pane.rb
 - lib/thinking_sphinx/panes/excerpts_pane.rb
 - lib/thinking_sphinx/panes/weight_pane.rb
+- lib/thinking_sphinx/query.rb
 - lib/thinking_sphinx/railtie.rb
 - lib/thinking_sphinx/rake_interface.rb
 - lib/thinking_sphinx/real_time.rb
@@ -268,6 +289,7 @@ files:
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
 - lib/thinking_sphinx/utf8.rb
+- lib/thinking_sphinx/wildcard.rb
 - sketchpad.rb
 - spec/acceptance/association_scoping_spec.rb
 - spec/acceptance/attribute_access_spec.rb
@@ -279,6 +301,7 @@ files:
 - spec/acceptance/geosearching_spec.rb
 - spec/acceptance/grouping_by_attributes_spec.rb
 - spec/acceptance/index_options_spec.rb
+- spec/acceptance/indexing_spec.rb
 - spec/acceptance/paginating_search_results_spec.rb
 - spec/acceptance/remove_deleted_records_spec.rb
 - spec/acceptance/search_counts_spec.rb
@@ -333,7 +356,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
-- spec/thinking_sphinx/active_record/associations_spec.rb
 - spec/thinking_sphinx/active_record/attribute/type_spec.rb
 - spec/thinking_sphinx/active_record/base_spec.rb
 - spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb
@@ -385,9 +407,10 @@ files:
 - spec/thinking_sphinx/search/glaze_spec.rb
 - spec/thinking_sphinx/search/query_spec.rb
 - spec/thinking_sphinx/search_spec.rb
+- spec/thinking_sphinx/wildcard_spec.rb
 - spec/thinking_sphinx_spec.rb
 - thinking-sphinx.gemspec
-homepage: http://pat.github.com/ts/en
+homepage: http://pat.github.io/thinking-sphinx/
 licenses:
 - MIT
 metadata: {}
@@ -407,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.1.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -422,6 +445,7 @@ test_files:
 - spec/acceptance/geosearching_spec.rb
 - spec/acceptance/grouping_by_attributes_spec.rb
 - spec/acceptance/index_options_spec.rb
+- spec/acceptance/indexing_spec.rb
 - spec/acceptance/paginating_search_results_spec.rb
 - spec/acceptance/remove_deleted_records_spec.rb
 - spec/acceptance/search_counts_spec.rb
@@ -476,7 +500,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
-- spec/thinking_sphinx/active_record/associations_spec.rb
 - spec/thinking_sphinx/active_record/attribute/type_spec.rb
 - spec/thinking_sphinx/active_record/base_spec.rb
 - spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb
@@ -528,4 +551,5 @@ test_files:
 - spec/thinking_sphinx/search/glaze_spec.rb
 - spec/thinking_sphinx/search/query_spec.rb
 - spec/thinking_sphinx/search_spec.rb
+- spec/thinking_sphinx/wildcard_spec.rb
 - spec/thinking_sphinx_spec.rb

data/lib/thinking_sphinx/active_record/associations.rb

@@ -1,98 +0,0 @@
-class ThinkingSphinx::ActiveRecord::Associations
-  JoinDependency = ::ActiveRecord::Associations::JoinDependency
-
-  attr_reader :model
-
-  def initialize(model)
-    @model = model
-    @joins = ActiveSupport::OrderedHash.new
-  end
-
-  def add_join_to(stack)
-    join_for(stack)
-  end
-
-  def aggregate_for?(stack)
-    return false if stack.empty?
-
-    joins_for(stack).compact.any? { |join|
-      [:has_many, :has_and_belongs_to_many].include?(
-        join.reflection.macro
-      )
-    }
-  end
-
-  def alias_for(stack)
-    return model.quoted_table_name if stack.empty?
-
-    join_for(stack).aliased_table_name
-  end
-
-  def join_values
-    @joins.values.compact
-  end
-
-  def model_for(stack)
-    return model if stack.empty?
-
-    join = join_for(stack)
-    join.nil? ? nil : join.reflection.klass
-  end
-
-  private
-
-  def base
-    @base ||= JoinDependency.new model, [], []
-  end
-
-  def join_for(stack)
-    @joins[stack] ||= begin
-      reflection = reflection_for stack
-      reflection.nil? ? nil : JoinDependency::JoinAssociation.new(
-        reflection, base, parent_join_for(stack)
-      ).tap { |join|
-        join.join_type = Arel::OuterJoin
-
-        rewrite_conditions_for join
-      }
-    end
-  end
-
-  def joins_for(stack)
-    if stack.length == 1
-      [join_for(stack)]
-    else
-      [joins_for(stack[0..-2]), join_for(stack)].flatten
-    end
-  end
-
-  def parent_for(stack)
-    stack.length == 1 ? base : join_for(stack[0..-2])
-  end
-
-  def parent_join_for(stack)
-    stack.length == 1 ? base.join_base : parent_for(stack)
-  end
-
-  def reflection_for(stack)
-    parent = parent_for(stack)
-    klass  = parent.respond_to?(:base_klass) ? parent.base_klass :
-      parent.active_record
-    klass.reflections[stack.last]
-  end
-
-  def rewrite_conditions_for(join)
-    if join.respond_to?(:scope_chain)
-      conditions = Array(join.scope_chain).flatten
-    else
-      conditions = Array(join.conditions).flatten
-    end
-
-    conditions.each do |condition|
-      next unless condition.is_a?(String)
-
-      condition.gsub! /::ts_join_alias::/,
-        model.connection.quote_table_name(join.parent.aliased_table_name)
-    end
-  end
-end

data/spec/thinking_sphinx/active_record/associations_spec.rb

@@ -1,230 +0,0 @@
-require 'spec_helper'
-
-describe ThinkingSphinx::ActiveRecord::Associations do
-  JoinDependency = ::ActiveRecord::Associations::JoinDependency
-
-  let(:associations) { ThinkingSphinx::ActiveRecord::Associations.new model }
-  let(:model)        { model_double 'articles' }
-  let(:base)         {
-    double('base', :active_record => model, :join_base => join_base)
-  }
-  let(:join_base)    { double('join base') }
-  let(:join)         { join_double 'users' }
-  let(:sub_join)     { join_double 'posts' }
-
-  def join_double(table_alias)
-    double 'join',
-      :join_type=         => nil,
-      :aliased_table_name => table_alias,
-      :reflection         => double('reflection'),
-      :conditions         => []
-  end
-
-  def model_double(table_name = nil)
-    double 'model', :quoted_table_name => table_name, :reflections => {}
-  end
-
-  before :each do
-    JoinDependency.stub :new => base
-    JoinDependency::JoinAssociation.stub(:new).and_return(join, sub_join)
-    model.reflections[:user] = join.reflection
-
-    join.stub :active_record => model_double
-    join.active_record.reflections[:posts] = sub_join.reflection
-  end
-
-  describe '#add_join_to' do
-    before :each do
-      JoinDependency::JoinAssociation.unstub :new
-    end
-
-    it "adds just one join for a stack with a single association" do
-      JoinDependency::JoinAssociation.should_receive(:new).
-        with(join.reflection, base, join_base).once.and_return(join)
-
-      associations.add_join_to([:user])
-    end
-
-    it "does not duplicate joins when given the same stack twice" do
-      JoinDependency::JoinAssociation.should_receive(:new).once.and_return(join)
-
-      associations.add_join_to([:user])
-      associations.add_join_to([:user])
-    end
-
-    context 'multiple joins' do
-      it "adds two joins for a stack with two associations" do
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(join.reflection, base, join_base).once.and_return(join)
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(sub_join.reflection, base, join).once.and_return(sub_join)
-
-        associations.add_join_to([:user, :posts])
-      end
-
-      it "extends upon existing joins when given stacks where parts are already mapped" do
-        JoinDependency::JoinAssociation.should_receive(:new).twice.
-          and_return(join, sub_join)
-
-        associations.add_join_to([:user])
-        associations.add_join_to([:user, :posts])
-      end
-    end
-
-    context 'join with conditions' do
-      let(:connection) { double }
-      let(:parent)     { double :aliased_table_name => 'qux' }
-
-      before :each do
-        JoinDependency::JoinAssociation.stub :new => join
-
-        join.stub :parent => parent
-        model.stub :connection => connection
-        connection.stub(:quote_table_name) { |table| "\"#{table}\"" }
-      end
-
-      it "leaves standard conditions untouched" do
-        join.stub :conditions => 'foo = bar'
-
-        associations.add_join_to [:user]
-
-        join.conditions.should == 'foo = bar'
-      end
-
-      it "modifies filtered polymorphic conditions" do
-        join.stub :conditions => '::ts_join_alias::.foo = bar'
-
-        associations.add_join_to [:user]
-
-        join.conditions.should == '"qux".foo = bar'
-      end
-
-      it "modifies filtered polymorphic conditions within arrays" do
-        join.stub :conditions => ['::ts_join_alias::.foo = bar']
-
-        associations.add_join_to [:user]
-
-        join.conditions.should == ['"qux".foo = bar']
-      end
-
-      it "does not modify conditions as hashes" do
-        join.stub :conditions => [{:foo => 'bar'}]
-
-        associations.add_join_to [:user]
-
-        join.conditions.should == [{:foo => 'bar'}]
-      end
-    end
-  end
-
-  describe '#aggregate_for?' do
-    it "is false when the stack is empty" do
-      associations.aggregate_for?([]).should be_false
-    end
-
-    it "is true when a reflection is a has_many" do
-      join.reflection.stub!(:macro => :has_many)
-
-      associations.aggregate_for?([:user]).should be_true
-    end
-
-    it "is true when a reflection is a has_and_belongs_to_many" do
-      join.reflection.stub!(:macro => :has_and_belongs_to_many)
-
-      associations.aggregate_for?([:user]).should be_true
-    end
-
-    it "is false when a reflection is a belongs_to" do
-      join.reflection.stub!(:macro => :belongs_to)
-
-      associations.aggregate_for?([:user]).should be_false
-    end
-
-    it "is false when a reflection is a has_one" do
-      join.reflection.stub!(:macro => :has_one)
-
-      associations.aggregate_for?([:user]).should be_false
-    end
-
-    it "is true when one level is aggregate" do
-      join.reflection.stub!(:macro => :belongs_to)
-      sub_join.reflection.stub!(:macro => :has_many)
-
-      associations.aggregate_for?([:user, :posts]).should be_true
-    end
-
-    it "is true when both levels are aggregates" do
-      join.reflection.stub!(:macro => :has_many)
-      sub_join.reflection.stub!(:macro => :has_many)
-
-      associations.aggregate_for?([:user, :posts]).should be_true
-    end
-
-    it "is false when both levels are not aggregates" do
-      join.reflection.stub!(:macro => :belongs_to)
-      sub_join.reflection.stub!(:macro => :belongs_to)
-
-      associations.aggregate_for?([:user, :posts]).should be_false
-    end
-  end
-
-  describe '#alias_for' do
-    it "returns the model's table name when no stack is given" do
-      associations.alias_for([]).should == 'articles'
-    end
-
-    it "adds just one join for a stack with a single association" do
-      JoinDependency::JoinAssociation.unstub :new
-      JoinDependency::JoinAssociation.should_receive(:new).
-        with(join.reflection, base, join_base).once.and_return(join)
-
-      associations.alias_for([:user])
-    end
-
-    it "returns the aliased table name for the join" do
-      associations.alias_for([:user]).should == 'users'
-    end
-
-    it "does not duplicate joins when given the same stack twice" do
-      JoinDependency::JoinAssociation.unstub :new
-      JoinDependency::JoinAssociation.should_receive(:new).once.and_return(join)
-
-      associations.alias_for([:user])
-      associations.alias_for([:user])
-    end
-
-    context 'multiple joins' do
-      it "adds two joins for a stack with two associations" do
-        JoinDependency::JoinAssociation.unstub :new
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(join.reflection, base, join_base).once.and_return(join)
-        JoinDependency::JoinAssociation.should_receive(:new).
-          with(sub_join.reflection, base, join).once.and_return(sub_join)
-
-        associations.alias_for([:user, :posts])
-      end
-
-      it "returns the sub join's aliased table name" do
-        associations.alias_for([:user, :posts]).should == 'posts'
-      end
-
-      it "extends upon existing joins when given stacks where parts are already mapped" do
-        JoinDependency::JoinAssociation.unstub :new
-        JoinDependency::JoinAssociation.should_receive(:new).twice.
-          and_return(join, sub_join)
-
-        associations.alias_for([:user])
-        associations.alias_for([:user, :posts])
-      end
-    end
-  end
-
-  describe '#join_values' do
-    it "returns all joins that have been created" do
-      associations.alias_for([:user])
-      associations.alias_for([:user, :posts])
-
-      associations.join_values.should == [join, sub_join]
-    end
-  end
-end