picky 4.0.0pre1 → 4.0.0pre2

data/spec/lib/search_spec.rb

@@ -51,7 +51,7 @@ describe Picky::Search do
     context 'no tokenizer predefined' do
       let(:search) { described_class.new }
       it 'returns the default tokenizer' do
-        search.tokenizer.should == Picky::Tokenizer.query_default
+        search.tokenizer.should == Picky::Tokenizer.searching
       end
     end
     context 'tokenizer predefined' do

data/spec/lib/sinatra_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe Picky::Sinatra do
-  
+
   let(:extendee) { Class.new {} }
-  
+
   it 'has no Picky specific methods' do
     lambda { extendee.indexing }.should raise_error
   end
   it 'has no Picky specific methods' do
     lambda { extendee.searching }.should raise_error
   end
-  
+
   context 'after extending' do
     before(:each) do
       extendee.extend Picky::Sinatra
@@ -22,15 +22,15 @@ describe Picky::Sinatra do
       extendee.send :searching, some: 'option'
     end
     it 'gets delegated correctly' do
-      Picky::Application.should_receive(:indexing).once.with some: 'option'
-      
+      Picky::Tokenizer.should_receive(:default_indexing_with).once.with some: 'option'
+
       extendee.send :indexing, some: 'option'
     end
     it 'gets delegated correctly' do
-      Picky::Application.should_receive(:searching).once.with some: 'option'
-      
+      Picky::Tokenizer.should_receive(:default_searching_with).once.with some: 'option'
+
       extendee.send :searching, some: 'option'
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.0.0pre1
+  version: 4.0.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2011-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70311745503320 !ruby/object:Gem::Requirement
+  requirement: &70284145905500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70311745503320
+  version_requirements: *70284145905500
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70311745502640 !ruby/object:Gem::Requirement
+  requirement: &70284145904960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0pre1
+        version: 4.0.0pre2
   type: :development
   prerelease: false
-  version_requirements: *70311745502640
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &70311745502040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70311745502040
-- !ruby/object:Gem::Dependency
-  name: rack_fast_escape
-  requirement: &70311745501280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70311745501280
+  version_requirements: *70284145904960
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70311745500860 !ruby/object:Gem::Requirement
+  requirement: &70284145904520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311745500860
+  version_requirements: *70284145904520
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70311745500360 !ruby/object:Gem::Requirement
+  requirement: &70284145904040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311745500360
+  version_requirements: *70284145904040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70311745499600 !ruby/object:Gem::Requirement
+  requirement: &70284145903480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311745499600
+  version_requirements: *70284145903480
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70311745498920 !ruby/object:Gem::Requirement
+  requirement: &70284145902860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,21 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70311745498920
+  version_requirements: *70284145902860
 - !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: &70311745498540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70311745498540
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70311745498080 !ruby/object:Gem::Requirement
+  name: rack_fast_escape
+  requirement: &70284145902240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311745498080
+  version_requirements: *70284145902240
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -130,13 +97,8 @@ extensions:
 extra_rdoc_files: []
 files:
 - aux/picky/cli.rb
-- lib/picky/adapters/rack/base.rb
-- lib/picky/adapters/rack/live_parameters.rb
-- lib/picky/adapters/rack/search.rb
-- lib/picky/adapters/rack.rb
 - lib/picky/analytics.rb
 - lib/picky/analyzer.rb
-- lib/picky/application.rb
 - lib/picky/backends/backend.rb
 - lib/picky/backends/file/basic.rb
 - lib/picky/backends/file/json.rb
@@ -171,6 +133,7 @@ files:
 - lib/picky/categories_indexed.rb
 - lib/picky/categories_indexing.rb
 - lib/picky/categories_realtime.rb
+- lib/picky/category/location.rb
 - lib/picky/category.rb
 - lib/picky/category_convenience.rb
 - lib/picky/category_indexed.rb
@@ -189,7 +152,6 @@ files:
 - lib/picky/extensions/object.rb
 - lib/picky/extensions/string.rb
 - lib/picky/extensions/symbol.rb
