picky 2.4.3 → 2.5.0

data/lib/picky/internals/indexed/categories.rb

@@ -46,12 +46,7 @@ module Internals
       #
       def << category
         categories << category
-        # Note: [category] is an optimization, since I need an array
-        #       of categories.
-        #       It's faster to just package it in an array on loading
-        #       Picky than doing it over and over with each query.
-        #
-        category_hash[category.name] = [category]
+        category_hash[category.name] = category
       end
 
       # Return all possible combinations for the given token.
@@ -129,10 +124,13 @@ module Internals
       # an existing category.
       #
       # Note: Returns nil if the user did not define one
-      #       or if he/she has defined a non-existing one.
+      #       or [] if he/she has defined a non-existing one.
       #
       def user_defined_categories token
-        category_hash[token.user_defined_category_name]
+        names = token.user_defined_category_names
+        names && names.map do |name|
+          category_hash[name]
+        end.compact
       end
 
     end

data/lib/picky/internals/query/token.rb

@@ -42,10 +42,10 @@ module Internals
         self
       end
 
-      # This returns a predefined category name if the user has given one.
+      # This returns an array of predefined category names if the user has given any.
       #
-      def user_defined_category_name
-        @qualifier
+      def user_defined_category_names
+        @qualifiers
       end
 
       # Extracts a qualifier for this token and pre-assigns an allocation.
@@ -53,8 +53,9 @@ module Internals
       # Note: Removes the qualifier if it is not allowed.
       #
       def qualify
-        @qualifier, @text = split @text
-        @qualifier = Query::Qualifiers.instance.normalize @qualifier
+        @qualifiers, @text = split @text
+        @qualifiers && @qualifiers.collect! { |qualifier| Query::Qualifiers.instance.normalize qualifier }.compact!
+        @qualifiers
       end
       def extract_original
         @original = @text.dup
@@ -151,27 +152,6 @@ module Internals
         bundle.similar(@text).dup || []
       end
 
-      # Generates a solr term from this token.
-      #
-      # E.g. "name:heroes~0.75"
-      #
-      @@solr_fuzzy_mapping = {
-        1 => :'',
-        2 => :'',
-        3 => :'',
-        4 => :'~0.74',
-        5 => :'~0.78',
-        6 => :'~0.81',
-        7 => :'~0.83',
-        8 => :'~0.85',
-        9 => :'~0.87',
-       10 => :'~0.89'
-      }
-      @@solr_fuzzy_mapping.default = :'~0.9'
-      def to_solr
-        blank? ? '' : (to_s + @@solr_fuzzy_mapping[@text.size].to_s)
-      end
-
       #
       #
       def to_result
@@ -194,8 +174,10 @@ module Internals
       #
       # e.g. name:meier
       #
+      @@split_qualifier_text = ':'
+      @@split_qualifiers     = ','
       def to_s
-        [@qualifier, @text].compact.join ':'
+        [@qualifiers && @qualifiers.join(@@split_qualifiers), @text].compact.join @@split_qualifier_text
       end
 
       private
@@ -205,11 +187,11 @@ module Internals
         # Returns [qualifier, text].
         #
         def split unqualified_text
-          qualifier, text = (unqualified_text || '').split(':', 2)
+          qualifiers, text = (unqualified_text || '').split(@@split_qualifier_text, 2)
           if text.blank?
-            [nil, (qualifier || '')]
+            [nil, (qualifiers || '')]
           else
-            [qualifier, text]
+            [qualifiers.split(@@split_qualifiers), text]
           end
         end
 

data/spec/lib/internals/indexed/categories_spec.rb

@@ -107,7 +107,7 @@ describe Internals::Indexed::Categories do
       context 'without preselected categories' do
         context 'user defined exists' do
           before(:each) do
-            @token = stub :token, :user_defined_category_name => :category2
+            @token = stub :token, :user_defined_category_names => [:category2]
           end
           context 'combination exists' do
             before(:each) do
@@ -139,7 +139,7 @@ describe Internals::Indexed::Categories do
     describe 'possible_categories' do
       context 'user defined exists' do
         before(:each) do
-          @token = stub :token, :user_defined_category_name => :category2
+          @token = stub :token, :user_defined_category_names => [:category2]
         end
         it 'should return the right categories' do
           @categories.possible_categories(@token).should == [@category2]
@@ -147,7 +147,7 @@ describe Internals::Indexed::Categories do
       end
       context 'user defined does not exist' do
         before(:each) do
-          @token = stub :token, :user_defined_category_name => nil
+          @token = stub :token, :user_defined_category_names => nil
         end
         it 'should return all categories' do
           @categories.possible_categories(@token).should == [@category1, @category2, @category3]
@@ -158,7 +158,7 @@ describe Internals::Indexed::Categories do
     describe 'user_defined_categories' do
       context 'category exists' do
         before(:each) do
-          @token = stub :token, :user_defined_category_name => :category2
+          @token = stub :token, :user_defined_category_names => [:category2]
         end
         it 'should return the right categories' do
           @categories.user_defined_categories(@token).should == [@category2]
@@ -166,10 +166,10 @@ describe Internals::Indexed::Categories do
       end
       context 'category does not exist' do
         before(:each) do
-          @token = stub :token, :user_defined_category_name => :gnoergel
+          @token = stub :token, :user_defined_category_names => [:gnoergel]
         end
         it 'should return nil' do
-          @categories.user_defined_categories(@token).should == nil
+          @categories.user_defined_categories(@token).should == []
         end
       end
     end

data/spec/lib/query/token_spec.rb

@@ -122,33 +122,33 @@ describe Internals::Query::Token do
     end
   end
   
-  describe 'to_solr' do
-    def self.it_should_solr text, expected_result
-      it "should solrify into #{expected_result} from #{text}" do
-        described_class.processed(text).to_solr.should == expected_result
-      end
-    end
-    it_should_solr 's',            's'
-    it_should_solr 'se',           'se'
-    it_should_solr 'sea',          'sea'
-    it_should_solr 'sear',         'sear~0.74'
-    it_should_solr 'searc',        'searc~0.78'
-    it_should_solr 'search',       'search~0.81'
-    it_should_solr 'searche',      'searche~0.83'
-    it_should_solr 'searchen',     'searchen~0.85'
-    it_should_solr 'searcheng',    'searcheng~0.87'
-    it_should_solr 'searchengi',   'searchengi~0.89'
-    it_should_solr 'searchengin',  'searchengin~0.9'
-    it_should_solr 'searchengine', 'searchengine~0.9'
-
-    it_should_solr 'spec:tex',     'specific:tex'
-    it_should_solr 'with:text',    'text~0.74'
-    it_should_solr 'name:',        'name~0.74'
-    it_should_solr '',             ''
-    it_should_solr 'sp:tex',       'specific:tex'
-    it_should_solr 'sp:tex~',      'specific:tex'
-    it_should_solr 'sp:tex"',      'specific:tex'
-  end
+  # describe 'to_solr' do
+  #   def self.it_should_solr text, expected_result
+  #     it "should solrify into #{expected_result} from #{text}" do
+  #       described_class.processed(text).to_solr.should == expected_result
+  #     end
+  #   end
+  #   it_should_solr 's',            's'
+  #   it_should_solr 'se',           'se'
+  #   it_should_solr 'sea',          'sea'
+  #   it_should_solr 'sear',         'sear~0.74'
+  #   it_should_solr 'searc',        'searc~0.78'
+  #   it_should_solr 'search',       'search~0.81'
+  #   it_should_solr 'searche',      'searche~0.83'
+  #   it_should_solr 'searchen',     'searchen~0.85'
+  #   it_should_solr 'searcheng',    'searcheng~0.87'
+  #   it_should_solr 'searchengi',   'searchengi~0.89'
+  #   it_should_solr 'searchengin',  'searchengin~0.9'
+  #   it_should_solr 'searchengine', 'searchengine~0.9'
+  # 
+  #   it_should_solr 'spec:tex',     'specific:tex'
+  #   it_should_solr 'with:text',    'text~0.74'
+  #   it_should_solr 'name:',        'name~0.74'
+  #   it_should_solr '',             ''
+  #   it_should_solr 'sp:tex',       'specific:tex'
+  #   it_should_solr 'sp:tex~',      'specific:tex'
+  #   it_should_solr 'sp:tex"',      'specific:tex'
+  # end
 
   describe 'qualify' do
     def self.it_should_qualify text, expected_result
@@ -156,13 +156,13 @@ describe Internals::Query::Token do
         described_class.new(text).qualify.should == expected_result
       end
     end
-    it_should_qualify 'spec:qualifier',    :specific
-    it_should_qualify 'with:qualifier',    nil
+    it_should_qualify 'spec:qualifier',    [:specific]
+    it_should_qualify 'with:qualifier',    []
     it_should_qualify 'without qualifier', nil
     it_should_qualify 'name:',             nil
-    it_should_qualify ':broken qualifier', nil
+    it_should_qualify ':broken qualifier', [] # Unsure about that. Probably should recognize it as text.
     it_should_qualify '',                  nil
-    it_should_qualify 'sp:text',           :specific
+    it_should_qualify 'sp:text',           [:specific]
   end
 
   describe 'processed' do
@@ -270,11 +270,13 @@ describe Internals::Query::Token do
     end
     it_should_split '""',         [nil, '""']
     it_should_split 'name:',      [nil, 'name']
-    it_should_split 'name:hanke', ['name', 'hanke']
-    it_should_split 'g:gaga',     ['g', 'gaga']
-    it_should_split ':nothing',   ['', 'nothing']
+    it_should_split 'name:hanke', [['name'], 'hanke']
+    it_should_split 'g:gaga',     [['g'], 'gaga']
+    it_should_split ':nothing',   [[], 'nothing']
     it_should_split 'hello',      [nil, 'hello']
-    it_should_split 'a:b:c',      ['a', 'b:c']
+    it_should_split 'a:b:c',      [['a'], 'b:c']
+    it_should_split 'a,b:c',      [['a','b'], 'c']
+    it_should_split 'a,b,c:d',      [['a','b','c'], 'd']
   end
 
   describe "original" do
@@ -321,7 +323,23 @@ describe Internals::Query::Token do
         @token = described_class.processed('sp:qualifier')
       end
       it 'should return the qualifier' do
-        @token.user_defined_category_name.should == :specific
+        @token.user_defined_category_names.should == [:specific]
+      end
+    end
+    context 'with incorrect qualifier' do
+      before(:each) do
+        @token = described_class.processed('specific:qualifier')
+      end
+      it 'should return the qualifier' do
+        @token.user_defined_category_names.should == []
+      end
+    end
+    context 'with multiple qualifiers' do
+      before(:each) do
+        @token = described_class.processed('sp,spec:qualifier')
+      end
+      it 'should return the qualifier' do
+        @token.user_defined_category_names.should == [:specific, :specific]
       end
     end
     context 'without qualifier' do
@@ -329,7 +347,7 @@ describe Internals::Query::Token do
         @token = described_class.processed('noqualifier')
       end
       it 'should return nil' do
-        @token.user_defined_category_name.should == nil
+        @token.user_defined_category_names.should == nil
       end
     end
   end
@@ -340,14 +358,14 @@ describe Internals::Query::Token do
         described_class.new('any').send(:split, text).should == expected_result
       end
     end
-    it_should_split ':',                 [nil,        '']
-    it_should_split 'vorname:qualifier', ['vorname', 'qualifier']
-    it_should_split 'with:qualifier',    ['with',    'qualifier']
-    it_should_split 'without qualifier', [nil,       'without qualifier']
-    it_should_split 'name:',             [nil,       'name']
-    it_should_split ':broken qualifier', ['',        'broken qualifier']
-    it_should_split '',                  [nil,       '']
-    it_should_split 'fn:text',           ['fn',      'text']
+    it_should_split ':',                 [nil,         '']
+    it_should_split 'vorname:qualifier', [['vorname'], 'qualifier']
+    it_should_split 'with:qualifier',    [['with'],    'qualifier']
+    it_should_split 'without qualifier', [nil,         'without qualifier']
+    it_should_split 'name:',             [nil,         'name']
+    it_should_split ':broken qualifier', [[],          'broken qualifier']
+    it_should_split '',                  [nil,         '']
+    it_should_split 'fn:text',           [['fn'],      'text']
   end
 
   describe 'partial=' do

data/spec/lib/query/tokens_spec.rb

@@ -35,23 +35,6 @@ describe Internals::Query::Tokens do
       described_class.processed ['this~', 'is', 'a', 'sp:solr', 'query"']
     end
   end
-  
-  describe 'to_solr_query' do
-    context 'many tokens' do
-      before(:each) do
-        @tokens = described_class.new [
-          Internals::Query::Token.processed('this~'),
-          Internals::Query::Token.processed('is'),
-          Internals::Query::Token.processed('a'),
-          Internals::Query::Token.processed('sp:solr'),
-          Internals::Query::Token.processed('query"')
-        ]
-      end
-      it 'should output a correct solr query' do
-        @tokens.to_solr_query.should == 'this~0.74 is a specific:solr~0.74 query~0.78'
-      end
-    end
-  end
 
   describe 'reject' do
     before(:each) do

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +10:00
+date: 2011-07-02 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.4.3
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 description: Fast Ruby semantic text search engine with comfortable single field interface.