picky 3.2.0 → 3.3.0

data/spec/lib/sources/wrappers/location_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Picky::Sources::Wrappers::Location do
-  
+describe Picky::Wrappers::Sources::Location do
+
   context "with backend" do
     before(:each) do
       @source   = stub :source
@@ -20,20 +20,20 @@ describe Picky::Sources::Wrappers::Location do
         @wrapper.calculation.precision.should == 1
       end
       it "delegates harvest" do
-        @category.stub! :indexing_exact => {}
-        
+        @category.stub! :exact => {}
+
         @source.should_receive(:harvest).once.with @category
-        
+
         @wrapper.harvest @category
       end
       it "delegates take_snapshot" do
         @source.should_receive(:take_snapshot).once.with()
-        
+
         @wrapper.take_snapshot
       end
       it "delegates connect_backend" do
         @source.should_receive(:connect_backend).once.with()
-        
+
         @wrapper.connect_backend
       end
     end
@@ -51,5 +51,5 @@ describe Picky::Sources::Wrappers::Location do
       lambda { described_class.new }.should raise_error(ArgumentError)
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000 Z
+date: 2011-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313421431340 !ruby/object:Gem::Requirement
+  requirement: &70120341880280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313421431340
+  version_requirements: *70120341880280
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70313421430840 !ruby/object:Gem::Requirement
+  requirement: &70120341879500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :development
   prerelease: false
-  version_requirements: *70313421430840
+  version_requirements: *70120341879500
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70313421430420 !ruby/object:Gem::Requirement
+  requirement: &70120341861000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421430420
+  version_requirements: *70120341861000
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70313421429920 !ruby/object:Gem::Requirement
+  requirement: &70120341860060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421429920
+  version_requirements: *70120341860060
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70313421429420 !ruby/object:Gem::Requirement
+  requirement: &70120341859480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421429420
+  version_requirements: *70120341859480
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70313421428860 !ruby/object:Gem::Requirement
+  requirement: &70120341858820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421428860
+  version_requirements: *70120341858820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70313421427820 !ruby/object:Gem::Requirement
+  requirement: &70120341857900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421427820
+  version_requirements: *70120341857900
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70313421443700 !ruby/object:Gem::Requirement
+  requirement: &70120341857140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421443700
+  version_requirements: *70120341857140
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70313421443320 !ruby/object:Gem::Requirement
+  requirement: &70120341856560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421443320
+  version_requirements: *70120341856560
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70313421442840 !ruby/object:Gem::Requirement
+  requirement: &70120341855740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421442840
+  version_requirements: *70120341855740
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70313421442420 !ruby/object:Gem::Requirement
+  requirement: &70120341854880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421442420
+  version_requirements: *70120341854880
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70313421441980 !ruby/object:Gem::Requirement
+  requirement: &70120341853680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313421441980
+  version_requirements: *70120341853680
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -174,6 +174,9 @@ files:
 - lib/picky/backends/redis/string.rb
 - lib/picky/backends/redis.rb
 - lib/picky/bundle.rb
+- lib/picky/bundle_indexed.rb
+- lib/picky/bundle_indexing.rb
+- lib/picky/bundle_realtime.rb
 - lib/picky/bundling.rb
 - lib/picky/calculations/location.rb
 - lib/picky/categories.rb
@@ -202,6 +205,7 @@ files:
 - lib/picky/generators/partial/default.rb
 - lib/picky/generators/partial/infix.rb
 - lib/picky/generators/partial/none.rb
+- lib/picky/generators/partial/postfix.rb
 - lib/picky/generators/partial/strategy.rb
 - lib/picky/generators/partial/substring.rb
 - lib/picky/generators/partial_generator.rb
@@ -223,21 +227,12 @@ files:
 - lib/picky/index_indexed.rb
 - lib/picky/index_indexing.rb
 - lib/picky/index_realtime.rb
