picky 2.7.0 → 3.0.0.pre1

data/lib/picky/indexed/bundle/memory.rb

@@ -1,80 +1,84 @@
 # encoding: utf-8
 #
-module Indexed # :nodoc:all
+module Picky
 
-  #
-  #
-  module Bundle
+  module Indexed # :nodoc:all
 
-    # This is the _actual_ index (based on memory).
     #
-    # Handles exact/partial index, weights index, and similarity index.
     #
-    # Delegates file handling and checking to an *Indexed*::*Files* object.
-    #
-    class Memory < Base
+    module Bundle
 
-      delegate :[], :to => :configuration
+      # This is the _actual_ index (based on memory).
+      #
+      # Handles exact/partial index, weights index, and similarity index.
+      #
+      # Delegates file handling and checking to an *Indexed*::*Files* object.
+      #
+      class Memory < Base
 
-      def initialize name, configuration, *args
-        super name, configuration, *args
+        delegate :[], :to => :configuration
 
-        @configuration = {} # A hash with config options.
+        def initialize name, category, *args
+          super name, category, *args
 
-        @backend = Backend::Files.new name, configuration
-      end
+          @configuration = {} # A hash with config options.
 
-      # Get the ids for the given symbol.
-      #
-      def ids sym
-        @inverted[sym] || []
-      end
-      # Get a weight for the given symbol.
-      #
-      def weight sym
-        @weights[sym]
-      end
+          @backend = Backend::Files.new self
+        end
 
-      # Loads the core index.
-      #
-      def load_inverted
-        self.inverted = @backend.load_inverted
-      end
-      # Loads the weights index.
-      #
-      def load_weights
-        self.weights = @backend.load_weights
-      end
-      # Loads the similarity index.
-      #
-      def load_similarity
-        self.similarity = @backend.load_similarity
-      end
-      # Loads the configuration.
-      #
-      def load_configuration
-        self.configuration = @backend.load_configuration
-      end
+        # Get the ids for the given symbol.
+        #
+        def ids sym
+          @inverted[sym] || []
+        end
+        # Get a weight for the given symbol.
+        #
+        def weight sym
+          @weights[sym]
+        end
+
+        # Loads the core index.
+        #
+        def load_inverted
+          self.inverted = @backend.load_inverted
+        end
+        # Loads the weights index.
+        #
+        def load_weights
+          self.weights = @backend.load_weights
+        end
+        # Loads the similarity index.
+        #
+        def load_similarity
+          self.similarity = @backend.load_similarity
+        end
+        # Loads the configuration.
+        #
+        def load_configuration
+          self.configuration = @backend.load_configuration
+        end
+
+        # Loads the core index.
+        #
+        def clear_inverted
+          self.inverted = {}
+        end
+        # Loads the weights index.
+        #
+        def clear_weights
+          self.weights = {}
+        end
+        # Loads the similarity index.
+        #
+        def clear_similarity
+          self.similarity = {}
+        end
+        # Loads the configuration.
+        #
+        def clear_configuration
+          self.configuration = {}
+        end
 
-      # Loads the core index.
-      #
-      def clear_inverted
-        self.inverted = {}
-      end
-      # Loads the weights index.
-      #
-      def clear_weights
-        self.weights = {}
-      end
-      # Loads the similarity index.
-      #
-      def clear_similarity
-        self.similarity = {}
-      end
-      # Loads the configuration.
-      #
-      def clear_configuration
-        self.configuration = {}
       end
 
     end

data/lib/picky/indexed/bundle/redis.rb

@@ -1,83 +1,87 @@
 # encoding: utf-8
 #
-module Indexed # :nodoc:all
+module Picky
 
-  #
-  #
-  module Bundle
+  module Indexed # :nodoc:all
 
-    # This is the _actual_ index (based on Redis).
     #
-    # Handles exact/partial index, weights index, and similarity index.
     #
-    class Redis < Base
+    module Bundle
 
-      def initialize name, category, *args
-        super name, category, *args
-
-        @backend = Backend::Redis.new name, category
-      end
-
-      # Get the ids for the given symbol.
-      #
-      # Ids are an array of string values in Redis.
-      #
-      def ids sym
-        @backend.ids sym
-      end
-      # Get a weight for the given symbol.
-      #
-      # A weight is a string value in Redis. TODO Convert?
+      # This is the _actual_ index (based on Redis).
       #
-      def weight sym
-        @backend.weight sym
-      end
-      # Settings of this bundle can be accessed via [].
+      # Handles exact/partial index, weights index, and similarity index.
       #
-      def [] sym
-        @backend.setting sym
-      end
+      class Redis < Base
 
-      # Loads the inverted index.
-      #
-      def load_inverted
-        # No loading needed.
-      end
-      # Loads the weights index.
-      #
-      def load_weights
-        # No loading needed.
-      end
-      # Loads the similarity index.
-      #
-      def load_similarity
-        # No loading needed.
-      end
-      # Loads the configuration.
-      #
-      def load_configuration
-        # No loading needed.
-      end
+        def initialize name, category, *args
+          super name, category, *args
+
+          @backend = Backend::Redis.new self
+        end
+
+        # Get the ids for the given symbol.
+        #
+        # Ids are an array of string values in Redis.
+        #
+        def ids sym
+          @backend.ids sym
+        end
+        # Get a weight for the given symbol.
+        #
+        # A weight is a string value in Redis.
+        #
+        def weight sym
+          @backend.weight sym
+        end
+        # Settings of this bundle can be accessed via [].
+        #
+        def [] sym
+          @backend.setting sym
+        end
+
+        # Loads the inverted index.
+        #
+        def load_inverted
+          # No loading needed.
+        end
+        # Loads the weights index.
+        #
+        def load_weights
+          # No loading needed.
+        end
+        # Loads the similarity index.
+        #
+        def load_similarity
+          # No loading needed.
+        end
+        # Loads the configuration.
+        #
+        def load_configuration
+          # No loading needed.
+        end
+
+        # Loads the inverted index.
+        #
+        def clear_inverted
+          # No clearing possible, currently.
+        end
+        # Loads the weights index.
+        #
+        def clear_weights
+          # No clearing possible, currently.
+        end
+        # Loads the similarity index.
+        #
+        def clear_similarity
+          # No clearing possible, currently.
+        end
+        # Loads the configuration.
+        #
+        def clear_configuration
+          # No clearing possible, currently.
+        end
 
-      # Loads the inverted index.
-      #
-      def clear_inverted
-        # No clearing possible, currently.
-      end
-      # Loads the weights index.
-      #
-      def clear_weights
-        # No clearing possible, currently.
-      end
-      # Loads the similarity index.
-      #
-      def clear_similarity
-        # No clearing possible, currently.
-      end
-      # Loads the configuration.
-      #
-      def clear_configuration
-        # No clearing possible, currently.
       end
 
     end

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

@@ -1,35 +1,39 @@
-module Indexed
-  module Wrappers
+module Picky
 
-    module Bundle
+  module Indexed
+    module Wrappers
 
-      # A calculation rewrites the symbol into a float.
-      #
-      # TODO I really need to allow integers as keys. The code below is just not up to the needed quality.
-      #
-      class Calculation < Wrapper
+      module Bundle
 
+        # A calculation rewrites the symbol into a float.
         #
+        # TODO I really need to allow integers as keys. The code below is just not up to the needed quality.
         #
-        def recalculate float
-          float
-        end
+        class Calculation < Wrapper
+
+          #
+          #
+          def recalculate float
+            float
+          end
+
+          #
+          #
+          def ids sym
+            @bundle.ids recalculate(sym.to_s.to_f).to_s.to_sym
+          end
+
+          #
+          #
+          def weight sym
+            @bundle.weight recalculate(sym.to_s.to_f).to_s.to_sym
+          end
 
-        #
-        #
-        def ids sym
-          @bundle.ids recalculate(sym.to_s.to_f).to_s.to_sym
-        end
-
-        #
-        #
-        def weight sym
-          @bundle.weight recalculate(sym.to_s.to_f).to_s.to_sym
         end
 
       end
 
     end
-
   end
+
 end

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

@@ -1,42 +1,46 @@
-module Indexed
-  module Wrappers
+module Picky
 
-    module Bundle
+  module Indexed
+    module Wrappers
 
-      # A location calculation recalculates a location to the Picky internal location.
-      #
-      class Location < Calculation
+      module Bundle
 
-        def initialize bundle, options = {}
-          super bundle
+        # A location calculation recalculates a location to the Picky internal location.
+        #
+        class Location < Calculation
 
-          precision  = options[:precision] || 1
-          user_grid  = options[:grid] || raise("Gridsize needs to be given for location #{bundle.identifier}.")
+          def initialize bundle, options = {}
+            super bundle
 
-          @calculation = Calculations::Location.new user_grid, precision
-        end
+            precision  = options[:precision] || 1
+            user_grid  = options[:grid] || raise("Gridsize needs to be given for location #{bundle.identifier}.")
 
-        #
-        #
-        def recalculate float
-          @calculation.recalculate float
-        end
+            @calculation = Calculations::Location.new user_grid, precision
+          end
 
-        #
-        #
-        def load
-          # Load first the bundle, then extract the config.
           #
-          bundle.load
-          # TODO Move the to_f to the backend.
           #
-          minimum = bundle[:location_minimum] && bundle[:location_minimum].to_f || raise("Configuration :location_minimum for #{bundle.identifier} missing. Did you run rake index already?")
-          @calculation.minimum = minimum
+          def recalculate float
+            @calculation.recalculate float
+          end
+
+          #
+          #
+          def load
+            # Load first the bundle, then extract the config.
+            #
+            bundle.load
+            # TODO Move the to_f to the backend.
+            #
+            minimum = bundle[:location_minimum] && bundle[:location_minimum].to_f || raise("Configuration :location_minimum for #{bundle.identifier} missing. Did you run rake index already?")
+            @calculation.minimum = minimum
+          end
+
         end
 
       end
 
     end
-
   end
+
 end

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

@@ -1,43 +1,47 @@
-module Indexed
-  module Wrappers
+module Picky
 
-    # Per Bundle wrappers.
-    #
-    module Bundle
+  module Indexed
+    module Wrappers
 
-      # Base wrapper. Just delegates all methods to the bundle.
+      # Per Bundle wrappers.
       #
-      class Wrapper
+      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
 
-        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

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

@@ -1,25 +1,29 @@
-module Indexed
-  module Wrappers
-    module Category
+module Picky
 
-      module Location
+  module Indexed
+    module Wrappers
+      module Category
 
-        def self.install_on category, grid, precision = 1
-          wrapped_exact = Indexed::Wrappers::Bundle::Location.new category.indexed_exact, grid: grid, precision: precision
+        module Location
 
-          category.class_eval do
-            define_method :indexed_exact do
-              wrapped_exact
-            end
-            define_method :indexed_partial do
-              wrapped_exact
+          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,51 +1,55 @@
 # encoding: utf-8
 #
-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::Base
-
-      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
+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::Base
+
+        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
+        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
-      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 ids text
+          @exact.ids(text) + @partial.ids(text)
+        end
+
+        def weight text
+          [@exact.weight(text) || 0, @partial.weight(text) || 0].max
+        end
 
-      def weight text
-        [@exact.weight(text) || 0, @partial.weight(text) || 0].max
       end
 
     end