picky 1.4.1 → 1.4.2

data/spec/lib/query/allocations_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Query::Allocations do
+describe Internals::Query::Allocations do
 
   describe 'reduce_to' do
     before(:each) do
       @allocation1 = stub :allocation1
       @allocation2 = stub :allocation2
       @allocation3 = stub :allocation3
-      @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+      @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     it 'should do nothing' do
       @allocations.reduce_to 2
@@ -21,7 +21,7 @@ describe Query::Allocations do
       @allocation1 = stub :allocation1
       @allocation2 = stub :allocation2
       @allocation3 = stub :allocation3
-      @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+      @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     context 'identifiers empty' do
       it 'should do nothing' do
@@ -47,7 +47,7 @@ describe Query::Allocations do
       @allocation1 = stub :allocation1
       @allocation2 = stub :allocation2
       @allocation3 = stub :allocation3
-      @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+      @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     context 'identifiers empty' do
       it 'should do nothing' do
@@ -74,7 +74,7 @@ describe Query::Allocations do
         @allocation1 = stub :allocation1, :ids => [1, 2, 3, 4]
         @allocation2 = stub :allocation2, :ids => [5, 6, 7]
         @allocation3 = stub :allocation3, :ids => [8, 9]
-        @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+        @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
       end
       it 'should return the right amount of ids' do
         @allocations.ids(0).should == []
@@ -91,7 +91,7 @@ describe Query::Allocations do
         @allocation1 = stub :allocation1, :ids => [:a, :b, :c, :d]
         @allocation2 = stub :allocation2, :ids => [:e, :f, :g]
         @allocation3 = stub :allocation3, :ids => [:h, :i]
-        @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+        @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
       end
       it 'should return the right amount of ids' do
         @allocations.ids(0).should == []
@@ -110,7 +110,7 @@ describe Query::Allocations do
       @allocation1 = stub :allocation1, :process! => [], :count => 4 #, ids: [1, 2, 3, 4]
       @allocation2 = stub :allocation2, :process! => [], :count => 3 #, ids: [5, 6, 7]
       @allocation3 = stub :allocation3, :process! => [], :count => 2 #, ids: [8, 9]
-      @allocations = Query::Allocations.new [@allocation1, @allocation2, @allocation3]
+      @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     describe 'amount spanning 3 allocations' do
       before(:each) do
@@ -184,7 +184,7 @@ describe Query::Allocations do
       before(:each) do
         @allocation1 = stub :allocation1, :ids => [1, 2, 3]
         @allocation2 = stub :allocation2, :ids => [4, 5, 6, 7]
-        @allocations = Query::Allocations.new [@allocation1, @allocation2]
+        @allocations = described_class.new [@allocation1, @allocation2]
       end
       it 'should return one random id from the first allocations by default' do
         @allocations.random_ids.size.should == 1
@@ -205,7 +205,7 @@ describe Query::Allocations do
       before(:each) do
         @allocation1 = stub :allocation1, :ids => [1]
         @allocation2 = stub :allocation2, :ids => []
-        @allocations = Query::Allocations.new [@allocation1, @allocation2]
+        @allocations = described_class.new [@allocation1, @allocation2]
       end
       it 'should return one random id from its allocations by default' do
         @allocations.random_ids.size.should == 1
@@ -221,7 +221,7 @@ describe Query::Allocations do
       before(:each) do
         @allocation1 = stub :allocation1, :ids => []
         @allocation2 = stub :allocation2, :ids => []
-        @allocations = Query::Allocations.new [@allocation1, @allocation2]
+        @allocations = described_class.new [@allocation1, @allocation2]
       end
       it 'should return one random id from its allocations by default' do
         @allocations.random_ids.size.should == 0
@@ -239,7 +239,7 @@ describe Query::Allocations do
     context 'all allocations have results' do
       before(:each) do
         @allocation = stub :allocation
