picky 4.5.4 → 4.5.5

data/lib/extconf.rb

@@ -0,0 +1,18 @@
+Dir.chdir File.expand_path('..', __FILE__) do
+  # Information.
+  #
+  print "Compiling on Ruby 1.9"
+  if defined?(RbConfig)
+    RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] 
+    print " with CC set to #{RbConfig::MAKEFILE_CONFIG['CC']}"
+  end
+  puts " into #{Dir.pwd}."
+
+  # Compile.
+  #
+  require 'mkmf'
+
+  abort 'need ruby.h' unless have_header("ruby.h")
+  
+  create_makefile('performant')
+end

data/lib/maybe_compile.rb

@@ -0,0 +1,39 @@
+# Note: This is handled toplevel 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.
+  #
+  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/lib/picky/loader.rb

@@ -53,7 +53,7 @@ module Picky
       def load_framework_internals
         # Load compiled C code.
         #
-        load_relative 'ext/maybe_compile'
+        load_relative '../maybe_compile'
 
         # Load extensions.
         #
@@ -70,6 +70,10 @@ module Picky
         load_relative 'helpers/measuring'
         load_relative 'helpers/indexing'
 
+        # Extension Modules
+        #
+        load_relative 'pool'
+
         # Calculations.
         #
         load_relative 'calculations/location'

data/lib/picky/pool.rb

@@ -0,0 +1,98 @@
+module Picky
+
+  # Module that handles object pool behaviour
+  # for you.
+  #
+  module Pool
+    
+    class << self
+      require 'set'
+      @@pools = Set.new
+      
+      # Add a Pool to the managed pools.
+      #
+      def add klass
+        @@pools << klass
+      end
+      
+      # Releases all obtained objects.
+      #
+      def release_all
+        @@pools.each { |pool| pool.release_all }
+      end
+      
+    end
+    
+    def self.extended klass
+      add klass
+      
+      class << klass
+        #
+        #
+        def clear
+          @__free__ = []
+          @__used__ = []
+        end
+           
+        # Obtain creates a new reference if there is no free one
+        # and uses an existing one if there is.
+        #
+        # (Any caches should be cleared using clear TODO in all initializers)
+        #
+        def obtain *args, &block
+          unless reference = @__free__.shift
+            reference = allocate
+          end
+          reference.send :initialize, *args, &block
+          @__used__ << reference
+          reference
+        end
+      
+        # Releasing an instance adds it to the free pool.
+        # (And removes it from the used pool)
+        #
+        def release instance
+           @__free__ << instance
+           @__used__.delete instance # TODO Optimize
+        end
+      
+        # After you have called release all, you can't
+        # use any reference that has formerly been obtained
+        # anymore.
+        #
+        def release_all
+          @__used__.each { |used| @__free__ << used } # TODO Optimize
+          @__used__.clear
+        end
+      
+        # How many obtainable objects are there?
+        #
+        def free_size
+          @__free__.size
+        end
+      
+        # How many used objects are there?
+        #
+        def used_size
+          @__used__.size
+        end
+      end
+      
+      # Initialize the pool.
+      #
+      klass.clear
+    
+      # Pooled objects can be released using
+      #   object.release
+      #
+      # Note: Do not use the object in any form after the release.
+      #
+      klass.send :define_method, :release do
+        klass.release self
+      end
+      
+    end
+    
+  end
+  
+end

data/spec/lib/pool_spec.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe Picky::Pool do
+  
+  class PoolTest
+    extend Picky::Pool
+    
+    attr_reader :number
+    
+    def initialize number
+      @number = number
+    end
+  end
+  class OtherPoolTest
+    extend Picky::Pool
+    
+    attr_reader :number
+    
+    def initialize number
+      @number = number
+    end
+  end
+  
+  context 'functional' do
+    before(:each) do
+      PoolTest.clear
+      OtherPoolTest.clear
+    end
+    it 'lets me get an instance' do
+      PoolTest.obtain(1).should be_kind_of(PoolTest)
+    end
+    it 'does not create a new reference if it has free ones' do
+      pt1 = PoolTest.obtain 1
+      pt2 = PoolTest.obtain 2
+      pt1.release
+      
+      PoolTest.free_size.should == 1
+    end
+    it 'gives me the released reference if I try to obtain' do
+      pt1 = PoolTest.obtain 1
+      pt2 = PoolTest.obtain 2
+      pt1.release
+      
+      PoolTest.obtain(3).number.should == 3
+    end
+    it 'releases all PoolTests if called on PoolTest' do
+      pt1 = PoolTest.obtain 1
+      PoolTest.obtain 2
+      OtherPoolTest.obtain 1
+      OtherPoolTest.obtain 2
+      
+      OtherPoolTest.free_size.should == 0 
+      
+      PoolTest.release_all
+      
+      PoolTest.obtain(3).should == pt1
+      OtherPoolTest.free_size.should == 0
+    end
+    it 'releases all if called on Pool' do
+      PoolTest.obtain 1
+      PoolTest.obtain 2
+      OtherPoolTest.obtain 1
+      OtherPoolTest.obtain 2
+      
+      PoolTest.free_size.should == 0
+      
+      described_class.release_all
+      
+      PoolTest.free_size.should == 2
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.5.4
+  version: 4.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70333809340140 !ruby/object:Gem::Requirement
+  requirement: &70256039582000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333809340140
+  version_requirements: *70256039582000
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70333809339480 !ruby/object:Gem::Requirement
+  requirement: &70256039580160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.4
+        version: 4.5.5
   type: :development
   prerelease: false
-  version_requirements: *70333809339480
+  version_requirements: *70256039580160
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70333809338840 !ruby/object:Gem::Requirement
+  requirement: &70256039578680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333809338840
+  version_requirements: *70256039578680
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70333809338380 !ruby/object:Gem::Requirement
+  requirement: &70256039576620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333809338380
+  version_requirements: *70256039576620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70333809337880 !ruby/object:Gem::Requirement
+  requirement: &70256039590760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333809337880
+  version_requirements: *70256039590760
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70333809353740 !ruby/object:Gem::Requirement
+  requirement: &70256039589300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70333809353740
+  version_requirements: *70256039589300
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70333809353360 !ruby/object:Gem::Requirement
+  requirement: &70256039588020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,16 +87,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333809353360
+  version_requirements: *70256039588020
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
 - picky
 extensions:
-- lib/picky/ext/ruby19/extconf.rb
+- lib/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/category/partial.rb
@@ -150,8 +152,6 @@ files:
 - lib/picky/console.rb
 - lib/picky/constants.rb
 - lib/picky/deployment.rb
-- lib/picky/ext/maybe_compile.rb
-- lib/picky/ext/ruby19/extconf.rb
 - lib/picky/extensions/array.rb
 - lib/picky/extensions/class.rb
 - lib/picky/extensions/hash.rb
@@ -204,6 +204,7 @@ files:
 - lib/picky/migrations/from_30_to_31.rb
 - lib/picky/performant.rb
 - lib/picky/platforms/macruby.rb
+- lib/picky/pool.rb
 - lib/picky/query/allocation.rb
 - lib/picky/query/allocations.rb
 - lib/picky/query/boosts.rb
@@ -238,7 +239,7 @@ files:
 - lib/tasks/statistics.rake
 - lib/tasks/todo.rake
 - lib/tasks/try.rake
-- lib/picky/ext/ruby19/performant.c
+- lib/performant.c
 - spec/aux/picky/cli_spec.rb
 - spec/category_realtime_spec.rb
 - spec/ext/performant_spec.rb
@@ -347,6 +348,7 @@ files:
 - spec/lib/loggers/silent_spec.rb
 - spec/lib/loggers/verbose_spec.rb
 - spec/lib/picky_spec.rb
+- spec/lib/pool_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/boosts_spec.rb
@@ -502,6 +504,7 @@ test_files:
 - spec/lib/loggers/silent_spec.rb
 - spec/lib/loggers/verbose_spec.rb
 - spec/lib/picky_spec.rb
+- spec/lib/pool_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/boosts_spec.rb

data/lib/picky/ext/maybe_compile.rb

@@ -1,9 +0,0 @@
-begin
-  require_relative 'ruby19/performant'
-rescue LoadError
-  require_relative 'ruby19/extconf'
-  Dir.chdir File.expand_path('../ruby19', __FILE__) do
-    %x{ ruby extconf.rb && make }
-  end
-  retry
-end

data/lib/picky/ext/ruby19/extconf.rb

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