thinking-sphinx 2.0.5 → 2.0.6

data/spec/thinking_sphinx/search_spec.rb

@@ -646,6 +646,13 @@ describe ThinkingSphinx::Search do
         filter.attribute.should == 'sphinx_internal_id'
         filter.exclude?.should be_true
       end
+
+      it "should not filter out any ids if :without_ids is an empty array" do
+        ThinkingSphinx::Search.new(:without_ids => []).first
+
+        filter = @client.filters.last
+        filter.attribute.should_not == 'sphinx_internal_id'
+      end
     end
     
     describe 'sort mode' do

data/spec/thinking_sphinx_spec.rb

@@ -5,40 +5,40 @@ describe ThinkingSphinx do
     it "should return a Context instance" do
       ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
     end
-    
+
     it "should remember changes to the Context instance" do
-      models = ThinkingSphinx.context.indexed_models
-      
+      models = ThinkingSphinx.context.indexed_models.clone
+
       ThinkingSphinx.context.indexed_models.replace([:model])
       ThinkingSphinx.context.indexed_models.should == [:model]
-      
+
       ThinkingSphinx.context.indexed_models.replace(models)
     end
   end
-  
+
   describe '.reset_context!' do
     it "should remove the existing Context instance" do
       existing = ThinkingSphinx.context
-      
+
       ThinkingSphinx.reset_context!
       ThinkingSphinx.context.should_not == existing
-      
+
       ThinkingSphinx.reset_context! existing
     end
   end
-    
+
   describe '.define_indexes?' do
     it "should define indexes by default" do
       ThinkingSphinx.define_indexes?.should be_true
     end
   end
-  
+
   describe '.define_indexes=' do
     it "should disable index definition" do
       ThinkingSphinx.define_indexes = false
       ThinkingSphinx.define_indexes?.should be_false
     end
-  
+
     it "should enable index definition" do
       ThinkingSphinx.define_indexes = false
       ThinkingSphinx.define_indexes?.should be_false
@@ -46,19 +46,19 @@ describe ThinkingSphinx do
       ThinkingSphinx.define_indexes?.should be_true
     end
   end
-  
+
   describe '.deltas_enabled?' do
     it "should index deltas by default" do
       ThinkingSphinx.deltas_enabled?.should be_true
     end
   end
-  
+
   describe '.deltas_enabled=' do
     it "should disable delta indexing" do
       ThinkingSphinx.deltas_enabled = false
       ThinkingSphinx.deltas_enabled?.should be_false
     end
-  
+
     it "should enable delta indexing" do
       ThinkingSphinx.deltas_enabled = false
       ThinkingSphinx.deltas_enabled?.should be_false
@@ -66,20 +66,22 @@ describe ThinkingSphinx do
       ThinkingSphinx.deltas_enabled?.should be_true
     end
   end
-  
+
   describe '.updates_enabled?' do
     it "should update indexes by default" do
+      ThinkingSphinx::Configuration.stub! :environment => 'development'
+
       ThinkingSphinx.updates_enabled = nil
       ThinkingSphinx.updates_enabled?.should be_true
     end
   end
-  
+
   describe '.updates_enabled=' do
     it "should disable index updating" do
       ThinkingSphinx.updates_enabled = false
       ThinkingSphinx.updates_enabled?.should be_false
     end
-  
+
     it "should enable index updating" do
       ThinkingSphinx.updates_enabled = false
       ThinkingSphinx.updates_enabled?.should be_false
@@ -87,35 +89,25 @@ describe ThinkingSphinx do
       ThinkingSphinx.updates_enabled?.should be_true
     end
   end
-  
+
   describe '.sphinx_running?' do
     it "should always say Sphinx is running if flagged as being on a remote machine" do
       ThinkingSphinx.remote_sphinx = true
       ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
-    
+
       ThinkingSphinx.sphinx_running?.should be_true
     end
-  
+
     it "should actually pay attention to Sphinx if not on a remote machine" do
       ThinkingSphinx.remote_sphinx = false
       ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
       ThinkingSphinx.sphinx_running?.should be_false
-    
+
       ThinkingSphinx.stub!(:sphinx_running_by_pid? => true)
       ThinkingSphinx.sphinx_running?.should be_true
     end
   end
