picky 4.24.0 → 4.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ccf80ba3d51955047795eb9a44e0bb90eafa14
-  data.tar.gz: 90a2c17f69019a6dbbdbc214ca238c8183443dab
+  metadata.gz: d83031c692b720f4c0e208135d1a9132865f6db8
+  data.tar.gz: da41d6d9de9c1762e83aee7c8bb3e62447e24934
 SHA512:
-  metadata.gz: 41d01ef1dbe5506274a96747a0dba0617fde5b50735cd59041901d661fea1ba328cfecf76376b06888eb73dcd2f1db5b8c1acb731317487857ae802c1b52f036
-  data.tar.gz: 05c23d26a4a86e04a84bcf9ba73b5e67a9a391d9541408a63c366e15cce6499cc272a94e0f364adaadf3605e948e8a26cfc5031fdde8478db6edb1ed8fc96542
+  metadata.gz: f119107151b6848085eb65eb0cf1c52c4d30bcff59f05bf37c09599007f16d8394bec8fbdeecf0b80ae1465c75496789169055d84ff507f4be632fa21b085b32
+  data.tar.gz: 9ab9540294fb221af016c379eff38486b96f9b0752428ed88e0dad44d60748de52f8d13c0172f99e2ebe503f82c6e81a053c130071efbeae6af315858ab6adf7

data/lib/picky/category.rb

@@ -42,21 +42,21 @@ module Picky
     end
     
     def configure_from options
-      @from      = options.delete :from
+      @from       = options.delete :from
       
       # Instantly extracted to raise an error instantly.
       #
-      @source    = Source.from options[:source], true, @index.name
-      @tokenize  = options[:tokenize] != false
-      @tokenizer = Tokenizer.from options[:indexing], @index.name, name
-      @ranger    = options[:ranging] || Range
+      @source     = Source.from options[:source], true, @index.name
+      @tokenize   = options[:tokenize] != false
+      @tokenizer  = Tokenizer.from options[:indexing], @index.name, name
+      @ranger     = options[:ranging] || Range
 
-      @key_format = options.delete :key_format
-      @backend    = options.delete :backend
+      @key_format  = options.delete :key_format
+      @backend     = options.delete :backend
 
-      @qualifiers = extract_qualifiers_from options
+      @qualifiers  = extract_qualifiers_from options
 
-      # @symbols    = options[:use_symbols] || index.use_symbols? # SYMBOLS.
+      @symbol_keys = options[:symbol_keys] || @index.symbol_keys # SYMBOLS.
     end
 
     # TODO I do a lot of helper method calls here. Refactor?

data/lib/picky/category_realtime.rb

@@ -64,7 +64,7 @@ module Picky
     # strings to the index for the given id.
     #
     def add_text id, text_or_tokens, where = :unshift
-      # text = text.to_sym if @symbols # SYMBOLS.
+      # text_or_tokens = text_or_tokens.to_sym if @symbol_keys # SYMBOLS.
       tokens = nil
       if tokenizer
         tokens, _ = tokenizer.tokenize text_or_tokens
@@ -92,7 +92,7 @@ module Picky
       return unless text
 
       id = id.send key_format if format
-      # text = text.to_sym if @symbols # SYMBOLS.
+      text = text.to_sym if @symbol_keys # SYMBOLS.
       id.freeze
 
       exact.add id, text, where, static

data/lib/picky/index.rb

@@ -150,6 +150,16 @@ module Picky
       end
     end
 
+    # API method.
+    #
+    def symbol_keys value = nil
+      if value
+        @symbol_keys = value
+      else
+        @symbol_keys
+      end 
+    end
+
     # The directory used by this index.
     #
     # Note: Used @directory ||=, but needs to be dynamic.

data/lib/picky/search.rb

@@ -138,6 +138,10 @@ module Picky
     def boost boosts
       @boosts = extract_boosts boosts
     end
+    
+    def symbol_keys
+      @symbol_keys = true
+    end
 
     # Ignore given categories and/or combinations of
     # categories.
@@ -258,7 +262,7 @@ module Picky
     def tokenized text, partialize_last = true
       tokens, originals = tokenizer.tokenize text
       tokens = Query::Tokens.processed tokens, originals || tokens, @ignore_unassigned
-      # tokens.symbolize # SYMBOLS.
+      tokens.symbolize if @symbol_keys # SYMBOLS.
       tokens.partialize_last if partialize_last
       tokens
     end

data/spec/functional/max_allocations_spec.rb

@@ -58,7 +58,7 @@ describe 'Search#max_allocations' do
 
     performance_of do
       try_again.search 'hello world'
-    end.should < (threshold*2/3)
+    end.should < (threshold*3/4)
   end
 
 end

data/spec/functional/symbol_keys_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+require 'ostruct'
+
+describe "Option symbol_keys" do
+
+  let(:index) do
+    Picky::Index.new(:results1) { symbol_keys true }
+  end
+  let(:try) do
+    Picky::Search.new(index) { symbol_keys }
+  end
+
+  # Test the enumerator abilities.
+  #
+  it 'can enumerate through the allocations' do
+    index.category :text
+
+    thing = OpenStruct.new id: 1, text: "ohai"
+    other = OpenStruct.new id: 2, text: "ohai kthxbye"
+
+    index.add thing
+    index.add other
+
+    try.search("text:ohai").ids.should == [2, 1]
+  end
+
+end

data/spec/functional/terminate_early_spec.rb

@@ -171,7 +171,7 @@ describe 'Search#terminate_early' do
       try_fast.search('hello hello').ids
     end
     slow.should < 0.00015
-    fast.should < 0.00009
+    fast.should < 0.0001
     (slow/fast).should >= 1.5
 
     try_slow = Picky::Search.new index

data/spec/lib/category_spec.rb

@@ -20,7 +20,7 @@ describe Picky::Category do
 
       category.partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
 
-      category.instance_variable_get(:@symbols).should == nil
+      category.instance_variable_get(:@symbol_keys).should == nil
     end
     
     context '#==' do

data/spec/lib/picky_spec.rb

@@ -19,7 +19,6 @@ describe Picky do
     simple_load = <<-COMMAND
       #{ruby} -I #{load_path} -r picky -e "puts 'OK'"
     COMMAND
-    p IO.popen(simple_load, err: [:child, :out]).readline
     IO.popen(simple_load, err: [:child, :out]).readline.strip.should == 'OK'
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 4.25.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,7 @@ files:
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb
 - spec/functional/stemming_spec.rb
+- spec/functional/symbol_keys_spec.rb
 - spec/functional/terminate_early_spec.rb
 - spec/functional/to_s_spec.rb
 - spec/functional/tokenizer_spec.rb
@@ -401,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/picky
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: 'Picky: Semantic Search Engine. Clever Interface. Good Tools.'
@@ -448,6 +449,7 @@ test_files:
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb
 - spec/functional/stemming_spec.rb
+- spec/functional/symbol_keys_spec.rb
 - spec/functional/terminate_early_spec.rb
 - spec/functional/to_s_spec.rb
 - spec/functional/tokenizer_spec.rb
@@ -561,4 +563,3 @@ test_files:
 - spec/lib/tokenizer_spec.rb
 - spec/performant_spec.rb
 - spec/tools/picky/cli_spec.rb
-has_rdoc: