xapian_db 1.2.4.5 → 1.2.4.6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+##1.2.4.6 (Decmber 17th, 2012)
+
+Changes:
+
+  - progressbar gem replaced by ruby-progressbar
+  - XapianDb.rebuild_xapian_index resets the database to remove any stale index data
+
 ##1.2.4.5 (July 19th, 2012)
 
 Fixes:

data/lib/xapian_db/database.rb

@@ -165,6 +165,12 @@ module XapianDb
       # Nothing to do for an in memory database
     end
 
+    # Reset (empty) the database
+    def reset
+      @writer = Xapian::inmemory_open
+      @reader = @writer
+    end
+
   end
 
   # Persistent database on disk
@@ -212,6 +218,15 @@ module XapianDb
       writer.commit
     end
 
+    # Reset (empty) the database
+    def reset
+      # We must release the writer and run the garbage collector to remove the write lock
+      @writer = nil
+      GC.start
+      @writer = Xapian::WritableDatabase.new(@path, Xapian::DB_CREATE_OR_OVERWRITE)
+      @reader = Xapian::Database.new(@path)
+    end
+
   end
 
-end
+end

data/lib/xapian_db/document_blueprint.rb

@@ -32,12 +32,8 @@ module XapianDb
       # - attribute (see {#attribute} for details)
       # - index (see {#index} for details)
       def setup(klass_or_name, &block)
-        if klass_or_name.is_a?(Class)
-          warn "xapian_db: XapianDb::DocumentBlueprint.setup(Class) is deprecated; use XapianDb::DocumentBlueprint.setup(Symbol) or XapianDb::DocumentBlueprint.setup(String) instead"
-          name = klass_or_name.name
-        else
-          name = klass_or_name.to_s
-        end
+        name = class_name_from klass_or_name
+
         @blueprints ||= {}
         blueprint = DocumentBlueprint.new
         yield blueprint if block_given? # configure the blueprint through the block
@@ -47,16 +43,7 @@ module XapianDb
         @blueprints.delete_if { |indexed_class, blueprint| indexed_class == name }
         @blueprints[name] = blueprint
 
-        # lazy load the adapter
-        unless defined? blueprint._adapter
-          adapter_file = blueprint._adapter.name.split("::").last.downcase + "_adapter"
-          require File.dirname(__FILE__) + "../adapters/#{adapter_file}"
-        end
-
-        # Needed to add class helper methods to indexed pure ruby classes
-        if eval("defined?(#{name}) && #{name}.is_a?(Class)")
-          blueprint._adapter.add_class_helper_methods_to XapianDb::Utilities.constantize(name)
-        end
+        lazy_load_adapter_for blueprint, name
 
         @searchable_prefixes = @blueprints.values.map { |blueprint| blueprint.searchable_prefixes }.flatten.compact.uniq || []
 
@@ -146,6 +133,28 @@ module XapianDb
 
       private
 
+      def class_name_from(klass_or_name)
+        if klass_or_name.is_a?(Class)
+          warn "xapian_db: XapianDb::DocumentBlueprint.setup(Class) is deprecated; use XapianDb::DocumentBlueprint.setup(Symbol) or XapianDb::DocumentBlueprint.setup(String) instead"
+          name = klass_or_name.name
+        else
+          name = klass_or_name.to_s
+        end
+      end
+
+      def lazy_load_adapter_for(blueprint, klass_name)
+        # lazy load the adapter
+        unless defined? blueprint._adapter
+          adapter_file = blueprint._adapter.name.split("::").last.downcase + "_adapter"
+          require File.dirname(__FILE__) + "../adapters/#{adapter_file}"
+        end
+
+        # Needed to add class helper methods to indexed pure ruby classes
+        if eval("defined?(#{klass_name}) && #{klass_name}.is_a?(Class)")
+          blueprint._adapter.add_class_helper_methods_to XapianDb::Utilities.constantize(klass_name)
+        end
+      end
+
       def validate_type_consistency_on(blueprint)
         blueprint.type_map.each do |method_name, type|
           if type_info_for(method_name) && type_info_for(method_name) != type

data/lib/xapian_db/index_writers/direct_writer.rb

@@ -64,7 +64,7 @@ module XapianDb
           if opts[:verbose]
             show_progressbar = defined?(ProgressBar)
             puts "reindexing #{obj_count} objects of #{klass}..."
-            pbar = ProgressBar.new("Status", obj_count) if show_progressbar
+            pbar = ProgressBar.create(:title => "Status", :total => obj_count, :format => ' %t %e %B %p%%') if show_progressbar
           end
 
           # Process the objects in batches to reduce the memory footprint
@@ -72,7 +72,7 @@ module XapianDb
           nr_of_batches.times do |batch|
             base_query.all(:offset => batch * BATCH_SIZE, :limit => BATCH_SIZE, :order => klass.order_condition(primary_key)).each do |obj|
               reindex obj, false
-              pbar.inc if show_progressbar
+              pbar.increment if show_progressbar
             end
           end
           XapianDb.database.commit

data/lib/xapian_db.rb

@@ -142,6 +142,7 @@ module XapianDb
   # @option options [Boolean] :verbose (false) Should the reindexing give status informations?
   # @return [Boolean] Did we reindex anything?
   def self.rebuild_xapian_index(options={})
+    database.reset
     configured_classes = XapianDb::DocumentBlueprint.configured_classes
     return false unless configured_classes.size > 0
     configured_classes.each do |klass|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.2.4.5
+  version: 1.2.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.7.1
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: XapianDb is a ruby gem that combines features of nosql databases and
   fulltext indexing. It is based on Xapian, an efficient and powerful indexing library
 email: gernot.kogler (at) garaio (dot) com
@@ -230,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1478598025924087543
+      hash: 2931539374051915858
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: