xapian_db 0.5.12 → 0.5.13

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+##0.5.13 (June 20th, 2011)
+
+Fixes:
+
+  - handle attribute objects that return nil from to_s
+
+Features:
+
+  - updated the xapian source to 1.2.6
+  - xapian source and build artefacts are removed after successful install
+  - added support for namespaced classes
+
 ##0.5.12 (April 28th, 2011)
 
 Fixes:

data/Rakefile

@@ -9,7 +9,7 @@ def system!(cmd)
 	system(cmd) or raise
 end
 
-ver = '1.2.5'
+ver = '1.2.6'
 source_dir = 'xapian_source'
 core = "xapian-core-#{ver}"
 bindings = "xapian-bindings-#{ver}"
@@ -38,6 +38,15 @@ task :default do
 		system! "make clean all"
 	end
 
-	system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
-	system! "cp #{bindings}/ruby/xapian.rb lib"
+  system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
+  system! "cp #{bindings}/ruby/xapian.rb lib"
+
+  system! "rm lib/*.a"
+  system! "rm lib/*.la"
+  system! "rm lib/*.lai"
+
+  system! "rm -R #{bindings}"
+  system! "rm -R #{core}"
+  system! "rm -R #{source_dir}"
+
 end

data/lib/xapian_db/adapters/active_record_adapter.rb

@@ -66,6 +66,8 @@ module XapianDb
          def add_doc_helper_methods_to(a_module)
            a_module.instance_eval do
 
+             include XapianDb::Utilities
+
              # Implement access to the model id
              define_method :id do
                return @id unless @d.nil?
@@ -79,7 +81,7 @@ module XapianDb
                return @indexed_object unless @indexed_object.nil?
                # retrieve the class and id from data
                klass_name, id = data.split("-")
-               klass = Kernel.const_get(klass_name)
+               klass =  constantize klass_name
                @indexed_object = klass.find(id.to_i)
              end
 

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -65,6 +65,8 @@ module XapianDb
          def add_doc_helper_methods_to(a_module)
            a_module.instance_eval do
 
+             include XapianDb::Utilities
+
              # Implement access to the model id
              define_method :id do
                return @id unless @d.nil?
@@ -78,7 +80,7 @@ module XapianDb
                return @indexed_object unless @indexed_object.nil?
                # retrieve the class and id from data
                klass_name, id = data.split("-")
-               klass = Kernel.const_get(klass_name)
+               klass = constantize klass_name
                @indexed_object = klass.get(id.to_i)
              end
            end

data/lib/xapian_db/database.rb

@@ -7,6 +7,8 @@ module XapianDb
   # Base class for a Xapian database
   class Database
 
+    include XapianDb::Utilities
+
     # A readable xapian database (see http://xapian.org/docs/apidoc/html/classXapian_1_1Database.html)
     attr_reader :reader
 
@@ -104,7 +106,7 @@ module XapianDb
         class_name = match.document.values[0].value
         # We must add 1 to the collapse_count since collapse_count means
         # "how many other matches are there?"
-        facets[Kernel.const_get(class_name)] = match.collapse_count + 1
+        facets[constantize class_name] = match.collapse_count + 1
       end
       facets
     end

data/lib/xapian_db/index_writers/beanstalk_worker.rb

@@ -8,20 +8,22 @@ module XapianDb
     # @author Gernot Kogler
     class BeanstalkWorker
 
+      include XapianDb::Utilities
+
       def index_task(options)
-        klass = Kernel.const_get options[:class]
+        klass = constantize options[:class]
         obj   = klass.respond_to?(:get) ? klass.get(options[:id].to_i) : klass.find(options[:id].to_i)
         DirectWriter.index obj
       end
 
       def unindex_task(options)
-        klass = Kernel.const_get options[:class]
+        klass = constantize options[:class]
         obj   = klass.respond_to?(:get) ? klass.get(options[:id].to_i) : klass.find(options[:id].to_i)
         DirectWriter.unindex obj
       end
 
       def reindex_class_task(options)
-        klass = Kernel.const_get options[:class]
+        klass = constantize options[:class]
         DirectWriter.reindex_class klass, :verbose => false
       end
 

data/lib/xapian_db/indexer.rb

@@ -86,11 +86,8 @@ module XapianDb
           end
         end
       end
-
     end
 
-    private
-
     # Get the values to index from an object
     def get_values_to_index_from(obj)
 
@@ -101,8 +98,9 @@ module XapianDb
       # we use the attributes values (works well for active_record and datamapper objects)
       return obj.attributes.values if obj.respond_to?(:attributes) && obj.attributes.is_a?(Hash)
 
-      # The object is unkown and will be indexed by its to_s method
-      return [obj]
+      # The object is unkown and will be indexed by its to_s method; if to_s retruns nil, we
+      # will not index it
+      obj.to_s.nil? ? [] : [obj]
     end
 
   end

data/lib/xapian_db/resultset.rb

@@ -16,6 +16,8 @@ module XapianDb
   # @author Gernot Kogler
   class Resultset < Array
 
+    include XapianDb::Utilities
+
     # The number of hits
     # @return [Integer]
     attr_reader :hits
@@ -88,8 +90,6 @@ module XapianDb
       @current_page < @total_pages ? (@current_page + 1): nil
     end
 
-    private
-
     # Build an empty resultset
     def build_empty_resultset
       @hits         = 0
@@ -104,7 +104,7 @@ module XapianDb
     # @return [Xapian::Match] the decorated match
     def decorate(match)
       klass_name = match.document.values[0].value
-      blueprint  = XapianDb::DocumentBlueprint.blueprint_for(Kernel.const_get(klass_name))
+      blueprint  = XapianDb::DocumentBlueprint.blueprint_for(constantize klass_name)
       match.document.extend blueprint.accessors_module
       match.document.instance_variable_set :@score, match.percent
       match

data/lib/xapian_db/utilities.rb

@@ -12,5 +12,17 @@ module XapianDb
       string.split(/[^a-z0-9]/i).map{|w| w.capitalize}.join
     end
 
+    # Taken from Rails
+    def constantize(camel_cased_word)
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: xapian_db
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 12
-  version: 0.5.12
+  prerelease: 
+  version: 0.5.13
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-06-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 10
         version: 1.0.10
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 1
         version: 2.3.1
   type: :development
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 7
         version: 0.3.7
   type: :development
   version_requirements: *id003
@@ -70,10 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :development
   version_requirements: *id004
@@ -124,8 +104,8 @@ files:
 - lib/xapian_db/utilities.rb
 - lib/xapian_db.rb
 - tasks/beanstalk_worker.rake
-- xapian_source/xapian-bindings-1.2.5.tar.gz
-- xapian_source/xapian-core-1.2.5.tar.gz
+- xapian_source/xapian-bindings-1.2.6.tar.gz
+- xapian_source/xapian-core-1.2.6.tar.gz
 - LICENSE
 - README.rdoc
 - CHANGELOG.md
@@ -149,23 +129,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby library to use a Xapian db as a key/value store with high performance fulltext search