-  
-  describe '.version' do
-    it "should return the version from the stored YAML file" do
-      version = Jeweler::VersionHelper.new(
-        File.join(File.dirname(__FILE__), '..')
-      ).to_s
-      
-      ThinkingSphinx.version.should == version
-    end
-  end
-  
+
   describe "use_group_by_shortcut? method" do
     before :each do
       adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
@@ -123,7 +115,7 @@ describe ThinkingSphinx do
         pending "No MySQL"
         return
       end
-      
+
       @connection = stub('adapter',
         :select_all => true,
         :class      => ActiveRecord::ConnectionAdapters::MysqlAdapter,
@@ -132,34 +124,43 @@ describe ThinkingSphinx do
       ::ActiveRecord::Base.stub!(
         :connection => @connection
       )
-      
+
       ThinkingSphinx.reset_use_group_by_shortcut
     end
-    
+
     it "should return true if no ONLY_FULL_GROUP_BY" do
       @connection.stub!(
         :select_all => {:a => "OTHER SETTINGS"}
       )
-      
+
       ThinkingSphinx.use_group_by_shortcut?.should be_true
     end
-  
+
     it "should return true if NULL value" do
       @connection.stub!(
         :select_all => {:a => nil}
       )
-      
+
       ThinkingSphinx.use_group_by_shortcut?.should be_true
     end
-  
+
+    it "should return true if using mysql2 gem" do
+      @connection.stub!(
+        :class => ActiveRecord::ConnectionAdapters::Mysql2Adapter,
+        :select_all => {:a => ""}
+      )
+
+      ThinkingSphinx.use_group_by_shortcut?.should be_true
+    end unless RUBY_PLATFORM == 'java'
+
     it "should return false if ONLY_FULL_GROUP_BY is set" do
       @connection.stub!(
         :select_all => {:a => "OTHER SETTINGS,ONLY_FULL_GROUP_BY,blah"}
       )
-      
+
       ThinkingSphinx.use_group_by_shortcut?.should be_false
     end
-    
+
     it "should return false if ONLY_FULL_GROUP_BY is set in any of the values" do
       @connection.stub!(
         :select_all => {
@@ -167,10 +168,10 @@ describe ThinkingSphinx do
           :b => "ONLY_FULL_GROUP_BY"
         }
       )
-      
+
       ThinkingSphinx.use_group_by_shortcut?.should be_false
     end
-    
+
     describe "if not using MySQL" do
       before :each do
         adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
@@ -178,7 +179,7 @@ describe ThinkingSphinx do
           pending "No PostgreSQL"
           return
         end
-        
+
         @connection = stub(adapter).as_null_object
         @connection.stub!(
           :select_all => true,
@@ -188,14 +189,14 @@ describe ThinkingSphinx do
           :connection => @connection
         )
       end
-    
+
       it "should return false" do
         ThinkingSphinx.use_group_by_shortcut?.should be_false
       end
-    
+
       it "should not call select_all" do
         @connection.should_not_receive(:select_all)
-        
+
         ThinkingSphinx.use_group_by_shortcut?
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-08-28 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,57 +36,57 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: actionpack
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.8.1
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: pg
+  name: cucumber
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: faker
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.3
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: ginger
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.8
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -97,157 +97,44 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
+  name: will_paginate
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: "3.0"
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec-expectations
+  name: yard
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.1
-  type: :development
-  prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 3.0.pre
-  type: :development
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: ginger
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: faker
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *id016
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
-email: pat@freelancing-gods.com
+email: 
+- pat@freelancing-gods.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
 - LICENCE
 - README.textile
-- VERSION
-- lib/cucumber/thinking_sphinx/external_world.rb
-- lib/cucumber/thinking_sphinx/internal_world.rb
-- lib/cucumber/thinking_sphinx/sql_logger.rb
-- lib/thinking-sphinx.rb
-- lib/thinking_sphinx.rb
-- lib/thinking_sphinx/action_controller.rb
-- lib/thinking_sphinx/active_record.rb
-- lib/thinking_sphinx/active_record/attribute_updates.rb
-- lib/thinking_sphinx/active_record/delta.rb
-- lib/thinking_sphinx/active_record/has_many_association.rb
-- lib/thinking_sphinx/active_record/has_many_association_with_scopes.rb
-- lib/thinking_sphinx/active_record/log_subscriber.rb
-- lib/thinking_sphinx/active_record/scopes.rb
-- lib/thinking_sphinx/adapters/abstract_adapter.rb
-- lib/thinking_sphinx/adapters/mysql_adapter.rb
-- lib/thinking_sphinx/adapters/postgresql_adapter.rb
-- lib/thinking_sphinx/association.rb
-- lib/thinking_sphinx/attribute.rb
-- lib/thinking_sphinx/auto_version.rb
-- lib/thinking_sphinx/bundled_search.rb
-- lib/thinking_sphinx/class_facet.rb
-- lib/thinking_sphinx/configuration.rb
-- lib/thinking_sphinx/context.rb
-- lib/thinking_sphinx/core/string.rb
-- lib/thinking_sphinx/deltas.rb
-- lib/thinking_sphinx/deltas/default_delta.rb
-- lib/thinking_sphinx/deploy/capistrano.rb
-- lib/thinking_sphinx/excerpter.rb
-- lib/thinking_sphinx/facet.rb
-- lib/thinking_sphinx/facet_search.rb
-- lib/thinking_sphinx/field.rb
-- lib/thinking_sphinx/index.rb
-- lib/thinking_sphinx/index/builder.rb
-- lib/thinking_sphinx/index/faux_column.rb
-- lib/thinking_sphinx/join.rb
-- lib/thinking_sphinx/property.rb
-- lib/thinking_sphinx/railtie.rb
-- lib/thinking_sphinx/search.rb
-- lib/thinking_sphinx/search_methods.rb
-- lib/thinking_sphinx/sinatra.rb
-- lib/thinking_sphinx/source.rb
-- lib/thinking_sphinx/source/internal_properties.rb
-- lib/thinking_sphinx/source/sql.rb
-- lib/thinking_sphinx/tasks.rb
-- lib/thinking_sphinx/test.rb
-- tasks/distribution.rb
-- tasks/testing.rb
 - features/abstract_inheritance.feature
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
@@ -281,6 +168,7 @@ files:
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
 - features/thinking_sphinx/database.example.yml
+- features/thinking_sphinx/db/.gitignore
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -295,6 +183,7 @@ files:
 - features/thinking_sphinx/db/fixtures/gammas.rb
 - features/thinking_sphinx/db/fixtures/music.rb
 - features/thinking_sphinx/db/fixtures/people.rb
+- features/thinking_sphinx/db/fixtures/post_keywords.txt
 - features/thinking_sphinx/db/fixtures/posts.rb
 - features/thinking_sphinx/db/fixtures/robots.rb
 - features/thinking_sphinx/db/fixtures/tags.rb
@@ -338,6 +227,13 @@ files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
+- spec/fixtures/data.sql
+- spec/fixtures/database.yml.default
+- spec/fixtures/models.rb
+- spec/fixtures/structure.sql
+- spec/spec_helper.rb
+- spec/sphinx_helper.rb
+- spec/support/rails.rb
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb
@@ -363,7 +259,7 @@ files:
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
 has_rdoc: true
-homepage: http://ts.freelancing-gods.com
+homepage: http://freelancing-god.github.com/ts/en/
 licenses: []
 
 post_install_message: |+
@@ -379,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1998854075128866188
+      hash: -3167487987555359766
       segments: 
       - 0
       version: "0"
@@ -388,10 +284,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -3167487987555359766
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: thinking-sphinx
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
@@ -430,6 +329,7 @@ test_files:
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
 - features/thinking_sphinx/database.example.yml
+- features/thinking_sphinx/db/.gitignore
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -444,6 +344,7 @@ test_files:
 - features/thinking_sphinx/db/fixtures/gammas.rb
 - features/thinking_sphinx/db/fixtures/music.rb
 - features/thinking_sphinx/db/fixtures/people.rb
+- features/thinking_sphinx/db/fixtures/post_keywords.txt
 - features/thinking_sphinx/db/fixtures/posts.rb
 - features/thinking_sphinx/db/fixtures/robots.rb
 - features/thinking_sphinx/db/fixtures/tags.rb
@@ -487,6 +388,13 @@ test_files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
+- spec/fixtures/data.sql
+- spec/fixtures/database.yml.default
+- spec/fixtures/models.rb
+- spec/fixtures/structure.sql
+- spec/spec_helper.rb
+- spec/sphinx_helper.rb
+- spec/support/rails.rb
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb