picky 1.2.4 → 1.3.0

data/spec/lib/query/weights_spec.rb

@@ -2,46 +2,69 @@ require 'spec_helper'
 
 describe Query::Weights do
 
-  before(:each) do
-    @weights = Query::Weights.new [:test1, :test2]         => 6,
-                                     [:test1]                 => 5,
-                                     [:test3]                 => 3,
-                                     [:test3, :test2]         => 4,
-                                     [:test1, :test4]         => 5,
-                                     [:test4, :test1]         => 5,
-                                     [:test4, :test1, :test2] => 4,
-                                     [:test1, :test4, :test2] => 4,
-                                     [:test4, :test5]         => 3,
-                                     [:test5, :test1]         => 2,
-                                     [:test1, :test5]         => 2,
-                                     [:test3, :test1]         => 2,
-                                     [:test1, :test3]         => 2
-  end
+  context 'with weights' do
+    before(:each) do
+      @weights = Query::Weights.new [:test1, :test2]         => 6,
+                                       [:test1]                 => 5,
+                                       [:test3]                 => 3,
+                                       [:test3, :test2]         => 4,
+                                       [:test1, :test4]         => 5,
+                                       [:test4, :test1]         => 5,
+                                       [:test4, :test1, :test2] => 4,
+                                       [:test1, :test4, :test2] => 4,
+                                       [:test4, :test5]         => 3,
+                                       [:test5, :test1]         => 2,
+                                       [:test1, :test5]         => 2,
+                                       [:test3, :test1]         => 2,
+                                       [:test1, :test3]         => 2
+    end
 
-  describe "weight_for" do
-    it "should return zero if there is no specific weight" do
-      @weights.weight_for([:not_a_specific_allocation]).should be_zero
+    describe "weight_for" do
+      it "should return zero if there is no specific weight" do
+        @weights.weight_for([:not_a_specific_allocation]).should be_zero
+      end
     end
-  end
   
-  def self.it_should_return_a_specific_weight_for(allocation, weight)
-    it "should return weight #{weight} for #{allocation.inspect}" do
-      @weights.weight_for(allocation).should == weight
+    def self.it_should_return_a_specific_weight_for(allocation, weight)
+      it "should return weight #{weight} for #{allocation.inspect}" do
+        @weights.weight_for(allocation).should == weight
+      end
     end
-  end
   
-  it_should_return_a_specific_weight_for [:test1, :test2],         6
-  it_should_return_a_specific_weight_for [:test1],                 5
-  it_should_return_a_specific_weight_for [:test1, :test3],         2
-  it_should_return_a_specific_weight_for [:test3],                 3
-  it_should_return_a_specific_weight_for [:test3, :test2],         4
-  it_should_return_a_specific_weight_for [:test1, :test4],         5
-  it_should_return_a_specific_weight_for [:test4, :test1],         5
-  it_should_return_a_specific_weight_for [:test4, :test1, :test2], 4
-  it_should_return_a_specific_weight_for [:test1, :test4, :test2], 4
-  it_should_return_a_specific_weight_for [:test4, :test5],         3
-  it_should_return_a_specific_weight_for [:test5, :test1],         2
-  it_should_return_a_specific_weight_for [:test1, :test5],         2
-  it_should_return_a_specific_weight_for [:test3, :test1],         2
+    it_should_return_a_specific_weight_for [:test1, :test2],         6
+    it_should_return_a_specific_weight_for [:test1],                 5
+    it_should_return_a_specific_weight_for [:test1, :test3],         2
+    it_should_return_a_specific_weight_for [:test3],                 3
+    it_should_return_a_specific_weight_for [:test3, :test2],         4
+    it_should_return_a_specific_weight_for [:test1, :test4],         5
+    it_should_return_a_specific_weight_for [:test4, :test1],         5
+    it_should_return_a_specific_weight_for [:test4, :test1, :test2], 4
+    it_should_return_a_specific_weight_for [:test1, :test4, :test2], 4
+    it_should_return_a_specific_weight_for [:test4, :test5],         3
+    it_should_return_a_specific_weight_for [:test5, :test1],         2
+    it_should_return_a_specific_weight_for [:test1, :test5],         2
+    it_should_return_a_specific_weight_for [:test3, :test1],         2
+  
+    describe 'to_s' do
+      it 'is correct' do
+        @weights.to_s.should == "{[:test1, :test2]=>6, [:test1]=>5, [:test3]=>3, [:test3, :test2]=>4, [:test1, :test4]=>5, [:test4, :test1]=>5, [:test4, :test1, :test2]=>4, [:test1, :test4, :test2]=>4, [:test4, :test5]=>3, [:test5, :test1]=>2, [:test1, :test5]=>2, [:test3, :test1]=>2, [:test1, :test3]=>2}"
+      end
+    end
+    describe 'empty?' do
+      it 'is correct' do
+        @weights.empty?.should == false
+      end
+    end
+  end
+  context 'without weights' do
+    before(:each) do
+      @weights = Query::Weights.new
+    end
+    describe 'empty?' do
+      it 'is correct' do
+        @weights.empty?.should == true
+      end
+    end
+  end
   
 end

