xapit 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,7 +1,15 @@
+*0.2.2* (June 16th, 2009)
+
+* performance improvements
+
+* adding Xapit::Config#close_database method for convenience
+
+
 *0.2.1* (June 15th, 2009)
 
 * including Xapit::Membership into ActiveRecord when using gem
 
+
 *0.2.0* (June 12th, 2009)
 
 * sort numeric attributes properly

data/Manifest

@@ -0,0 +1,61 @@
+CHANGELOG
+features/facets.feature
+features/finding.feature
+features/indexing.feature
+features/sorting.feature
+features/step_definitions/common_steps.rb
+features/step_definitions/xapit_steps.rb
+features/suggestions.feature
+features/support/env.rb
+features/support/xapit_helpers.rb
+init.rb
+install.rb
+lib/xapit/adapters/abstract_adapter.rb
+lib/xapit/adapters/active_record_adapter.rb
+lib/xapit/adapters/data_mapper_adapter.rb
+lib/xapit/collection.rb
+lib/xapit/config.rb
+lib/xapit/facet.rb
+lib/xapit/facet_blueprint.rb
+lib/xapit/facet_option.rb
+lib/xapit/index_blueprint.rb
+lib/xapit/indexers/abstract_indexer.rb
+lib/xapit/indexers/classic_indexer.rb
+lib/xapit/indexers/simple_indexer.rb
+lib/xapit/membership.rb
+lib/xapit/query.rb
+lib/xapit/query_parsers/abstract_query_parser.rb
+lib/xapit/query_parsers/classic_query_parser.rb
+lib/xapit/query_parsers/simple_query_parser.rb
+lib/xapit/rake_tasks.rb
+lib/xapit.rb
+LICENSE
+Manifest
+rails_generators/xapit/templates/setup_xapit.rb
+rails_generators/xapit/templates/xapit.rake
+rails_generators/xapit/USAGE
+rails_generators/xapit/xapit_generator.rb
+Rakefile
+README.rdoc
+spec/spec_helper.rb
+spec/xapit/adapters/active_record_adapter_spec.rb
+spec/xapit/adapters/data_mapper_adapter_spec.rb
+spec/xapit/collection_spec.rb
+spec/xapit/config_spec.rb
+spec/xapit/facet_blueprint_spec.rb
+spec/xapit/facet_option_spec.rb
+spec/xapit/facet_spec.rb
+spec/xapit/index_blueprint_spec.rb
+spec/xapit/indexers/abstract_indexer_spec.rb
+spec/xapit/indexers/classic_indexer_spec.rb
+spec/xapit/indexers/simple_indexer_spec.rb
+spec/xapit/membership_spec.rb
+spec/xapit/query_parsers/abstract_query_parser_spec.rb
+spec/xapit/query_parsers/classic_query_parser_spec.rb
+spec/xapit/query_parsers/simple_query_parser_spec.rb
+spec/xapit/query_spec.rb
+spec/xapit_member.rb
+tasks/spec.rb
+tasks/xapit.rake
+TODO
+uninstall.rb

data/README.rdoc

