picky 0.10.0 → 0.10.1

data/lib/picky/query/base.rb

@@ -10,14 +10,20 @@ module Query
     attr_writer   :tokenizer
     attr_accessor :reduce_to_amount, :weights
     
-    # Run a query on the given text, with the offset and these indexes.
+    # Takes:
+    #  * A number of indexes
+    #  * Options hash (optional) with:
+    #    * weigher:   A weigher. Query::Weigher by default.
+    #    * tokenizer: Tokenizers::Query.default by default.
+    #    * weights:   A hash of weights, or a Query::Weights object.
     #
     def initialize *index_types
       options      = Hash === index_types.last ? index_types.pop : {}
       @index_types = index_types
       @weigher     = options[:weigher]   || Weigher.new(index_types)
       @tokenizer   = options[:tokenizer] || Tokenizers::Query.default
-      @weights     = options[:weights]   || Weights.new
+      weights      = options[:weights] || Weights.new
+      @weights     = Hash === weights ? Weights.new(weights) : weights
     end
     
     # Convenience method.

data/project_prototype/app/application.rb

@@ -35,11 +35,13 @@ class PickySearch < Application
                       category(:isbn,
                                partial: Partial::None.new) # Partial substring searching on an ISBN makes not much sense, neither does similarity.
   
-  full_books = Query::Full.new books_index    # A Full query returns ids, combinations, and counts.
-  live_books = Query::Live.new books_index    # A Live query does return all that Full returns, except ids.
+  query_options = { :weights => { [:title, :author] => +3, [:title] => +1 } } # +/- points for ordered combinations.
   
-  route %r{\A/books/full\Z} => full_books        # Routing is simple: url_path_regexp => query
-  route %r{\A/books/live\Z} => live_books        # 
+  full_books = Query::Full.new books_index, query_options    # A Full query returns ids, combinations, and counts.
+  live_books = Query::Live.new books_index, query_options    # A Live query does return all that Full returns, except ids.
+  
+  route %r{\A/books/full\Z} => full_books                    # Routing is simple: url_path_regexp => query
+  route %r{\A/books/live\Z} => live_books                    # 
   
   # Note: You can pass a query multiple indexes and it will query in all of them.
   

data/spec/lib/query/base_spec.rb

@@ -3,6 +3,24 @@ require 'spec_helper'
 
 describe 'Query::Base' do
   
+  describe "weights handling" do
+    it "creates a default weight when no weights are given" do
+      query = Query::Base.new
+      
+      query.weights.should be_kind_of(Query::Weights)
+    end
+    it "handles :weights options when not yet wrapped" do
+      query = Query::Base.new :weights => { [:a, :b] => +3 }
+      
+      query.weights.should be_kind_of(Query::Weights)
+    end
+    it "handles :weights options when already wrapped" do
+      query = Query::Base.new :weights => Query::Weights.new([:a, :b] => +3)
+      
+      query.weights.should be_kind_of(Query::Weights)
+    end
+  end
+  
   describe "empty_results" do
     before(:each) do
       @query = Query::Full.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency