index.rb in gitmodel-0.0.5

- old
+ new

@@ -2,43 +2,46 @@
   class Index
     def initialize(model_class)
       @model_class = model_class
     end
 
-    def generate!
+    def generate!(branch)
       GitModel.logger.debug "Generating indexes for #{@model_class}"
       # TODO it sucks to load every instance here, optimize later
       @indexes = {}
-      @model_class.find_all.each do |o|
+      @model_class.find_all(:branch => branch).each do |o|
         o.attributes.each do |attr, value|
           @indexes[attr] ||= {}
           @indexes[attr][value] ||= SortedSet.new
           @indexes[attr][value] << o.id
         end
       end
     end
 
     def attr_index(attr)
       self.load unless @indexes
-      return nil unless @indexes # this is just so that we can stub self.load in tests
-
-      ret = @indexes[attr.to_s] 
-      raise GitModel::AttributeNotIndexed.new(attr.to_s) unless ret
-      return ret
+      unless @indexes # this is just so that we can stub self.load in tests
+        nil
+      else
+        ret = @indexes[attr.to_s] 
+        raise GitModel::AttributeNotIndexed.new(attr.to_s) unless ret
+        ret
+      end
     end
 
     def filename
       File.join(@model_class.db_subdir, '_indexes.json')
     end
 
-    def generated?
-      (GitModel.current_tree / filename) ? true : false
+    def generated?(branch = GitModel.default_branch)
+      (GitModel.current_tree(branch) / filename) ? true : false
     end
 
     def save(options = {})
       GitModel.logger.debug "Saving indexes for #{@model_class}..."
       transaction = options.delete(:transaction) || GitModel::Transaction.new(options) 
+      branch = transaction.branch || options.delete(:branch) || GitModel.default_branch
       result = transaction.execute do |t|
         # convert to array because JSON hash keys must be strings
         data = []
         @indexes.each do |attr,values|
           values_and_ids = []
@@ -50,29 +53,31 @@
         data = Yajl::Encoder.encode(data, nil, :pretty => true)
         t.index.add(filename, data)
       end
     end
 
-    def load
-      unless generated?
-        GitModel.logger.debug "No index generated for #{@model_class}, not loading."
-        return
-      end
-
-      GitModel.logger.debug "Loading indexes for #{@model_class}..."
-      @indexes = {}
-      blob = GitModel.current_tree / filename
-      
-      data = Yajl::Parser.parse(blob.data)
-      data.each do |attr_and_values|
-        attr = attr_and_values[0]
-        values = {}
-        attr_and_values[1].each do |value_and_ids|
-          value = value_and_ids[0]
-          ids = SortedSet.new(value_and_ids[1])
-          values[value] = ids
+    def load(branch = GitModel.default_branch)
+      @indexes = GitModel.cache(branch, "#{@model_class.db_subdir}-index-load") do
+        unless generated?(branch)
+          GitModel.logger.debug "No index generated for #{@model_class}, on branch #{branch}, not loading."
+        else
+          GitModel.logger.debug "Loading indexes for #{@model_class}..."
+          indexes = {}
+          blob = GitModel.current_tree(branch) / filename
+          
+          data = Yajl::Parser.parse(blob.data)
+          data.each do |attr_and_values|
+            attr = attr_and_values[0]
+            values = {}
+            attr_and_values[1].each do |value_and_ids|
+              value = value_and_ids[0]
+              ids = SortedSet.new(value_and_ids[1])
+              values[value] = ids
+            end
+            indexes[attr] = values
+          end
         end
-        @indexes[attr] = values
+        indexes
       end
     end
 
   end
 end