@@ -77,8 +77,8 @@ You may want to trigger this via a cron job on a recurring schedule (i.e. every
 
 There are two projects in development to help improve this reindexing.
 
-http://github.com/ryanb/xapit-sync/tree/master
-http://github.com/ryanb/xapit-server/tree/master
+* http://github.com/ryanb/xapit-sync/tree/master
+* http://github.com/ryanb/xapit-server/tree/master
 
 
 == Search

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('xapit', '0.2.1') do |p|
+Echoe.new('xapit', '0.2.2') do |p|
   p.summary        = "Ruby library for interacting with Xapian, a full text search engine."
   p.description    = "Ruby library for interacting with Xapian, a full text search engine."
   p.url            = "http://github.com/ryanb/xapit"

data/lib/xapit/collection.rb

@@ -141,14 +141,16 @@ module Xapit
       @query_parser.spelling_suggestion
     end
     
-    private
-    
+    # All Xapit::Facet objects, even if they do not include options.
+    # Usually you'll want to call Collection#facets
     def all_facets
       @query_parser.member_class.xapit_index_blueprint.facets.map do |facet_blueprint|
         Facet.new(facet_blueprint, @query_parser.query, @query_parser.facet_identifiers)
       end
     end
     
+    private
+    
     def matchset(options = {})
       @query_parser.query.matchset(options)
     end

data/lib/xapit/config.rb

@@ -70,6 +70,15 @@ module Xapit
         @database = nil
         @writable_database = nil
       end
+      
+      # Clear the current database from memory. Unfortunately this is a hack because
+      # Xapian doesn't provide a "close" method on the database. We just have to hope
+      # no other references are lying around.
+      def close_database
+        @database = nil
+        @writable_database = nil
+        GC.start
+      end
     end
   end
 end

data/lib/xapit/facet.rb

@@ -20,16 +20,21 @@ module Xapit
       @existing_facet_identifiers = existing_facet_identifiers
     end
     
-    # Xapit::FacetOption objects for this facet. This only lists the ones which match the current query.
+    # Xapit::FacetOption objects for this facet which match the current query.
+    # Hides options which don't narrow down results.
     def options
+      unfiltered_options.select { |o| o.count < @query.count }
+    end
+    
+    # Xapit::FacetOption objects for this facet which match the current query.
+    # Includes options which may not narrow down result set.
+    def unfiltered_options
       matching_identifiers.map do |identifier, count|
-        if count < @query.count
-          option = FacetOption.find(identifier)
-          if option.facet.attribute == @blueprint.attribute
-            option.count = count
-            option.existing_facet_identifiers = @existing_facet_identifiers
-            option
-          end
+        option = FacetOption.find(identifier)
+        if option.facet.attribute == @blueprint.attribute
+          option.count = count
+          option.existing_facet_identifiers = @existing_facet_identifiers
+          option
         end
       end.compact.sort_by(&:name)
     end

data/lib/xapit/query.rb

@@ -43,12 +43,13 @@ module Xapit
     
     def count
       # a bit of a hack to get more accurate count estimate
-      matchset(:limit => Config.database.doccount).matches_estimated
+      @count ||= matchset(:limit => Config.database.doccount).matches_estimated
     end
     
     private
     
     def merge_query(operator, *args)
+      @count = nil
       @xapian_query = Xapian::Query.new(xapian_operator(operator), @xapian_query, build_xapian_query(*args)) unless args.first.blank?
       self
     end

data/xapit.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapit}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
-  s.date = %q{2009-06-15}
+  s.date = %q{2009-06-16}
   s.description = %q{Ruby library for interacting with Xapian, a full text search engine.}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/xapit/adapters/abstract_adapter.rb", "lib/xapit/adapters/active_record_adapter.rb", "lib/xapit/adapters/data_mapper_adapter.rb", "lib/xapit/collection.rb", "lib/xapit/config.rb", "lib/xapit/facet.rb", "lib/xapit/facet_blueprint.rb", "lib/xapit/facet_option.rb", "lib/xapit/index_blueprint.rb", "lib/xapit/indexers/abstract_indexer.rb", "lib/xapit/indexers/classic_indexer.rb", "lib/xapit/indexers/simple_indexer.rb", "lib/xapit/membership.rb", "lib/xapit/query.rb", "lib/xapit/query_parsers/abstract_query_parser.rb", "lib/xapit/query_parsers/classic_query_parser.rb", "lib/xapit/query_parsers/simple_query_parser.rb", "lib/xapit/rake_tasks.rb", "lib/xapit.rb", "LICENSE", "README.rdoc", "tasks/spec.rb", "tasks/xapit.rake", "TODO"]
