xapian-fu 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/xapian_fu/stopper_factory.rb +4 -1
  2. data/lib/xapian_fu/xapian_doc.rb +1 -1
  3. data/spec/stopper_factory_spec.rb +5 -0
  4. data/spec/xapian_doc_spec.rb +7 -0
  5. metadata +61 -61
data/lib/xapian_fu/stopper_factory.rb CHANGED
@@ -6,8 +6,11 @@ module XapianFu
6
6
 
7
7
  # Return a SimpleStopper loaded with stop words for the given language
8
8
  def self.stopper_for(lang)
9
- if lang.is_a? Xapian::Stopper
9
+ case lang
10
+ when Xapian::Stopper
10
11
  lang
12
+ when false
13
+ false
11
14
  else
12
15
  lang = lang.to_s.downcase.strip
13
16
  if @stoppers[lang]
data/lib/xapian_fu/xapian_doc.rb CHANGED
@@ -255,7 +255,7 @@ module XapianFu #:nodoc:
255
255
  tg = Xapian::TermGenerator.new
256
256
  tg.database = db.rw
257
257
  tg.document = xapian_document
258
- tg.stopper = stopper
258
+ tg.stopper = stopper if stopper
259
259
  tg.stemmer = stemmer
260
260
  index_method = db.index_positions ? :index_text : :index_text_without_positions
261
261
  fields.each do |k,v|
data/spec/stopper_factory_spec.rb CHANGED
@@ -17,6 +17,11 @@ describe StopperFactory do
17
17
  stopper = Xapian::SimpleStopper.new
18
18
  StopperFactory.stopper_for(stopper).should === stopper
19
19
  end
20
+
21
+ it "should return false when given false" do
22
+ stopper = StopperFactory.stopper_for(false)
23
+ stopper.should == false
24
+ end
20
25
  end
21
26
 
22
27
  describe "stop_words_for" do
data/spec/xapian_doc_spec.rb CHANGED
@@ -147,6 +147,13 @@ describe XapianDoc do
147
147
  xdoc.stopper.call("and").should == false
148
148
  end
149
149
 
150
+ it "should not stop words when stopper is set to false" do
151
+ xdb = XapianDb.new
152
+ xdoc = xdb.documents.new("And they made a cake", :stopper => false).to_xapian_document
153
+ terms = xdoc.terms.collect { |t| t.term }
154
+ terms.should include 'and'
155
+ end
156
+
150
157
  it "should support stop words encoded in utf8" do
151
158
  xdb = XapianDb.new
152
159
  xdoc = xdb.documents.new("и они made a cake", :stemmer => :russian, :stopper => :russian).to_xapian_document
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xapian-fu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Leach
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-12-13 00:00:00 +00:00
12
+ date: 2010-04-21 00:00:00 +01:00
13
13
  default_executable:
14
14
  dependencies: []
15
15
 
@@ -23,33 +23,33 @@ extra_rdoc_files:
23
23
  - README.rdoc
24
24
  - LICENSE
25
25
  files:
26
- - lib/xapian-fu.rb
27
26
  - lib/xapian_fu.rb
28
- - lib/xapian_fu/result_set.rb
29
- - lib/xapian_fu/stopper_factory.rb
30
- - lib/xapian_fu/stopwords/swedish.txt
27
+ - lib/xapian_fu/xapian_doc_value_accessor.rb
28
+ - lib/xapian_fu/query_parser.rb
29
+ - lib/xapian_fu/xapian_db.rb
30
+ - lib/xapian_fu/xapian_documents_accessor.rb
31
+ - lib/xapian_fu/xapian_doc.rb
32
+ - lib/xapian_fu/stopwords/russian.txt
33
+ - lib/xapian_fu/stopwords/spanish.txt
34
+ - lib/xapian_fu/stopwords/README
35
+ - lib/xapian_fu/stopwords/danish.txt
31
36
  - lib/xapian_fu/stopwords/french.txt
32
- - lib/xapian_fu/stopwords/english.txt
33
37
  - lib/xapian_fu/stopwords/dutch.txt
