thinking-sphinx 3.3.0 → 3.4.0

data/spec/thinking_sphinx/search/query_spec.rb

@@ -74,5 +74,12 @@ describe ThinkingSphinx::Search::Query do
 
       expect(query.to_s).to eq('tasty @title pancakes')
     end
+
+    it "handles multiple fields for a single condition" do
+      query = ThinkingSphinx::Search::Query.new '',
+        [:title, :content] => 'pancakes'
+
+      expect(query.to_s).to eq('@(title,content) pancakes')
+    end
   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.3.0'
+  s.version     = '3.4.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddle',       '>= 2.0.0'
 
   s.add_development_dependency 'appraisal',        '~> 1.0.2'
-  s.add_development_dependency 'combustion',       '~> 0.5.4'
-  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
-  s.add_development_dependency 'rspec',            '~> 3.5.0'
+  s.add_development_dependency 'combustion',       '~> 0.7.0'
+  s.add_development_dependency 'database_cleaner', '~> 1.6.0'
+  s.add_development_dependency 'rspec',            '~> 3.6.0'
+  s.add_development_dependency 'rspec-retry',      '~> 0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,47 +114,64 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: An intelligent layer for ActiveRecord (via Rails and Sinatra) for the
   Sphinx full-text search tool.
 email:
 - pat@freelancing-gods.com
-executables: []
+executables:
+- console
+- literals
+- loadsphinx
 extensions: []
 extra_rdoc_files: []
 files:
@@ -166,12 +183,9 @@ files:
 - LICENCE
 - README.textile
 - Rakefile
-- gemfiles/.gitignore
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
+- bin/console
+- bin/literals
+- bin/loadsphinx
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -212,11 +226,18 @@ files:
 - lib/thinking_sphinx/active_record/sql_builder/statement.rb
 - lib/thinking_sphinx/active_record/sql_source.rb
 - lib/thinking_sphinx/active_record/sql_source/template.rb
+- lib/thinking_sphinx/attribute_types.rb
 - 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/commands/base.rb
+- lib/thinking_sphinx/commands/configure.rb
+- lib/thinking_sphinx/commands/index.rb
+- lib/thinking_sphinx/commands/start_attached.rb
+- lib/thinking_sphinx/commands/start_detached.rb
+- lib/thinking_sphinx/commands/stop.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/configuration/consistent_ids.rb
 - lib/thinking_sphinx/configuration/defaults.rb
@@ -224,6 +245,9 @@ files:
 - lib/thinking_sphinx/configuration/duplicate_names.rb
 - lib/thinking_sphinx/configuration/minimum_fields.rb
 - lib/thinking_sphinx/connection.rb
+- lib/thinking_sphinx/connection/client.rb
+- lib/thinking_sphinx/connection/jruby.rb
+- lib/thinking_sphinx/connection/mri.rb
 - lib/thinking_sphinx/controller.rb
 - lib/thinking_sphinx/core.rb
 - lib/thinking_sphinx/core/field.rb
@@ -253,6 +277,9 @@ files:
 - lib/thinking_sphinx/index_set.rb
 - lib/thinking_sphinx/indexing_strategies/all_at_once.rb
 - lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb
+- lib/thinking_sphinx/interfaces/daemon.rb
+- lib/thinking_sphinx/interfaces/real_time.rb
+- lib/thinking_sphinx/interfaces/sql.rb
 - lib/thinking_sphinx/logger.rb
 - lib/thinking_sphinx/masks.rb
 - lib/thinking_sphinx/masks/group_enumerators_mask.rb
@@ -261,6 +288,7 @@ files:
 - lib/thinking_sphinx/masks/weight_enumerator_mask.rb
 - lib/thinking_sphinx/middlewares.rb
 - lib/thinking_sphinx/middlewares/active_record_translator.rb
+- lib/thinking_sphinx/middlewares/attribute_typer.rb
 - lib/thinking_sphinx/middlewares/geographer.rb
 - lib/thinking_sphinx/middlewares/glazier.rb
 - lib/thinking_sphinx/middlewares/ids_only.rb
@@ -270,6 +298,7 @@ files:
 - lib/thinking_sphinx/middlewares/stale_id_checker.rb
 - lib/thinking_sphinx/middlewares/stale_id_filter.rb
 - lib/thinking_sphinx/middlewares/utf8.rb
+- lib/thinking_sphinx/middlewares/valid_options.rb
 - lib/thinking_sphinx/panes.rb
 - lib/thinking_sphinx/panes/attributes_pane.rb
 - lib/thinking_sphinx/panes/distance_pane.rb
@@ -304,6 +333,7 @@ files:
 - lib/thinking_sphinx/test.rb
 - lib/thinking_sphinx/utf8.rb
 - lib/thinking_sphinx/wildcard.rb
+- lib/thinking_sphinx/with_output.rb
 - spec/acceptance/association_scoping_spec.rb
 - spec/acceptance/attribute_access_spec.rb
 - spec/acceptance/attribute_updates_spec.rb
@@ -338,6 +368,7 @@ files:
 - spec/acceptance/suspended_deltas_spec.rb
 - spec/fixtures/database.yml
 - spec/internal/app/indices/admin_person_index.rb
+- spec/internal/app/indices/album_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
 - spec/internal/app/indices/bird_index.rb
@@ -348,6 +379,7 @@ files:
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
 - spec/internal/app/models/admin/person.rb
+- spec/internal/app/models/album.rb
 - spec/internal/app/models/animal.rb
 - spec/internal/app/models/article.rb
 - spec/internal/app/models/bird.rb
@@ -396,6 +428,12 @@ files:
 - 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/attribute_types_spec.rb
