picky 2.7.0 → 3.0.0.pre1

data/spec/lib/tokenizers/base_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Tokenizers::Base do
+describe Picky::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 }
@@ -65,7 +65,7 @@ EXPECTED
         expect { tokenizer.substitutes_characters_with Object.new }.to raise_error("The substitutes_characters_with option needs a character substituter, which responds to #substitute.")
       end
       it "uses the substituter to replace characters" do
-        tokenizer.substitutes_characters_with CharacterSubstituters::WestEuropean.new
+        tokenizer.substitutes_characters_with Picky::CharacterSubstituters::WestEuropean.new
 
         tokenizer.substitute_characters('abcdefghijklmnopqrstuvwxyzäöü').should == 'abcdefghijklmnopqrstuvwxyzaeoeue'
       end

data/spec/lib/tokenizers/index_spec.rb

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

data/spec/lib/tokenizers/query_spec.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: picky
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.7.0
+  prerelease: 6
+  version: 3.0.0.pre1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +10:00
+date: 2011-08-07 00:00:00 +10:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.7.0
+        version: 3.0.0.pre1
   type: :development
   version_requirements: *id002
 description: Fast Ruby semantic text search engine with comfortable single field interface.
@@ -45,12 +45,9 @@ extra_rdoc_files: []
 
 files: 
 - aux/picky/cli.rb
-- 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/search.rb
 - lib/picky/adapters/rack.rb
 - lib/picky/analyzer.rb
 - lib/picky/application.rb
@@ -65,6 +62,7 @@ files:
 - lib/picky/backend/redis/string_hash.rb
 - lib/picky/backend/redis.rb
 - lib/picky/bundle.rb
+- lib/picky/bundling.rb
 - lib/picky/calculations/location.rb
 - lib/picky/categories.rb
 - lib/picky/categories_indexed.rb
@@ -73,7 +71,9 @@ files:
 - lib/picky/category_indexed.rb
 - lib/picky/category_indexing.rb
 - lib/picky/character_substituters/west_european.rb
+- lib/picky/constants.rb
 - lib/picky/cores.rb
+- lib/picky/deployment.rb
 - lib/picky/ext/maybe_compile.rb
 - lib/picky/ext/ruby19/extconf.rb
 - lib/picky/extensions/array.rb
@@ -104,11 +104,6 @@ files:
 - lib/picky/generators/weights/strategy.rb
 - lib/picky/generators/weights_generator.rb
 - lib/picky/helpers/measuring.rb
-- lib/picky/index/base.rb
-- lib/picky/index/base_indexed.rb
-- lib/picky/index/base_indexing.rb
-- lib/picky/index/memory.rb
-- lib/picky/index/redis.rb
 - lib/picky/indexed/bundle/base.rb
 - lib/picky/indexed/bundle/memory.rb
 - lib/picky/indexed/bundle/redis.rb
@@ -120,6 +115,11 @@ files:
 - lib/picky/indexers/base.rb
 - lib/picky/indexers/parallel.rb
 - lib/picky/indexers/serial.rb
+- lib/picky/indexes/index.rb
+- lib/picky/indexes/index_indexed.rb
+- lib/picky/indexes/index_indexing.rb
+- lib/picky/indexes/memory.rb
+- lib/picky/indexes/redis.rb
 - lib/picky/indexes.rb
 - lib/picky/indexes_indexed.rb
 - lib/picky/indexes_indexing.rb
@@ -139,8 +139,7 @@ files:
 - lib/picky/query/combinations/memory.rb
 - lib/picky/query/combinations/redis.rb
 - lib/picky/query/indexes.rb
-- lib/picky/query/qualifiers.rb
-- lib/picky/query/solr.rb
+- lib/picky/query/qualifier_category_mapper.rb
 - lib/picky/query/token.rb
 - lib/picky/query/tokens.rb
 - lib/picky/query/weights.rb
@@ -148,7 +147,7 @@ files:
 - lib/picky/rack/harakiri.rb
 - lib/picky/results.rb
 - lib/picky/search.rb
-- lib/picky/signals.rb
+- lib/picky/sinatra.rb
 - lib/picky/sources/base.rb
 - lib/picky/sources/couch.rb
 - lib/picky/sources/csv.rb
@@ -158,11 +157,11 @@ files:
 - lib/picky/sources/wrappers/base.rb
 - lib/picky/sources/wrappers/location.rb
 - lib/picky/statistics.rb
+- lib/picky/tasks.rb
 - lib/picky/tokenizers/base.rb
 - lib/picky/tokenizers/index.rb
 - lib/picky/tokenizers/location.rb
 - lib/picky/tokenizers/query.rb
