observer.rb in arborist-0.0.1.pre20160128152542

- old
+ new

@@ -59,28 +59,14 @@
 	ensure
 		Thread.current[ LOADED_INSTANCE_KEY ] = nil
 	end
 
 
-	### Return an iterator for all the observer files in the specified +directory+.
-	def self::each_in( directory )
-		path = Pathname( directory )
-		paths = if path.directory?
-				Pathname.glob( directory + OBSERVER_FILE_PATTERN )
-			else
-				[ path ]
-			end
-
-		return paths.flat_map do |file|
-			file_url = "file://%s" % [ file.expand_path ]
-			observers = self.load( file )
-			self.log.debug "Loaded observers %p..." % [ observers ]
-			observers.each do |observer|
-				observer.source = file_url
-			end
-			observers
-		end
+	### Return an iterator for all the observers supplied by the specified +loader+.
+	def self::each_in( loader )
+		return loader.observers
 	end
+
 
 
 	### Create a new Observer with the specified +description+.
 	def initialize( description, &block )
 		@description = description