+- spec/thinking_sphinx/commands/configure_spec.rb
+- spec/thinking_sphinx/commands/index_spec.rb
+- spec/thinking_sphinx/commands/start_detached_spec.rb
+- spec/thinking_sphinx/commands/stop_spec.rb
+- spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
@@ -406,15 +444,20 @@ files:
 - spec/thinking_sphinx/facet_search_spec.rb
 - spec/thinking_sphinx/index_set_spec.rb
 - spec/thinking_sphinx/index_spec.rb
+- spec/thinking_sphinx/interfaces/daemon_spec.rb
+- spec/thinking_sphinx/interfaces/real_time_spec.rb
+- spec/thinking_sphinx/interfaces/sql_spec.rb
 - spec/thinking_sphinx/masks/pagination_mask_spec.rb
 - spec/thinking_sphinx/masks/scopes_mask_spec.rb
 - spec/thinking_sphinx/middlewares/active_record_translator_spec.rb
+- spec/thinking_sphinx/middlewares/attribute_typer_spec.rb
 - spec/thinking_sphinx/middlewares/geographer_spec.rb
 - spec/thinking_sphinx/middlewares/glazier_spec.rb
 - spec/thinking_sphinx/middlewares/inquirer_spec.rb
 - spec/thinking_sphinx/middlewares/sphinxql_spec.rb
 - spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb
 - spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb
+- spec/thinking_sphinx/middlewares/valid_options_spec.rb
 - spec/thinking_sphinx/panes/attributes_pane_spec.rb
 - spec/thinking_sphinx/panes/distance_pane_spec.rb
 - spec/thinking_sphinx/panes/excerpts_pane_spec.rb
@@ -452,7 +495,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -491,6 +534,7 @@ test_files:
 - spec/acceptance/suspended_deltas_spec.rb
 - spec/fixtures/database.yml
 - spec/internal/app/indices/admin_person_index.rb
+- spec/internal/app/indices/album_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
 - spec/internal/app/indices/bird_index.rb
@@ -501,6 +545,7 @@ test_files:
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
 - spec/internal/app/models/admin/person.rb
+- spec/internal/app/models/album.rb
 - spec/internal/app/models/animal.rb
 - spec/internal/app/models/article.rb
 - spec/internal/app/models/bird.rb
@@ -549,6 +594,12 @@ test_files:
 - 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/attribute_types_spec.rb
+- spec/thinking_sphinx/commands/configure_spec.rb
+- spec/thinking_sphinx/commands/index_spec.rb
+- spec/thinking_sphinx/commands/start_detached_spec.rb
+- spec/thinking_sphinx/commands/stop_spec.rb
+- spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
@@ -559,15 +610,20 @@ test_files:
 - spec/thinking_sphinx/facet_search_spec.rb
 - spec/thinking_sphinx/index_set_spec.rb
 - spec/thinking_sphinx/index_spec.rb
+- spec/thinking_sphinx/interfaces/daemon_spec.rb
+- spec/thinking_sphinx/interfaces/real_time_spec.rb
+- spec/thinking_sphinx/interfaces/sql_spec.rb
 - spec/thinking_sphinx/masks/pagination_mask_spec.rb
 - spec/thinking_sphinx/masks/scopes_mask_spec.rb
 - spec/thinking_sphinx/middlewares/active_record_translator_spec.rb
+- spec/thinking_sphinx/middlewares/attribute_typer_spec.rb
 - spec/thinking_sphinx/middlewares/geographer_spec.rb
 - spec/thinking_sphinx/middlewares/glazier_spec.rb
 - spec/thinking_sphinx/middlewares/inquirer_spec.rb
 - spec/thinking_sphinx/middlewares/sphinxql_spec.rb
 - spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb
 - spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb
+- spec/thinking_sphinx/middlewares/valid_options_spec.rb
 - spec/thinking_sphinx/panes/attributes_pane_spec.rb
 - spec/thinking_sphinx/panes/distance_pane_spec.rb
 - spec/thinking_sphinx/panes/excerpts_pane_spec.rb

data/gemfiles/.gitignore

@@ -1 +0,0 @@
-*.gemfile.lock

data/gemfiles/rails_3_2.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.12b4", :platform => :ruby
-gem "pg", "~> 0.18.4", :platform => :ruby
-gem "jdbc-mysql", "5.1.35", :platform => :jruby
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.4", :platform => :jruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.4", :platform => :jruby
-gem "rails", "~> 3.2.22.2"
-gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
-
-gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.12b4", :platform => :ruby
-gem "pg", "~> 0.18.4", :platform => :ruby
-gem "jdbc-mysql", "5.1.35", :platform => :jruby
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.4", :platform => :jruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.4", :platform => :jruby
-gem "rails", "~> 4.0.13"
-gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
-
-gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.12b4", :platform => :ruby
-gem "pg", "~> 0.18.4", :platform => :ruby
-gem "jdbc-mysql", "5.1.35", :platform => :jruby
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.4", :platform => :jruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.4", :platform => :jruby
-gem "rails", "~> 4.1.15"
-gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
-
-gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.12b4", :platform => :ruby
-gem "pg", "~> 0.18.4", :platform => :ruby
-gem "jdbc-mysql", "5.1.35", :platform => :jruby
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.4", :platform => :jruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.4", :platform => :jruby
-gem "rails", "~> 4.2.6"
-gem "rack", "~> 1.0", :platforms => [:ruby_20, :ruby_21]
-
-gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mysql2", "~> 0.3.12b4", :platform => :ruby
-gem "pg", "~> 0.18.4", :platform => :ruby
-gem "jdbc-mysql", "5.1.35", :platform => :jruby
-gem "activerecord-jdbcmysql-adapter", "~> 1.3.4", :platform => :jruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.4", :platform => :jruby
-gem "rails", "~> 5.0.0"
-
-gemspec :path => "../"