-        @allocations = Query::Allocations.new [@allocation, @allocation, @allocation]
+        @allocations = described_class.new [@allocation, @allocation, @allocation]
       end
       it 'should delegate to each allocation with no params' do
         @allocation.should_receive(:to_result).exactly(3).times.with
@@ -251,7 +251,7 @@ describe Query::Allocations do
       before(:each) do
         @allocation           = stub :allocation, :to_result => :some_result
         @no_result_allocation = stub :no_results, :to_result => nil
-        @allocations = Query::Allocations.new [@allocation, @no_result_allocation, @allocation]
+        @allocations = described_class.new [@allocation, @no_result_allocation, @allocation]
       end
       it 'should delegate to each allocation with the same params' do
         @allocations.to_result.should == [:some_result, :some_result]
@@ -262,7 +262,7 @@ describe Query::Allocations do
   describe 'total' do
     context 'with allocations' do
       before(:each) do
-        @allocations = Query::Allocations.new [
+        @allocations = described_class.new [
           stub(:allocation, :process! => (1..10).to_a, :count => 10),
           stub(:allocation, :process! => (1..80).to_a, :count => 80),
           stub(:allocation, :process! => (1..20).to_a, :count => 20)
@@ -276,7 +276,7 @@ describe Query::Allocations do
     end
     context 'without allocations' do
       before(:each) do
-        @allocations = Query::Allocations.new []
+        @allocations = described_class.new []
       end
       it 'should be 0' do
         @allocations.process! 20, 0
@@ -289,7 +289,7 @@ describe Query::Allocations do
   describe "each" do
     before(:each) do
       @internal_allocations = mock :internal_allocations
-      @allocations = Query::Allocations.new @internal_allocations
+      @allocations = described_class.new @internal_allocations
     end
     it "should delegate to the internal allocations" do
       stub_proc = lambda {}
@@ -301,7 +301,7 @@ describe Query::Allocations do
   describe "inject" do
     before(:each) do
       @internal_allocations = mock :internal_allocations
-      @allocations = Query::Allocations.new @internal_allocations
+      @allocations = described_class.new @internal_allocations
     end
     it "should delegate to the internal allocations" do
       stub_proc = lambda {}
@@ -313,7 +313,7 @@ describe Query::Allocations do
   describe "empty?" do
     before(:each) do
       @internal_allocations = mock :internal_allocations
-      @allocations = Query::Allocations.new @internal_allocations
+      @allocations = described_class.new @internal_allocations
     end
     it "should delegate to the internal allocations array" do
       @internal_allocations.should_receive(:empty?).once
@@ -324,7 +324,7 @@ describe Query::Allocations do
   describe "to_s" do
     before(:each) do
       @internal_allocations = mock :internal_allocations
-      @allocations = Query::Allocations.new @internal_allocations
+      @allocations = described_class.new @internal_allocations
     end
     it "should delegate to the internal allocations array" do
       @internal_allocations.should_receive(:inspect).once
@@ -335,7 +335,7 @@ describe Query::Allocations do
   describe "process!" do
     context 'some allocations' do
       before(:each) do
-        @allocations = Query::Allocations.new [
+        @allocations = described_class.new [
           stub(:allocation, :process! => (1..10).to_a, :count => 10),
           stub(:allocation, :process! => (1..80).to_a, :count => 80),
           stub(:allocation, :process! => (1..20).to_a, :count => 20)

data/spec/lib/query/base_spec.rb

@@ -1,21 +1,45 @@
 # coding: utf-8
+#
 require 'spec_helper'
 
-describe 'Query::Base' do
+describe Query::Base do
+  
+  describe 'combinations_type_for' do
+    let(:query) { described_class.new }
+    it 'returns a specific Combination for a specific input' do
+      query.combinations_type_for([Index::Memory.new(:gu, :ga)]).should == Internals::Query::Combinations::Memory
+    end
+    it 'just works on the same types' do
+      query.combinations_type_for([:blorf, :blarf]).should == Internals::Query::Combinations::Memory
+    end
+    it 'just uses standard combinations' do
+      query.combinations_type_for([:blorf]).should == Internals::Query::Combinations::Memory
+    end
+    it 'raises on multiple types' do
+      expect do
+        query.combinations_type_for [:blorf, "blarf"]
+      end.to raise_error(Query::Base::DifferentTypesError)
+    end
+    it 'raises with the right message on multiple types' do
+      expect do
+        query.combinations_type_for [:blorf, "blarf"]
+      end.to raise_error("Currently it isn't possible to mix Symbol and String Indexes in the same Query.")
+    end
+  end
   
   describe "weights handling" do
     it "creates a default weight when no weights are given" do
-      query = Query::Base.new
+      query = described_class.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 = described_class.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 = described_class.new :weights => Query::Weights.new([:a, :b] => +3)
       
       query.weights.should be_kind_of(Query::Weights)
     end

data/spec/lib/query/combination_spec.rb

@@ -6,10 +6,10 @@ describe 'Query::Combination' do
 
   before(:each) do
     @bundle      = stub :bundle, :identifier => :bundle_name
-    @token       = stub :token, :text => :some_text, :partial => false, :similar? => true
+    @token       = Internals::Query::Token.processed('some_text~')
     @category    = stub :category, :bundle_for => @bundle, :name => :some_category_name
 
-    @combination = Query::Combination.new @token, @category
+    @combination = Internals::Query::Combination.new @token, @category
   end
   
   describe "to_s" do
@@ -41,9 +41,9 @@ describe 'Query::Combination' do
   describe 'to_result' do
     context 'functional with qualifier' do
       before(:each) do
-        token = Tokenizers::Query.new.tokenize('name:Blä~').first
+        token = Internals::Tokenizers::Query.new.tokenize('name:Blä~').first
 
-        @combination = Query::Combination.new token, @category
+        @combination = Internals::Query::Combination.new token, @category
       end
       it 'should return a correct result' do
         @combination.to_result.should == [:some_category_name, 'Blä~', :blä] # Note: Characters not substituted. That's ok.
@@ -51,21 +51,20 @@ describe 'Query::Combination' do
     end
     it 'should return a correct result' do
       @token.stub! :to_result => [:some_original_text, :some_text]
-      @combination.stub! :identifier => :some_identifier
 
-      @combination.to_result.should == [:some_identifier, :some_original_text, :some_text]
+      @combination.to_result.should == [:some_category_name, :some_original_text, :some_text]
     end
   end
 
   describe 'identifier' do
     it 'should get the category name from the bundle' do
-      @combination.identifier.should == :some_category_name
+      @combination.identifier.should == "bundle_name:similarity:some_text"
     end
   end
 
   describe 'ids' do
     it 'should call ids with the text on bundle' do
-      @bundle.should_receive(:ids).once.with :some_text
+      @bundle.should_receive(:ids).once.with 'some_text'
 
       @combination.ids
     end
@@ -81,7 +80,7 @@ describe 'Query::Combination' do
 
   describe 'weight' do
     it 'should call weight with the text on bundle' do
-      @bundle.should_receive(:weight).once.with :some_text
+      @bundle.should_receive(:weight).once.with 'some_text'
 
       @combination.weight
     end

data/spec/lib/query/combinations/base_spec.rb

@@ -0,0 +1,116 @@
+# coding: utf-8
+#
+require 'spec_helper'
+
+describe Internals::Query::Combinations::Base do
+
+  before(:each) do
+    @combinations_ary = stub :combinations_ary
+    
+    @combinations = described_class.new @combinations_ary
+  end
+  
+  describe "pack_into_allocation" do
+    it "return an Allocation" do
+      @combinations.pack_into_allocation(:some_result_identifier).should be_kind_of(Internals::Query::Allocation)
+    end
+    it "returns an Allocation with specific result_identifier" do
+      @combinations.pack_into_allocation(:some_result_identifier).result_identifier.should == :some_result_identifier
+    end
+  end
+  
+  describe "to_result" do
+    before(:each) do
+      @combination1 = stub :combination1, :to_result => :result1
+      @combination2 = stub :combination2, :to_result => :result2
+      
+      @combinations_ary = [@combination1, @combination2]
+      
+      @combinations = described_class.new @combinations_ary
+    end
+    it "resultifies the combinations" do
+      @combinations.to_result.should == [:result1, :result2]
+    end
+  end
+  
+  describe "weighted_score" do
+    it "uses the weights' score method" do
+      weights = stub :weights
+      weights.should_receive(:score).once.with @combinations_ary
+      
+      @combinations.weighted_score weights
+    end
+  end
+  
+  describe "total_score" do
+    before(:each) do
+      @combination1 = stub :combination1, :weight => 3.14
+      @combination2 = stub :combination2, :weight => 2.76
+      
+      @combinations_ary = [@combination1, @combination2]
+      
+      @combinations = described_class.new @combinations_ary
+    end
+    it "sums the scores" do
+      @combinations.total_score.should == 5.90
+    end
+  end
+  
+  describe "calculate_score" do
+    before(:each) do
+      @combinations.stub! :total_score => 0
+      @combinations.stub! :weighted_score => 0
+    end
+    it "first sums, then weighs" do
+      @combinations.should_receive(:total_score).once.ordered.and_return 0
+      @combinations.should_receive(:weighted_score).once.ordered.and_return 0
+      
+      @combinations.calculate_score :anything
+    end
+    it "calls sum_score" do
+      @combinations.should_receive(:total_score).once.with.and_return 0
+      
+      @combinations.calculate_score :anything
+    end
+    it "calls sum_score" do
+      @combinations.should_receive(:weighted_score).once.with(:weights).and_return 0
+      
+      @combinations.calculate_score :weights
+    end
+  end
+  
+  describe 'hash' do
+    it "delegates to the combinations array" do
+      @combinations_ary.should_receive(:hash).once.with
+      
+      @combinations.hash
+    end
+  end
+  
+  describe 'remove' do
+    before(:each) do
+      @combination1 = stub :combination1, :in? => false
+      @combination2 = stub :combination2, :in? => true
+      @combination3 = stub :combination3, :in? => true
+
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
+    end
+    it 'should remove the combinations' do
+      @combinations.remove([:any]).should == [@combination1]
+    end
+  end
+
+  describe 'keep' do
+    before(:each) do
+      @combination1 = stub :combination1, :in? => false
+      @combination2 = stub :combination2, :in? => true
+      @combination3 = stub :combination3, :in? => true
+
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
+    end
+    it 'should filter the combinations' do
+      @combinations.keep([:any]).should == [@combination2, @combination3]
+    end
+  end
+
+end

data/spec/lib/query/{combinations_spec.rb → combinations/memory_spec.rb}

@@ -2,17 +2,17 @@
 #
 require 'spec_helper'
 
-describe 'Query::Combinations' do
+describe Internals::Query::Combinations::Memory do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary
     
-    @combinations = Query::Combinations.new @combinations_ary
+    @combinations = described_class.new @combinations_ary
   end
   
   describe "pack_into_allocation" do
     it "return an Allocation" do
-      @combinations.pack_into_allocation(:some_result_identifier).should be_kind_of(Query::Allocation)
+      @combinations.pack_into_allocation(:some_result_identifier).should be_kind_of(Internals::Query::Allocation)
     end
     it "returns an Allocation with specific result_identifier" do
       @combinations.pack_into_allocation(:some_result_identifier).result_identifier.should == :some_result_identifier
@@ -26,7 +26,7 @@ describe 'Query::Combinations' do
       
       @combinations_ary = [@combination1, @combination2]
       
-      @combinations = Query::Combinations.new @combinations_ary
+      @combinations = described_class.new @combinations_ary
     end
     it "resultifies the combinations" do
       @combinations.to_result.should == [:result1, :result2]
@@ -49,7 +49,7 @@ describe 'Query::Combinations' do
       
       @combinations_ary = [@combination1, @combination2]
       
-      @combinations = Query::Combinations.new @combinations_ary
+      @combinations = described_class.new @combinations_ary
     end
     it "sums the scores" do
       @combinations.total_score.should == 5.90
@@ -93,7 +93,7 @@ describe 'Query::Combinations' do
       @combination2 = stub :combination2, :in? => true
       @combination3 = stub :combination3, :in? => true
 
-      @combinations = Query::Combinations.new [@combination1, @combination2, @combination3]
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
     end
     it 'should remove the combinations' do
       @combinations.remove([:any]).should == [@combination1]
@@ -106,7 +106,7 @@ describe 'Query::Combinations' do
       @combination2 = stub :combination2, :in? => true
       @combination3 = stub :combination3, :in? => true
 
-      @combinations = Query::Combinations.new [@combination1, @combination2, @combination3]
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
     end
     it 'should filter the combinations' do
       @combinations.keep([:any]).should == [@combination2, @combination3]
@@ -118,49 +118,49 @@ describe 'Query::Combinations' do
       @combination1 = stub :combination1
       @combination2 = stub :combination2
       @combination3 = stub :combination3
-      @combinations = Query::Combinations.new [@combination1, @combination2, @combination3]
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
     end
     it "should intersect correctly" do
       @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
       @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
       @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
 
-      @combinations.ids.should == (1..10).to_a
+      @combinations.ids(:any, :thing).should == (1..10).to_a
     end
     it "should intersect symbol_keys correctly" do
       @combination1.should_receive(:ids).once.with.and_return (:'00001'..:'10000').to_a
       @combination2.should_receive(:ids).once.with.and_return (:'00001'..:'00100').to_a
       @combination3.should_receive(:ids).once.with.and_return (:'00001'..:'00010').to_a
 
-      @combinations.ids.should == (:'00001'..:'0010').to_a
+      @combinations.ids(:any, :thing).should == (:'00001'..:'0010').to_a
     end
     it "should intersect correctly when intermediate intersect result is empty" do
       @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
       @combination2.should_receive(:ids).once.with.and_return (11..100).to_a
       @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
 
-      @combinations.ids.should == []
+      @combinations.ids(:any, :thing).should == []
     end
     it "should be fast" do
       @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
       @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
       @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
 
-      performance_of { @combinations.ids }.should < 0.004
+      performance_of { @combinations.ids(:any, :thing) }.should < 0.004
     end
     it "should be fast" do
       @combination1.should_receive(:ids).once.with.and_return (1..1000).to_a
       @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
       @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
 
-      performance_of { @combinations.ids }.should < 0.00015
+      performance_of { @combinations.ids(:any, :thing) }.should < 0.00015
     end
     it "should be fast" do
       @combination1.should_receive(:ids).once.with.and_return (1..1000).to_a
       @combination2.should_receive(:ids).once.with.and_return (901..1000).to_a
       @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
 
-      performance_of { @combinations.ids }.should < 0.0001
+      performance_of { @combinations.ids(:any, :thing) }.should < 0.0001
     end
   end
 

data/spec/lib/query/combinations/redis_spec.rb

@@ -0,0 +1,132 @@
+# coding: utf-8
+#
+require 'spec_helper'
+
+describe Internals::Query::Combinations::Redis do
+
+  before(:each) do
+    @combinations_ary = stub :combinations_ary
+    
+    @combinations = described_class.new @combinations_ary
+  end
+  
+  describe "pack_into_allocation" do
+    it "return an Allocation" do
+      @combinations.pack_into_allocation(:some_result_identifier).should be_kind_of(Internals::Query::Allocation)
+    end
+    it "returns an Allocation with specific result_identifier" do
+      @combinations.pack_into_allocation(:some_result_identifier).result_identifier.should == :some_result_identifier
+    end
+  end
+  
+  describe "to_result" do
+    before(:each) do
+      @combination1 = stub :combination1, :to_result => :result1
+      @combination2 = stub :combination2, :to_result => :result2
+      
+      @combinations_ary = [@combination1, @combination2]
+      
+      @combinations = described_class.new @combinations_ary
+    end
+    it "resultifies the combinations" do
+      @combinations.to_result.should == [:result1, :result2]
+    end
+  end
+  
+  describe "weighted_score" do
+    it "uses the weights' score method" do
+      weights = stub :weights
+      weights.should_receive(:score).once.with @combinations_ary
+      
+      @combinations.weighted_score weights
+    end
+  end
+  
+  describe "total_score" do
+    before(:each) do
+      @combination1 = stub :combination1, :weight => 3.14
+      @combination2 = stub :combination2, :weight => 2.76
+      
+      @combinations_ary = [@combination1, @combination2]
+      
+      @combinations = described_class.new @combinations_ary
+    end
+    it "sums the scores" do
+      @combinations.total_score.should == 5.90
+    end
+  end
+  
+  describe "calculate_score" do
+    before(:each) do
+      @combinations.stub! :total_score => 0
+      @combinations.stub! :weighted_score => 0
+    end
+    it "first sums, then weighs" do
+      @combinations.should_receive(:total_score).once.ordered.and_return 0
+      @combinations.should_receive(:weighted_score).once.ordered.and_return 0
+      
+      @combinations.calculate_score :anything
+    end
+    it "calls sum_score" do
+      @combinations.should_receive(:total_score).once.with.and_return 0
+      
+      @combinations.calculate_score :anything
+    end
+    it "calls sum_score" do
+      @combinations.should_receive(:weighted_score).once.with(:weights).and_return 0
+      
+      @combinations.calculate_score :weights
+    end
+  end
+  
+  describe 'hash' do
+    it "delegates to the combinations array" do
+      @combinations_ary.should_receive(:hash).once.with
+      
+      @combinations.hash
+    end
+  end
+  
+  describe 'remove' do
+    before(:each) do
+      @combination1 = stub :combination1, :in? => false
+      @combination2 = stub :combination2, :in? => true
+      @combination3 = stub :combination3, :in? => true
+
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
+    end
+    it 'should remove the combinations' do
+      @combinations.remove([:any]).should == [@combination1]
+    end
+  end
+
+  describe 'keep' do
+    before(:each) do
+      @combination1 = stub :combination1, :in? => false
+      @combination2 = stub :combination2, :in? => true
+      @combination3 = stub :combination3, :in? => true
+
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
+    end
+    it 'should filter the combinations' do
+      @combinations.keep([:any]).should == [@combination2, @combination3]
+    end
+  end
+  
+  describe 'generate_intermediate_result_id' do
+    # TODO
+  end
+
+  describe "ids" do
+    before(:each) do
+      @combination1 = stub :combination1, :identifier => 'cat1'
+      @combination2 = stub :combination2, :identifier => 'cat2'
+      @combination3 = stub :combination3, :identifier => 'cat3'
+      @combinations = described_class.new [@combination1, @combination2, @combination3]
+    end
+    it 'calls the redis client correctly' do
+      # TODO
+    end
+  end
+
+end

data/spec/lib/query/full_spec.rb

@@ -9,10 +9,10 @@ describe Query::Full do
 
   describe 'result_type' do
     before(:each) do
-      @query = Query::Full.new @index
+      @query = described_class.new @index
     end
     it "should return a specific type" do
-      @query.result_type.should == Results::Full
+      @query.result_type.should == Internals::Results::Full
     end
   end