picky 1.5.4 → 2.0.0.pre1

data/spec/lib/internals/frontend_adapters/rack_spec.rb

@@ -47,7 +47,7 @@ describe Internals::FrontendAdapters::Rack do
     end
     context 'with routes' do
       before(:each) do
-        @rack_adapter.route %r{something} => Query::Full.new
+        @rack_adapter.route %r{something} => Search.new
       end
       it 'returns the right answer' do
         @rack_adapter.empty?.should == false
@@ -101,11 +101,11 @@ describe Internals::FrontendAdapters::Rack do
     it 'should route correctly' do
       env = rack_defaults_for '/searches/some_route?query=some_query'
       
-      full = stub :full
-      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Internals::Results::Full.new)
-      Query::Full.stub! :new => full
+      search = stub :search
+      search.should_receive(:search_with_text).once.with(anything, 20, 0).and_return(Internals::Results.new)
+      Search.stub! :new => search
       
-      @rack_adapter.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index)
+      @rack_adapter.route '/searches/some_route' => Search.new(:some_index, :some_other_index)
       
       @rack_adapter.routes.freeze
       @rack_adapter.call(env).should == [200, {"Content-Type"=>"application/json", "Content-Length"=>"52"}, ["{\"allocations\":[],\"offset\":0,\"duration\":0,\"total\":0}"]]
@@ -113,11 +113,11 @@ describe Internals::FrontendAdapters::Rack do
     it 'should route correctly' do
       env = rack_defaults_for '/searches/some_route?query=some_query&type=some_type'
       
-      full = stub :full
-      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Internals::Results::Full.new)
-      Query::Full.stub! :new => full
+      search = stub :search
+      search.should_receive(:search_with_text).once.with(anything, 20, 0).and_return(Internals::Results.new)
+      Search.stub! :new => search
       
-      @rack_adapter.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index), :query => { :type => :some_type }
+      @rack_adapter.route '/searches/some_route' => Search.new(:some_index, :some_other_index), :query => { :type => :some_type }
       
       @rack_adapter.routes.freeze
       @rack_adapter.call(env).should == [200, {"Content-Type"=>"application/json", "Content-Length"=>"52"}, ["{\"allocations\":[],\"offset\":0,\"duration\":0,\"total\":0}"]]
@@ -125,11 +125,11 @@ describe Internals::FrontendAdapters::Rack do
     it 'should route correctly' do
       env = rack_defaults_for '/searches/some_wrong_route?query=some_query'
       
-      full = stub :full
-      full.should_receive(:search_with_text).never
-      Query::Full.stub! :new => full
+      search = stub :search
+      search.should_receive(:search_with_text).never
+      Search.stub! :new => search
       
-      @rack_adapter.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index)
+      @rack_adapter.route '/searches/some_route' => Search.new(:some_index, :some_other_index)
       
       @rack_adapter.routes.freeze
       @rack_adapter.call(env).should == [404, {"Content-Type"=>"text/html", "X-Cascade"=>"pass"}, ["Not Found"]]

