+ backend rewrite, towards making it more exchangeable

server/lib/picky/backend/base.rb → server/lib/picky/backends/base.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     class Base
 

server/lib/picky/backend/file/basic.rb → server/lib/picky/backends/file/basic.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     # Handles all aspects of index files, such as dumping/loading.
     #

server/lib/picky/backend/file/json.rb → server/lib/picky/backends/file/json.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     module File
 

server/lib/picky/backend/file/marshal.rb → server/lib/picky/backends/file/marshal.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     module File
 

server/lib/picky/backend/file/text.rb → server/lib/picky/backends/file/text.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     module File
 

server/lib/picky/backend/files.rb → server/lib/picky/backends/memory.rb

@@ -1,8 +1,8 @@
 module Picky
 
-  module Backend
+  module Backends
 
-    class Files < Base
+    class Memory < Base
 
       def initialize bundle
         super bundle

server/lib/picky/backend/redis.rb → server/lib/picky/backends/redis.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     #
     #

server/lib/picky/backend/redis/basic.rb → server/lib/picky/backends/redis/basic.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     class Redis
 

server/lib/picky/backend/redis/float_hash.rb → server/lib/picky/backends/redis/float_hash.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     class Redis
 

server/lib/picky/backend/redis/list_hash.rb → server/lib/picky/backends/redis/list_hash.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     class Redis
 

server/lib/picky/backend/redis/string_hash.rb → server/lib/picky/backends/redis/string_hash.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Backend
+  module Backends
 
     class Redis
 

server/lib/picky/bundle.rb

@@ -35,16 +35,22 @@ class Bundle
     delegate :[], :[]=,        :to => :configuration
     delegate :index_directory, :to => :category
 
-    def initialize name, category, similarity_strategy, options = {}
+    def initialize name, category, backend_class, similarity_strategy, options = {}
       @name          = name
       @category      = category
 
-      # TODO Still needed?
+      # TODO Refactor further.
+      #
+      @backend = backend_class.new self
+
+      # Default backend values.
+      #
+      # TODO Use a default (memory) backend and load instantly.
       #
       @inverted      = {}
       @weights       = {}
       @similarity    = {}
-      @configuration = {} # A hash with config options.
+      @configuration = {}
 
       @similarity_strategy = similarity_strategy
     end

server/lib/picky/category.rb

@@ -35,16 +35,16 @@ def initialize name, index, options = {}
       partial    = options[:partial]    || Generators::Partial::Default
       similarity = options[:similarity] || Generators::Similarity::Default
 
-      @indexing_exact   = index.indexing_bundle_class.new :exact,   self, weights, Generators::Partial::None.new, similarity, options
-      @indexing_partial = index.indexing_bundle_class.new :partial, self, weights, partial, Generators::Similarity::None.new, options
+      @indexing_exact   = Indexing::Bundle.new  :exact,  self, index.backend_class, weights, Generators::Partial::None.new, similarity, options
+      @indexing_partial = Indexing::Bundle.new :partial, self, index.backend_class, weights, partial, Generators::Similarity::None.new, options
 
       # Indexed.
       #
-      @indexed_exact  = index.indexed_bundle_class.new  :exact, self, similarity
+      @indexed_exact  = Indexed::Bundle.new :exact, self, index.backend_class, similarity
       if partial.use_exact_for_partial?
         @indexed_partial  = @indexed_exact
       else
-        @indexed_partial  = index.indexed_bundle_class.new  :partial, self, similarity
+        @indexed_partial  = Indexed::Bundle.new :partial, self, index.backend_class, similarity
       end
 
       # @exact   = exact_lambda.call(@exact, @partial)   if exact_lambda   = options[:exact_lambda]
@@ -92,7 +92,7 @@ def prepared_index_path
     # Note: If you don't use it with the block, do not forget to close it.
     #
     def prepared_index_file &block
-      @prepared_index_file ||= Backend::File::Text.new prepared_index_path
+      @prepared_index_file ||= Backends::File::Text.new prepared_index_path
       @prepared_index_file.open &block
     end
     # Creates the index directory including all necessary paths above it.

server/lib/picky/indexed/bundle.rb

@@ -0,0 +1,112 @@
+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
+
+      # 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 [].
+      #
+      def load
+        load_inverted
+        load_weights
+        load_similarity
+        load_configuration
+      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
+
+      # 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