xapian-fu 1.3.1 → 1.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.3.2 (4th December 2011)
+
+* Number range queries (Damian Janowski)
+
 === 1.3.1 (12th October 2011)
 
 * Fix casting of values on search. (Damian Janowski)

data/lib/xapian_fu/query_parser.rb

@@ -96,6 +96,15 @@ module XapianFu #:nodoc:
         fields.each do |name, type|
           qp.add_prefix(name.to_s.downcase, "X" + name.to_s.upcase)
         end
+
+        database.sortable_fields.each do |field, opts|
+          if opts[:range_prefix]
+            qp.add_valuerangeprocessor(Xapian::NumberValueRangeProcessor.new(XapianDocValueAccessor.value_key(field), opts[:range_prefix], true))
+          else
+            qp.add_valuerangeprocessor(Xapian::NumberValueRangeProcessor.new(XapianDocValueAccessor.value_key(field), opts[:range_postfix], false))
+          end
+        end if database
+
         @query_parser = qp
       end
     end

data/lib/xapian_fu/version.rb

@@ -0,0 +1,3 @@
+module XapianFu #:nodoc:
+  VERSION = "1.3.2"
+end

data/lib/xapian_fu/xapian_db.rb

@@ -114,6 +114,7 @@ module XapianFu #:nodoc:
     attr_reader :unindexed_fields
     # Whether this db will generate a spelling dictionary during indexing
     attr_reader :spelling
+    attr_reader :sortable_fields
 
     def initialize( options = { } )
       @options = { :index_positions => true, :spelling => true }.merge(options)
@@ -315,8 +316,9 @@ module XapianFu #:nodoc:
       @fields = { }
       @unindexed_fields = []
       @store_values = []
+      @sortable_fields = {}
       return nil if field_options.nil?
-      default_opts = { 
+      default_opts = {
         :store => true,
         :index => true,
         :type => String
@@ -332,6 +334,7 @@ module XapianFu #:nodoc:
         opts = { :type => opts } unless opts.is_a? Hash
         opts = default_opts.merge(opts)
         @store_values << name if opts[:store]
+        @sortable_fields[name] = {:range_prefix => opts[:range_prefix], :range_postfix => opts[:range_postfix]} if opts[:sortable]
         @unindexed_fields << name if opts[:index] == false
         @fields[name] = opts[:type]
       end

data/lib/xapian_fu/xapian_doc_value_accessor.rb

@@ -85,11 +85,17 @@ module XapianFu #:nodoc:
     # <tt>from_xapian_fu_storage_value</tt> class method on retrieval.
     def store(key, value, type = nil)
       type = @doc.db.fields[key] if type.nil? and @doc.db
-      if type and type.respond_to?(:to_xapian_fu_storage_value)
-        converted_value = type.to_xapian_fu_storage_value(value)
+
+      if @doc.db && @doc.db.sortable_fields.include?(key)
+        converted_value = Xapian.sortable_serialise(value)
       else
-        converted_value = value.to_s
+        if type and type.respond_to?(:to_xapian_fu_storage_value)
+          converted_value = type.to_xapian_fu_storage_value(value)
+        else
+          converted_value = value.to_s
+        end
       end
+
       @doc.xapian_document.add_value(XapianDocValueAccessor.value_key(key), converted_value)
       value
     end

data/spec/xapian_db_spec.rb

@@ -444,6 +444,30 @@ describe XapianDb do
       doc.values.fetch(:age).should == "32"
     end
 
+    it "should allow range searches on sortable values with prefixes" do
+      xdb = XapianDb.new(:fields => { :price => { :type => Integer, :sortable => true, :range_prefix => "$" } })
+
+      xdb << XapianDoc.new(:price => 10)
+      xdb << XapianDoc.new(:price => 20)
+      xdb << XapianDoc.new(:price => 15)
+
+      docs = xdb.search("$10..15")
+
+      docs.map { |d| d.id }.should == [1, 3]
+    end
+
+    it "should allow range searches on sortable values with postfixes" do
+      xdb = XapianDb.new(:fields => { :age => { :type => Integer, :sortable => true, :range_postfix => "y" } })
+
+      xdb << XapianDoc.new(:age => 32)
+      xdb << XapianDoc.new(:age => 40)
+      xdb << XapianDoc.new(:age => 35)
+
+      docs = xdb.search("32..35y")
+
+      docs.map { |d| d.id }.should == [1, 3]
+    end
+
     it "should store values declared as to be collapsible" do
       xdb = XapianDb.new(:collapsible => :group_id)
       xdb << XapianDoc.new(:group_id => "666", :author => "Jim Jones")

data/spec/xapian_doc_value_accessor_spec.rb

@@ -72,7 +72,7 @@ describe XapianDocValueAccessor do
     time = Time.now
     doc = xdb.documents.new(:created_at => time)
     doc.values.store(:created_at, time).should == time
-    doc.values.fetch(:created_at).should be_close(time, 0.0001) # ignore milliseconds
+    doc.values.fetch(:created_at).should be_within(0.0001).of(time) # ignore milliseconds
     doc.to_xapian_document.values.first.value.should == [time.utc.to_f].pack("G")
   end
 
@@ -81,7 +81,7 @@ describe XapianDocValueAccessor do
     datetime = DateTime.now
     doc = xdb.documents.new(:created_at => datetime)
     doc.values.store(:created_at, datetime).should == datetime
-    doc.values.fetch(:created_at).should be_close(datetime, 0.0001) # miliseconds are not stored
+    doc.values.fetch(:created_at).should be_within(0.0001).of(datetime) # miliseconds are not stored
     doc.to_xapian_document.values.first.value.should == datetime.to_s
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xapian-fu
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - John Leach
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -23,16 +23,44 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 1
-        - 3
+        - 2
+        - 7
         - 0
-        version: 1.3.0
+        version: 2.7.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: A library to provide a more Ruby-like interface to the Xapian search engine.
 email: john@johnleach.co.uk
 executables: []
@@ -47,6 +75,7 @@ files:
 - lib/xapian_fu.rb
 - lib/xapian_fu/xapian_doc_value_accessor.rb
 - lib/xapian_fu/query_parser.rb
+- lib/xapian_fu/version.rb
 - lib/xapian_fu/xapian_db.rb
 - lib/xapian_fu/xapian_documents_accessor.rb
 - lib/xapian_fu/xapian_doc.rb
@@ -133,7 +162,6 @@ files:
 - spec/xapian_doc_value_accessor_spec.rb
 - spec/build_db_for_value_testing.rb
 - spec/query_parser_spec.rb
-- spec/spec.opts
 homepage: http://github.com/johnl/xapian-fu
 licenses: []
 
@@ -230,4 +258,3 @@ test_files:
 - spec/xapian_doc_value_accessor_spec.rb
 - spec/build_db_for_value_testing.rb
 - spec/query_parser_spec.rb
-- spec/spec.opts

data/spec/spec.opts

@@ -1,5 +0,0 @@
---colour
---format n
---loadby mtime
---reverse
-