34
- - lib/xapian_fu/stopwords/italian.txt
38
+ - lib/xapian_fu/stopwords/english.txt
39
+ - lib/xapian_fu/stopwords/german.txt
35
40
  - lib/xapian_fu/stopwords/norwegian.txt
41
+ - lib/xapian_fu/stopwords/swedish.txt
42
+ - lib/xapian_fu/stopwords/update.rb
43
+ - lib/xapian_fu/stopwords/italian.txt
36
44
  - lib/xapian_fu/stopwords/finnish.txt
37
45
  - lib/xapian_fu/stopwords/hungarian.txt
38
- - lib/xapian_fu/stopwords/README
39
- - lib/xapian_fu/stopwords/update.rb
40
46
  - lib/xapian_fu/stopwords/portuguese.txt
41
- - lib/xapian_fu/stopwords/german.txt
42
- - lib/xapian_fu/stopwords/danish.txt
43
- - lib/xapian_fu/stopwords/spanish.txt
44
- - lib/xapian_fu/stopwords/russian.txt
45
- - lib/xapian_fu/xapian_db.rb
46
- - lib/xapian_fu/xapian_doc.rb
47
- - lib/xapian_fu/xapian_documents_accessor.rb
48
- - lib/xapian_fu/query_parser.rb
49
- - lib/xapian_fu/xapian_doc_value_accessor.rb
47
+ - lib/xapian_fu/result_set.rb
48
+ - lib/xapian_fu/stopper_factory.rb
49
+ - lib/xapian-fu.rb
50
+ - examples/spider.rb
50
51
  - examples/ar_spider.rb
51
52
  - examples/query.rb
52
- - examples/spider.rb
53
53
  - examples/ar_query.rb
54
54
  - README.rdoc
55
55
  - LICENSE
@@ -86,62 +86,62 @@ signing_key:
86
86
  specification_version: 3
87
87
  summary: A Ruby interface to the Xapian search engine
88
88
  test_files:
89
- - spec/stopper_factory_spec.rb
90
89
  - spec/xapian_doc_spec.rb
91
- - spec/build_db_for_value_testing.rb
92
90
  - spec/xapian_db_spec.rb
93
- - spec/fixtures/film_data.rb
91
+ - spec/stopper_factory_spec.rb
92
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/value.baseA
94
93
  - spec/fixtures/film_data/x86_64-linux~1.8.7/position.baseA
95
- - spec/fixtures/film_data/x86_64-linux~1.8.7/flintlock
96
94
  - spec/fixtures/film_data/x86_64-linux~1.8.7/record.baseA
95
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/value.DB
96
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.baseA
97
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.DB
97
98
  - spec/fixtures/film_data/x86_64-linux~1.8.7/termlist.baseB
98
- - spec/fixtures/film_data/x86_64-linux~1.8.7/position.baseB
99
- - spec/fixtures/film_data/x86_64-linux~1.8.7/position.DB
99
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/termlist.baseA
100
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.baseB
101
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/value.baseB
100
102
  - spec/fixtures/film_data/x86_64-linux~1.8.7/record.baseB
103
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/flintlock
101
104
  - spec/fixtures/film_data/x86_64-linux~1.8.7/termlist.DB
102
- - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.baseB
103
105
  - spec/fixtures/film_data/x86_64-linux~1.8.7/record.DB
106
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/position.DB
107
+ - spec/fixtures/film_data/x86_64-linux~1.8.7/position.baseB
104
108
  - spec/fixtures/film_data/x86_64-linux~1.8.7/iamflint
