thinking-sphinx 3.0.0.pre → 3.0.0.rc

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

@@ -5,14 +5,14 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
     ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks.new instance
   }
   let(:instance)   { double('instance', :id => 12) }
-  let(:config)     { double('config', :indices_for_references => [index],
-    :connection => connection) }
+  let(:config)     { double('config', :indices_for_references => [index]) }
   let(:index)      { double('index', :name => 'my_index', :is_a? => true,
     :document_id_for_key => 123, :fields => [], :attributes => []) }
-  let(:connection) { double('connection', :query => true) }
+  let(:connection) { double('connection', :execute => true) }
 
   before :each do
     ThinkingSphinx::Configuration.stub :instance => config
+    ThinkingSphinx::Connection.stub :new => connection
   end
 
   describe '.after_save' do
@@ -68,7 +68,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
     end
 
     it "sends the insert through to the server" do
-      connection.should_receive(:query).with('REPLACE INTO my_index')
+      connection.should_receive(:execute).with('REPLACE INTO my_index')
 
       callbacks.after_save
     end

data/spec/thinking_sphinx/scopes_spec.rb

@@ -35,4 +35,11 @@ describe ThinkingSphinx::Scopes do
       model.sphinx_scopes[:foo].call.should == 27
     end
   end
+
+  describe '#default_sphinx_scope' do
+    it "gets and sets the default scope depending on the argument" do
+      model.default_sphinx_scope :foo
+      model.default_sphinx_scope.should == :foo
+    end
+  end
 end

data/thinking-sphinx.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.0.pre'
+  s.version     = '3.0.0.rc'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
-  s.homepage    = 'http://freelancing-god.github.com/ts/en'
+  s.homepage    = 'http://pat.github.com/ts/en'
   s.summary     = 'A smart wrapper over Sphinx for ActiveRecord'
   s.description = %Q{An intelligent layer for ActiveRecord (via Rails and Sinatra) for the Sphinx full-text search tool.}
 
@@ -28,6 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal',        '~> 0.4.0'
   # s.add_development_dependency 'combustion',       '~> 0.3.1'
   s.add_development_dependency 'database_cleaner', '~> 0.7.1'
-  s.add_runtime_dependency     'mysql2',           '~> 0.3.12b4'
   s.add_development_dependency 'rspec',            '~> 2.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre
+  version: 3.0.0.rc
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70165526203260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165526203260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70165526202760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70165526202760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: middleware
-  requirement: &70165526202300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165526202300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: riddle
-  requirement: &70165526201840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70165526201840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70165526201380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70165526201380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70165526200920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +101,15 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70165526200920
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: &70165526200460 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.12b4
-  type: :runtime
-  prerelease: false
-  version_requirements: *70165526200460
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165526200000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +117,12 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70165526200000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 description: An intelligent layer for ActiveRecord (via Rails and Sinatra) for the
   Sphinx full-text search tool.
 email:
@@ -142,6 +166,7 @@ files:
 - lib/thinking_sphinx/active_record/interpreter.rb
 - lib/thinking_sphinx/active_record/log_subscriber.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
 - lib/thinking_sphinx/active_record/sql_builder.rb
 - lib/thinking_sphinx/active_record/sql_source.rb
@@ -151,7 +176,9 @@ files:
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/configuration/consistent_ids.rb
 - lib/thinking_sphinx/configuration/defaults.rb
+- lib/thinking_sphinx/connection.rb
 - lib/thinking_sphinx/core.rb
+- lib/thinking_sphinx/core/field.rb
 - lib/thinking_sphinx/core/index.rb
 - lib/thinking_sphinx/core/interpreter.rb
 - lib/thinking_sphinx/deltas.rb
@@ -159,6 +186,9 @@ files:
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
 - lib/thinking_sphinx/facet_search.rb
+- lib/thinking_sphinx/frameworks.rb
+- lib/thinking_sphinx/frameworks/plain.rb
+- lib/thinking_sphinx/frameworks/rails.rb
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/index_set.rb
 - lib/thinking_sphinx/masks.rb
@@ -200,6 +230,7 @@ files:
 - lib/thinking_sphinx/search/query.rb
 - lib/thinking_sphinx/search/stale_ids_exception.rb
 - lib/thinking_sphinx/search/translator.rb
+- lib/thinking_sphinx/sinatra.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
 - sketchpad.rb
@@ -212,6 +243,7 @@ files:
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
 - spec/acceptance/grouping_by_attributes_spec.rb
+- spec/acceptance/index_options_spec.rb
 - spec/acceptance/paginating_search_results_spec.rb
 - spec/acceptance/remove_deleted_records_spec.rb
 - spec/acceptance/search_counts_spec.rb
@@ -230,7 +262,9 @@ files:
 - spec/acceptance/support/sphinx_controller.rb
 - spec/acceptance/support/sphinx_helpers.rb
 - spec/acceptance/suspended_deltas_spec.rb
+- spec/fixtures/database.yml
 - spec/internal/.gitignore
+- 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/book_index.rb
@@ -238,6 +272,7 @@ files:
 - spec/internal/app/indices/product_index.rb
 - 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/animal.rb
 - spec/internal/app/models/article.rb
 - spec/internal/app/models/bird.rb
@@ -245,6 +280,7 @@ files:
 - spec/internal/app/models/city.rb
 - spec/internal/app/models/colour.rb
 - spec/internal/app/models/flightless_bird.rb
+- spec/internal/app/models/genre.rb
 - spec/internal/app/models/mammal.rb
 - spec/internal/app/models/product.rb
 - spec/internal/app/models/tag.rb
@@ -307,7 +343,7 @@ files:
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx_spec.rb
 - thinking-sphinx.gemspec
-homepage: http://freelancing-god.github.com/ts/en
+homepage: http://pat.github.com/ts/en
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -327,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -341,6 +377,7 @@ test_files:
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
 - spec/acceptance/grouping_by_attributes_spec.rb
+- spec/acceptance/index_options_spec.rb
 - spec/acceptance/paginating_search_results_spec.rb
 - spec/acceptance/remove_deleted_records_spec.rb
 - spec/acceptance/search_counts_spec.rb
@@ -359,7 +396,9 @@ test_files:
 - spec/acceptance/support/sphinx_controller.rb
 - spec/acceptance/support/sphinx_helpers.rb
 - spec/acceptance/suspended_deltas_spec.rb
+- spec/fixtures/database.yml
 - spec/internal/.gitignore
+- 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/book_index.rb
@@ -367,6 +406,7 @@ test_files:
 - spec/internal/app/indices/product_index.rb
 - 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/animal.rb
 - spec/internal/app/models/article.rb
 - spec/internal/app/models/bird.rb
@@ -374,6 +414,7 @@ test_files:
 - spec/internal/app/models/city.rb
 - spec/internal/app/models/colour.rb
 - spec/internal/app/models/flightless_bird.rb
+- spec/internal/app/models/genre.rb
 - spec/internal/app/models/mammal.rb
 - spec/internal/app/models/product.rb
 - spec/internal/app/models/tag.rb
@@ -435,4 +476,3 @@ test_files:
 - spec/thinking_sphinx/search/query_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: