picky 2.5.2 → 2.6.0

data/spec/lib/query/tokens_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe Internals::Query::Tokens do
+describe Query::Tokens do
   
   before(:all) do
-    Internals::Query::Qualifiers.instance << Internals::Query::Qualifier.new(:specific, [:sp, :spec])
-    Internals::Query::Qualifiers.instance.prepare
+    Query::Qualifiers.instance << Query::Qualifier.new(:specific, [:sp, :spec])
+    Query::Qualifiers.instance.prepare
   end
   
   describe '.processed' do
     it 'generates processed tokens from all words' do
       expected = [
-        Internals::Query::Token.processed('this~'),
-        Internals::Query::Token.processed('is'),
-        Internals::Query::Token.processed('a'),
-        Internals::Query::Token.processed('sp:solr'),
-        Internals::Query::Token.processed('query"')
+        Query::Token.processed('this~'),
+        Query::Token.processed('is'),
+        Query::Token.processed('a'),
+        Query::Token.processed('sp:solr'),
+        Query::Token.processed('query"')
       ]
       
       described_class.should_receive(:new).once.with expected
@@ -23,11 +23,11 @@ describe Internals::Query::Tokens do
     end
     it 'generates processed tokens from all words' do
       expected = [
-        Internals::Query::Token.processed('this~', false),
-        Internals::Query::Token.processed('is', false),
-        Internals::Query::Token.processed('a', false),
-        Internals::Query::Token.processed('sp:solr', false),
-        Internals::Query::Token.processed('query"', false)
+        Query::Token.processed('this~', false),
+        Query::Token.processed('is', false),
+        Query::Token.processed('a', false),
+        Query::Token.processed('sp:solr', false),
+        Query::Token.processed('query"', false)
       ]
       
       described_class.should_receive(:new).once.with expected
@@ -52,7 +52,7 @@ describe Internals::Query::Tokens do
   describe 'cap' do
     context 'one token' do
       before(:each) do
-        @token = Internals::Query::Token.processed 'Token'
+        @token = Query::Token.processed 'Token'
         @tokens = described_class.new [@token]
       end
       it 'does not cut it down' do
@@ -68,15 +68,15 @@ describe Internals::Query::Tokens do
     end
     context 'many tokens' do
       before(:each) do
-        @first = Internals::Query::Token.processed 'Hello'
-        @second = Internals::Query::Token.processed 'I'
-        @third = Internals::Query::Token.processed 'Am'
-        @tokens = Internals::Query::Tokens.new [
+        @first = Query::Token.processed 'Hello'
+        @second = Query::Token.processed 'I'
+        @third = Query::Token.processed 'Am'
+        @tokens = Query::Tokens.new [
           @first,
           @second,
           @third,
-          Internals::Query::Token.processed('A'),
-          Internals::Query::Token.processed('Token')
+          Query::Token.processed('A'),
+          Query::Token.processed('Token')
         ]
       end
       it 'should cap the number of tokens' do
@@ -90,7 +90,7 @@ describe Internals::Query::Tokens do
   describe 'partialize_last' do
     context 'special case' do
       before(:each) do
-        @token = Internals::Query::Token.processed 'a*'
+        @token = Query::Token.processed 'a*'
         @tokens = described_class.new [@token]
       end
       it 'should have a last partialized token' do
@@ -104,7 +104,7 @@ describe Internals::Query::Tokens do
     end
     context 'one token' do
       before(:each) do
-        @token = Internals::Query::Token.processed 'Token'
+        @token = Query::Token.processed 'Token'
         @tokens = described_class.new [@token]
       end
       it 'should not have a last partialized token' do
@@ -118,13 +118,13 @@ describe Internals::Query::Tokens do
     end
     context 'many tokens' do
       before(:each) do
-        @first  = Internals::Query::Token.processed 'Hello'
-        @last   = Internals::Query::Token.processed 'Token'
+        @first  = Query::Token.processed 'Hello'
+        @last   = Query::Token.processed 'Token'
         @tokens = described_class.new [
           @first,
-          Internals::Query::Token.processed('I'),
-          Internals::Query::Token.processed('Am'),
-          Internals::Query::Token.processed('A'),
+          Query::Token.processed('I'),
+          Query::Token.processed('Am'),
+          Query::Token.processed('A'),
           @last
         ]
       end
@@ -178,11 +178,11 @@ describe Internals::Query::Tokens do
   describe 'to_s' do
     before(:each) do
       @tokens = described_class.new [
-        Internals::Query::Token.processed('Hello~'),
-        Internals::Query::Token.processed('I~'),
-        Internals::Query::Token.processed('Am'),
-        Internals::Query::Token.processed('A*'),
-        Internals::Query::Token.processed('Token~')
+        Query::Token.processed('Hello~'),
+        Query::Token.processed('I~'),
+        Query::Token.processed('Am'),
+        Query::Token.processed('A*'),
+        Query::Token.processed('Token~')
       ]
     end
     it 'should work correctly' do

data/spec/lib/search_spec.rb

@@ -37,7 +37,7 @@ describe Search do
     context 'no tokenizer predefined' do
       let(:search) { described_class.new }
       it 'returns the default tokenizer' do
-        search.tokenizer.should == Internals::Tokenizers::Query.default
+        search.tokenizer.should == Tokenizers::Query.default
       end
     end
     context 'tokenizer predefined' do
@@ -62,13 +62,13 @@ describe Search do
     let(:search) { described_class.new }
     it 'returns a specific Combination for a specific input' do
       some_source = stub(:source, :harvest => nil)
-      search.combinations_type_for([Index::Memory.new(:gu, source: some_source)]).should == Internals::Query::Combinations::Memory
+      search.combinations_type_for([Index::Memory.new(:gu, source: some_source)]).should == Query::Combinations::Memory
     end
     it 'just works on the same types' do
-      search.combinations_type_for([:blorf, :blarf]).should == Internals::Query::Combinations::Memory
+      search.combinations_type_for([:blorf, :blarf]).should == Query::Combinations::Memory
     end
     it 'just uses standard combinations' do
-      search.combinations_type_for([:blorf]).should == Internals::Query::Combinations::Memory
+      search.combinations_type_for([:blorf]).should == Query::Combinations::Memory
     end
     it 'raises on multiple types' do
       expect do
@@ -132,7 +132,7 @@ describe Search do
   
   describe 'to_s' do
     before(:each) do
-      @type.stub! :name => :some_index
+      @index.stub! :name => :some_index
     end
     context 'with weights' do
       before(:each) do

data/spec/lib/sources/db_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe Sources::DB do
   
   before(:each) do
-    @type       = stub :type, :name => 'some_type_name'
-    
     @connection = stub :connection
     @adapter    = stub :adapter, :connection => @connection
     
@@ -24,8 +22,7 @@ describe Sources::DB do
   
   describe "get_data" do
     before(:each) do
-      @index    = stub :index, :name => :some_index_name
-      @category = stub :category, :from => :some_category, :index => @index
+      @category = stub :category, :from => :some_category, :index_name => :some_index_name
     end
     context 'mysql' do
       before(:each) do
@@ -88,20 +85,19 @@ describe Sources::DB do
       result = stub(:result, :to_i => 12_345)
       @connection.should_receive(:select_value).once.and_return(result)
       
-      @source.count @type
+      @source.count :anything
     end
     it "should get the id count" do
       result = stub(:result, :to_i => 12_345)
       @connection.should_receive(:select_value).once.with("SELECT COUNT(__picky_id) FROM picky_some_type_name_index")
       
-      @source.count @type
+      @source.count :some_type_name
     end
   end
   
   describe 'harvest' do
     before(:each) do
-      @index    = stub :index,    :name => :some_index
-      @category = stub :category, :name => :some_category, :index => @index
+      @category = stub :category, :name => :some_category, :index_name => :some_index
 
       @source.should_receive(:get_data).any_number_of_times.and_return [[:some_id, 'some_text']].cycle
       @source.stub! :count => 17

data/spec/lib/sources/wrappers/location_spec.rb

@@ -20,7 +20,7 @@ describe Sources::Wrappers::Location do
         @wrapper.calculation.precision.should == 1
       end
       it "delegates harvest" do
-        @category.stub! :exact => {}
+        @category.stub! :indexing_exact => {}
         
         @source.should_receive(:harvest).once.with @category
         

data/spec/lib/{internals/tokenizers → tokenizers}/base_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Tokenizers::Base do
+describe Tokenizers::Base do
   
   context 'with special instance' do
     let (:tokenizer) { described_class.new reject_token_if: lambda { |token| token.to_s.length < 2 || token == :hello }, case_sensitive: true }

data/spec/lib/{internals/tokenizers → tokenizers}/index_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Tokenizers::Index do
+describe Tokenizers::Index do
   
   let(:tokenizer) { described_class.new }
   

data/spec/lib/{internals/tokenizers → tokenizers}/query_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe Internals::Tokenizers::Query do
+describe Tokenizers::Query do
 
   let(:tokenizer) { described_class.new }