picky 4.14.0 → 4.15.0

data/{lib → ext/picky}/extconf.rb

@@ -1,6 +1,7 @@
 # Information.
 #
-print "Compiling on Ruby 1.9"
+puts
+print "Compiling on Ruby #{RUBY_VERSION}"
 if defined?(RbConfig)
   RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] 
   print " with CC set to #{RbConfig::MAKEFILE_CONFIG['CC']}"
@@ -10,7 +11,6 @@ puts "."
 # Compile.
 #
 require 'mkmf'
-
 abort 'need ruby.h' unless have_header("ruby.h")
-  
-create_makefile('performant')
+create_makefile 'picky/picky'
+puts

data/{lib/performant.c → ext/picky/picky.c}

@@ -79,7 +79,7 @@ static inline VALUE memory_efficient_intersect(VALUE self, VALUE unsorted_array_
 
 VALUE p_mPerformant, p_cArray;
 
-void Init_performant() {
+void Init_picky() {
   p_mPerformant = rb_define_module("Performant");
   p_cArray = rb_define_class_under(p_mPerformant, "Array", rb_cObject);
   rb_define_singleton_method(p_cArray, "memory_efficient_intersect", memory_efficient_intersect, 1);

data/lib/picky/backends/redis.rb

@@ -212,13 +212,17 @@ module Picky
         @intermediate_result_id ||= "#{host}:#{pid}:picky:result"
       end
       
+      def identifiers_for combinations
+        combinations.inject([]) do |identifiers, combination|
+          identifiers << "#{PICKY_ENVIRONMENT}:#{combination.identifier}"
+        end
+      end
+      
       # Uses Lua scripting on Redis 2.6.
       #
       module Scripting
         def ids combinations, amount, offset
-          identifiers = combinations.inject([]) do |identifiers, combination|
-            identifiers << "#{PICKY_ENVIRONMENT}:#{combination.identifier}"
-          end
+          identifiers = identifiers_for combinations
 
           # Assume it's using EVALSHA.
           #
@@ -256,9 +260,7 @@ module Picky
       #
       module NonScripting
         def ids combinations, amount, offset
-          identifiers = combinations.inject([]) do |identifiers, combination|
-            identifiers << "#{combination.identifier}"
-          end
+          identifiers = identifiers_for combinations
 
           result_id = generate_intermediate_result_id
 

data/lib/picky/extensions/module.rb

@@ -3,35 +3,33 @@
 class Module
   
   def forward *methods
-    to = extract_to_from_options methods,
-           "Forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. forward :something, :to => :an_array_reader)."
-    forwarding methods do |method|
-      "def #{method}(*args, &block)\n#{to}.__send__(#{method.inspect}, *args, &block)\nend\n"
-    end
+    forwarding methods,
+      'def %{method}(*args, &block); %{to}.__send__(:%{method}, *args, &block); end',
+      'Forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. forward :something, :to => :a_reader).'
   end
   
   def each_forward *methods
-    to = extract_to_from_options methods,
-           "Multi forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. each_forward :something, :to => :an_array_reader)."
-    forwarding methods do |method|
-      "def #{method}(*args, &block)\n#{to}.each{ |t| t.__send__(#{method.inspect}, *args, &block) }\nend\n"
-    end
+    forwarding methods,
+      'def %{method}(*args, &block); %{to}.each{ |t| t.__send__(:%{method}, *args, &block) }; end',
+      'Multi forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. each_forward :something, :to => :an_array_reader).'
   end
   
   private
   
-    def extract_to_from_options args, error_string
+    def forwarding methods, method_definition_template, error_message = nil
+      to = extract_to_from_options methods, error_message
+      methods.each do |method|
+        method_definition = method_definition_template % { to: to, method: method }
+        module_eval method_definition, "(__FORWARDING__)", 1
+      end
+    end
+    
+    def extract_to_from_options args, error_message
       options = args.pop
       unless options.is_a?(Hash) && to = options[:to]
-        raise ArgumentError, "Multi forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. each_forward :something, :to => :an_array_reader)."
+        raise ArgumentError, error_message
       end
       to
     end
-  
-    def forwarding methods, &method_definition
-      methods.each do |method|
-        module_eval method_definition[method], "(__FORWARDING__)", 1
-      end
-    end
 
 end

data/lib/picky/indexers/parallel.rb

@@ -61,23 +61,12 @@ module Picky
         
         # Optimized, therefore duplicate code.
         #
-        # TODO Deoptimize?
-        #
-        if tokenizer
-          objects.each do |object|
-            tokens, _ = tokenizer.tokenize object.send(category.from) # Note: Originals not needed.
-            tokens.each do |token_text|
-              next unless token_text
-              cache << object.id << comma << token_text << newline
-            end
-          end
-        else
-          objects.each do |object|
-            tokens = object.send(category.from) # Note: Originals not needed.
-            tokens.each do |token_text|
-              next unless token_text
-              cache << object.id << comma << token_text << newline
-            end
+        objects.each do |object|
+          tokens = object.send category.from
+          tokens, _ = tokenizer.tokenize tokens if tokenizer # Note: Originals not needed. TODO Optimize?
+          tokens.each do |token_text|
+            next unless token_text
+            cache << object.id << comma << token_text << newline
           end
         end
 

data/lib/picky/loader.rb

@@ -55,7 +55,7 @@ module Picky
       # when installing the gem.
       #
       def load_c_code
-        require_relative '../maybe_compile'
+        require_relative '../try_compile'
       end
       def load_extensions
         load_relative 'extensions/object',

data/lib/try_compile.rb

@@ -0,0 +1,24 @@
+begin
+  require ::File.expand_path '../picky/picky', __FILE__
+rescue LoadError => e
+  # Give up and inform the user.
+  #
+  puts <<-NOTE
+
+Picky tried to compile its source on your system but failed.
+
+If you are trying to develop for it, please run the specs first:
+bundle exec rake
+(You might need to set ulimit -n 3000 for the tests to run)
+
+Please add an issue: https://github.com/floere/picky/issues/
+and copy anything into it that you think is helpful. Thanks!
+
+See related issue: https://github.com/floere/picky/issues/81
+
+The problem reported by the compiler was:
+#{e}
+
+NOTE
+  exit 1
+end

data/spec/functional/no_tokenize_spec.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe 'Category#tokenize(false)' do
+  
+  it 'does tokenize' do
+    index = Picky::Index.new :thing do
+      category :text, tokenize: true
+    end
+
+    thing = Struct.new :id, :text
+    index.add thing.new(1, ['already', 'tokenized']) # Does not fail – because #to_s is called on the Array.
+    index.add thing.new(2, 'this should not fail')
+    
+    try = Picky::Search.new index
+    try.search('already').ids.should == [] # Not found because ["already", is indexed.
+    try.search('should').ids.should == [2]
+  end
+  it 'does tokenize (default)' do
+    index = Picky::Index.new :thing do
+      category :text
+    end
+
+    thing = Struct.new :id, :text
+    # expect do # Does not fail – because #to_s is called on the Array.
+    index.add thing.new(1, ['already', 'tokenized'])
+    # end.to raise_error
+    index.add thing.new(2, 'this should not fail')
+    
+    try = Picky::Search.new index
+    
+    try.search('already').ids.should == [] # Not found because ['already', is indexed.
+  end
+  it 'does not tokenize' do
+    index = Picky::Index.new :thing do
+      category :text, tokenize: false
+    end
+
+    thing = Struct.new :id, :text
+    index.add thing.new(1, ['already', 'tokenized'])
+    expect do
+      index.add thing.new(2, 'this should fail')
+    end.to raise_error('You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.')
+    
+    try = Picky::Search.new index
+    
+    try.search('already').ids.should == [1]
+  end
+  it 'does not tokenize and indexes correctly' do
+    index = Picky::Index.new :thing do
+      category :text, tokenize: false
+    end
+
+    thing = Struct.new :id, :text
+    index.add thing.new(1, ['already', 'tokenized'])
+    expect do
+      index.add thing.new(2, 'this should fail')
+    end.to raise_error('You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.')
+    
+    try = Picky::Search.new index
+    
+    try.search('already').ids.should == [1]
+  end
+  
+end

data/spec/functional/pool_spec.rb

@@ -28,7 +28,7 @@ describe 'GC stats: searching' do
   end
   let(:search) { Picky::Search.new data }
 
-  # TODO Study what the problem is.
+  # TODO Why are both versions almost equally fast?
   #
   context 'without pool' do
     it 'runs the GC more' do
@@ -40,14 +40,14 @@ describe 'GC stats: searching' do
       query = 'abracadabra mirgel'
       gc_runs_of do
         amount.times { try.search query }
-      end.should <= 13
+      end.should >= 10
     end
     it 'is less (?) performant' do
       try = search
       query = 'abracadabra mirgel'
       performance_of do
         amount.times { try.search query }
-      end.should <= 0.42
+      end.should >= 0.15
     end
   end
   context 'with pool' do
@@ -67,7 +67,10 @@ describe 'GC stats: searching' do
       try = search
       query = 'abracadabra mirgel'
       gc_runs_of do
-        amount.times { try.search query; Picky::Pool.release_all }
+        amount.times do
+          try.search query
+          Picky::Pool.release_all
+        end
       end.should <= 1 # Definitely less GC runs.
     end
     it 'is more (?) performant' do
@@ -75,7 +78,7 @@ describe 'GC stats: searching' do
       query = 'abracadabra mirgel'
       performance_of do
         amount.times { try.search query }
-      end.should <= 0.42
+      end.should <= 0.2
     end
   end
   

data/spec/lib/extensions/module_spec.rb

@@ -67,7 +67,14 @@ describe Module do
           Class.new do
             forward :bli, :bla, :blu # :to missing
           end
-        end.should raise_error(ArgumentError)
+        end.should raise_error(ArgumentError, "Forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. forward :something, :to => :a_reader).")
+      end
+      it 'should raise an error' do
+        lambda do
+          Class.new do
+            each_forward :bli, :bla, :blu # :to missing
+          end
+        end.should raise_error(ArgumentError, "Multi forwarding needs a target. Supply an options hash with a :to key as the last argument (e.g. each_forward :something, :to => :an_array_reader).")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147105922620 !ruby/object:Gem::Requirement
+  requirement: &70116179207700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147105922620
+  version_requirements: *70116179207700
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70116179229800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70116179229800
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70147105922020 !ruby/object:Gem::Requirement
+  requirement: &70116179229120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.14.0
+        version: 4.15.0
   type: :development
   prerelease: false
-  version_requirements: *70147105922020
+  version_requirements: *70116179229120
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70147105921540 !ruby/object:Gem::Requirement
+  requirement: &70116179228440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147105921540
+  version_requirements: *70116179228440
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70147105921060 !ruby/object:Gem::Requirement
+  requirement: &70116179227980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147105921060
+  version_requirements: *70116179227980
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70147105920460 !ruby/object:Gem::Requirement
+  requirement: &70116179227480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147105920460
+  version_requirements: *70116179227480
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70147105919900 !ruby/object:Gem::Requirement
+  requirement: &70116179227040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,18 +87,16 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147105919900
+  version_requirements: *70116179227040
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
 - picky
 extensions:
-- lib/extconf.rb
+- ext/picky/extconf.rb
 extra_rdoc_files: []
 files:
 - aux/picky/cli.rb
-- lib/extconf.rb
-- lib/maybe_compile.rb
 - lib/picky/analytics.rb
 - lib/picky/analyzer.rb
 - lib/picky/api/search/boost.rb
@@ -224,6 +233,7 @@ files:
 - lib/picky/wrappers/bundle/wrapper.rb
 - lib/picky.rb
 - lib/tasks/try.rb
+- lib/try_compile.rb
 - lib/tasks/application.rake
 - lib/tasks/framework.rake
 - lib/tasks/index.rake
@@ -231,7 +241,7 @@ files:
 - lib/tasks/statistics.rake
 - lib/tasks/todo.rake
 - lib/tasks/try.rake
-- lib/performant.c
+- ext/picky/picky.c
 - spec/aux/picky/cli_spec.rb
 - spec/functional/allocations_uniq_by_definition_spec.rb
 - spec/functional/automatic_segmentation_spec.rb
@@ -239,7 +249,6 @@ files:
 - spec/functional/backends/memory_bundle_realtime_spec.rb
 - spec/functional/backends/memory_json_utf8_spec.rb
 - spec/functional/backends/memory_spec.rb
-- spec/functional/backends/no_tokenize_spec.rb
 - spec/functional/backends/redis_bundle_realtime_spec.rb
 - spec/functional/backends/redis_spec.rb
 - spec/functional/backends/special_spec.rb
@@ -254,6 +263,7 @@ files:
 - spec/functional/ignore_spec.rb
 - spec/functional/max_allocations_spec.rb
 - spec/functional/multi_index_qualifier_spec.rb
+- spec/functional/no_tokenize_spec.rb
 - spec/functional/non_specific_ids_larger_than_20_spec.rb
 - spec/functional/only_spec.rb
 - spec/functional/pool_spec.rb
@@ -376,6 +386,7 @@ files:
 - spec/lib/tokenizer_spec.rb
 - spec/performant_spec.rb
 - bin/picky
+- ext/picky/extconf.rb
 homepage: http://florianhanke.com/picky
 licenses: []
 post_install_message: 
@@ -408,7 +419,6 @@ test_files:
 - spec/functional/backends/memory_bundle_realtime_spec.rb
 - spec/functional/backends/memory_json_utf8_spec.rb
 - spec/functional/backends/memory_spec.rb
-- spec/functional/backends/no_tokenize_spec.rb
 - spec/functional/backends/redis_bundle_realtime_spec.rb
 - spec/functional/backends/redis_spec.rb
 - spec/functional/backends/special_spec.rb
@@ -423,6 +433,7 @@ test_files:
 - spec/functional/ignore_spec.rb
 - spec/functional/max_allocations_spec.rb
 - spec/functional/multi_index_qualifier_spec.rb
+- spec/functional/no_tokenize_spec.rb
 - spec/functional/non_specific_ids_larger_than_20_spec.rb
 - spec/functional/only_spec.rb
 - spec/functional/pool_spec.rb

data/lib/maybe_compile.rb

@@ -1,40 +0,0 @@
-# Note: This is handled toplevel (in the file
-# structure) to not confuse compilers.
-#
-failed = 0
-
-begin
-  require ::File.expand_path '../performant', __FILE__
-rescue LoadError => e
-  failed += 1
-  
-  # Have Makefile built.
-  #
-  require ::File.expand_path '../extconf', __FILE__
-  
-  # Run make in the right gem directory.
-  #
-  Dir.chdir(::File.expand_path '..', __FILE__) do
-    puts %x(make)
-  end
-  
-  # Try again.
-  #
-  retry if failed < 2
-  
-  # Give up and inform the user.
-  #
-  puts <<-NOTE
-
-Picky tried to compile its source on your system but failed.
-Please add an issue: https://github.com/floere/picky/issues/
-and copy anything into it that you think is helpful. Thanks!
-
-See related issue: https://github.com/floere/picky/issues/81
-
-The problem reported by the compiler was:
-#{e}
-
-NOTE
-  exit 1
-end

data/spec/functional/backends/no_tokenize_spec.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-#
-require 'spec_helper'
-
-describe 'Category#tokenize(false)' do
-  
-  it 'does tokenize' do
-    index = Picky::Index.new :thing do
-      category :text, tokenize: true
-    end
-
-    thing = Struct.new :id, :text
-    # expect do # Does not fail – because #to_s is called on the Array.
-    index.add thing.new(1, ['already', 'tokenized'])
-    # end.to raise_error
-    index.add thing.new(2, 'this should fail')
-    
-    try = Picky::Search.new index
-    
-    try.search('already').ids.should == [] # Not found because ['already', is indexed.
-  end
-  it 'does not tokenize' do
-    index = Picky::Index.new :thing do
-      category :text, tokenize: false
-    end
-
-    thing = Struct.new :id, :text
-    index.add thing.new(1, ['already', 'tokenized'])
-    expect do
-      index.add thing.new(2, 'this should fail')
-    end.to raise_error('You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.')
-    
-    try = Picky::Search.new index
-    
-    try.search('already').ids.should == [1]
-  end
-  
-end