105
- - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.baseA
106
- - spec/fixtures/film_data/x86_64-linux~1.8.7/value.DB
107
- - spec/fixtures/film_data/x86_64-linux~1.8.7/termlist.baseA
108
- - spec/fixtures/film_data/x86_64-linux~1.8.7/postlist.DB
109
- - spec/fixtures/film_data/x86_64-linux~1.8.7/value.baseA
110
- - spec/fixtures/film_data/x86_64-linux~1.8.7/value.baseB
111
- - spec/fixtures/film_data/x86_64-linux~1.9.1/position.baseA
112
- - spec/fixtures/film_data/x86_64-linux~1.9.1/flintlock
113
- - spec/fixtures/film_data/x86_64-linux~1.9.1/record.baseA
114
- - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.baseB
115
- - spec/fixtures/film_data/x86_64-linux~1.9.1/position.baseB
116
- - spec/fixtures/film_data/x86_64-linux~1.9.1/position.DB
117
- - spec/fixtures/film_data/x86_64-linux~1.9.1/record.baseB
118
- - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.DB
119
- - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.baseB
120
- - spec/fixtures/film_data/x86_64-linux~1.9.1/record.DB
121
- - spec/fixtures/film_data/x86_64-linux~1.9.1/iamflint
122
- - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.baseA
123
- - spec/fixtures/film_data/x86_64-linux~1.9.1/value.DB
124
- - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.baseA
125
- - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.DB
126
- - spec/fixtures/film_data/x86_64-linux~1.9.1/value.baseA
127
- - spec/fixtures/film_data/x86_64-linux~1.9.1/value.baseB
109
+ - spec/fixtures/film_data/i486-linux~1.8.7/value.baseA
128
110
  - spec/fixtures/film_data/i486-linux~1.8.7/position.baseA
129
- - spec/fixtures/film_data/i486-linux~1.8.7/flintlock
130
111
  - spec/fixtures/film_data/i486-linux~1.8.7/record.baseA
112
+ - spec/fixtures/film_data/i486-linux~1.8.7/value.DB
113
+ - spec/fixtures/film_data/i486-linux~1.8.7/postlist.baseA
114
+ - spec/fixtures/film_data/i486-linux~1.8.7/postlist.DB
131
115
  - spec/fixtures/film_data/i486-linux~1.8.7/termlist.baseB
132
- - spec/fixtures/film_data/i486-linux~1.8.7/position.baseB
133
- - spec/fixtures/film_data/i486-linux~1.8.7/position.DB
116
+ - spec/fixtures/film_data/i486-linux~1.8.7/termlist.baseA
117
+ - spec/fixtures/film_data/i486-linux~1.8.7/postlist.baseB
118
+ - spec/fixtures/film_data/i486-linux~1.8.7/value.baseB
134
119
  - spec/fixtures/film_data/i486-linux~1.8.7/record.baseB
120
+ - spec/fixtures/film_data/i486-linux~1.8.7/flintlock
135
121
  - spec/fixtures/film_data/i486-linux~1.8.7/termlist.DB
136
- - spec/fixtures/film_data/i486-linux~1.8.7/postlist.baseB
137
122
  - spec/fixtures/film_data/i486-linux~1.8.7/record.DB
123
+ - spec/fixtures/film_data/i486-linux~1.8.7/position.DB
124
+ - spec/fixtures/film_data/i486-linux~1.8.7/position.baseB
138
125
  - spec/fixtures/film_data/i486-linux~1.8.7/iamflint
139
- - spec/fixtures/film_data/i486-linux~1.8.7/postlist.baseA
140
- - spec/fixtures/film_data/i486-linux~1.8.7/value.DB
141
- - spec/fixtures/film_data/i486-linux~1.8.7/termlist.baseA
142
- - spec/fixtures/film_data/i486-linux~1.8.7/postlist.DB
143
- - spec/fixtures/film_data/i486-linux~1.8.7/value.baseA
144
- - spec/fixtures/film_data/i486-linux~1.8.7/value.baseB
145
- - spec/query_parser_spec.rb
126
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/value.baseA
127
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/position.baseA
128
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/record.baseA
129
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/value.DB
130
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.baseA
131
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.DB
132
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.baseB
133
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.baseA
134
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/postlist.baseB
135
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/value.baseB
136
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/record.baseB
137
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/flintlock
138
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/termlist.DB
139
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/record.DB
140
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/position.DB
141
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/position.baseB
142
+ - spec/fixtures/film_data/x86_64-linux~1.9.1/iamflint
143
+ - spec/fixtures/film_data.rb
146
144
  - spec/xapian_doc_value_accessor_spec.rb
145
+ - spec/build_db_for_value_testing.rb
146
+ - spec/query_parser_spec.rb
147
147
  - spec/spec.opts