lib/lookbook/entities/collections/entity_collection.rb in lookbook-1.4.0 vs lib/lookbook/entities/collections/entity_collection.rb in lookbook-1.4.1

@@ -10,55 +10,50 @@
       @_cache = {}
       @entities = []
       add(entities)
     end
 
-    def add(entities = nil)
-      Array(entities).each do |entity|
+    def add(to_add = nil)
+      Array(to_add).each do |entity|
         unless find_by_path(entity.path)
-          clear_cache
           @entities.push(entity)
         end
       end
-      sort_entities
+      clear_cache
     end
 
     def find_by_id(id)
       id = Utils.id(id)
-      find { |entity| entity.id == id }
+      entities.find { |entity| entity.id == id }
     end
 
     def find_by_path(path)
-      find { |entity| entity.path.to_s == path.to_s }
+      entities.find { |entity| entity.path.to_s == path.to_s }
     end
 
     def next(entity)
-      index = find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.path == entity.path }
       entities[index + 1] unless index.nil?
     end
 
     def previous(entity)
-      index = find_index { |i| i.path == entity.path }
+      index = entities.find_index { |i| i.path == entity.path }
       entities[index - 1] if !index.nil? && index > 0
     end
 
     def each(&block)
       if block
-        entities.each { |entity| yield entity }
+        entities.sort.each { |entity| yield entity }
       else
         to_enum(:each)
       end
     end
 
     def flat_map(...)
-      map(...).map(&:to_a).flatten
+      entities.map(...).map(&:to_a).flatten
     end
 
     protected
-
-    def sort_entities
-      @entities.sort_by! { |entity| [entity.label] }
-    end
 
     def clear_cache
       @_cache = {}
     end
   end