xapian-fu 1.5.2 → 1.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQ0ZTRhYmZlNmM5MWVlMWJmMjg1OTViNjYyNTBjYTc4NGMyYjlkMQ==
+    YTU3ZmE1ZDAxMjgwZWQ1OTgzMDRlNGIwYWUwZTAyNmE3ODRlMTY3NQ==
   data.tar.gz: !binary |-
-    MGEyZjY2MDcxMTRjNWY4NjQ4ZDllNDAyYjY0Y2MzOTBmODg4ZTRmNA==
+    OWYzOTNiYjVmOTMzZTVjNDZhYWU5MjQ1NDMzMzM3ZWM1OTlkMzA4NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGVhZDMyNzM4YzU3MDVkZDQwZDkwZTQ0NTdjZWM3N2U2YzM4Mjk2ZjExNWU3
-    NDA2MjI3N2YyNzEzNGY5NWNhZWYzMjZjYjViYzBjYmJjNTdjZmQ3YTUzOWFj
-    ZWFmMDI2OGFmOWVmNTMyYmE5OTI2MzgwMmNkNzM0NmZlMTZjOTM=
+    MTZhNWNjMmY1ZGI2ODIwNjM1ZTdmNTRjNjNjMzczYzNmOGY1OTg4NjA1NzM2
+    N2E4MThmZDU2ZGRiYjFkYmJlMjg4NjExMmM3NGZlM2UzZmFhZWNlOTk3YTIy
+    MTAzYmU3ZDA1ZjRiODk1OGY0ZTJkZWVhMDMyMjM3NjI4OWE0M2Y=
   data.tar.gz: !binary |-
-    MGUxNWFjYzAxMWNiZmU5ZGRkYWI2YTVjOThlYjk5Y2EwMjQ4ZjE4ZTE5MjUw
-    ZDFjODA2NDQ3ZGRhMDAyNzg1ZmFmY2EyNTAwMmFmNDk0NjdjNjI5NzI5NTRj
-    OGY2MDAxYjUxOTJkNzQ4NTEyMTZhYmEwMDQzMTU0MDQ4ZDdlNGM=
+    NmVlMzRlZGNlMmVjNjkwMjYzMzliNmM2OTY5MWE5ZjZkZDM1Y2QxMGU5OGI5
+    NzU2M2MzYjkxYzljMWEwZGRmYjk0Mjc3MzY1ODlhNzdjMmFiMzg2ODZjZmYw
+    MTJiYjc1ZTZjZTc5Nzk3NDgxZjFlOWZkMTU4ZmZhYjNjNmM3YjM=

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.5.3 (19th February 2015)
+
+* Added support for indexing multiple terms without stemming (`:exact`).
+
 === 1.5.2 (25th July 2014)
 
 * Added `XapianDb#close` to close both the read and write databases.

data/lib/xapian_fu/version.rb

@@ -1,3 +1,3 @@
 module XapianFu #:nodoc:
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/lib/xapian_fu/xapian_db.rb

@@ -137,6 +137,7 @@ module XapianFu #:nodoc:
     # Whether this db will generate a spelling dictionary during indexing
     attr_reader :spelling
     attr_reader :sortable_fields
+    attr_reader :field_options
     attr_accessor :weights_function
     attr :field_weights
 
@@ -151,6 +152,7 @@ module XapianFu #:nodoc:
       @language = @options.fetch(:language, :english)
       @stemmer = @options.fetch(:stemmer, @language)
       @stopper = @options.fetch(:stopper, @language)
+      @field_options = {}
       setup_fields(@options[:fields])
       @store_values << @options[:store]
       @store_values << @options[:sortable]
@@ -444,6 +446,7 @@ module XapianFu #:nodoc:
         @boolean_fields << name if opts[:boolean]
         @fields[name] = opts[:type]
         @field_weights[name] = opts[:weight] if opts.include?(:weight)
+        @field_options[name] = opts
       end
       @fields
     end

data/lib/xapian_fu/xapian_doc.rb

@@ -268,19 +268,33 @@ module XapianFu #:nodoc:
       tg.stemmer = stemmer
       tg.set_flags Xapian::TermGenerator::FLAG_SPELLING if db.spelling
       index_method = db.index_positions ? :index_text : :index_text_without_positions
-      fields.each do |k,v|
+      fields.each do |k,o|
         next if unindexed_fields.include?(k)
-        if v.respond_to?(:to_xapian_fu_string)
-          v = v.to_xapian_fu_string
+
+        if db.fields[k] == Array
+          values = Array(o)
         else
-          v = v.to_s
+          values = [o]
+        end
+
+        values.each do |v|
+          if v.respond_to?(:to_xapian_fu_string)
+            v = v.to_xapian_fu_string
+          else
+            v = v.to_s
+          end
+
+          # get the custom term weight if a weights function exists
+          weight = db.weights_function ? db.weights_function.call(k, v, fields).to_i : db.field_weights[k]
+          # add value with field name
+          tg.send(index_method, v, weight, 'X' + k.to_s.upcase)
+          # add value without field name
+          tg.send(index_method, v, weight)
+
+          if db.field_options[k] && db.field_options[k][:exact]
+            xapian_document.add_term("X#{k.to_s.upcase}#{v.to_s.downcase}", weight)
+          end
         end
-        # get the custom term weight if a weights function exists
-        weight = db.weights_function ? db.weights_function.call(k, v, fields).to_i : db.field_weights[k]
-        # add value with field name
-        tg.send(index_method, v, weight, 'X' + k.to_s.upcase)
-        # add value without field name
-        tg.send(index_method, v, weight)
       end
 
       db.boolean_fields.each do |name|

data/spec/xapian_db_spec.rb

@@ -289,6 +289,23 @@ describe XapianDb do
       xdb.search("red").map(&:id).should == [1, 2]
     end
 
+    it "should index arrays with exact option" do
+      xdb = XapianDb.new(:dir => tmp_dir, :create => true,
+                         :fields => {
+                           :colors => { :index => true, :type => Array, :exact => true }
+                         })
+
+      xdb << {:colors => ["light blue", "red"]}
+
+      xdb.flush
+
+      doc = xdb.documents.find(1)
+
+      terms = doc.terms.map(&:term)
+
+      terms.should include("XCOLORSlight blue")
+      terms.should include("XCOLORSred")
+    end
   end
 
   describe "search" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian-fu
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - John Leach