-- lib/picky/indexed/bundle.rb
-- lib/picky/indexed/bundle_realtime.rb
-- lib/picky/indexed/wrappers/bundle/calculation.rb
-- lib/picky/indexed/wrappers/bundle/location.rb
-- lib/picky/indexed/wrappers/bundle/wrapper.rb
-- lib/picky/indexed/wrappers/category/location.rb
-- lib/picky/indexed/wrappers/exact_first.rb
 - lib/picky/indexers/base.rb
 - lib/picky/indexers/parallel.rb
 - lib/picky/indexers/serial.rb
 - lib/picky/indexes.rb
 - lib/picky/indexes_indexed.rb
 - lib/picky/indexes_indexing.rb
-- lib/picky/indexing/bundle.rb
-- lib/picky/indexing/wrappers/category/location.rb
 - lib/picky/interfaces/live_parameters.rb
 - lib/picky/loader.rb
 - lib/picky/migrations/from_30_to_31.rb
@@ -263,12 +258,19 @@ files:
 - lib/picky/sources/db.rb
 - lib/picky/sources/delicious.rb
 - lib/picky/sources/mongo.rb
-- lib/picky/sources/wrappers/base.rb
-- lib/picky/sources/wrappers/location.rb
 - 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/wrappers/sources/base.rb
+- lib/picky/wrappers/sources/location.rb
 - lib/picky.rb
 - lib/tasks/try.rb
 - lib/tasks/application.rake
@@ -288,6 +290,9 @@ files:
 - spec/lib/adapters/rack/query_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
+- spec/lib/backends/backend_spec.rb
+- spec/lib/backends/file/basic_spec.rb
+- spec/lib/backends/file_spec.rb
 - spec/lib/backends/memory/basic_spec.rb
 - spec/lib/backends/memory/json_spec.rb
 - spec/lib/backends/memory/marshal_spec.rb
@@ -318,6 +323,7 @@ files:
 - spec/lib/generators/partial/default_spec.rb
 - spec/lib/generators/partial/infix_spec.rb
 - spec/lib/generators/partial/none_spec.rb
+- spec/lib/generators/partial/postfix_spec.rb
 - spec/lib/generators/partial/substring_spec.rb
 - spec/lib/generators/partial_generator_spec.rb
 - spec/lib/generators/similarity/double_metaphone_spec.rb
@@ -410,6 +416,9 @@ test_files:
 - spec/lib/adapters/rack/query_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
+- spec/lib/backends/backend_spec.rb
+- spec/lib/backends/file/basic_spec.rb
+- spec/lib/backends/file_spec.rb
 - spec/lib/backends/memory/basic_spec.rb
 - spec/lib/backends/memory/json_spec.rb
 - spec/lib/backends/memory/marshal_spec.rb
@@ -440,6 +449,7 @@ test_files:
 - spec/lib/generators/partial/default_spec.rb
 - spec/lib/generators/partial/infix_spec.rb
 - spec/lib/generators/partial/none_spec.rb
+- spec/lib/generators/partial/postfix_spec.rb
 - spec/lib/generators/partial/substring_spec.rb
 - spec/lib/generators/partial_generator_spec.rb
 - spec/lib/generators/similarity/double_metaphone_spec.rb

data/lib/picky/indexed/bundle.rb

