thinking-sphinx 1.2.12 → 1.2.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. data/README.textile +4 -17
  2. data/VERSION.yml +2 -1
  3. data/features/alternate_primary_key.feature +27 -0
  4. data/features/attribute_transformation.feature +22 -0
  5. data/features/attribute_updates.feature +33 -0
  6. data/features/datetime_deltas.feature +66 -0
  7. data/features/delayed_delta_indexing.feature +37 -0
  8. data/features/deleting_instances.feature +64 -0
  9. data/features/direct_attributes.feature +11 -0
  10. data/features/excerpts.feature +13 -0
  11. data/features/extensible_delta_indexing.feature +9 -0
  12. data/features/facets.feature +76 -0
  13. data/features/facets_across_model.feature +29 -0
  14. data/features/handling_edits.feature +92 -0
  15. data/features/retry_stale_indexes.feature +24 -0
  16. data/features/searching_across_models.feature +20 -0
  17. data/features/searching_by_model.feature +175 -0
  18. data/features/searching_with_find_arguments.feature +56 -0
  19. data/features/sphinx_detection.feature +25 -0
  20. data/features/sphinx_scopes.feature +35 -0
  21. data/features/step_definitions/alpha_steps.rb +3 -0
  22. data/features/step_definitions/beta_steps.rb +7 -0
  23. data/features/step_definitions/common_steps.rb +178 -0
  24. data/features/step_definitions/datetime_delta_steps.rb +15 -0
  25. data/features/step_definitions/delayed_delta_indexing_steps.rb +7 -0
  26. data/features/step_definitions/extensible_delta_indexing_steps.rb +7 -0
  27. data/features/step_definitions/facet_steps.rb +92 -0
  28. data/features/step_definitions/find_arguments_steps.rb +36 -0
  29. data/features/step_definitions/gamma_steps.rb +15 -0
  30. data/features/step_definitions/scope_steps.rb +11 -0
  31. data/features/step_definitions/search_steps.rb +89 -0
  32. data/features/step_definitions/sphinx_steps.rb +31 -0
  33. data/features/sti_searching.feature +14 -0
  34. data/features/support/database.example.yml +3 -0
  35. data/features/support/database.yml +5 -0
  36. data/features/support/db/active_record.rb +40 -0
  37. data/features/support/db/database.yml +5 -0
  38. data/features/support/db/fixtures/alphas.rb +10 -0
  39. data/features/support/db/fixtures/authors.rb +1 -0
  40. data/features/support/db/fixtures/betas.rb +10 -0
  41. data/features/support/db/fixtures/boxes.rb +9 -0
  42. data/features/support/db/fixtures/categories.rb +1 -0
  43. data/features/support/db/fixtures/cats.rb +3 -0
  44. data/features/support/db/fixtures/comments.rb +24 -0
  45. data/features/support/db/fixtures/delayed_betas.rb +10 -0
  46. data/features/support/db/fixtures/developers.rb +29 -0
  47. data/features/support/db/fixtures/dogs.rb +3 -0
  48. data/features/support/db/fixtures/extensible_betas.rb +10 -0
  49. data/features/support/db/fixtures/gammas.rb +10 -0
  50. data/features/support/db/fixtures/people.rb +1001 -0
  51. data/features/support/db/fixtures/posts.rb +6 -0
  52. data/features/support/db/fixtures/robots.rb +14 -0
  53. data/features/support/db/fixtures/tags.rb +27 -0
  54. data/features/support/db/fixtures/thetas.rb +10 -0
  55. data/features/support/db/migrations/create_alphas.rb +7 -0
  56. data/features/support/db/migrations/create_animals.rb +5 -0
  57. data/features/support/db/migrations/create_authors.rb +3 -0
  58. data/features/support/db/migrations/create_authors_posts.rb +6 -0
  59. data/features/support/db/migrations/create_betas.rb +5 -0
  60. data/features/support/db/migrations/create_boxes.rb +5 -0
  61. data/features/support/db/migrations/create_categories.rb +3 -0
  62. data/features/support/db/migrations/create_comments.rb +10 -0
  63. data/features/support/db/migrations/create_delayed_betas.rb +17 -0
  64. data/features/support/db/migrations/create_developers.rb +9 -0
  65. data/features/support/db/migrations/create_extensible_betas.rb +5 -0
  66. data/features/support/db/migrations/create_gammas.rb +3 -0
  67. data/features/support/db/migrations/create_people.rb +13 -0
  68. data/features/support/db/migrations/create_posts.rb +5 -0
  69. data/features/support/db/migrations/create_robots.rb +4 -0
  70. data/features/support/db/migrations/create_taggings.rb +5 -0
  71. data/features/support/db/migrations/create_tags.rb +4 -0
  72. data/features/support/db/migrations/create_thetas.rb +5 -0
  73. data/features/support/db/mysql.rb +3 -0
  74. data/features/support/db/postgresql.rb +3 -0
  75. data/features/support/env.rb +18 -0
  76. data/features/support/lib/generic_delta_handler.rb +8 -0
  77. data/features/support/models/alpha.rb +10 -0
  78. data/features/support/models/animal.rb +5 -0
  79. data/features/support/models/author.rb +3 -0
  80. data/features/support/models/beta.rb +8 -0
  81. data/features/support/models/box.rb +8 -0
  82. data/features/support/models/cat.rb +3 -0
  83. data/features/support/models/category.rb +4 -0
  84. data/features/support/models/comment.rb +10 -0
  85. data/features/support/models/delayed_beta.rb +7 -0
  86. data/features/support/models/developer.rb +16 -0
  87. data/features/support/models/dog.rb +3 -0
  88. data/features/support/models/extensible_beta.rb +9 -0
  89. data/features/support/models/gamma.rb +5 -0
  90. data/features/support/models/person.rb +23 -0
  91. data/features/support/models/post.rb +20 -0
  92. data/features/support/models/robot.rb +12 -0
  93. data/features/support/models/tag.rb +3 -0
  94. data/features/support/models/tagging.rb +4 -0
  95. data/features/support/models/theta.rb +7 -0
  96. data/features/support/post_database.rb +43 -0
  97. data/lib/cucumber/thinking_sphinx/internal_world.rb +125 -0
  98. data/lib/cucumber/thinking_sphinx/sql_logger.rb +20 -0
  99. data/lib/thinking_sphinx.rb +4 -2
  100. data/lib/thinking_sphinx/active_record.rb +1 -2
  101. data/lib/thinking_sphinx/adapters/mysql_adapter.rb +1 -1
  102. data/lib/thinking_sphinx/adapters/postgresql_adapter.rb +18 -11
  103. data/lib/thinking_sphinx/attribute.rb +3 -4
  104. data/lib/thinking_sphinx/excerpter.rb +1 -1
  105. data/lib/thinking_sphinx/search.rb +1 -0
  106. data/lib/thinking_sphinx/source.rb +1 -1
  107. data/spec/lib/thinking_sphinx/active_record_spec.rb +0 -11
  108. data/spec/lib/thinking_sphinx/attribute_spec.rb +14 -7
  109. data/spec/lib/thinking_sphinx/deltas/job_spec.rb +32 -0
  110. data/spec/lib/thinking_sphinx/excerpter_spec.rb +8 -0
  111. data/spec/lib/thinking_sphinx/search_spec.rb +9 -0
  112. data/tasks/distribution.rb +4 -1
  113. data/tasks/testing.rb +8 -19
  114. metadata +99 -2