data/spec/lib/{internals/results/base_spec.rb → results_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Results::Base do
+describe Internals::Results do
   
   describe "from" do
     before(:each) do
@@ -10,14 +10,14 @@ describe Internals::Results::Base do
       @results.stub! :prepare!
     end
     it "should generate a result" do
-      described_class.from(0, @allocations).should == @results
+      described_class.from(20, 0, @allocations).should == @results
     end
   end
   
   describe "ids" do
     before(:each) do
       @allocations = stub :allocations
-      @results = described_class.new :unimportant, @allocations
+      @results = described_class.new :unimportant, :unimportant, @allocations
     end
     it "delegates" do
       @allocations.should_receive(:ids).once.with :anything
@@ -36,20 +36,21 @@ describe Internals::Results::Base do
         @results = described_class.new
       end
       it 'should output a default log' do
-        @results.to_log('some_query').should == '|0-08-16 10:07:33|0.000000|some_query                                        |       0|   0| 0|'
+        @results.to_log('some_query').should == '.|0-08-16 10:07:33|0.000000|some_query                                        |       0|   0| 0|'
       end
     end
     context 'with results' do
       before(:each) do
         @allocations = stub :allocations,
-                            :process! => nil, :size => 12
+                            :process! => nil,
+                            :size => 12
 
-        @results = described_class.new 1234, @allocations
+        @results = described_class.new 20, 1234, @allocations
         @results.stub! :duration => 0.1234567890,
                        :total    => 12345678
       end
       it 'should output a specific log' do
-        @results.to_log('some_query').should == '|0-08-16 10:07:33|0.123457|some_query                                        |12345678|1234|12|'
+        @results.to_log('some_query').should == '>|0-08-16 10:07:33|0.123457|some_query                                        |12345678|1234|12|'
       end
     end
   end
@@ -69,7 +70,7 @@ describe Internals::Results::Base do
     before(:each) do
       @allocations = stub :allocations, :process! => nil, :to_result => :allocations, :total => :some_total
 
-      @results = described_class.new :some_offset, @allocations
+      @results = described_class.new :some_results_amount, :some_offset, @allocations
       @results.duration = :some_duration
     end
     it 'should do it correctly' do
@@ -81,7 +82,7 @@ describe Internals::Results::Base do
 
   describe "accessors" do
     before(:each) do
-      @results = described_class.new :anything
+      @results = described_class.new :anything, :anything
       @some_stub = stub(:some)
     end
     it "should have accessors for duration" do

data/spec/lib/{query/base_spec.rb → search_spec.rb}

@@ -2,84 +2,84 @@
 #
 require 'spec_helper'
 
-describe Query::Base do
+describe Search do
   
   describe 'combinations_type_for' do
-    let(:query) { described_class.new }
+    let(:search) { described_class.new }
     it 'returns a specific Combination for a specific input' do
       some_source = stub(:source, :harvest => nil)
-      query.combinations_type_for([Index::Memory.new(:gu, some_source)]).should == Internals::Query::Combinations::Memory
+      search.combinations_type_for([Index::Memory.new(:gu, some_source)]).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
+      search.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
+      search.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)
+        search.combinations_type_for [:blorf, "blarf"]
+      end.to raise_error(Search::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.")
+        search.combinations_type_for [:blorf, "blarf"]
+      end.to raise_error("Currently it isn't possible to mix Symbol and String Indexes in the same Search instance.")
     end
   end
   
   describe "weights handling" do
     it "creates a default weight when no weights are given" do
-      query = described_class.new
+      search = described_class.new
       
-      query.weights.should be_kind_of(Query::Weights)
+      search.weights.should be_kind_of(Query::Weights)
     end
     it "handles :weights options when not yet wrapped" do
-      query = described_class.new :weights => { [:a, :b] => +3 }
+      search = described_class.new :weights => { [:a, :b] => +3 }
       
-      query.weights.should be_kind_of(Query::Weights)
+      search.weights.should be_kind_of(Query::Weights)
     end
     it "handles :weights options when already wrapped" do
-      query = described_class.new :weights => Query::Weights.new([:a, :b] => +3)
+      search = described_class.new :weights => Query::Weights.new([:a, :b] => +3)
       
-      query.weights.should be_kind_of(Query::Weights)
+      search.weights.should be_kind_of(Query::Weights)
     end
   end
   
   # describe "empty_results" do
   #   before(:each) do
-  #     @query = Query::Full.new
+  #     @search = search::Full.new
   #     
   #     @result_type = stub :result_type
-  #     @query.stub! :result_type => @result_type
+  #     @search.stub! :result_type => @result_type
   #   end
   #   it "returns a new result type" do
   #     @result_type.should_receive(:new).once.with :some_offset
   #     
-  #     @query.empty_results :some_offset
+  #     @search.empty_results :some_offset
   #   end
   #   it "returns a new result type with default offset" do
   #     @result_type.should_receive(:new).once.with 0
   #     
-  #     @query.empty_results
+  #     @search.empty_results
   #   end
   # end
   
   describe "search_with_text" do
     before(:each) do
-      @query = Query::Full.new
+      @search = Search.new
     end
     it "delegates to search" do
-      @query.stub! :tokenized => :tokens
+      @search.stub! :tokenized => :tokens
       
-      @query.should_receive(:search).once.with :tokens, :offset
+      @search.should_receive(:search).once.with :tokens, :results, :offset
       
-      @query.search_with_text :text, :offset
+      @search.search_with_text :text, :results, :offset
     end
     it "uses the tokenizer" do
-      @query.should_receive(:tokenized).once.with :text
+      @search.should_receive(:tokenized).once.with :text
       
-      @query.search_with_text :text, :anything
+      @search.search_with_text :text, :anything
     end
   end
   
@@ -87,46 +87,46 @@ describe Query::Base do
     context 'real' do
       before(:each) do
         @allocations = stub :allocations
-        @query       = Query::Full.new
+        @search      = Search.new
       end
       context 'reduce_to_amount not set' do
         it 'should not call anything on the allocations' do
           @allocations.should_receive(:reduce_to).never
           
-          @query.reduce @allocations
+          @search.reduce @allocations
         end
       end
       context 'reduce_to_amount set' do
         before(:each) do
-          @query.reduce_to_amount = :some_amount
+          @search.reduce_to_amount = :some_amount
         end
         it 'should call reduce_to on the allocations' do
           @allocations.should_receive(:reduce_to).once.with :some_amount
           
-          @query.reduce @allocations
+          @search.reduce @allocations
         end
       end
     end
     context 'stubbed' do
       before(:each) do
         @allocations = stub :allocations
-        @query       = Query::Full.new
+        @search      = Search.new
       end
       context 'reduce_to_amount not set' do
         it 'should not call anything on the allocations' do
           @allocations.should_receive(:reduce_to).never
           
-          @query.reduce @allocations
+          @search.reduce @allocations
         end
       end
       context 'reduce_to_amount set' do
         before(:each) do
-          @query.stub! :reduce_to_amount => :some_amount
+          @search.stub! :reduce_to_amount => :some_amount
         end
         it 'should call reduce_to on the allocations' do
           @allocations.should_receive(:reduce_to).once.with :some_amount
           
-          @query.reduce @allocations
+          @search.reduce @allocations
         end
       end
     end
@@ -141,10 +141,10 @@ describe Query::Base do
     context 'with tokenizer' do
       before(:each) do
         @tokenizer = stub :tokenizer, :tokenize => :some_tokenized_text
-        @query     = Query::Full.new @index, tokenizer: @tokenizer
+        @search    = Search.new @index, tokenizer: @tokenizer
       end
       it 'should tokenize using the tokenizer' do
-        @query.tokenized('some text').should == :some_tokenized_text
+        @search.tokenized('some text').should == :some_tokenized_text
       end
     end
   end
@@ -155,18 +155,18 @@ describe Query::Base do
     end
     context 'with weights' do
       before(:each) do
-        @query = Query::Full.new @index, weights: :some_weights
+        @search = Search.new @index, weights: :some_weights
       end
       it 'works correctly' do
-        @query.to_s.should == 'Query::Full(some_index, weights: some_weights)'
+        @search.to_s.should == 'Search(some_index, weights: some_weights)'
       end
     end
     context 'without weights' do
       before(:each) do
-        @query = Query::Full.new @index
+        @search = Search.new @index
       end
       it 'works correctly' do
-        @query.to_s.should == 'Query::Full(some_index)'
+        @search.to_s.should == 'Search(some_index)'
       end
     end
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: picky
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.5.4
+  prerelease: 6
+  version: 2.0.0.pre1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
+date: 2011-03-18 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,20 +123,16 @@ files:
 - lib/picky/internals/query/token.rb
 - lib/picky/internals/query/tokens.rb
 - lib/picky/internals/query/weights.rb
-- lib/picky/internals/results/base.rb
-- lib/picky/internals/results/full.rb
-- lib/picky/internals/results/live.rb
 - lib/picky/internals/solr/schema_generator.rb
 - lib/picky/internals/tokenizers/base.rb
 - lib/picky/internals/tokenizers/index.rb
 - lib/picky/internals/tokenizers/query.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
-- lib/picky/query/base.rb
-- lib/picky/query/full.rb
-- lib/picky/query/live.rb
 - lib/picky/query/solr.rb
 - lib/picky/rack/harakiri.rb
+- lib/picky/results.rb
+- lib/picky/search.rb
 - lib/picky/signals.rb
 - lib/picky/sources/base.rb
 - lib/picky/sources/couch.rb
@@ -158,6 +154,7 @@ files:
 - lib/tasks/solr.rake
 - lib/tasks/spec.rake
 - lib/tasks/statistics.rake
+- lib/tasks/todo.rake
 - lib/tasks/try.rake
 - lib/picky/internals/ext/ruby19/performant.c
 - spec/ext/performant_spec.rb
@@ -216,9 +213,6 @@ files:
 - spec/lib/internals/indexing/index_spec.rb
 - spec/lib/internals/indexing/indexes_spec.rb
 - spec/lib/internals/interfaces/live_parameters_spec.rb
-- spec/lib/internals/results/base_spec.rb
-- spec/lib/internals/results/full_spec.rb
-- spec/lib/internals/results/live_spec.rb
 - spec/lib/internals/solr/schema_generator_spec.rb
 - spec/lib/internals/tokenizers/base_spec.rb
 - spec/lib/internals/tokenizers/index_spec.rb
@@ -227,20 +221,19 @@ files:
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
-- spec/lib/query/base_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations/base_spec.rb
 - spec/lib/query/combinations/memory_spec.rb
 - spec/lib/query/combinations/redis_spec.rb
-- spec/lib/query/full_spec.rb
 - spec/lib/query/indexes_spec.rb
-- spec/lib/query/live_spec.rb
 - spec/lib/query/qualifiers_spec.rb
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
 - spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
+- spec/lib/results_spec.rb
+- spec/lib/search_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb
@@ -268,9 +261,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/picky
@@ -335,9 +328,6 @@ test_files:
 - spec/lib/internals/indexing/index_spec.rb
 - spec/lib/internals/indexing/indexes_spec.rb
 - spec/lib/internals/interfaces/live_parameters_spec.rb
-- spec/lib/internals/results/base_spec.rb
-- spec/lib/internals/results/full_spec.rb
-- spec/lib/internals/results/live_spec.rb
 - spec/lib/internals/solr/schema_generator_spec.rb
 - spec/lib/internals/tokenizers/base_spec.rb
 - spec/lib/internals/tokenizers/index_spec.rb
@@ -346,20 +336,19 @@ test_files:
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
-- spec/lib/query/base_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations/base_spec.rb
 - spec/lib/query/combinations/memory_spec.rb
 - spec/lib/query/combinations/redis_spec.rb
-- spec/lib/query/full_spec.rb
 - spec/lib/query/indexes_spec.rb
-- spec/lib/query/live_spec.rb
 - spec/lib/query/qualifiers_spec.rb
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
 - spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
+- spec/lib/results_spec.rb
+- spec/lib/search_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb

data/lib/picky/internals/results/base.rb

@@ -1,99 +0,0 @@
-module Internals
-
-  module Results # :nodoc:all
-
-    # This is the internal results object. Usually, to_marshal, or to_json
-    # is called on it to get a string for the answer.
-    #
-    class Base
-
-      # Duration is set externally by the query.
-      #
-      attr_writer :duration
-      attr_reader :allocations, :offset
-
-      # Takes instances of Query::Allocations as param.
-      #
-      def initialize offset = 0, allocations = Query::Allocations.new
-        @offset      = offset
-        @allocations = allocations
-      end
-      # Create new results and calculate the ids.
-      #
-      def self.from offset, allocations
-        results = new offset, allocations
-        results.prepare!
-        results
-      end
-
-      # Returns a hash with the allocations, offset, duration and total.
-      #
-      def serialize
-        { allocations: allocations.to_result,
-          offset:      offset,
-          duration:    duration,
-          total:       total }
-      end
-      # The default format is json.
-      #
-      def to_response options = {}
-        to_json options
-      end
-      # Convert to json format.
-      #
-      def to_json options = {}
-        serialize.to_json options
-      end
-
-      # This starts the actual processing.
-      #
-      # Without this, the allocations are not processed,
-      # and no ids are calculated.
-      #
-      def prepare!
-        allocations.process! self.max_results, self.offset
-      end
-
-      # Duration default is 0.
-      #
-      def duration
-        @duration || 0
-      end
-      # The total results. Delegates to the allocations.
-      #
-      # Caches.
-      #
-      def total
-        @total || @total = allocations.total || 0
-      end
-
-      # How many results are returned.
-      #
-      # Set in config using
-      #   Results::Full.max_results = 20
-      #
-      class_inheritable_accessor :max_results
-      def max_results
-        self.class.max_results
-      end
-
-      # Convenience methods.
-      #
-
-      # Delegates to allocations.
-      #
-      def ids amount = 20
-        allocations.ids amount
-      end
-
-      # Human readable log.
-      #
-      def to_log query
-        "|#{Time.now.to_s(:db)}|#{'%8f' % duration}|#{'%-50s' % query}|#{'%8d' % total}|#{'%4d' % offset}|#{'%2d' % allocations.size}|"
-      end
-    
-    end
-
-  end
-  
-end

data/lib/picky/internals/results/full.rb

@@ -1,17 +0,0 @@
-module Internals
-
-  module Results
-    # Full results are limited to maximally 20 results (by default).
-    #
-    class Full < Base
-    
-      self.max_results = 20
-    
-      def to_log *args
-        ?> + super
-      end
-    
-    end
-  end
-  
-end

data/lib/picky/internals/results/live.rb

@@ -1,17 +0,0 @@
-module Internals
-
-  module Results
-    # Live results are not returning any results.
-    #
-    class Live < Base
-    
-      self.max_results = 0
-    
-      def to_log *args
-        ?. + super
-      end
-    
-    end
-  end
-  
-end