active_lucene 0.5.2 → 0.6

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "active_lucene"
-GEM_VERSION = "0.5.2"
+GEM_VERSION = "0.6"
 SUMMARY = "ActiveRecord/ActiveModel's like interface for Lucene"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"
@@ -44,4 +44,4 @@ task :make_spec do
   File.open("#{GEM}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/lib/active_lucene.rb

@@ -1,36 +1,20 @@
-require 'java'
-require 'rubygems'
 require 'active_support'
-
-Dir[File.expand_path(File.dirname(__FILE__) + "/*.jar")].each { |path| require path.split('/').last.gsub('.jar', '') }
-import org.apache.lucene.document.Field
-import org.apache.lucene.store.FSDirectory
-import org.apache.lucene.index.IndexWriter
-import org.apache.lucene.analysis.standard.StandardAnalyzer
-import org.apache.lucene.queryParser.standard.StandardQueryParser
-
-import org.apache.lucene.search.IndexSearcher
-import org.apache.lucene.search.BooleanClause
-import org.apache.lucene.search.BooleanQuery
-import org.apache.lucene.search.MatchAllDocsQuery
-import org.apache.lucene.search.WildcardQuery
-
-import org.apache.lucene.search.highlight.QueryScorer
-import org.apache.lucene.search.highlight.Highlighter
-
-import org.apache.lucene.util.Version
+require 'java_classes'
 
 if defined? RAILS_ROOT
   APP_ROOT = RAILS_ROOT
   APP_ENV  = RAILS_ENV
-else
-  APP_ROOT ||= '.'
-  APP_ENV  ||= 'default'
+elsif not defined? APP_ROOT
+  APP_ROOT = '.'
+  APP_ENV  = 'default'
 end
 
-%w(analyzer document index query searcher term writer).each { |name| require "active_lucene/#{name}" }
+%w(analyzer document index index/reader index/writer index/searcher dictionary query search_result suggest term).each do |name| 
+  require "active_lucene/#{name}"
+end
 
 module ActiveLucene
   ID = 'id'
   ALL = '_all'
-end
+  TYPE = '_type'
+end

data/lib/active_lucene/dictionary.rb

@@ -0,0 +1,9 @@
+module ActiveLucene
+  module Dictionary
+    PATH = "#{Index::PATH}/dictionary"
+    
+    def directory
+      FSDirectory.open java.io.File.new(PATH)
+    end
+  end
+end

data/lib/active_lucene/document.rb

@@ -19,11 +19,12 @@ module ActiveLucene
       end
       document.add Field.new ID, @id, Field::Store::YES, Field::Index::NOT_ANALYZED
       document.add Field.new ALL, _all.join(' '), Field::Store::NO, Field::Index::ANALYZED
-      Writer.write document
+      document.add Field.new TYPE, self.class.to_s, Field::Store::YES, Field::Index::NOT_ANALYZED
+      Index::Writer.write document
     end
 
     def destroy
-      Writer.delete @id
+      Index::Writer.delete @id
     end
 
     def update_attributes(new_attributes)
@@ -35,31 +36,36 @@ module ActiveLucene
     def to_param
       @id
     end
+    
+    def self.all(opts = {})
+      find :all, opts
+    end
 
-    def self.create!(attributes)
+    def self.create!(attributes = {})
       returning new(attributes) do |model|
         model.save
       end
     end
 
-    def self.find(param)
+    def self.find(param, opts = {})
       if param.instance_of? Symbol
-        search :all
+        search :all, opts
       else
         search(:id => param).first
       end
     end
 
-    def self.search(param)
-      search = Searcher.search(param)
-      results = search.attributes.map { |attributes| new attributes }
-      results.instance_eval "def total_pages; #{search.total_pages}; end;"
-      results
+    def self.search(param, opts = {})
+      Index::Searcher.search(param, opts)
     end
 
     def self.columns
       []
     end
+    
+    def self.paginate(opts)
+      all opts
+    end
 
     private
 

data/lib/active_lucene/index.rb

@@ -2,8 +2,8 @@ module ActiveLucene
   module Index
     PATH = "#{APP_ROOT}/db/lucene/#{APP_ENV}"
 
-    def directory
+    def self.directory
       FSDirectory.open java.io.File.new(PATH)
     end
   end
-end
+end

data/lib/active_lucene/index/reader.rb

@@ -0,0 +1,9 @@
+module ActiveLucene
+  module Index
+    class Reader < IndexReader
+      def self.open
+        super Index.directory
+      end
+    end
+  end
+end

data/lib/active_lucene/index/searcher.rb

@@ -0,0 +1,34 @@
+module ActiveLucene
+  module Index
+    class Searcher < IndexSearcher
+      def self.search(param, opts = {})
+        new.search param, opts
+      end
+
+      def initialize
+        super Index.directory, true
+      end
+
+      def search(param, opts)
+        page = (opts[:page] || 1).to_i
+        query = Query.for(param)
+        highlighter = Highlighter.new(QueryScorer.new(query))
+        top_docs = super(query, nil, page * Document::PER_PAGE)
+        score_docs = top_docs.scoreDocs 
+        returning SearchResult.new(param) do |search_result|
+          score_docs[(page - 1) * Document::PER_PAGE ... score_docs.size].each do |score_doc|
+            attributes = {}
+            doc(score_doc.doc).fields.each do |field|
+              attributes.store field.name, field.string_value
+              highlight = highlighter.get_best_fragment(Analyzer.new, ALL, field.string_value)
+              attributes[:highlight] = highlight if highlight
+            end
+            search_result.add_document attributes
+          end
+          search_result.current_page = page
+          search_result.total_pages = (top_docs.totalHits / Document::PER_PAGE.to_f).ceil
+        end
+      end
+    end
+  end
+end

data/lib/active_lucene/index/writer.rb

@@ -0,0 +1,24 @@
+module ActiveLucene
+  module Index
+    class Writer < IndexWriter
+      def initialize
+        overwrite = Dir[PATH + '/*'].size < 1
+        super Index.directory, Analyzer.new, overwrite, IndexWriter::MaxFieldLength::UNLIMITED
+        yield self
+        close
+      end
+
+      def self.write(document)
+        new do |index|
+          index.add_document document
+        end
+      end
+
+      def self.delete(id)
+        new do |index|
+          index.delete_documents ActiveLucene::Term.for(ID, id)
+        end
+      end
+    end
+  end
+end

data/lib/active_lucene/search_result.rb

@@ -0,0 +1,32 @@
+module ActiveLucene
+  class SearchResult < Array
+    include Dictionary
+    
+    attr_reader :query
+    attr_accessor :total_pages, :current_page
+    
+    def initialize(query)
+      @query = query
+    end
+    
+    def add_document(attributes)
+      self << eval(attributes.delete(TYPE)).new(attributes)
+    end
+    
+    def suggest
+      spell_checker = SpellChecker.new directory
+      spell_checker.index_dictionary LuceneDictionary.new(Index::Reader.open, ALL)
+      query.split(' ').map do |word|
+        spell_checker.suggest_similar(word, 1).first || word
+      end.join(' ')
+    end
+    
+    def previous_page
+      @current_page - 1
+    end
+    
+    def next_page
+      @current_page + 1
+    end
+  end
+end

data/lib/active_lucene/suggest.rb

@@ -0,0 +1,4 @@
+module ActiveLucene
+  class Suggest
+  end
+end

data/lib/java_classes.rb

@@ -0,0 +1,28 @@
+Dir[File.expand_path(File.dirname(__FILE__) + "/*.jar")].each do |path| 
+  require path.split('/').last.gsub('.jar', '')
+end
+
+import org.apache.lucene.document.Field
+
+import org.apache.lucene.store.FSDirectory
+
+import org.apache.lucene.index.IndexReader
+import org.apache.lucene.index.IndexWriter
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer
+
+import org.apache.lucene.queryParser.standard.StandardQueryParser
+
+import org.apache.lucene.search.IndexSearcher
+import org.apache.lucene.search.BooleanClause
+import org.apache.lucene.search.BooleanQuery
+import org.apache.lucene.search.MatchAllDocsQuery
+import org.apache.lucene.search.WildcardQuery
+
+import org.apache.lucene.search.spell.LuceneDictionary;
+import org.apache.lucene.search.spell.SpellChecker;
+
+import org.apache.lucene.search.highlight.QueryScorer
+import org.apache.lucene.search.highlight.Highlighter
+
+import org.apache.lucene.util.Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_lucene
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: "0.6"
 platform: ruby
 authors: 
 - Diego Carrion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -02:00
+date: 2010-02-07 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -22,20 +22,26 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/active_lucene.rb
-- lib/lucene-highlighter-3.0.0.jar
-- lib/lucene-queryparser-3.0.0.jar
-- lib/lucene-core-3.0.0.jar
-- lib/lucene-memory-3.0.0.jar
 - lib/active_lucene/analyzer.rb
-- lib/active_lucene/writer.rb
+- lib/active_lucene/dictionary.rb
 - lib/active_lucene/document.rb
+- lib/active_lucene/index/reader.rb
+- lib/active_lucene/index/searcher.rb
+- lib/active_lucene/index/writer.rb
 - lib/active_lucene/index.rb
-- lib/active_lucene/searcher.rb
 - lib/active_lucene/query.rb
+- lib/active_lucene/search_result.rb
+- lib/active_lucene/suggest.rb
 - lib/active_lucene/term.rb
-- README.textile
+- lib/active_lucene.rb
+- lib/java_classes.rb
+- lib/lucene-core-3.0.0.jar
+- lib/lucene-highlighter-3.0.0.jar
+- lib/lucene-memory-3.0.0.jar
+- lib/lucene-queryparser-3.0.0.jar
+- lib/lucene-spellchecker-3.0.0.jar
 - Rakefile
+- README.textile
 has_rdoc: true
 homepage: http://www.diegocarrion.com
 licenses: []

data/lib/active_lucene/searcher.rb

@@ -1,33 +0,0 @@
-module ActiveLucene
-  class Searcher < IndexSearcher
-    include Index
-
-    attr_reader :attributes, :total_pages
-
-    def initialize
-      super directory, true
-    end
-
-    def self.search(param)
-      returning new do |searcher|
-        searcher.search param
-      end
-    end
-
-    def search(param)
-      query = Query.for(param)
-      top_docs = super(query, nil, Document::PER_PAGE)
-      @attributes = top_docs.scoreDocs.map do |score_doc|
-        attributes = {}
-        doc(score_doc.doc).fields.each do |field|
-          attributes.store field.name, field.string_value
-          highlight = Highlighter.new(QueryScorer.new(query)).get_best_fragment(Analyzer.new, ALL, field.string_value)
-          attributes[:highlight] = highlight if highlight
-        end
-        attributes
-      end
-      @total_pages = (top_docs.totalHits / Document::PER_PAGE.to_f).ceil
-    end
-
-  end
-end

data/lib/active_lucene/writer.rb

@@ -1,24 +0,0 @@
-module ActiveLucene
-  class Writer < IndexWriter
-    include Index
-
-    def initialize
-      overwrite = Dir[PATH + '/*'].size < 1
-      super directory, Analyzer.new, overwrite, IndexWriter::MaxFieldLength::UNLIMITED
-      yield self
-      close
-    end
-
-    def self.write(document)
-      new do |index|
-        index.add_document document
-      end
-    end
-
-    def self.delete(id)
-      new do |index|
-        index.delete_documents ActiveLucene::Term.for(ID, id)
-      end
-    end
-  end
-end