picky 1.2.2 → 1.2.3

data/lib/picky/cacher/partial/none.rb

@@ -17,6 +17,12 @@ module Cacher
       def saved?
         false
       end
+      
+      # Do not use the partial bundle for getting ids and weights.
+      #
+      def use_exact_for_partial?
+        true
+      end
 
     end
 

data/lib/picky/cacher/partial/strategy.rb

@@ -4,6 +4,18 @@ module Cacher
     #
     class Strategy < Cacher::Strategy
       
+      # Defines whether to use the exact bundle
+      # instead of the partial one.
+      #
+      # Default is @false@.
+      #
+      # For example: 
+      #  Partial::None.new # Uses the exact index instead of the partial one.
+      #
+      def use_exact_for_partial?
+        false
+      end
+      
     end
   end
 end

data/lib/picky/indexed/category.rb

@@ -7,8 +7,9 @@ module Indexed
   #
   class Category
     
-    attr_accessor :exact, :partial
+    attr_accessor :exact
     attr_reader   :identifier, :name
+    attr_writer   :partial
     
     #
     #
@@ -19,6 +20,9 @@ module Indexed
       
       @identifier    = configuration.identifier
       
+      # TODO Push the defaults out into the index.
+      #
+      @partial_strategy = options[:partial] || Cacher::Partial::Default
       similarity = options[:similarity] || Cacher::Similarity::Default
       
       @exact   = options[:exact_index_bundle]   || Bundle.new(:exact,   configuration, similarity)
@@ -64,6 +68,12 @@ module Indexed
       token.partial? ? partial : exact
     end
     
+    # The partial strategy defines whether to really use the partial index.
+    #
+    def partial
+      @partial_strategy.use_exact_for_partial?? @exact : @partial
+    end
+    
     #
     #
     def combination_for token

data/lib/picky/routing.rb

@@ -53,9 +53,18 @@ class Routing # :nodoc:all
     [mappings, route_options]
   end
   def route_one url, query, route_options = {}
+    raise TargetQueryNilError.new(url) unless query
     query.tokenizer = @defaults[:tokenizer] if @defaults[:tokenizer]
     routes.add_route generate_app(query, route_options), default_options(url, route_options)
   end
+  class TargetQueryNilError < StandardError
+    def initialize url
+      @url = url
+    end
+    def to_s
+      "Routing for #{@url.inspect} was defined with a nil query object."
+    end
+  end
   #
   #
   def root status

data/spec/lib/cacher/partial/none_spec.rb

@@ -8,5 +8,10 @@ describe Cacher::Partial::None do
   it "returns an empty index" do
     Cacher::Partial::None.new.generate_from(:unimportant).should == {}
   end
+  describe 'use_exact_for_partial?' do
+    it 'returns true' do
+      Cacher::Partial::None.new.use_exact_for_partial?.should == true
+    end
+  end
   
 end

data/spec/lib/cacher/partial/substring_spec.rb

@@ -6,6 +6,11 @@ describe Cacher::Partial::Substring do
     before(:each) do
       @cacher = Cacher::Partial::Substring.new
     end
+    describe 'use_exact_for_partial?' do
+      it 'returns false' do
+        Cacher::Partial::Substring.new.use_exact_for_partial?.should == false
+      end
+    end
     describe 'from' do
       it 'should return the right value' do
         @cacher.from.should == 1

data/spec/lib/indexed/category_spec.rb

@@ -3,23 +3,40 @@ require 'spec_helper'
 describe Indexed::Category do
 
   before(:each) do
-    @index      = stub :index, :name => :some_index
-    @partial    = stub :partial
-    @weights    = stub :weights
-    @similarity = stub :similarity
-    @category   = Indexed::Category.new :some_name, @index, :partial    => @partial,
-                                                           :weights    => @weights,
-                                                           :similarity => @similarity,
-                                                           :qualifiers => [:q, :qualifier]
+    @index               = stub :index, :name => :some_index
+    @partial_strategy    = stub :partial, :use_exact_for_partial? => false
+    @weights_strategy    = stub :weights
+    @similarity_strategy = stub :similarity
     
     @exact   = stub :exact, :dump => nil
-    @category.stub! :exact => @exact
-    
     @partial = stub :partial, :dump => nil
-    @category.stub! :partial => @partial
+    
+    @category = Indexed::Category.new :some_name, @index, :partial    => @partial_strategy,
+                                                          :weights    => @weights_strategy,
+                                                          :similarity => @similarity_strategy,
+                                                          :qualifiers => [:q, :qualifier],
+                                                          :exact_index_bundle => @exact,
+                                                          :partial_index_bundle => @partial
+    
     @category.stub! :exclaim
   end
   
+  describe 'partial' do
+    context 'with a partial strategy that uses the exact index' do
+      before(:each) do
+        @partial_strategy.stub! :use_exact_for_partial? => true
+      end
+      it 'returns the partial index' do
+        @category.partial.should == @exact
+      end
+    end
+    context 'with a partial strategy that uses the partial index (default)' do
+      it 'returns the partial index' do
+        @category.partial.should == @partial
+      end
+    end
+  end
+  
   describe 'generate_qualifiers_from' do
     context 'with qualifiers' do
       it 'returns that' do

data/spec/lib/routing_spec.rb

@@ -178,6 +178,9 @@ describe Routing do
         
         @routing.route %r{regexp1} => :query1, %r{regexp2} => :query2, :some => :option
       end
+      it 'does not accept nil queries' do
+        lambda { @routing.route %r{some/regexp} => nil }.should raise_error(Routing::TargetQueryNilError, /Routing for \/some\\\/regexp\/ was defined with a nil query object/)
+      end
     end
     
     describe 'route_one' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +01:00
+date: 2010-12-28 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency