picky 4.10.0 → 4.11.0

data/spec/lib/tokenizer_spec.rb

@@ -137,6 +137,32 @@ ERROR
           tokenizer.normalize_with_patterns('alice & bob').should == 'alice and bob'
         end
       end
+      # TODO Reinstate.
+      #
+      # context 'with a normalizer' do
+      #   let(:normalizer) {
+      #     Class.new do
+      #       def normalize_with_patterns text
+      #         text.reverse
+      #       end
+      #     end.new
+      #   }
+      #   before(:each) do
+      #     tokenizer.normalizes_words normalizer
+      #   end
+      #   it "has normalize_with_patterns" do
+      #     expect { tokenizer.normalize_with_patterns('a b/c.d') }.to_not raise_error
+      #   end
+      #   it "normalizes, but just the first one" do
+      #     tokenizer.normalize_with_patterns('1234567890').should == '0987654321'
+      #   end
+      #   it "works correctly" do
+      #     tokenizer.normalize_with_patterns('camera +').should == '+ aremac'
+      #   end
+      #   it "works correctly" do
+      #     tokenizer.normalize_with_patterns('alice & bob').should == 'bob & ecila'
+      #   end
+      # end
     end
 
     describe "splits_text_on" do
@@ -157,17 +183,32 @@ ERROR
           tokenizer.split('this is a test').should == ['this', 'is', 'a', 'test']
         end
       end
-      context "with removes_characters called" do
+      context "with specific splitting pattern" do
         before(:each) do
           tokenizer.splits_text_on(/[\s\.\/]/)
         end
-        it "has split" do
+        it "splits text correctly" do
           expect { tokenizer.split('a b/c.d') }.to_not raise_error
         end
-        it "removes illegal characters" do
+        it "splits text correctly" do
           tokenizer.split('a b/c.d').should == ['a','b','c','d']
         end
       end
+      context "with a splitter given" do
+        let(:splitter) do
+          Class.new do
+            def split text
+              text.split(/,/)
+            end
+          end.new
+        end
+        before(:each) do
+          tokenizer.splits_text_on splitter
+        end
+        it "splits text correctly" do
+          tokenizer.split('a,b/c.d').should == ['a', 'b/c.d']
+        end
+      end
     end
 
     describe "removes_characters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -220,10 +220,10 @@ files:
 - lib/picky/loggers/default.rb
 - lib/picky/loggers/silent.rb
 - lib/picky/loggers/verbose.rb
-- lib/picky/migrations/from_30_to_31.rb
 - lib/picky/performant.rb
 - lib/picky/platforms/macruby.rb
 - lib/picky/pool.rb
+- lib/picky/qualifier_mapper.rb
 - lib/picky/query/allocation.rb
 - lib/picky/query/allocations.rb
 - lib/picky/query/boosts.rb
@@ -231,7 +231,6 @@ files:
 - lib/picky/query/combinations.rb
 - lib/picky/query/indexes.rb
 - lib/picky/query/indexes_check.rb
-- lib/picky/query/qualifier_category_mapper.rb
 - lib/picky/query/token.rb
 - lib/picky/query/tokens.rb
 - lib/picky/rack/harakiri.rb
@@ -279,8 +278,10 @@ files:
 - spec/functional/exact_first_spec.rb
 - spec/functional/facets_spec.rb
 - spec/functional/max_allocations_spec.rb
+- spec/functional/multi_index_qualifier_spec.rb
 - spec/functional/non_specific_ids_larger_than_20_spec.rb
 - spec/functional/only_spec.rb
+- spec/functional/pool_spec.rb
 - spec/functional/realtime_spec.rb
 - spec/functional/regression_spec.rb
 - spec/functional/reloading_spec.rb
@@ -374,6 +375,7 @@ files:
 - spec/lib/loggers/verbose_spec.rb
 - spec/lib/picky_spec.rb
 - spec/lib/pool_spec.rb
