Merge branch 'default_create_query'

README

@@ -5,19 +5,22 @@ Moonstone is a JRuby wrapper around Java's Lucene search engine toolkit.
 == Goals
 
 * Engines: An engine abstraction that brings all common index and search operations under a single roof.
-* Lucene Transparency: a transparent JRuby wrapper around Lucene
-* Rubify Lucene: higher level classes that simplify use of Lucene constructs in Ruby
+* Lucene Transparency: A transparent JRuby wrapper around Lucene which allows clear and direct access to the underlying lucene classes.
+* Rubify Lucene: Higher level classes that simplify and Rubify the use of Lucene.
 
 == Engines
 
 Using moonstone is simple.
 
     engine = Moonstone::Engine.new
     # note: you can't use symbols for the keys
-    engine.index([{'title' => 'my blog post', 'content' => "blah blah blah"}])
-    q = Lucene::Search::TermQuery.new("title", "blog")
-    documents = engine.search(q)
-    documents.each {|d| puts d['name']}
+    engine.index([{'title' => 'first post', 'content' => "blah blah blah"}])
+		# this sets the field that is searched by default
+		engine.default_query_parser('title')
+    documents = engine.search('first')
+    documents.each {|d| puts d['title']}
+		# to search on a different field
+		engine.search("content:blah")
 
 A typical engine will override two things; the doc_from method and the analyzer.
 

lib/moonstone/engine.rb

@@ -150,8 +150,10 @@ def close
       @reader = nil
     end
 
-    #def create_query(query_string)
-    #end
+    def create_query(query_string)
+      raise "no default query parser" unless @default_query_parser
+      @default_query_parser.parse(query_string)
+    end
 
     # Returns an instance of the Analyzer class defined within 
     # this class's namespace.
@@ -191,9 +193,8 @@ def reader
       reader.close
     end
 
-    def parser(field, analyzer = nil)
-      @parser ||= {}
-      @parser[field.to_sym] ||= Lucene::QueryParser::Parser.new(field, analyzer || self.analyzer)
+    def default_query_parser(field, analyzer = nil)
+      @default_query_parser ||= Lucene::QueryParser::Parser.new(field, analyzer || self.analyzer)
     end
 
     def inspect_mode?

test/moonstone/engine_test.rb

@@ -46,7 +46,12 @@ def create_query(string)
     engine.index(@some_docs)
     engine.reader do |r|
       r.terms.for_field('name').sort.should == %w{ burger king depeche mode }.sort
-    end  
+    end
+
+    engine.default_query_parser("name")
+    results = engine.search("burger")
+    results[0]["name"].should == "Burger King"
+    results.length.should == 1
   end
 
   it "initializes with an options hash" do