@@ -0,0 +1,6 @@
1
+ post = Post.create(
2
+ :subject => "Hello World", :content => "Um Text", :id => 1, :category_id => 1
3
+ )
4
+
5
+ post.authors << Author.find(:first)
6
+ post.save
@@ -0,0 +1,14 @@
1
+ # Reset the primary key to allow us to create robots with specific internal_ids
2
+ class Robot < ActiveRecord::Base
3
+ set_primary_key :alternate_primary_key
4
+ end
5
+
6
+ Robot.create :name => 'Fritz', :internal_id => 'F0001'
7
+ Robot.create :name => 'Sizzle', :internal_id => 'S0001'
8
+ Robot.create :name => 'Sizzle Jr.', :internal_id => 'S0002'
9
+ Robot.create :name => 'Expendable', :internal_id => 'E0001'
10
+
11
+ # Annnnnnnnnnd we're back
12
+ class Robot < ActiveRecord::Base
13
+ set_primary_key :internal_id
14
+ end
@@ -0,0 +1,27 @@
1
+ post = Post.find(1)
2
+
3
+ [
4
+ 'Nunc in neque. Integer sed odio ac quam pellentesque suscipit. Cras posuere posuere est. Suspendisse est.',
5
+ 'In hac habitasse platea dictumst. Etiam eleifend est ac diam. Ut ac felis sit amet mi bibendum varius.',
6
+ 'Nullam sollicitudin tellus at ipsum. Duis mi eros, blandit sed, condimentum non, mattis vel, orci.',
7
+ 'Praesent auctor mollis leo. Nulla facilisi. Pellentesque habitant morbi tristique senectus et netus et',
8
+ 'malesuada fames ac turpis egestas. Donec non odio. Maecenas varius elit ut ante. Phasellus egestas, quam',
9
+ 'a congue euismod, diam urna gravida risus, at euismod lectus diam id sem. Vestibulum sed dolor et massa',
10
+ 'porta placerat. Etiam eget risus. Sed ornare. Vivamus in sapien. Maecenas non enim nec metus posuere',
11
+ 'vehicula. Donec rhoncus mauris at metus. Curabitur volutpat massa a metus. Aliquam ornare, neque ut',
12
+ 'tristique convallis, libero orci eleifend nibh, ac porta leo felis sed orci. Lorem ipsum dolor sit amet,',
13
+ 'Waffles' # This one is important, whereas the others are just padding
14
+ ].each do |text|
15
+ Tagging.create :taggable => post, :tag => Tag.create(:text => text)
16
+ end
17
+
18
+ Developer.find(:all).each do |developer|
19
+ [:country, :city, :state].each do |column|
20
+ Tagging.create(
21
+ :taggable => developer,
22
+ :tag => Tag.find_or_create_by_text(developer.send(column))
23
+ )
24
+ end
25
+ end
26
+
27
+ Tagging.create(:taggable => Developer.last)
@@ -0,0 +1,10 @@
1
+ Theta.create :name => "one"
2
+ Theta.create :name => "two"
3
+ Theta.create :name => "three"
4
+ Theta.create :name => "four"
5
+ Theta.create :name => "five"
6
+ Theta.create :name => "six"
7
+ Theta.create :name => "seven"
8
+ Theta.create :name => "eight"
9
+ Theta.create :name => "nine"
10
+ Theta.create :name => "ten"
@@ -0,0 +1,7 @@
1
+ ActiveRecord::Base.connection.create_table :alphas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :value, :integer, :null => false
4
+ t.column :cost, :decimal, :precision => 10, :scale => 6
5
+ t.column :created_on, :date
6
+ t.column :created_at, :timestamp
7
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :animals, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :type, :string
4
+ t.column :delta, :boolean, :null => false, :default => false
5
+ end
@@ -0,0 +1,3 @@
1
+ ActiveRecord::Base.connection.create_table :authors, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ end
@@ -0,0 +1,6 @@
1
+ ActiveRecord::Base.connection.create_table(
2
+ :authors_posts, :force => true, :id => false
3
+ ) do |t|
4
+ t.column :author_id, :integer, :null => false
5
+ t.column :post_id, :integer, :null => false
6
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :betas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :value, :integer, :null => false
4
+ t.column :delta, :boolean, :null => false, :default => false
5
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :boxes, :force => true do |t|
2
+ t.column :width, :integer, :null => false
3
+ t.column :length, :integer, :null => false
4
+ t.column :depth, :integer
5
+ end
@@ -0,0 +1,3 @@
1
+ ActiveRecord::Base.connection.create_table :categories, :force => true do |t|
2
+ t.column :name, :string
3
+ end
@@ -0,0 +1,10 @@
1
+ ActiveRecord::Base.connection.create_table :comments, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :email, :string
4
+ t.column :url, :string
5
+ t.column :content, :text
6
+ t.column :post_id, :integer, :null => false
7
+ t.column :category_id, :integer, :null => false
8
+ t.column :created_at, :datetime
9
+ t.column :updated_at, :datetime
10
+ end
@@ -0,0 +1,17 @@
1
+ ActiveRecord::Base.connection.create_table :delayed_betas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :delta, :boolean, :null => false, :default => false
4
+ end
5
+
6
+ ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |t|
7
+ t.column :priority, :integer, :default => 0
8
+ t.column :attempts, :integer, :default => 0
9
+ t.column :handler, :text
10
+ t.column :last_error, :string
11
+ t.column :run_at, :datetime
12
+ t.column :locked_at, :datetime
13
+ t.column :failed_at, :datetime
14
+ t.column :locked_by, :string
15
+ t.column :created_at, :datetime
16
+ t.column :updated_at, :datetime
17
+ end
@@ -0,0 +1,9 @@
1
+ require 'faker'
2
+
3
+ ActiveRecord::Base.connection.create_table :developers, :force => true do |t|
4
+ t.column :name, :string, :null => false
5
+ t.column :city, :string
6
+ t.column :state, :string
7
+ t.column :country, :string
8
+ t.column :age, :integer
9
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :extensible_betas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :delta, :boolean, :null => false, :default => false
4
+ t.column :changed_by_generic, :boolean, :null => false, :default => false
5
+ end
@@ -0,0 +1,3 @@
1
+ ActiveRecord::Base.connection.create_table :gammas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ end
@@ -0,0 +1,13 @@
1
+ ActiveRecord::Base.connection.create_table :people, :force => true do |t|
2
+ t.column :first_name, :string
3
+ t.column :middle_initial, :string
4
+ t.column :last_name, :string
5
+ t.column :gender, :string
6
+ t.column :street_address, :string
7
+ t.column :city, :string
8
+ t.column :state, :string
9
+ t.column :postcode, :string
10
+ t.column :email, :string
11
+ t.column :birthday, :datetime
12
+ t.column :delta, :boolean, :null => false, :default => false
13
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :posts, :force => true do |t|
2
+ t.column :subject, :string, :null => false
3
+ t.column :content, :text
4
+ t.column :category_id, :integer, :null => false
5
+ end
@@ -0,0 +1,4 @@
1
+ ActiveRecord::Base.connection.create_table :robots, :primary_key => :alternate_primary_key, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :internal_id, :string, :null => false
4
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :taggings, :force => true do |t|
2
+ t.column :tag_id, :integer
3
+ t.column :taggable_id, :integer, :null => false
4
+ t.column :taggable_type, :string, :null => false
5
+ end
@@ -0,0 +1,4 @@
1
+ ActiveRecord::Base.connection.create_table :tags, :force => true do |t|
2
+ # t.column :post_id, :integer, :null => false
3
+ t.column :text, :text, :null => true
4
+ end
@@ -0,0 +1,5 @@
1
+ ActiveRecord::Base.connection.create_table :thetas, :force => true do |t|
2
+ t.column :name, :string, :null => false
3
+ t.column :created_at, :datetime, :null => false
4
+ t.column :updated_at, :datetime, :null => false
5
+ end
@@ -0,0 +1,3 @@
1
+ require 'active_record'
2
+ Database = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
3
+ require "active_record/connection_adapters/#{Database}_adapter"
@@ -0,0 +1,3 @@
1
+ require 'active_record'
2
+ Database = defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'
3
+ require "active_record/connection_adapters/#{Database}_adapter"
@@ -0,0 +1,18 @@
1
+ require 'rubygems'
2
+ require 'cucumber'
3
+ require 'spec'
4
+ require 'fileutils'
5
+ require 'ginger'
6
+ require 'will_paginate'
7
+ require 'active_record'
8
+
9
+ $:.unshift File.dirname(__FILE__) + '/../../lib'
10
+
11
+ require 'cucumber/thinking_sphinx/internal_world'
12
+
13
+ world = Cucumber::ThinkingSphinx::InternalWorld.new
14
+ world.configure_database
15
+
16
+ require 'thinking_sphinx'
17
+
18
+ world.setup
@@ -0,0 +1,8 @@
1
+ class GenericDeltaHandler < ThinkingSphinx::Deltas::DefaultDelta
2
+
3
+ def index(model, instance = nil)
4
+ #do nothing but set a bit for every record
5
+ #this is just a demonstration of extensibility
6
+ model.update_all(:changed_by_generic => true)
7
+ end
8
+ end
@@ -0,0 +1,10 @@
1
+ class Alpha < ActiveRecord::Base
2
+ define_index do
3
+ indexes :name, :sortable => true
4
+
5
+ has value, created_at, created_on
6
+ has cost, :facet => true
7
+
8
+ set_property :field_weights => {"name" => 10}
9
+ end
10
+ end
@@ -0,0 +1,5 @@
1
+ class Animal < ActiveRecord::Base
2
+ define_index do
3
+ indexes name, :sortable => true
4
+ end
5
+ end
@@ -0,0 +1,3 @@
1
+ class Author < ActiveRecord::Base
2
+ #
3
+ end
@@ -0,0 +1,8 @@
1
+ class Beta < ActiveRecord::Base
2
+ define_index do
3
+ indexes :name, :sortable => true
4
+ has value
5
+
6
+ set_property :delta => true
7
+ end
8
+ end
@@ -0,0 +1,8 @@
1
+ class Box < ActiveRecord::Base
2
+ define_index do
3
+ indexes width, :as => :width_field
4
+
5
+ has width, length, depth
6
+ has [width, length, depth], :as => :dimensions
7
+ end
8
+ end
@@ -0,0 +1,3 @@
1
+ class Cat < Animal
2
+ #
3
+ end
@@ -0,0 +1,4 @@
1
+ class Category < ActiveRecord::Base
2
+ has_many :posts
3
+ has_many :comments
4
+ end
@@ -0,0 +1,10 @@
1
+ class Comment < ActiveRecord::Base
2
+ belongs_to :post
3
+ belongs_to :category
4
+
5
+ define_index do
6
+ indexes :content
7
+
8
+ has category.name, :facet => true, :as => :category_name, :type => :string
9
+ end
10
+ end
@@ -0,0 +1,7 @@
1
+ class DelayedBeta < ActiveRecord::Base
2
+ define_index do
3
+ indexes :name, :sortable => true
4
+
5
+ set_property :delta => :delayed
6
+ end
7
+ end
@@ -0,0 +1,16 @@
1
+ require 'features/support/models/tag'
2
+ require 'features/support/models/tagging'
3
+
4
+ class Developer < ActiveRecord::Base
5
+ has_many :taggings, :as => :taggable
6
+ has_many :tags, :through => :taggings
7
+
8
+ define_index do
9
+ indexes country, :facet => true
10
+ indexes state, :facet => true
11
+ indexes tags.text, :as => :tags, :facet => true
12
+ has age, :facet => true
13
+ has tags(:id), :as => :tag_ids, :facet => true
14
+ facet city
15
+ end
16
+ end
@@ -0,0 +1,3 @@
1
+ class Dog < Animal
2
+ #
3
+ end
@@ -0,0 +1,9 @@
1
+ require File.join(File.dirname(__FILE__), "..", "lib", "generic_delta_handler")
2
+
3
+ class ExtensibleBeta < ActiveRecord::Base
4
+ define_index do
5
+ indexes :name, :sortable => true
6
+
7
+ set_property :delta => "GenericDeltaHandler"
8
+ end
9
+ end
@@ -0,0 +1,5 @@
1
+ class Gamma < ActiveRecord::Base
2
+ define_index do
3
+ indexes :name, :sortable => true
4
+ end
5
+ end
@@ -0,0 +1,23 @@
1
+ class Person < ActiveRecord::Base
2
+ define_index do
3
+ indexes first_name, last_name, :sortable => true
4
+
5
+ has [first_name, middle_initial, last_name], :as => :name_sort
6
+ has birthday
7
+ has gender, :facet => true
8
+
9
+ set_property :min_infix_len => 1
10
+ set_property :enable_star => true
11
+ end
12
+
13
+ sphinx_scope(:with_first_name) { |name|
14
+ { :conditions => {:first_name => name} }
15
+ }
16
+ sphinx_scope(:with_last_name) { |name|
17
+ { :conditions => {:last_name => name} }
18
+ }
19
+ sphinx_scope(:with_id) { |id|
20
+ { :with => {:sphinx_internal_id => id} }
21
+ }
22
+ sphinx_scope(:ids_only) { {:ids_only => true} }
23
+ end
@@ -0,0 +1,20 @@
1
+ class Post < ActiveRecord::Base
2
+ has_many :comments, :dependent => :destroy
3
+ has_many :taggings, :as => :taggable
4
+ has_many :tags, :through => :taggings
5
+ belongs_to :category
6
+ has_and_belongs_to_many :authors
7
+
8
+ define_index do
9
+ indexes subject
10
+ indexes content
11
+ indexes tags.text, :as => :tags
12
+ indexes comments.content, :as => :comments
13
+ indexes authors.name, :as => :authors
14
+
15
+ has comments(:id), :as => :comment_ids, :source => :ranged_query
16
+ has category.name, :facet => true, :as => :category_name, :type => :string
17
+ has 'COUNT(DISTINCT comments.id)', :as => :comments_count, :type => :integer
18
+ has comments.created_at, :as => :comments_created_at
19
+ end
20
+ end
@@ -0,0 +1,12 @@
1
+ class Robot < ActiveRecord::Base
2
+ set_primary_key :internal_id
3
+ set_sphinx_primary_key :alternate_primary_key
4
+
5
+ define_index do
6
+ indexes :name
7
+ end
8
+
9
+ def id
10
+ internal_id
11
+ end
12
+ end
@@ -0,0 +1,3 @@
1
+ class Tag < ActiveRecord::Base
2
+ belongs_to :post
3
+ end