data/spec/lib/results/base_spec.rb

@@ -1,6 +1,18 @@
 require 'spec_helper'
 
-describe Results do
+describe Results::Base do
+  
+  describe "from" do
+    before(:each) do
+      @results = stub :results
+      Results::Base.stub! :new => @results
+      
+      @results.stub! :prepare!
+    end
+    it "should generate a result" do
+      Results::Base.from(0, @allocations).should == @results
+    end
+  end
   
   describe "ids" do
     before(:each) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,10 @@ files:
 - lib/bundling.rb
 - lib/constants.rb
 - lib/deployment.rb
+- lib/picky/adapters/rack/base.rb
+- lib/picky/adapters/rack/live_parameters.rb
+- lib/picky/adapters/rack/query.rb
+- lib/picky/adapters/rack.rb
 - lib/picky/alias_instances.rb
 - lib/picky/application.rb
 - lib/picky/cacher/convenience.rb
@@ -73,6 +77,7 @@ files:
 - lib/picky/extensions/module.rb
 - lib/picky/extensions/object.rb
 - lib/picky/extensions/symbol.rb
+- lib/picky/frontend_adapters/rack.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index/bundle.rb
 - lib/picky/index/file/basic.rb
@@ -99,6 +104,7 @@ files:
 - lib/picky/indexing/category.rb
 - lib/picky/indexing/index.rb
 - lib/picky/indexing/indexes.rb
+- lib/picky/interfaces/live_parameters.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
 - lib/picky/performant.rb
@@ -119,7 +125,6 @@ files:
 - lib/picky/results/base.rb
 - lib/picky/results/full.rb
 - lib/picky/results/live.rb
-- lib/picky/routing.rb
 - lib/picky/signals.rb
 - lib/picky/solr/schema_generator.rb
 - lib/picky/sources/base.rb
@@ -146,6 +151,9 @@ files:
 - lib/tasks/try.rake
 - lib/picky/ext/ruby19/performant.c
 - spec/ext/performant_spec.rb
+- spec/lib/adapters/rack/base_spec.rb
+- spec/lib/adapters/rack/live_parameters_spec.rb
+- spec/lib/adapters/rack/query_spec.rb
 - spec/lib/application_spec.rb
 - spec/lib/cacher/cacher_strategy_spec.rb
 - spec/lib/cacher/partial/default_spec.rb
@@ -167,6 +175,7 @@ files:
 - spec/lib/extensions/module_spec.rb
 - spec/lib/extensions/object_spec.rb
 - spec/lib/extensions/symbol_spec.rb
+- spec/lib/frontend_adapters/rack_spec.rb
 - spec/lib/helpers/measuring_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/file/basic_spec.rb
@@ -188,6 +197,7 @@ files:
 - spec/lib/indexing/category_spec.rb
 - spec/lib/indexing/index_spec.rb
 - spec/lib/indexing/indexes_spec.rb
+- spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
@@ -205,7 +215,6 @@ files:
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results/base_spec.rb
 - spec/lib/results/live_spec.rb
-- spec/lib/routing_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb
@@ -252,6 +261,9 @@ specification_version: 3
 summary: "Picky: Helps you find your data."
 test_files: 
 - spec/ext/performant_spec.rb
+- spec/lib/adapters/rack/base_spec.rb
+- spec/lib/adapters/rack/live_parameters_spec.rb
+- spec/lib/adapters/rack/query_spec.rb
 - spec/lib/application_spec.rb
 - spec/lib/cacher/cacher_strategy_spec.rb
 - spec/lib/cacher/partial/default_spec.rb
@@ -273,6 +285,7 @@ test_files:
 - spec/lib/extensions/module_spec.rb
 - spec/lib/extensions/object_spec.rb
 - spec/lib/extensions/symbol_spec.rb
+- spec/lib/frontend_adapters/rack_spec.rb
 - spec/lib/helpers/measuring_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/file/basic_spec.rb
@@ -294,6 +307,7 @@ test_files:
 - spec/lib/indexing/category_spec.rb
 - spec/lib/indexing/index_spec.rb
 - spec/lib/indexing/indexes_spec.rb
+- spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
@@ -311,7 +325,6 @@ test_files:
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results/base_spec.rb
 - spec/lib/results/live_spec.rb
-- spec/lib/routing_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
 - spec/lib/sources/couch_spec.rb
 - spec/lib/sources/csv_spec.rb

data/lib/picky/routing.rb

@@ -1,171 +0,0 @@
-require 'rack/mount'
-
-# 
-#
-class Routing # :nodoc:all
-  
-  @@defaults = {
-    query_key:    'query'.freeze,
-    offset_key:   'offset'.freeze,
-    content_type: 'application/octet-stream'.freeze
-  }
-  
-  def initialize
-    @defaults = @@defaults.dup
-  end
-  
-  # 
-  #
-  def reset_routes
-    @routes = Rack::Mount::RouteSet.new
-  end
-  def routes
-    @routes || reset_routes
-  end
-  def freeze
-    routes.freeze
-  end
-  
-  # Routing simply delegates to the route set to handle a request.
-  #
-  def call env
-    routes.call env
-  end
-  
-  #
-  #
-  def route options = {}
-    mappings, route_options = split options
-    mappings.each do |url, query|
-      route_one url, query, route_options
-    end
-  end
-  def split options
-    mappings      = {}
-    route_options = {}
-    options.each_pair do |key, value|
-      if Regexp === key or String === key
-        mappings[key] = value
-      else
-        route_options[key] = value
-      end
-    end
-    [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
-    answer %r{^/$}, STATUSES[status]
-  end
-  #
-  #
-  def default status
-    answer nil, STATUSES[status]
-  end
-  
-  
-  
-  # TODO Can Rack handle this for me?
-  #
-  # Note: Rack-mount already handles the 404.
-  #
-  STATUSES = {
-    200 => lambda { |_| [200, { 'Content-Type' => 'text/html', 'Content-Length' => '0' }, ['']] },
-    404 => lambda { |_| [404, { 'Content-Type' => 'text/html', 'Content-Length' => '0' }, ['']] }
-  }
-  
-  #
-  #
-  def default_options url, route_options = {}
-    url = normalized url
-    
-    options = { request_method: 'GET' }.merge route_options
-    
-    options[:path_info] = url if url
-    
-    options.delete :content_type # TODO
-    
-    query_params = options.delete :query
-    options[:query_string] = %r{#{generate_query_string(query_params)}} if query_params
-    
-    options
-  end
-  
-  #
-  #
-  def generate_query_string query_params
-    raise "At least one query string condition is needed." if query_params.size.zero?
-    raise "Too many query param conditions (only 1 allowed): #{query_params}" if query_params.size > 1
-    k, v = query_params.first
-    "#{k}=#{v}"
-  end
-  
-  # Generates a rack app for the given query.
-  #
-  def generate_app query, options = {}
-    query_key    = options[:query_key]    || @defaults[:query_key]
-    content_type = options[:content_type] || @defaults[:content_type]
-    lambda do |env|
-      params  = Rack::Request.new(env).params
-      
-      results = query.search_with_text *extracted(params)
-      
-      PickyLog.log results.to_log(params[query_key]) # TODO Save the original query in the results object.
-      
-      respond_with results.to_response, content_type
-    end
-  end
-  UTF8_STRING = 'UTF-8'.freeze
-  def extracted params
-    [
-      # query is encoded in ASCII
-      #
-      params[@defaults[:query_key]]  && params[@defaults[:query_key]].force_encoding(UTF8_STRING),
-      params[@defaults[:offset_key]] && params[@defaults[:offset_key]].to_i || 0
-    ]
-  end
-  def respond_with response, content_type
-    [200, { 'Content-Type' => content_type, 'Content-Length' => response.size.to_s, }, [response]]
-  end
-  
-  # Setup a route that answers using the given app.
-  #
-  def answer url = nil, app = nil
-    routes.add_route (app || STATUSES[200]), default_options(url)
-  end
-  
-  def normalized url
-    String === url ? %r{#{url}} : url
-  end
-  
-  # Returns true if there are no routes defined.
-  #
-  def empty?
-    routes.length.zero?
-  end
-  
-  # TODO Beautify.
-  #
-  def to_s
-    routes.instance_variable_get(:@routes).map do |route|
-      path_info = route.conditions[:path_info]
-      anchored = Rack::Mount::Utils.regexp_anchored?(path_info)
-      anchored_ok = anchored ? "\u2713" : " "
-      "#{anchored_ok}  #{path_info.source}"
-    end.join "\n"
-  end
-  
-end