-- lib/picky-tasks.rb
 - lib/picky.rb
 - lib/tasks/application.rake
 - lib/tasks/checks.rake
@@ -170,7 +169,6 @@ files:
 - lib/tasks/index.rake
 - lib/tasks/routes.rake
 - lib/tasks/server.rake
-- lib/tasks/spec.rake
 - lib/tasks/statistics.rake
 - lib/tasks/todo.rake
 - lib/tasks/try.rake
@@ -220,10 +218,6 @@ files:
 - spec/lib/generators/weights/logarithmic_spec.rb
 - spec/lib/generators/weights_generator_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/base_indexed_spec.rb
-- spec/lib/index/base_indexing_spec.rb
-- spec/lib/index/base_spec.rb
-- spec/lib/index/redis_spec.rb
 - spec/lib/indexed/bundle/memory_spec.rb
 - spec/lib/indexed/bundle/redis_spec.rb
 - spec/lib/indexed/wrappers/bundle/calculation_spec.rb
@@ -232,6 +226,10 @@ files:
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/parallel_spec.rb
 - spec/lib/indexers/serial_spec.rb
+- spec/lib/indexes/index_indexed_spec.rb
+- spec/lib/indexes/index_indexing_spec.rb
+- spec/lib/indexes/index_spec.rb
+- spec/lib/indexes/redis_spec.rb
 - spec/lib/indexes_class_spec.rb
 - spec/lib/indexes_indexed_spec.rb
 - spec/lib/indexes_indexing_spec.rb
@@ -250,7 +248,7 @@ files:
 - spec/lib/query/combinations/memory_spec.rb
 - spec/lib/query/combinations/redis_spec.rb
 - spec/lib/query/indexes_spec.rb
-- spec/lib/query/qualifiers_spec.rb
+- spec/lib/query/qualifier_category_mapper_spec.rb
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
@@ -258,6 +256,7 @@ files:
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results_spec.rb
 - 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
@@ -291,9 +290,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
@@ -347,10 +346,6 @@ test_files:
 - spec/lib/generators/weights/logarithmic_spec.rb
 - spec/lib/generators/weights_generator_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/base_indexed_spec.rb
-- spec/lib/index/base_indexing_spec.rb
-- spec/lib/index/base_spec.rb
-- spec/lib/index/redis_spec.rb
 - spec/lib/indexed/bundle/memory_spec.rb
 - spec/lib/indexed/bundle/redis_spec.rb
 - spec/lib/indexed/wrappers/bundle/calculation_spec.rb
@@ -359,6 +354,10 @@ test_files:
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/parallel_spec.rb
 - spec/lib/indexers/serial_spec.rb
+- spec/lib/indexes/index_indexed_spec.rb
+- spec/lib/indexes/index_indexing_spec.rb
+- spec/lib/indexes/index_spec.rb
+- spec/lib/indexes/redis_spec.rb
 - spec/lib/indexes_class_spec.rb
 - spec/lib/indexes_indexed_spec.rb
 - spec/lib/indexes_indexing_spec.rb
@@ -377,7 +376,7 @@ test_files:
 - spec/lib/query/combinations/memory_spec.rb
 - spec/lib/query/combinations/redis_spec.rb
 - spec/lib/query/indexes_spec.rb
-- spec/lib/query/qualifiers_spec.rb
+- spec/lib/query/qualifier_category_mapper_spec.rb
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
@@ -385,6 +384,7 @@ test_files:
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results_spec.rb
 - 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

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

@@ -1,65 +0,0 @@
-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_with_text on it if it is called by Rack.
-  #
-  module Rack
-
-    # TODO Rename to Search.
-    #
-    class Query < Base
-
-      @@defaults = {
-        query_key:    'query'.freeze,
-        ids_key:      'ids'.freeze,
-        offset_key:   'offset'.freeze,
-        content_type: 'application/json'.freeze
-      }
-
-      def initialize query
-        @query    = query
-        @defaults = @@defaults.dup
-      end
-
-      def to_app options = {}
-        # For capturing in the lambda.
-        #
-        query        = @query
-        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])
-
-          respond_with results.to_response, content_type
-        end
-      end
-
-      # Helper method to extract the params
-      #
-      # Defaults are 20 ids, offset 0.
-      #
-      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[:ids_key]]    && params[@defaults[:ids_key]].to_i || 20,
-          params[@defaults[:offset_key]] && params[@defaults[:offset_key]].to_i || 0
-        ]
-      end
-
-    end
-
-  end
-
-end