-- lib/picky/frontend_adapters/rack.rb
 - lib/picky/generators/aliases.rb
 - lib/picky/generators/partial/default.rb
 - lib/picky/generators/partial/infix.rb
@@ -209,8 +171,8 @@ files:
 - lib/picky/generators/weights/default.rb
 - lib/picky/generators/weights/dynamic.rb
 - lib/picky/generators/weights/logarithmic.rb
-- lib/picky/generators/weights/runtime.rb
 - lib/picky/generators/weights/strategy.rb
+- lib/picky/generators/weights/stub.rb
 - lib/picky/helpers/indexing.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index.rb
@@ -225,7 +187,8 @@ files:
 - lib/picky/indexes_convenience.rb
 - lib/picky/indexes_indexed.rb
 - lib/picky/indexes_indexing.rb
-- lib/picky/interfaces/live_parameters.rb
+- lib/picky/interfaces/live_parameters/master_child.rb
+- lib/picky/interfaces/live_parameters/unicorn.rb
 - lib/picky/loader.rb
 - lib/picky/migrations/from_30_to_31.rb
 - lib/picky/performant.rb
@@ -245,12 +208,6 @@ files:
 - lib/picky/scheduler.rb
 - lib/picky/search.rb
 - lib/picky/sinatra.rb
-- lib/picky/sources/base.rb
-- lib/picky/sources/couch.rb
-- lib/picky/sources/csv.rb
-- lib/picky/sources/db.rb
-- lib/picky/sources/delicious.rb
-- lib/picky/sources/mongo.rb
 - lib/picky/statistics.rb
 - lib/picky/tasks.rb
 - lib/picky/tokenizer.rb
@@ -259,13 +216,11 @@ files:
 - lib/picky/wrappers/bundle/exact_partial.rb
 - lib/picky/wrappers/bundle/location.rb
 - lib/picky/wrappers/bundle/wrapper.rb
-- lib/picky/wrappers/category/location.rb
 - lib/picky.rb
 - lib/tasks/try.rb
 - lib/tasks/application.rake
 - lib/tasks/framework.rake
 - lib/tasks/index.rake
-- lib/tasks/routes.rake
 - lib/tasks/server.rake
 - lib/tasks/statistics.rake
 - lib/tasks/todo.rake
@@ -288,12 +243,8 @@ files:
 - spec/functional/regression_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/terminate_early_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/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
-- spec/lib/application_spec.rb
 - spec/lib/backends/backend_spec.rb
 - spec/lib/backends/file/basic_spec.rb
 - spec/lib/backends/file_spec.rb
@@ -316,6 +267,7 @@ files:
 - spec/lib/bundling_spec.rb
 - spec/lib/calculations/location_spec.rb
 - spec/lib/categories_indexed_spec.rb
+- spec/lib/category/location_spec.rb
 - spec/lib/category_indexed_spec.rb
 - spec/lib/category_indexing_spec.rb
 - spec/lib/category_spec.rb
@@ -326,7 +278,6 @@ files:
 - spec/lib/extensions/object_spec.rb
 - spec/lib/extensions/string_spec.rb
 - spec/lib/extensions/symbol_spec.rb
-- spec/lib/frontend_adapters/rack_spec.rb
 - spec/lib/generators/aliases_spec.rb
 - spec/lib/generators/cacher_strategy_spec.rb
 - spec/lib/generators/partial/default_spec.rb
@@ -360,7 +311,8 @@ files:
 - spec/lib/indexes_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
-- spec/lib/interfaces/live_parameters_spec.rb
+- spec/lib/interfaces/live_parameters/master_child_spec.rb
+- spec/lib/interfaces/live_parameters/unicorn_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
@@ -380,12 +332,6 @@ files:
 - spec/lib/search_spec.rb
 - spec/lib/sinatra_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
-- spec/lib/sources/base_spec.rb
-- spec/lib/sources/couch_spec.rb
-- spec/lib/sources/csv_spec.rb
-- spec/lib/sources/db_spec.rb
-- spec/lib/sources/delicious_spec.rb
-- spec/lib/sources/mongo_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb
@@ -432,12 +378,8 @@ test_files:
 - spec/functional/regression_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/terminate_early_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/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
