CHANGES.txt @@ -1,5 +1,6 @@ dm-xapian is released under the MIT License. Copyright (c) 2008 Joshaven Potter <yourtech@gmail.com> +Copyright (c) 2008 Pascal Belloncle <psq@nanorails.com> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the LICENSE @@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s| s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true - s.extra_rdoc_files = ["README.txt", "LICENSE", 'TODO', 'SETUP.txt'] + s.extra_rdoc_files = ["README.txt", "LICENSE", 'TODO', 'SETUP.txt', 'CHANGES.txt'] s.summary = SUMMARY s.description = s.summary s.author = AUTHOR @@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.add_dependency('merb', '>= 0.9.7') s.require_path = 'lib' - s.files = %w(LICENSE README.txt Rakefile TODO) + Dir.glob("{lib,spec}/**/*") + s.files = %w(LICENSE README.txt Rakefile TODO CHANGES.txt SETUP.txt) + Dir.glob("{lib,spec}/**/*") end Rakefile @@ -1,20 +1,20 @@ Gem::Specification.new do |s| s.name = %q{dm-xapian} - s.version = "0.2" + s.version = "0.3" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Joshaven Potter, Pascal Belloncle"] - s.date = %q{2008-09-21} - s.description = %q{Merb plugin that provides use of the Ruby Xapian search engine library} + s.date = %q{2008-11-08} + s.description = %q{Merb plugin that provides access to the Ruby Xapian search engine library} s.email = %q{yourtech@gmail.com, psq@nanorails.com}} - s.extra_rdoc_files = ["README.txt", "LICENSE", "TODO", "SETUP.txt"] - s.files = ["LICENSE", "README.txt", "Rakefile", "TODO", "lib/dm-xapian.rb", "SETUP.txt"] + s.extra_rdoc_files = ["README.txt", "LICENSE", "TODO", "SETUP.txt", "CHANGES.txt"] + s.files = ["LICENSE", "README.txt", "Rakefile", "TODO", "lib/dm-xapian.rb", "SETUP.txt", "CHANGES.txt"] s.has_rdoc = true s.homepage = %q{http://github.com/psq/dm-xapian} s.require_paths = ["lib"] s.rubyforge_project = %q{merb} s.rubygems_version = %q{1.2.0} - s.summary = %q{Merb plugin that provides use of the Ruby Xapian search engine library} + s.summary = %q{Merb plugin that provides access to the Ruby Xapian search engine library} if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION dm-xapian.gemspec @@ -26,7 +26,21 @@ namespace :xapian do raise "specify ALL your models with models=\"ModelName1 ModelName2\" as parameter" if ENV['models'].nil? ActsAsXapian.configure(Merb.env||'development', Merb.root) - ActsAsXapian.rebuild_index(ENV['models'].split(" ").map{|m| m.constantize}, ENV['verbose'] ? true : false) + # Transform the array of model strings into an array of resource classes + # Only retain resources which have been indexed by Xapian + indexed_models = DataMapper::Resource.descendants.select { |m| m.include?(DataMapper::Xapian::InstanceMethods) } + models_for_rebuild = [] + found_models = nil + ENV['models'].split(" ").each do |m_name| + found_models = indexed_models.select { |m| m.name == m_name } + unless found_models.empty? + models_for_rebuild << found_models.first + else + raise "The model name #{m_name} is either unknown to " + + "DataMapper or not indexed by Xapian" + end + end + ActsAsXapian.rebuild_index(models_for_rebuild, ENV['verbose'] ? true : false) end # Parameters - are models, query, offset, limit, sort_by_prefix, @@ -36,7 +50,7 @@ namespace :xapian do ActsAsXapian.configure(Merb.env||'development', Merb.root) raise "specify models=\"ModelName1 ModelName2\" as parameter" if ENV['models'].nil? raise "specify query=\"your terms\" as parameter" if ENV['query'].nil? - s = ActsAsXapian::Search.new(ENV['models'].split(" ").map{|m| m.constantize}, + s = ActsAsXapian::Search.new(ENV['models'].split(" "), ENV['query'], :offset => (ENV['offset'] || 0), :limit => (ENV['limit'] || 10), :sort_by_prefix => (ENV['sort_by_prefix'] || nil), lib/dm-xapian/merbtasks.rb abf27d10afda124bd37685915b6fee9ca249d019 Pascal psq@psq-imac-3.local http://github.com/psq/dm-xapian/commit/fe86025a5873b16595ce759d17a4a779bd3fa78f fe86025a5873b16595ce759d17a4a779bd3fa78f 2008-11-08T21:12:50-08:00 2008-11-08T21:12:50-08:00 applied Emm patch, updated version, license, added CHANGES.txt 1063786d1da69e17d8ac54843d478c34c87ba858 Pascal psq@psq-imac-3.local