+- spec/lib/qualifier_mapper_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/boosts_spec.rb
@@ -381,7 +383,6 @@ files:
 - spec/lib/query/combinations_spec.rb
 - spec/lib/query/indexes_check_spec.rb
 - spec/lib/query/indexes_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
@@ -440,8 +441,10 @@ test_files:
 - spec/functional/exact_first_spec.rb
 - spec/functional/facets_spec.rb
 - spec/functional/max_allocations_spec.rb
+- spec/functional/multi_index_qualifier_spec.rb
 - spec/functional/non_specific_ids_larger_than_20_spec.rb
 - spec/functional/only_spec.rb
+- spec/functional/pool_spec.rb
 - spec/functional/realtime_spec.rb
 - spec/functional/regression_spec.rb
 - spec/functional/reloading_spec.rb
@@ -535,6 +538,7 @@ test_files:
 - spec/lib/loggers/verbose_spec.rb
 - spec/lib/picky_spec.rb
 - spec/lib/pool_spec.rb
+- spec/lib/qualifier_mapper_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/boosts_spec.rb
@@ -542,7 +546,6 @@ test_files:
 - spec/lib/query/combinations_spec.rb
 - spec/lib/query/indexes_check_spec.rb
 - spec/lib/query/indexes_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

data/lib/picky/migrations/from_30_to_31.rb

@@ -1,61 +0,0 @@
-module Picky
-
-  class Indexes
-
-    class Memory
-
-      def initialize(*)
-        raise <<-MESSAGE
-
-The Picky::Indexes::Memory is not available anymore and has been replaced by Picky::Index.
-
-So instead of
-
-  index = Picky::Indexes::Memory.new :name do
-    # your config
-  end
-
-use
-
-  index = Picky::Index.new :name do
-    # your config
-  end
-
-Thanks and sorry for the inconvenience!
-
-MESSAGE
-      end
-
-    end
-
-    class Redis
-
-      def initialize(*)
-        raise <<-MESSAGE
-
-The Picky::Indexes::Redis is not available anymore and has been replaced by Picky::Index.
-(with the addition of a "backend" option)
-
-So instead of
-
-  index = Picky::Indexes::Redis.new :name do
-    # your config
-  end
-
-use
-
-  index = Picky::Index.new :name do
-    backend Picky::Backends::Redis.new
-    # your config
-  end
-
-Thanks and sorry for the inconvenience!
-
-MESSAGE
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/query/qualifier_category_mapper.rb

@@ -1,61 +0,0 @@
-module Picky
-
-  # coding: utf-8
-  #
-  module Query
-
-    # Collection class for qualifiers.
-    #
-    class QualifierCategoryMapper
-
-      attr_reader :mapping
-      
-      #
-      #
-      def initialize indexes
-        @mapping = {}
-        indexes.each do |index|
-          index.each_category do |category|
-            add category
-          end
-        end
-      end
-
-      #
-      #
-      def add category
-        category.qualifiers.each do |qualifier|
-          sym_qualifier = qualifier.intern
-          Picky.logger.warn %Q{Warning: Qualifier "#{qualifier}" already mapped to category #{mapping[sym_qualifier].identifier} (ambiguous qualifier mapping).} if mapping.has_key? sym_qualifier
-          mapping[sym_qualifier] = category
-        end
-      end
-
-      # Normalizes the given qualifier.
-      #
-      # Returns nil if it is not allowed, the normalized qualifier if it is.
-      #
-      def map qualifier
-        return nil if qualifier.empty?
-
-        @mapping[qualifier.intern]
-      end
-      
-      # Restricts the given categories.
-      #
-      def restrict user_qualified
-        if @restricted
-          user_qualified ? @restricted & user_qualified : @restricted 
-        else
-          user_qualified
-        end
-      end
-      def restrict_to *qualifiers
-        @restricted = qualifiers.map { |qualifier| map qualifier }.compact
-      end
-
-    end
-
-  end
-
-end