-- spec/lib/application_spec.rb
 - spec/lib/backends/backend_spec.rb
 - spec/lib/backends/file/basic_spec.rb
 - spec/lib/backends/file_spec.rb
@@ -460,6 +402,7 @@ test_files:
 - spec/lib/bundling_spec.rb
 - spec/lib/calculations/location_spec.rb
 - spec/lib/categories_indexed_spec.rb
+- spec/lib/category/location_spec.rb
 - spec/lib/category_indexed_spec.rb
 - spec/lib/category_indexing_spec.rb
 - spec/lib/category_spec.rb
@@ -470,7 +413,6 @@ test_files:
 - spec/lib/extensions/object_spec.rb
 - spec/lib/extensions/string_spec.rb
 - spec/lib/extensions/symbol_spec.rb
-- spec/lib/frontend_adapters/rack_spec.rb
 - spec/lib/generators/aliases_spec.rb
 - spec/lib/generators/cacher_strategy_spec.rb
 - spec/lib/generators/partial/default_spec.rb
@@ -504,7 +446,8 @@ test_files:
 - spec/lib/indexes_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
-- spec/lib/interfaces/live_parameters_spec.rb
+- spec/lib/interfaces/live_parameters/master_child_spec.rb
+- spec/lib/interfaces/live_parameters/unicorn_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
@@ -524,12 +467,6 @@ test_files:
 - spec/lib/search_spec.rb
 - spec/lib/sinatra_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
-- spec/lib/sources/base_spec.rb
-- spec/lib/sources/couch_spec.rb
-- spec/lib/sources/csv_spec.rb
-- spec/lib/sources/db_spec.rb
-- spec/lib/sources/delicious_spec.rb
-- spec/lib/sources/mongo_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb

data/lib/picky/adapters/rack.rb

@@ -1,34 +0,0 @@
-module Picky
-
-  module Adapters
-
-    # This is an adapter that is plugged into a Rack outlet.
-    #
-    # It looks at what is given to it and generate an appropriate
-    # adapter for it.
-    #
-    # For example, if you give it a query, it will extract the query param etc.
-    # and call search on it if it is called by Rack.
-    #
-    # Usage:
-    #   Adapters::Rack.app_for(thing, options)
-    #
-    module Rack
-
-      # Generates the appropriate app for Rack.
-      #
-      @@mapping = {
-        :search     => Search,
-        :parameters => LiveParameters
-      }
-      def self.app_for thing, options = {}
-        @@mapping.each_pair do |method, adapter|
-          return adapter.new(thing).to_app(options) if thing.respond_to?(method)
-        end
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/adapters/rack/base.rb

@@ -1,27 +0,0 @@
-module Picky
-
-  module Adapters
-    # Adapter that is plugged into a Rack outlet.
-    #
-    module Rack
-
-      # Subclasses of this class should respond to
-      # * to_app(options)
-      #
-      class Base
-
-        # Puts together an appropriately structured Rack response.
-        #
-        # Note: Bytesize is needed to have special characters not trip up Rack.
-        #
-        def respond_with response, content_type = 'application/json'
-          [200, { 'Content-Type' => content_type, 'Content-Length' => response.bytesize.to_s }, [response]]
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/adapters/rack/live_parameters.rb

@@ -1,37 +0,0 @@
-module Picky
-
-  module Adapters
-
-    #
-    #
-    module Rack
-
-      class LiveParameters < Base
-
-        def initialize live_parameters
-          @live_parameters = live_parameters
-        end
-
-        #
-        #
-        def to_app options = {}
-          # For capturing by the lambda block.
-          #
-          live_parameters = @live_parameters
-
-          lambda do |env|
-            params = ::Rack::Request.new(env).params
-
-            results = live_parameters.parameters params
-
-            respond_with results.to_json
-          end
-        end
-
-      end
-
-    end
-
-  end
-
-end