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,178 @@
1
+ Before do
2
+ $queries_executed = []
3
+ ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
4
+
5
+ @model = nil
6
+ @method = :search
7
+ @query = ""
8
+ @conditions = {}
9
+ @with = {}
10
+ @without = {}
11
+ @with_all = {}
12
+ @options = {}
13
+ @results = nil
14
+ end
15
+
16
+ Given /^I am searching on (.+)$/ do |model|
17
+ @model = model.gsub(/\s/, '_').singularize.camelize.constantize
18
+ end
19
+
20
+ Given /^updates are (\w+)$/ do |action|
21
+ ThinkingSphinx.updates_enabled = (action == "enabled")
22
+ end
23
+
24
+ When /^I am searching for ids$/ do
25
+ @results = nil
26
+ @method = :search_for_ids
27
+ end
28
+
29
+ When /^I am retrieving the result count$/ do
30
+ @result = nil
31
+ @method = @model ? :search_count : :count
32
+ end
33
+
34
+ When /^I search$/ do
35
+ @results = nil
36
+ end
37
+
38
+ When /^I search for (\w+)$/ do |query|
39
+ @results = nil
40
+ @query = query
41
+ end
42
+
43
+ When /^I search for "([^\"]*)"$/ do |query|
44
+ @results = nil
45
+ @query = query
46
+ end
47
+
48
+ When /^I search for (\w+) on (\w+)$/ do |query, field|
49
+ @results = nil
50
+ @conditions[field.to_sym] = query
51
+ end
52
+
53
+ When /^I clear existing filters$/ do
54
+ @with = {}
55
+ @without = {}
56
+ @with_all = {}
57
+ end
58
+
59
+ When /^I filter by (\w+) on (\w+)$/ do |filter, attribute|
60
+ @results = nil
61
+ @with[attribute.to_sym] = filter.to_i
62
+ end
63
+
64
+ When /^I filter by (\d+) and (\d+) on (\w+)$/ do |value_one, value_two, attribute|
65
+ @results = nil
66
+ @with[attribute.to_sym] = [value_one.to_i, value_two.to_i]
67
+ end
68
+
69
+ When /^I filter by both (\d+) and (\d+) on (\w+)$/ do |value_one, value_two, attribute|
70
+ @results = nil
71
+ @with_all[attribute.to_sym] = [value_one.to_i, value_two.to_i]
72
+ end
73
+
74
+ When /^I filter between ([\d\.]+) and ([\d\.]+) on (\w+)$/ do |first, last, attribute|
75
+ @results = nil
76
+ if first[/\./].nil? && last[/\./].nil?
77
+ @with[attribute.to_sym] = first.to_i..last.to_i
78
+ else
79
+ @with[attribute.to_sym] = first.to_f..last.to_f
80
+ end
81
+ end
82
+
83
+ When /^I filter between (\d+) and (\d+) days ago on (\w+)$/ do |last, first, attribute|
84
+ @results = nil
85
+ @with[attribute.to_sym] = first.to_i.days.ago..last.to_i.days.ago
86
+ end
87
+
88
+ When /^I filter by (\w+) between (\d+) and (\d+)$/ do |attribute, first, last|
89
+ @results = nil
90
+ @with[attribute.to_sym] = Time.utc(first.to_i)..Time.utc(last.to_i)
91
+ end
92
+
93
+ When /^I order by (\w+)$/ do |attribute|
94
+ @results = nil
95
+ @options[:order] = attribute.to_sym
96
+ end
97
+
98
+ When /^I order by "([^\"]+)"$/ do |str|
99
+ @results = nil
100
+ @options[:order] = str
101
+ end
102
+
103
+ When /^I group results by the (\w+) attribute$/ do |attribute|
104
+ @results = nil
105
+ @options[:group_function] = :attr
106
+ @options[:group_by] = attribute
107
+ end
108
+
109
+ When /^I set match mode to (\w+)$/ do |match_mode|
110
+ @results = nil
111
+ @options[:match_mode] = match_mode.to_sym
112
+ end
113
+
114
+ When /^I set per page to (\d+)$/ do |per_page|
115
+ @results = nil
116
+ @options[:per_page] = per_page.to_i
117
+ end
118
+
119
+ When /^I set retry stale to (\w+)$/ do |retry_stale|
120
+ @results = nil
121
+ @options[:retry_stale] = case retry_stale
122
+ when "true" then true
123
+ when "false" then false
124
+ else retry_stale.to_i
125
+ end
126
+ end
127
+
128
+ When /^I destroy (\w+) (\w+)$/ do |model, name|
129
+ model.gsub(/\s/, '_').camelize.
130
+ constantize.find_by_name(name).destroy
131
+ end
132
+
133
+ Then /^the (\w+) of each result should indicate order$/ do |attribute|
134
+ results.inject(nil) do |prev, current|
135
+ unless prev.nil?
136
+ current.send(attribute.to_sym).should >= prev.send(attribute.to_sym)
137
+ end
138
+
139
+ current
140
+ end
141
+ end
142
+
143
+ Then /^I can iterate by result and (\w+)$/ do |attribute|
144
+ iteration = lambda { |result, attr_value|
145
+ result.should be_kind_of(@model)
146
+ unless attribute == "group" && attr_value.nil?
147
+ attr_value.should be_kind_of(Integer)
148
+ end
149
+ }
150
+
151
+ results.send("each_with_#{attribute}", &iteration)
152
+ end
153
+
154
+ Then /^I should get (\d+) results?$/ do |count|
155
+ results.length.should == count.to_i
156
+ end
157
+
158
+ Then /^I should not get (\d+) results?$/ do |count|
159
+ results.length.should_not == count.to_i
160
+ end
161
+
162
+ Then /^I should get as many results as there are (.+)$/ do |model|
163
+ results.length.should == model.gsub(/\s/, '_').singularize.camelize.
164
+ constantize.count
165
+ end
166
+
167
+ def results
168
+ @results ||= (@model || ThinkingSphinx).send(
169
+ @method,
170
+ @query,
171
+ @options.merge(
172
+ :conditions => @conditions,
173
+ :with => @with,
174
+ :without => @without,
175
+ :with_all => @with_all
176
+ )
177
+ )
178
+ end
@@ -0,0 +1,15 @@
1
+ When /^I index the theta datetime delta$/ do
2
+ Theta.sphinx_indexes.first.delta_object.delayed_index(Theta)
3
+ end
4
+
5
+ When /^I change the name of theta (\w+) to (\w+)$/ do |current, replacement|
6
+ Theta.find_by_name(current).update_attributes(:name => replacement)
7
+ end
8
+
9
+ When /^I create a new theta named (\w+)$/ do |name|
10
+ Theta.create(:name => name)
11
+ end
12
+
13
+ When /^I delete the theta named (\w+)$/ do |name|
14
+ Theta.find_by_name(name).destroy
15
+ end
@@ -0,0 +1,7 @@
1
+ When /^I run the delayed jobs$/ do
2
+ Delayed::Job.work_off.inspect
3
+ end
4
+
5
+ When /^I change the name of delayed beta (\w+) to (\w+)$/ do |current, replacement|
6
+ DelayedBeta.find_by_name(current).update_attributes(:name => replacement)
7
+ end
@@ -0,0 +1,7 @@
1
+ When /I change the name of extensible beta (\w+) to (\w+)$/ do |current, replacement|
2
+ ExtensibleBeta.find_by_name(current).update_attributes(:name => replacement)
3
+ end
4
+
5
+ Then /^the generic delta handler should handle the delta indexing$/ do
6
+ ExtensibleBeta.find(:first, :conditions => {:changed_by_generic => true}).should_not be_nil
7
+ end
@@ -0,0 +1,92 @@
1
+ When /^I am requesting facet results$/ do
2
+ @results = nil
3
+ @method = :facets
4
+ end
5
+
6
+ When /^I am requesting just the facet (\w+)$/ do |facet|
7
+ @results = nil
8
+ @options[:facets] = facet.downcase.to_sym
9
+ end
10
+
11
+ When /^I am requesting just the facets (\w+) and (\w+)$/ do |one, two|
12
+ @results = nil
13
+ @options[:facets] = [one.downcase.to_sym, two.downcase.to_sym]
14
+ end
15
+
16
+ When "I want classes included" do
17
+ @options[:class_facet] = true
18
+ end
19
+
20
+ When "I don't want classes included" do
21
+ @options[:class_facet] = false
22
+ end
23
+
24
+ When "I want all possible attributes" do
25
+ @options[:all_facets] = true
26
+ end
27
+
28
+ When /^I drill down where (\w+) is (\w+)$/ do |facet, value|
29
+ @results = results.for(facet.downcase.to_sym => value)
30
+ end
31
+
32
+ When /^I drill down where (\w+) is (\w+) and (\w+) is (\w+)$/ do |facet_one, value_one, facet_two, value_two|
33
+ value_one = value_one.to_i unless value_one[/^\d+$/].nil?
34
+ value_two = value_two.to_i unless value_two[/^\d+$/].nil?
35
+
36
+ @results = results.for(
37
+ facet_one.downcase.to_sym => value_one,
38
+ facet_two.downcase.to_sym => value_two
39
+ )
40
+ end
41
+
42
+ When /^I drill down where ([\w_]+) includes the id of tag (\w+)$/ do |facet, text|
43
+ tag = Tag.find_by_text(text)
44
+ @results = results.for(facet.downcase.to_sym => tag.id)
45
+ end
46
+
47
+ When /^I drill down where ([\w_]+) includes the id of tags (\w+) or (\w+)$/ do |facet, text_one, text_two|
48
+ tag_one = Tag.find_by_text(text_one)
49
+ tag_two = Tag.find_by_text(text_two)
50
+ @results = results.for(facet.downcase.to_sym => [tag_one.id, tag_two.id])
51
+ end
52
+
53
+ Then "I should have valid facet results" do
54
+ results.should be_kind_of(Hash)
55
+ results.values.each { |value| value.should be_kind_of(Hash) }
56
+ end
57
+
58
+ Then /^I should have (\d+) facets?$/ do |count|
59
+ results.keys.length.should == count.to_i
60
+ end
61
+
62
+ Then /^I should have the facet ([\w_\s]+)$/ do |name|
63
+ results[facet_name(name)].should be_kind_of(Hash)
64
+ end
65
+
66
+ Then /^I should not have the facet ([\w_\s]+)$/ do |name|
67
+ results.keys.should_not include(facet_name(name))
68
+ end
69
+
70
+ Then /^the ([\w_\s]+) facet should have an? "([\w\s_]+)" key with (\d+) hits$/ do |name, key, hit_count|
71
+ facet_name = facet_name name
72
+ results[facet_name].keys.should include(key)
73
+ results[facet_name][key].should eql(hit_count.to_i)
74
+ end
75
+
76
+ Then /^the ([\w_\s]+) facet should have an? "(\w+)" key$/ do |name, key|
77
+ results[facet_name(name)].keys.should include(key)
78
+ end
79
+
80
+ Then /^the ([\w_\s]+) facet should have an? (\d+\.?\d*) key$/ do |name, key|
81
+ if key[/\./]
82
+ key = key.to_f
83
+ else
84
+ key = key.to_i
85
+ end
86
+
87
+ results[facet_name(name)].keys.should include(key)
88
+ end
89
+
90
+ def facet_name(string)
91
+ string.gsub(/\s/, '').underscore.to_sym
92
+ end
@@ -0,0 +1,36 @@
1
+ When "I include comments" do
2
+ @results = nil
3
+ @options[:include] = :comments
4
+ end
5
+
6
+ When /^I get the first comment$/ do
7
+ @comment = Comment.find(:first)
8
+ end
9
+
10
+ When /^I track queries$/ do
11
+ $queries_executed = []
12
+ end
13
+
14
+ When /^I compare comments$/ do
15
+ results.first.comments.first.should == @comment
16
+ end
17
+
18
+ When /^I select only content$/ do
19
+ @results = nil
20
+ @options[:select] = "id, content"
21
+ end
22
+
23
+ Then /^I should have (\d+) quer[yies]+$/ do |count|
24
+ $queries_executed.length.should == count.to_i
25
+ end
26
+
27
+ Then /^I should not get an error accessing the subject$/ do
28
+ lambda { results.first.subject }.should_not raise_error
29
+ end
30
+
31
+ Then /^I should get an error accessing the subject$/ do
32
+ error_class = NoMethodError
33
+ error_class = ActiveRecord::MissingAttributeError if ActiveRecord.constants.include?("MissingAttributeError")
34
+
35
+ lambda { results.first.subject }.should raise_error(error_class)
36
+ end
@@ -0,0 +1,15 @@
1
+ When /^I destroy gamma (\w+) without callbacks$/ do |name|
2
+ @results = nil
3
+ gamma = Gamma.find_by_name(name)
4
+ Gamma.delete(gamma.id) if gamma
5
+ end
6
+
7
+ Then "I should get a single result of nil" do
8
+ results.to_a.should == [nil]
9
+ end
10
+
11
+ Then /^I should get a single gamma result with a name of (\w+)$/ do |name|
12
+ results.length.should == 1
13
+ results.first.should be_a(Gamma)
14
+ results.first.name.should == name
15
+ end
@@ -0,0 +1,11 @@
1
+ When /^I use the ([\w]+) scope$/ do |scope|
2
+ @results = results.send(scope.to_sym)
3
+ end
4
+
5
+ When /^I use the ([\w]+) scope set to "([^\"]*)"$/ do |scope, value|
6
+ @results = results.send(scope.to_sym, value)
7
+ end
8
+
9
+ When /^I use the ([\w]+) scope set to (\d+)$/ do |scope, int|
10
+ @results = results.send(scope.to_sym, int.to_i)
11
+ end
@@ -0,0 +1,89 @@
1
+ # encoding: UTF-8
2
+ When /^I search for the specific id of (\d+) in the (\w+) index$/ do |id, index|
3
+ @id = id.to_i
4
+ @index = index
5
+ end
6
+
7
+ When /^I search for the document id of (\w+) (\w+) in the (\w+) index$/ do |model, name, index|
8
+ model = model.gsub(/\s/, '_').camelize.constantize
9
+ @id = model.find_by_name(name).sphinx_document_id
10
+ @index = index
11
+ end
12
+
13
+ Then "it should exist" do
14
+ ThinkingSphinx::Search.search_for_id(@id, @index).should == true
15
+ end
16
+
17
+ Then "it should not exist" do
18
+ ThinkingSphinx::Search.search_for_id(@id, @index).should == false
19
+ end
20
+
21
+ Then "it should exist if using Rails 2.1 or newer" do
22
+ require 'active_record/version'
23
+ unless ActiveRecord::VERSION::STRING.to_f < 2.1
24
+ ThinkingSphinx::Search.search_for_id(@id, @index).should == true
25
+ end
26
+ end
27
+
28
+ Then "it should not exist if using Rails 2.1 or newer" do
29
+ require 'active_record/version'
30
+ unless ActiveRecord::VERSION::STRING.to_f < 2.1
31
+ ThinkingSphinx::Search.search_for_id(@id, @index).should == false
32
+ end
33
+ end
34
+
35
+ Then /^I can iterate by result and group and count$/ do
36
+ results.each_with_groupby_and_count do |result, group, count|
37
+ result.should be_kind_of(@model)
38
+ count.should be_kind_of(Integer)
39
+ group.should be_kind_of(Integer)
40
+ end
41
+ end
42
+
43
+ Then "each result id should match the corresponding sphinx internal id" do
44
+ results.each_with_sphinx_internal_id do |result, id|
45
+ result.id.should == id
46
+ end
47
+ end
48
+
49
+ Then "I should have an array of integers" do
50
+ results.each do |result|
51
+ result.should be_kind_of(Integer)
52
+ end
53
+ end
54
+
55
+ Then "searching for ids should match the record ids of the normal search results" do
56
+ normal_results = results
57
+
58
+ # reset search, switch method
59
+ @results = nil
60
+ @method = :search_for_ids
61
+
62
+ results.to_a.should == normal_results.collect(&:id)
63
+ end
64
+
65
+ Then /^I should get a value of (\d+)$/ do |count|
66
+ results.should == count.to_i
67
+ end
68
+
69
+ Then /^the (\w+) excerpt of the first result is "(.*)"$/ do |column, string|
70
+ excerpt = results.excerpt_for(results.first.send(column))
71
+ if excerpt.respond_to?(:force_encoding)
72
+ excerpt = excerpt.force_encoding('UTF-8')
73
+ end
74
+
75
+ excerpt.should == string
76
+ end
77
+
78
+ Then /^calling (\w+) on the first result excerpts object should return "(.*)"$/ do |column, string|
79
+ excerpt = results.first.excerpts.send(column)
80
+ if excerpt.respond_to?(:force_encoding)
81
+ excerpt = excerpt.force_encoding('UTF-8')
82
+ end
83
+
84
+ excerpt.should == string
85
+ end
86
+
87
+ Then /^the first result should have a (\w+\s?\w*) of (\d+)$/ do |attribute, value|
88
+ results.first.sphinx_attributes[attribute.gsub(/\s+/, '_')].should == value.to_i
89
+ end