-  s.files = ["CHANGELOG", "features/facets.feature", "features/finding.feature", "features/indexing.feature", "features/sorting.feature", "features/step_definitions/common_steps.rb", "features/step_definitions/xapit_steps.rb", "features/suggestions.feature", "features/support/env.rb", "features/support/xapit_helpers.rb", "init.rb", "install.rb", "lib/xapit/adapters/abstract_adapter.rb", "lib/xapit/adapters/active_record_adapter.rb", "lib/xapit/adapters/data_mapper_adapter.rb", "lib/xapit/collection.rb", "lib/xapit/config.rb", "lib/xapit/facet.rb", "lib/xapit/facet_blueprint.rb", "lib/xapit/facet_option.rb", "lib/xapit/index_blueprint.rb", "lib/xapit/indexers/abstract_indexer.rb", "lib/xapit/indexers/classic_indexer.rb", "lib/xapit/indexers/simple_indexer.rb", "lib/xapit/membership.rb", "lib/xapit/query.rb", "lib/xapit/query_parsers/abstract_query_parser.rb", "lib/xapit/query_parsers/classic_query_parser.rb", "lib/xapit/query_parsers/simple_query_parser.rb", "lib/xapit/rake_tasks.rb", "lib/xapit.rb", "LICENSE", "rails_generators/xapit/templates/setup_xapit.rb", "rails_generators/xapit/templates/xapit.rake", "rails_generators/xapit/USAGE", "rails_generators/xapit/xapit_generator.rb", "Rakefile", "README.rdoc", "spec/spec_helper.rb", "spec/xapit/adapters/active_record_adapter_spec.rb", "spec/xapit/adapters/data_mapper_adapter_spec.rb", "spec/xapit/collection_spec.rb", "spec/xapit/config_spec.rb", "spec/xapit/facet_blueprint_spec.rb", "spec/xapit/facet_option_spec.rb", "spec/xapit/facet_spec.rb", "spec/xapit/index_blueprint_spec.rb", "spec/xapit/indexers/abstract_indexer_spec.rb", "spec/xapit/indexers/classic_indexer_spec.rb", "spec/xapit/indexers/simple_indexer_spec.rb", "spec/xapit/membership_spec.rb", "spec/xapit/query_parsers/abstract_query_parser_spec.rb", "spec/xapit/query_parsers/classic_query_parser_spec.rb", "spec/xapit/query_parsers/simple_query_parser_spec.rb", "spec/xapit/query_spec.rb", "spec/xapit_member.rb", "tasks/spec.rb", "tasks/xapit.rake", "TODO", "uninstall.rb", "xapit.gemspec"]
+  s.files = ["CHANGELOG", "features/facets.feature", "features/finding.feature", "features/indexing.feature", "features/sorting.feature", "features/step_definitions/common_steps.rb", "features/step_definitions/xapit_steps.rb", "features/suggestions.feature", "features/support/env.rb", "features/support/xapit_helpers.rb", "init.rb", "install.rb", "lib/xapit/adapters/abstract_adapter.rb", "lib/xapit/adapters/active_record_adapter.rb", "lib/xapit/adapters/data_mapper_adapter.rb", "lib/xapit/collection.rb", "lib/xapit/config.rb", "lib/xapit/facet.rb", "lib/xapit/facet_blueprint.rb", "lib/xapit/facet_option.rb", "lib/xapit/index_blueprint.rb", "lib/xapit/indexers/abstract_indexer.rb", "lib/xapit/indexers/classic_indexer.rb", "lib/xapit/indexers/simple_indexer.rb", "lib/xapit/membership.rb", "lib/xapit/query.rb", "lib/xapit/query_parsers/abstract_query_parser.rb", "lib/xapit/query_parsers/classic_query_parser.rb", "lib/xapit/query_parsers/simple_query_parser.rb", "lib/xapit/rake_tasks.rb", "lib/xapit.rb", "LICENSE", "Manifest", "rails_generators/xapit/templates/setup_xapit.rb", "rails_generators/xapit/templates/xapit.rake", "rails_generators/xapit/USAGE", "rails_generators/xapit/xapit_generator.rb", "Rakefile", "README.rdoc", "spec/spec_helper.rb", "spec/xapit/adapters/active_record_adapter_spec.rb", "spec/xapit/adapters/data_mapper_adapter_spec.rb", "spec/xapit/collection_spec.rb", "spec/xapit/config_spec.rb", "spec/xapit/facet_blueprint_spec.rb", "spec/xapit/facet_option_spec.rb", "spec/xapit/facet_spec.rb", "spec/xapit/index_blueprint_spec.rb", "spec/xapit/indexers/abstract_indexer_spec.rb", "spec/xapit/indexers/classic_indexer_spec.rb", "spec/xapit/indexers/simple_indexer_spec.rb", "spec/xapit/membership_spec.rb", "spec/xapit/query_parsers/abstract_query_parser_spec.rb", "spec/xapit/query_parsers/classic_query_parser_spec.rb", "spec/xapit/query_parsers/simple_query_parser_spec.rb", "spec/xapit/query_spec.rb", "spec/xapit_member.rb", "tasks/spec.rb", "tasks/xapit.rake", "TODO", "uninstall.rb", "xapit.gemspec"]
   s.homepage = %q{http://github.com/ryanb/xapit}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Xapit", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xapit
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ files:
 - lib/xapit/rake_tasks.rb
 - lib/xapit.rb
 - LICENSE
+- Manifest
 - rails_generators/xapit/templates/setup_xapit.rb
 - rails_generators/xapit/templates/xapit.rake
 - rails_generators/xapit/USAGE