xapian_db 1.3.5.1 → 1.3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e203761f0f1566b21fdc710814a182e16975655
-  data.tar.gz: 06d0a9a439ac17159cb3a5bcaa807e037ae3e5c1
+  metadata.gz: 6c261e611b52eb0ee8488a557ccc7a8f5527263e
+  data.tar.gz: d70a7ba090414139326ea0d55484395a6a5b6096
 SHA512:
-  metadata.gz: 1858b52f0e632241103a29ae0b882bdc4daaac213b44315d0c042da728230be229c99f9f0f4d3e69b1a0c74337dbaa33af915a78b7f4e35fdb5c16107eb61580
-  data.tar.gz: cf08d43a0ed01be48ebc5084b1f88478dc9323a925c8674961d7295c30d3e29688e38be5df984b2c965ceb7082717439aaee2ed36ca8f8b567e4ed1fd686c411
+  metadata.gz: 35737fa35a89f057a815df6848f90e0251b6d72d9fdadaa4587c97399239b3686c6705d597366ce9accbf0c85953b61a936cc39c7008c8c81c86dec6e1a97994
+  data.tar.gz: e05a9527113baaef7e963473fa8dc44d89e42f02cc9a32f72cf59681f2dbe7b1318aa3dc902d3b043418cfb9b44fa7f62ee118905db6d2b14148fdd517743d1f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+##1.3.5.2 (January 3rd, 2014)
+
+Fixes:
+
+  - total_pages are calculated correctly when a limit option is passed (Thanks, Jan)
+  - fix for will_paginate support
+
 ##1.3.5.1 (August 16th, 2013)
 
 Fixes:

data/README.rdoc

@@ -84,8 +84,8 @@ You can override these defaults by placing a config file named 'xapian_db.yml' i
   - language: any iso language code, default: :none (activates spelling corrections, stemmer and stop words if an iso language code ist set)
   - term_min_length: <n>, default: 1 (do not index terms shorter than n)
   - term_splitter_count: <n>, default: 0 (see chapter Term Splitting)
-  - enabled_query_flags: <list of flags, separated by colons>
-  - disabled_query_flags: <list of flags, separated by colons>
+  - enabled_query_flags: <list of flags, separated by commas>
+  - disabled_query_flags: <list of flags, separated by commas>
 
   The following query flags are enabled by default:
 

data/lib/xapian_db/railtie.rb

@@ -35,6 +35,7 @@ module XapianDb
         env_config ? configure_from(env_config) : configure_defaults
       else
         # No config file, set the defaults
+        Rails.logger.warn "#{Rails.root}/config/xapian_db.yml not found, using built in defaults"
         configure_defaults
       end
 
@@ -83,7 +84,9 @@ module XapianDb
 
       if env_config["enabled_query_flags"]
         @enabled_query_flags = []
-        env_config["enabled_query_flags"].split(",").each { |flag_name| @enabled_query_flags << const_get("Xapian::QueryParser::%s" % flag_name.strip) }
+        env_config["enabled_query_flags"].split(",").each do |flag_name|
+          @enabled_query_flags << Xapian::QueryParser.const_get(flag_name.strip)
+        end
       else
         @enabled_query_flags = [ Xapian::QueryParser::FLAG_WILDCARD,
                                  Xapian::QueryParser::FLAG_BOOLEAN,
@@ -94,7 +97,9 @@ module XapianDb
 
       if env_config["disabled_query_flags"]
         @disabled_query_flags = []
-        env_config["disabled_query_flags"].split(",").each { |flag_name| @disabled_query_flags << const_get("Xapian::QueryParser::%s" % flag_name.strip) }
+        env_config["disabled_query_flags"].split(",").each do |flag_name|
+          @disabled_query_flags << Xapian::QueryParser.const_get(flag_name.strip)
+        end
       else
         @disabled_query_flags = []
       end
@@ -114,6 +119,7 @@ module XapianDb
                                 Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE,
                                 Xapian::QueryParser::FLAG_SPELLING_CORRECTION
                               ]
+      @disabled_query_flags = []
     end
   end
 end

data/lib/xapian_db/resultset.rb

@@ -22,6 +22,7 @@ module XapianDb
     # @return [Integer]
     attr_reader :hits
     alias_method :total_count, :hits
+    alias_method :total_entries, :hits
 
     # The number of pages
     # @return [Integer]
@@ -73,7 +74,7 @@ module XapianDb
       raise ArgumentError.new "page #{@page} does not exist" if @hits > 0 && offset >= limit
 
       self.replace result_window.matches.map{|match| decorate(match).document}
-      @total_pages  = (limit / per_page.to_f).ceil
+      @total_pages  = (@hits / per_page.to_f).ceil
       @current_page = page
       @limit_value  = per_page
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.3.5.1
+  version: 1.3.5.2
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby library to use a Xapian db as a key/value store with high performance