@@ -1,125 +0,0 @@
-module Picky
-
-  module Indexed # :nodoc:all
-
-    # An indexed bundle is a number of memory/redis
-    # indexes that compose the indexes for a single category:
-    #  * core (inverted) index
-    #  * weights index
-    #  * similarity index
-    #  * index configuration
-    #
-    # Indexed refers to them being indexed.
-    # This class notably offers the methods:
-    #  * load
-    #  * clear
-    #
-    # To (re)load or clear the current indexes.
-    #
-    class Bundle < Picky::Bundle
-
-      attr_reader :realtime_mapping
-
-      def initialize name, category, backend, weights_strategy, partial_strategy, similarity_strategy, options = {}
-        super name, category, backend, weights_strategy, partial_strategy, similarity_strategy, options
-
-        @inverted      = @backend_inverted.initial
-        @weights       = @backend_weights.initial
-        @similarity    = @backend_similarity.initial
-        @configuration = @backend_configuration.initial
-
-        @realtime_mapping = {} # id -> ary of syms.  TODO Always instantiate?
-      end
-
-      # Get the ids for the given symbol.
-      #
-      # Returns a (potentially empty) array of ids.
-      #
-      def ids sym
-        @inverted[sym] || []
-      end
-
-      # Get a weight for the given symbol.
-      #
-      # Returns a number, or nil.
-      #
-      def weight sym
-        @weights[sym]
-      end
-
-      # Get settings for this bundle.
-      #
-      # Returns an object.
-      #
-      def [] sym
-        @configuration[sym]
-      end
-
-      # Loads all indexes.
-      #
-      # Loading loads index objects from the backend.
-      # They should each respond to [] and return something appropriate.
-      #
-      def load
-        load_inverted
-        load_weights
-        load_similarity
-        load_configuration
-      end
-
-      # Loads the core index.
-      #
-      def load_inverted
-        self.inverted = @backend_inverted.load
-      end
-      # Loads the weights index.
-      #
-      def load_weights
-        self.weights = @backend_weights.load
-      end
-      # Loads the similarity index.
-      #
-      def load_similarity
-        self.similarity = @backend_similarity.load
-      end
-      # Loads the configuration.
-      #
-      def load_configuration
-        self.configuration = @backend_configuration.load
-      end
-
-      # Clears all indexes.
-      #
-      def clear
-        clear_inverted
-        clear_weights
-        clear_similarity
-        clear_configuration
-      end
-
-      # Clears the core index.
-      #
-      def clear_inverted
-        inverted.clear
-      end
-      # Clears the weights index.
-      #
-      def clear_weights
-        weights.clear
-      end
-      # Clears the similarity index.
-      #
-      def clear_similarity
-        similarity.clear
-      end
-      # Clears the configuration.
-      #
-      def clear_configuration
-        configuration.clear
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/indexed/bundle_realtime.rb

@@ -1,76 +0,0 @@
-module Picky
-
-  module Indexed # :nodoc:all
-
-    class Bundle < Picky::Bundle
-
-      # Removes the given id from the indexes.
-      #
-      def remove id
-        # Is it anywhere?
-        #
-        syms = @realtime_mapping[id]
-        return unless syms
-
-        syms.each do |sym|
-          ids = @inverted[sym]
-          ids.delete id
-
-          encoded = self.similarity_strategy.encoded sym
-
-          if ids.empty?
-            @inverted.delete   sym
-            @weights.delete    sym
-            # Since no element uses this sym anymore, we can delete the similarity for it.
-            # TODO Not really. Since multiple syms can point to the same encoded.
-            @similarity.delete encoded
-          else
-            @weights[sym] = self.weights_strategy.weight_for ids.size
-          end
-        end
-
-        @realtime_mapping.delete id
-      end
-
-      # Returns a reference to the array where the id has been added.
-      #
-      def add id, sym
-        ary = @inverted[sym]
-
-        syms = @realtime_mapping[id]
-        syms = (@realtime_mapping[id] = []) unless syms # TODO Nicefy.
-
-        # Inverted.
-        #
-        ids = if syms.include? sym
-          ids = @inverted[sym]
-          ids.delete  id # Move id
-          ids.unshift id # to front
-        else
-          syms << sym
-          inverted = @inverted[sym] ||= []
-          inverted.unshift id
-        end
-
-        # Weights.
-        #
-        @weights[sym] = self.weights_strategy.weight_for ids.size
-
-        # Similarity.
-        #
-        if encoded = self.similarity_strategy.encoded(sym)
-          similarity = @similarity[encoded] ||= []
-          if similarity.include? sym
-            similarity.delete sym  # Not completely correct, as others will also be affected, but meh.
-            similarity.unshift sym #
-          else
-            similarity.unshift sym
-          end
-        end
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/indexed/wrappers/bundle/calculation.rb

@@ -1,47 +0,0 @@
-module Picky
-
-  module Indexed
-    module Wrappers
-
-      module Bundle
-
-        # A calculation rewrites the symbol into a float.
-        #
-        # Note: A calculation will try to find a float in the index,
-        #       not a sym.
-        #
-        # TODO I really need to allow integers as keys.
-        #      The code below is just not up to the needed quality.
-        #      Use key_format :to_i?
-        #
-        class Calculation < Wrapper
-
-          # API.
-          #
-          # By default, a calculation does not
-          # recalculate anything.
-          #
-          def recalculate float
-            float
-          end
-
-          #
-          #
-          def ids float_as_sym
-            @bundle.ids recalculate(float_as_sym.to_s.to_f).to_s.to_sym
-          end
-
-          #
-          #
-          def weight float_as_sym
-            @bundle.weight recalculate(float_as_sym.to_s.to_f).to_s.to_sym
-          end
-
-        end
-
-      end
-
-    end
-  end
-
-end

data/lib/picky/indexed/wrappers/bundle/wrapper.rb

@@ -1,47 +0,0 @@
-module Picky
-
-  module Indexed
-    module Wrappers
-
-      # Per Bundle wrappers.
-      #
-      module Bundle
-
-        # Base wrapper. Just delegates all methods to the bundle.
-        #
-        class Wrapper
-
-          attr_reader :bundle
-
-          def initialize bundle
-            @bundle = bundle
-          end
-
-          delegate :load,
-                   :load_inverted,
-                   :load_weights,
-                   :load_similarity,
-                   :load_configuration,
-                   :clear_inverted,
-                   :clear_weights,
-                   :clear_similarity,
-                   :clear_configuration,
-                   :ids,
-                   :weight,
-                   :identifier,
-                   :analyze,
-                   :size,
-                   :inverted,
-                   :weights,
-                   :similarity,
-                   :configuration,
-                   :to => :@bundle
-
-        end
-
-      end
-
-    end
-  end
-
-end

data/lib/picky/indexed/wrappers/category/location.rb

@@ -1,31 +0,0 @@
-module Picky
-
-  module Indexed
-    module Wrappers
-      module Category
-
-        module Location
-
-          # THINK Is this the best way to do this?
-          #
-          def self.install_on category, grid, precision = 1
-            wrapped_exact = Indexed::Wrappers::Bundle::Location.new category.indexed_exact, grid: grid, precision: precision
-
-            category.class_eval do
-              define_method :indexed_exact do
-                wrapped_exact
-              end
-              define_method :indexed_partial do
-                wrapped_exact
-              end
-            end
-
-          end
-
-        end
-
-      end
-    end
-  end
-
-end

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

@@ -1,59 +0,0 @@
-# encoding: utf-8
-#
-module Picky
-
-  module Indexed
-
-    module Wrappers
-
-      # This index combines an exact and partial index.
-      # It serves to order the results such that exact hits are found first.
-      #
-      class ExactFirst < Indexed::Bundle
-
-        delegate :similar,
-                 :identifier,
-                 :name,
-                 :to => :@exact
-        delegate :index,
-                 :category,
-                 :weight,
-                 :generate_partial_from,
-                 :generate_caches_from_memory,
-                 :generate_derived,
-                 :dump,
-                 :load,
-                 :to => :@partial
-
-        def initialize category
-          @exact   = category.indexed_exact
-          @partial = category.indexed_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
-          categories.categories.collect! { |category| new(category) }
-        end
-
-        def ids text
-          @exact.ids(text) + @partial.ids(text)
-        end
-
-        def weight text
-          [@exact.weight(text) || 0, @partial.weight(text) || 0].max
-        end
-
-      end
-
-    end
-
-  end
-
-end