lib/lookbook/entities/collections/entity_collection.rb in lookbook-1.5.5 vs lib/lookbook/entities/collections/entity_collection.rb in lookbook-2.0.0.beta.0

@@ -12,33 +12,33 @@
       add(entities)
     end
 
     def add(to_add = nil)
       Array(to_add).each do |entity|
-        unless find_by_path(entity.path)
+        unless find_by_path(entity.lookup_path)
           @entities.push(entity)
         end
       end
       clear_cache
     end
 
     def find_by_id(id)
       id = Utils.id(id)
-      entities.find { |entity| entity.id == id }
+      @entities.find { |entity| entity.id == id }
     end
 
     def find_by_path(path)
-      entities.find { |entity| entity.path.to_s == path.to_s }
+      @entities.find { |entity| entity.lookup_path.to_s == path.to_s }
     end
 
     def next(entity)
-      index = entities.find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.lookup_path == entity.lookup_path }
       entities[index + 1] unless index.nil?
     end
 
     def previous(entity)
-      index = entities.find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.lookup_path == entity.lookup_path }
       entities[index - 1] if !index.nil? && index > 0
     end
 
     def each(&block)
       if block
@@ -47,10 +47,15 @@
         to_enum(:each)
       end
     end
 
     def flat_map(...)
-      entities.map(...).map(&:to_a).flatten
+      entities.map(...).map { |e| e.respond_to?(:to_a) ? e.to_a : e }.flatten
+    end
+
+    def clear_all
+      @entities = []
+      clear_cache
     end
 
     protected
 
     def clear_cache