thinking-sphinx 1.3.4 → 1.3.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +11:00
+date: 2009-11-26 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: after_commit
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.0.5
     version: 
 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
@@ -53,7 +53,7 @@ extra_rdoc_files:
 files: 
 - LICENCE
 - README.textile
-- VERSION.yml
+- VERSION
 - lib/cucumber/thinking_sphinx/external_world.rb
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
@@ -141,6 +141,7 @@ test_files:
 - features/handling_edits.feature
 - features/retry_stale_indexes.feature
 - features/searching_across_models.feature
+- features/searching_by_index.feature
 - features/searching_by_model.feature
 - features/searching_with_find_arguments.feature
 - features/sphinx_detection.feature
@@ -158,8 +159,6 @@ test_files:
 - features/sti_searching.feature
 - features/support/database.example.yml
 - features/support/database.yml
-- features/support/db/active_record.rb
-- features/support/db/database.yml
 - features/support/db/fixtures/alphas.rb
 - features/support/db/fixtures/authors.rb
 - features/support/db/fixtures/betas.rb
@@ -191,8 +190,6 @@ test_files:
 - features/support/db/migrations/create_robots.rb
 - features/support/db/migrations/create_taggings.rb
 - features/support/db/migrations/create_tags.rb
-- features/support/db/mysql.rb
-- features/support/db/postgresql.rb
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
 - features/support/models/alpha.rb
@@ -212,25 +209,24 @@ test_files:
 - features/support/models/robot.rb
 - features/support/models/tag.rb
 - features/support/models/tagging.rb
-- features/support/post_database.rb
-- spec/lib/thinking_sphinx/active_record/delta_spec.rb
-- spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
-- spec/lib/thinking_sphinx/active_record/scopes_spec.rb
-- spec/lib/thinking_sphinx/active_record_spec.rb
-- spec/lib/thinking_sphinx/association_spec.rb
-- spec/lib/thinking_sphinx/attribute_spec.rb
-- spec/lib/thinking_sphinx/configuration_spec.rb
-- spec/lib/thinking_sphinx/core/array_spec.rb
-- spec/lib/thinking_sphinx/core/string_spec.rb
-- spec/lib/thinking_sphinx/excerpter_spec.rb
-- spec/lib/thinking_sphinx/facet_search_spec.rb
-- spec/lib/thinking_sphinx/facet_spec.rb
-- spec/lib/thinking_sphinx/field_spec.rb
-- spec/lib/thinking_sphinx/index/builder_spec.rb
-- spec/lib/thinking_sphinx/index/faux_column_spec.rb
-- spec/lib/thinking_sphinx/index_spec.rb
-- spec/lib/thinking_sphinx/rails_additions_spec.rb
-- spec/lib/thinking_sphinx/search_methods_spec.rb
-- spec/lib/thinking_sphinx/search_spec.rb
-- spec/lib/thinking_sphinx/source_spec.rb
-- spec/lib/thinking_sphinx_spec.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
+- spec/thinking_sphinx/active_record_spec.rb
+- spec/thinking_sphinx/association_spec.rb
+- spec/thinking_sphinx/attribute_spec.rb
+- spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/core/array_spec.rb
+- spec/thinking_sphinx/core/string_spec.rb
+- spec/thinking_sphinx/excerpter_spec.rb
+- spec/thinking_sphinx/facet_search_spec.rb
+- spec/thinking_sphinx/facet_spec.rb
+- spec/thinking_sphinx/field_spec.rb
+- spec/thinking_sphinx/index/builder_spec.rb
+- spec/thinking_sphinx/index/faux_column_spec.rb
+- spec/thinking_sphinx/index_spec.rb
+- spec/thinking_sphinx/rails_additions_spec.rb
+- spec/thinking_sphinx/search_methods_spec.rb
+- spec/thinking_sphinx/search_spec.rb
+- spec/thinking_sphinx/source_spec.rb
+- spec/thinking_sphinx_spec.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:patch: 4
-:major: 1
-:build: 
-:minor: 3

data/features/support/db/active_record.rb

