xapian_db 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+##0.4.1 (December 16th, 2010)
+
+Bugfixes:
+
+  - fixed the handling of invalid page arguments in resultset.paginate. Invalid page arguments return
+    an empty result set
+  - searches with an empty search expression do not raise an exception anymore and return an empty
+    resultset
+
 ##0.4.0 (December 15th, 2010)
 
 Features:

data/lib/xapian_db/adapters/base_adapter.rb

@@ -23,6 +23,10 @@ module XapianDb
              # - :order          (Array<Symbol>) Accepts an array of attribute names for sorting
              # - :sort_decending (Boolean)       Allows to reverse the sorting
              define_singleton_method(:search) do |expression, options={}|
+
+               # return an empty search if no search expression is given
+               return XapianDb.database.search(nil) if expression.nil? || expression.strip.empty?
+
                options = {:sort_decending => false}.merge options
                class_scope = "indexed_class:#{klass.name.downcase}"
 

data/lib/xapian_db/database.rb

@@ -61,9 +61,12 @@ module XapianDb
       opts          = {:per_page => 10, :sort_decending => false}.merge(options)
       @query_parser ||= QueryParser.new(self)
       query         = @query_parser.parse(expression)
+
+      # If we do not have a valid query we return an empty result set
+      return Resultset.new(nil, opts) unless query
+
       enquiry       = Xapian::Enquire.new(reader)
       enquiry.query = query
-
       if opts[:sort_indices]
         raise ArgumentError.new("Sorting is available for class scoped searches only") unless expression =~ /^indexed_class:/
         sorter = Xapian::MultiValueSorter.new

data/lib/xapian_db/query_parser.rb

@@ -26,6 +26,7 @@ module XapianDb
     # Parse an expression
     # @return [Xapian::Query] The query object (see http://xapian.org/docs/apidoc/html/classXapian_1_1Query.html)
     def parse(expression)
+      return nil if expression.nil? || expression.strip.empty?
       parser            = Xapian::QueryParser.new
       parser.database   = @db.reader
       parser.default_op = Xapian::Query::OP_AND # Could be made configurable

data/lib/xapian_db/resultset.rb

@@ -31,26 +31,31 @@ module XapianDb
     attr_accessor :spelling_suggestion
 
     # Constructor
-    # @param [Xapian::Enquire] enquiry a Xapian query result (see http://xapian.org/docs/apidoc/html/classXapian_1_1Enquire.html)
+    # @param [Xapian::Enquire] enquiry a Xapian query result (see http://xapian.org/docs/apidoc/html/classXapian_1_1Enquire.html).
+    #   Pass nil to get an empty result set.
     # @param [Hash] options
     # @option options [Integer] :per_page (10) How many docs per page?
     # @option options [String] :spelling_suggestion (nil) The spelling corrected query (if a language is configured)
     def initialize(enquiry, options)
       @enquiry = enquiry
-      # To get more accurate results, we pass the doc count to the mset method
-      @size                = enquiry.mset(0, options[:db_size]).matches_estimated
+      if @enquiry.nil?
+        @size = 0
+      else
+        # To get more accurate results, we pass the doc count to the mset method
+        @size = enquiry.mset(0, options[:db_size]).matches_estimated
+      end
       @spelling_suggestion = options[:spelling_suggestion]
       @per_page            = options[:per_page]
-      @total_pages         = (@size / @per_page.to_f).ceil
+      @total_pages         = @size == 0 ? 0 : (@size / @per_page.to_f).ceil
       @current_page        = 1
     end
 
     # Paginate the result
-    # @param [Hash] opts Options for the persistent database
-    # @option opts [Integer] :page (1) The page to access
-    def paginate(opts={})
-      options       = {:page => 1}.merge(opts)
-      @current_page = options[:page].to_i
+    # @param [Hash] options Options for the persistent database
+    # @option options [Integer] :page (1) The page to access
+    def paginate(options={})
+      @current_page = options[:page] ? options[:page].to_i : 1
+      return [] if @current_page < 1 || @current_page > @total_pages
       build_page(@current_page)
     end
 
@@ -71,7 +76,6 @@ module XapianDb
     # Build a page of Xapian documents
     # @return [Array<Xapian::Document>] An array of xapian documents
     def build_page(page)
-      page.nil? ? page = 1 : page = page.to_i
       docs = []
       offset = (page - 1) * @per_page
       return [] if offset > @size

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +01:00
+date: 2010-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency