picky 3.6.16 → 4.0.0pre1

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.6.16
-  prerelease: 
+  version: 4.0.0pre1
+  prerelease: 5
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2011-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70259516646360 !ruby/object:Gem::Requirement
+  requirement: &70311745503320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259516646360
+  version_requirements: *70311745503320
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70259516645760 !ruby/object:Gem::Requirement
+  requirement: &70311745502640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.16
+        version: 4.0.0pre1
   type: :development
   prerelease: false
-  version_requirements: *70259516645760
+  version_requirements: *70311745502640
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70259516645320 !ruby/object:Gem::Requirement
+  requirement: &70311745502040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516645320
+  version_requirements: *70311745502040
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70259516644860 !ruby/object:Gem::Requirement
+  requirement: &70311745501280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516644860
+  version_requirements: *70311745501280
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70259516644400 !ruby/object:Gem::Requirement
+  requirement: &70311745500860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516644400
+  version_requirements: *70311745500860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70259516643960 !ruby/object:Gem::Requirement
+  requirement: &70311745500360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516643960
+  version_requirements: *70311745500360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70259516659780 !ruby/object:Gem::Requirement
+  requirement: &70311745499600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516659780
+  version_requirements: *70311745499600
+- !ruby/object:Gem::Dependency
+  name: procrastinate
+  requirement: &70311745498920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70311745498920
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70259516659260 !ruby/object:Gem::Requirement
+  requirement: &70311745498540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516659260
+  version_requirements: *70311745498540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70259516658620 !ruby/object:Gem::Requirement
+  requirement: &70311745498080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259516658620
+  version_requirements: *70311745498080
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -135,8 +146,8 @@ files:
 - lib/picky/backends/memory/basic.rb
 - lib/picky/backends/memory/json.rb
 - lib/picky/backends/memory/marshal.rb
-- lib/picky/backends/memory/text.rb
 - lib/picky/backends/memory.rb
+- lib/picky/backends/prepared/text.rb
 - lib/picky/backends/redis/basic.rb
 - lib/picky/backends/redis/directly_manipulable.rb
 - lib/picky/backends/redis/float.rb
@@ -168,7 +179,6 @@ files:
 - lib/picky/character_substituters/west_european.rb
 - lib/picky/console.rb
 - lib/picky/constants.rb
-- lib/picky/cores.rb
 - lib/picky/deployment.rb
 - lib/picky/ext/maybe_compile.rb
 - lib/picky/ext/ruby19/extconf.rb
@@ -201,6 +211,7 @@ files:
 - lib/picky/generators/weights/logarithmic.rb
 - lib/picky/generators/weights/runtime.rb
 - lib/picky/generators/weights/strategy.rb
+- lib/picky/helpers/indexing.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index.rb
 - lib/picky/index_convenience.rb
@@ -229,7 +240,9 @@ files:
 - lib/picky/query/tokens.rb
 - lib/picky/query/weights.rb
 - lib/picky/rack/harakiri.rb
+- lib/picky/results/exact_first.rb
 - lib/picky/results.rb
+- lib/picky/scheduler.rb
 - lib/picky/search.rb
 - lib/picky/sinatra.rb
 - lib/picky/sources/base.rb
@@ -241,13 +254,11 @@ files:
 - lib/picky/statistics.rb
 - lib/picky/tasks.rb
 - lib/picky/tokenizer.rb
-- lib/picky/tokenizers/location.rb
 - lib/picky/wrappers/bundle/calculation.rb
 - lib/picky/wrappers/bundle/delegators.rb
 - lib/picky/wrappers/bundle/exact_partial.rb
 - lib/picky/wrappers/bundle/location.rb
 - lib/picky/wrappers/bundle/wrapper.rb
-- lib/picky/wrappers/category/exact_first.rb
 - lib/picky/wrappers/category/location.rb
 - lib/picky.rb
 - lib/tasks/try.rb
@@ -289,8 +300,8 @@ files:
 - spec/lib/backends/memory/basic_spec.rb
 - spec/lib/backends/memory/json_spec.rb
 - spec/lib/backends/memory/marshal_spec.rb
-- spec/lib/backends/memory/text_spec.rb
 - spec/lib/backends/memory_spec.rb
+- spec/lib/backends/prepared/text_spec.rb
 - spec/lib/backends/redis/basic_spec.rb
 - spec/lib/backends/redis/directly_manipulable_spec.rb
 - spec/lib/backends/redis/float_spec.rb
@@ -309,7 +320,6 @@ files:
 - spec/lib/category_indexing_spec.rb
 - spec/lib/category_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
-- spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
 - spec/lib/extensions/module_spec.rb
@@ -341,7 +351,6 @@ files:
 - spec/lib/indexed/bundle_spec.rb
 - spec/lib/indexed/wrappers/bundle/calculation_spec.rb
 - spec/lib/indexed/wrappers/bundle/wrapper_spec.rb
-- spec/lib/indexed/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/parallel_spec.rb
 - spec/lib/indexers/serial_spec.rb
@@ -365,7 +374,9 @@ files:
 - spec/lib/query/tokens_spec.rb
 - spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
+- spec/lib/results/exact_first_spec.rb
 - spec/lib/results_spec.rb
+- spec/lib/scheduler_spec.rb
 - spec/lib/search_spec.rb
 - spec/lib/sinatra_spec.rb
 - spec/lib/solr/schema_generator_spec.rb
@@ -394,9 +405,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/picky
 rubygems_version: 1.8.11
@@ -433,8 +444,8 @@ test_files:
 - spec/lib/backends/memory/basic_spec.rb
 - spec/lib/backends/memory/json_spec.rb
 - spec/lib/backends/memory/marshal_spec.rb
-- spec/lib/backends/memory/text_spec.rb
 - spec/lib/backends/memory_spec.rb
+- spec/lib/backends/prepared/text_spec.rb
 - spec/lib/backends/redis/basic_spec.rb
 - spec/lib/backends/redis/directly_manipulable_spec.rb
 - spec/lib/backends/redis/float_spec.rb
@@ -453,7 +464,6 @@ test_files:
 - spec/lib/category_indexing_spec.rb
 - spec/lib/category_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
-- spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
 - spec/lib/extensions/module_spec.rb
@@ -485,7 +495,6 @@ test_files:
 - spec/lib/indexed/bundle_spec.rb
 - spec/lib/indexed/wrappers/bundle/calculation_spec.rb
 - spec/lib/indexed/wrappers/bundle/wrapper_spec.rb
-- spec/lib/indexed/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/parallel_spec.rb
 - spec/lib/indexers/serial_spec.rb
@@ -509,7 +518,9 @@ test_files:
 - spec/lib/query/tokens_spec.rb
 - spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
+- spec/lib/results/exact_first_spec.rb
 - spec/lib/results_spec.rb
+- spec/lib/scheduler_spec.rb
 - spec/lib/search_spec.rb
 - spec/lib/sinatra_spec.rb
 - spec/lib/solr/schema_generator_spec.rb

data/lib/picky/cores.rb

@@ -1,127 +0,0 @@
-module Picky
-
-  Infinity = 1.0/0
-
-  # Handles processing over multiple cores.
-  #
-  class Cores # :nodoc:all
-
-    # Pass it an ary.
-    #
-    #   ary = (1..10).to_a
-    #   forked ary, :max => 5 do |element|
-    #
-    #   end
-    #
-    # Options include:
-    #  * max: Maximum # of processors to use. Default is all it can get.
-    #  * amount: An exactly defined amount of processors to use.
-    #  * randomly: Whether to use random order or not.
-    #
-    def self.forked elements, options = {}, &block
-      return if elements.empty?
-      raise "Block argument needed when running Cores.forked" unless block_given?
-
-      # Note: Not using a generator because Enumerator#each
-      # is exhibiting problems in some Rubies on some OSs
-      # (see e.g. http://redmine.ruby-lang.org/issues/5003).
-      #
-      elements = elements.dup
-      elements = elements.sort_by { rand } if options[:randomly]
-
-      # Get the maximum number of processors.
-      #
-      max = max_processors options
-
-      # Decide whether to use forking.
-      #
-      if fork?(max)
-        processing = 0
-
-        loop do
-          while processing < max
-            # Get the next element
-            #
-            element = elements.shift
-            break unless element
-            processing += 1
-
-            # Fork and yield.
-            #
-            Process.fork do
-              sleep 0.05*processing
-              block.call element
-            end
-          end
-
-          # Block and wait for any child to finish.
-          #
-          begin
-            Process.wait 0
-          rescue Errno::ECHILD => e
-            break
-          ensure
-            processing -= 1
-          end
-        end
-      else
-        elements.each &block
-      end
-
-    end
-
-    # Do not fork if there is just one processor,
-    # or as in Windows, if there isn't the
-    # possibility of forking.
-    #
-    def self.fork? max_processors
-      max_processors > 1 && Process.respond_to?(:fork)
-    end
-
-    # Return the number of maximum usable processors.
-    #
-    # Options
-    #   max: The maximum amount of cores used.
-    #
-    def self.max_processors options = {}
-      options[:amount] || [number_of_cores, (options[:max] || Infinity)].min
-    end
-
-    # Gets the number of cores depending on OS.
-    #
-    def self.number_of_cores
-      extract_cores_for actual_platform
-    end
-    # Extracts the platform os from the platform.
-    #
-    # Note: Could also use 'rbconfig'.
-    #
-    def self.actual_platform
-      matched = platform.match(/-\b([a-z]*)/)
-      matched && matched[1]
-    end
-    # Returns a mapping
-    #   os_name => lambda_which_returns_a_number_of_cores
-    #
-    @@number_of_cores = {
-      'darwin' => lambda { `system_profiler SPHardwareDataType | grep -i 'Total Number [oO]f Cores'`.gsub(/[^\d]/, '') },
-      'linux'  => lambda { `grep -ci ^processor /proc/cpuinfo` }
-    }
-    def self.os_to_core_mapping
-      @@number_of_cores
-    end
-    # Extracts the number of cores for the given os name.
-    #
-    # Note: Default is 1.
-    #
-    def self.extract_cores_for os
-      code_to_execute = os_to_core_mapping[os]
-      code_to_execute && code_to_execute.call.to_i || 1
-    end
-    def self.platform
-      RUBY_PLATFORM
-    end
-
-  end
-
-end

data/lib/picky/tokenizers/location.rb

@@ -1,53 +0,0 @@
-module Picky
-
-  module Tokenizers
-
-    class Location < Picky::Tokenizer # TODO Still needed?
-
-      attr_reader :calculation
-
-      def initialize options = {}
-        super options
-
-        grid      = options[:grid]
-        precision = options[:precision] || 1
-
-        @calculation = Calculations::Location.new grid, precision
-
-        @minimum = 1.0 / 0
-
-        @locations = []
-      end
-
-      #
-      #
-      def tokenize text
-
-        # Gather min/max.
-        #
-        source.harvest category do |indexed_id, location|
-          location = location.to_f
-          minimum = location if location < minimum
-          locations << [indexed_id, location]
-        end
-
-        calculation.minimum = minimum
-
-        # Recalculate locations.
-        #
-        locations.each do |indexed_id, location|
-          calculation.recalculated_range(location).each do |new_location|
-            yield indexed_id, new_location.to_s
-          end
-        end
-
-        # TODO Move to the right place.
-        #
-        category.exact[:location_minimum] = minimum
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/wrappers/category/exact_first.rb

@@ -1,94 +0,0 @@
-# encoding: utf-8
-#
-module Picky
-
-  module Wrappers
-
-    module Category
-
-      # This index combines an exact and partial index.
-      # It serves to order the results such that exact hits are found first.
-      #
-      class ExactFirst
-
-        # TODO Refactor!
-        #
-        delegate :add,
-                 :qualifiers,
-                 :exact,
-                 :partial,
-                 :replace,
-
-                 :identifier,
-                 :name,
-
-                 :index,
-                 :category,
-                 :dump,
-                 :load,
-
-                 :empty,
-                 :prepared_index_file,
-                 :tokenizer,
-                 :cache,
-                 :from,
-
-                 :bundle_for,
-                 :build_realtime_mapping,
-
-                 :to => :@category
-
-        def initialize category
-          @category = category
-          @exact   = category.exact
-          @partial = category.partial
-        end
-
-        def self.wrap index_or_category
-          if index_or_category.respond_to? :categories
-            wrap_each_of index_or_category.categories
-            index_or_category
-          else
-            new index_or_category
-          end
-        end
-        def self.wrap_each_of categories
-          actual_categories = categories.categories
-          categories.clear_categories
-
-          actual_categories.each do |category|
-            categories << new(category)
-          end
-        end
-
-        def ids token
-          text = token.text
-          if token.partial?
-            @exact.ids(text) | @partial.ids(text)
-          else
-            @exact.ids text
-          end
-        end
-
-        def weight token
-          text = token.text
-          if token.partial?
-            [@exact.weight(text), @partial.weight(text)].compact.max
-          else
-            @exact.weight text
-          end
-        end
-
-        # TODO Refactor! (Subclass Picky::Category?)
-        #
-        def combination_for token
-          weight(token) && Query::Combination.new(token, self)
-        end
-
-      end
-
-    end
-
-  end
-
-end