@@ -1,40 +0,0 @@
-require 'yaml'
-require 'active_record'
-
-# Database Defaults
-host     = "localhost"
-username = "thinking_sphinx"
-password = nil
-
-# Read in YAML file
-if File.exist?("features/support/db/database.yml")
-  config    = YAML.load open("features/support/db/database.yml")
-  host      = config["host"]     || host
-  username  = config["username"] || username
-  password  = config["password"] || password
-end
-
-# Set up Connection
-ActiveRecord::Base.establish_connection(
-  :adapter  => Database,
-  :database => 'thinking_sphinx',
-  :username => username,
-  :password => password,
-  :host     => host
-)
-
-# Copied from ActiveRecord's test suite
-ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [
-    /^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
-    /^SELECT @@ROWCOUNT/, /^SHOW FIELDS/
-  ]
-
-  def execute_with_query_record(sql, name = nil, &block)
-    $queries_executed ||= []
-    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
-    execute_without_query_record(sql, name, &block)
-  end
-
-  alias_method_chain :execute, :query_record
-end

data/features/support/db/database.yml

@@ -1,5 +0,0 @@
-adapter: mysql
-username: thinking_sphinx
-host: localhost
-password: thinking_sphinx
-pool: 1

data/features/support/db/mysql.rb

@@ -1,3 +0,0 @@
-require 'active_record'
-Database = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
-require "active_record/connection_adapters/#{Database}_adapter"

data/features/support/db/postgresql.rb

@@ -1,3 +0,0 @@
-require 'active_record'
-Database = defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'
-require "active_record/connection_adapters/#{Database}_adapter"

data/features/support/post_database.rb

@@ -1,43 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-
-require 'lib/thinking_sphinx'
-
-%w( tmp/config tmp/log tmp/db/sphinx/development ).each do |path|
-  FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
-end
-
-Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT)
-
-at_exit do
-  ThinkingSphinx::Configuration.instance.controller.stop
-  sleep(1) # Ensure Sphinx has shut down completely
-  ActiveRecord::Base.logger.close
-  FileUtils.rm_r "#{Dir.pwd}/tmp"
-end
-
-# Add log file
-ActiveRecord::Base.logger = Logger.new open("tmp/active_record.log", "a")
-
-# Set up database tables
-Dir["features/support/db/migrations/*.rb"].each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-# Load Models
-Dir["features/support/models/*.rb"].sort.each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-ThinkingSphinx.deltas_enabled = false
-
-# Load Fixtures
-Dir["features/support/db/fixtures/*.rb"].each do |file|
-  require file.gsub(/\.rb$/, '')
-end
-
-ThinkingSphinx.deltas_enabled = true
-ThinkingSphinx.suppress_delta_output = true
-
-ThinkingSphinx::Configuration.instance.build
-ThinkingSphinx::Configuration.instance.controller.index
-ThinkingSphinx::Configuration.instance.controller.start

data/spec/lib/thinking_sphinx/index_spec.rb

@@ -1,45 +0,0 @@
-require 'spec/spec_helper'
-
-describe ThinkingSphinx::Index do
-  describe "prefix_fields method" do
-    before :each do
-      @index = ThinkingSphinx::Index.new(Person)
-      
-      @field_a = stub('field', :prefixes => true)
-      @field_b = stub('field', :prefixes => false)
-      @field_c = stub('field', :prefixes => true)
-      
-      @index.stub!(:fields => [@field_a, @field_b, @field_c])
-    end
-    
-    it "should return fields that are flagged as prefixed" do
-      @index.prefix_fields.should include(@field_a)
-      @index.prefix_fields.should include(@field_c)
-    end
-    
-    it "should not return fields that aren't flagged as prefixed" do
-      @index.prefix_fields.should_not include(@field_b)
-    end
-  end
-  
-  describe "infix_fields method" do
-    before :each do
-      @index = ThinkingSphinx::Index.new(Person)
-      
-      @field_a = stub('field', :infixes => true)
-      @field_b = stub('field', :infixes => false)
-      @field_c = stub('field', :infixes => true)
-      
-      @index.stub!(:fields => [@field_a, @field_b, @field_c])
-    end
-    
-    it "should return fields that are flagged as infixed" do
-      @index.infix_fields.should include(@field_a)
-      @index.infix_fields.should include(@field_c)
-    end
-    
-    it "should not return fields that aren't flagged as infixed" do
-      @index.infix_fields.should_not include(@field_b)
-    end
-  end
-end