directory_watcher 1.0.0 → 1.1.0

data/Rakefile

@@ -19,6 +19,9 @@ dispatched to registered observers. Three types of events are supported --
 added, modified, and removed.
   DESC
   proj.changes = <<-CHANGES
+Version 1.1.0 / 2007-11-28
+  * directory watcher now works with Ruby 1.9
+
 Version 1.0.0 / 2007-08-21
   * added a join method (much like Thread#join)
 

data/lib/directory_watcher.rb

@@ -149,9 +149,8 @@ require 'observer'
 # Tim Pease
 #
 class DirectoryWatcher
-  include Observable
 
-  VERSION = '1.0.0'    # :nodoc:
+  VERSION = '1.1.0'    # :nodoc:
 
   # An +Event+ structure contains the _type_ of the event and the file _path_
   # to which the event pertains. The type can be one of the following:
@@ -210,29 +209,54 @@ class DirectoryWatcher
     @files = (opts[:pre_load] ? scan_files : Hash.new)
     @events = []
     @thread = nil
+    @observer_peers = {}
   end
 
   # call-seq:
-  #    add_observer( observer )
+  #    add_observer( observer, func = :update )
   #    add_observer {|*events| block}
   #
   # Adds the given _observer_ as an observer on this directory watcher. The
   # _observer_ will now receive file events when they are generated. The
-  # _observer_ must implement an <code>update( *events )</code> method.
+  # second optional argument specifies a method to notify updates, of which
+  # the default value is +update+.
   #
   # Optionally, a block can be passed as the observer. The block will be
   # executed with the file events passed as the arguments. A reference to the
   # underlying +Proc+ object will be returned for use with the
   # +delete_observer+ method.
   #
-  def add_observer( observer = nil, &block )
+  def add_observer( observer = nil, func = :update, &block )
     unless block.nil?
       observer = block.to_proc
-      class << observer
-        alias_method :update, :call
-      end
+      func = :call
+    end
+
+    unless observer.respond_to? func
+      raise NoMethodError, "observer does not respond to `#{func.to_s}'"
     end
-    super observer
+
+    @observer_peers[observer] = func
+    observer
+  end
+
+  # Delete +observer+ as an observer of this directory watcher. It will no
+  # longer receive notifications.
+  #
+  def delete_observer( observer )
+    @observer_peers.delete observer
+  end
+
+  # Delete all observers associated with the directory watcher.
+  #
+  def delete_observers
+    @observer_peers.clear
+  end
+
+  # Return the number of observers associated with this directory watcher..
+  #
+  def count_observers
+    @observer_peers.size
   end
 
   # call-seq:
@@ -244,8 +268,8 @@ class DirectoryWatcher
   #
   def glob=( val )
     @glob = case val
-            when String: [File.join(@dir, val)]
-            when Array: val.flatten.map! {|g| File.join(@dir, g)}
+            when String; [File.join(@dir, val)]
+            when Array; val.flatten.map! {|g| File.join(@dir, g)}
             else
               raise(ArgumentError,
                     'expecting a glob pattern or an array of glob patterns')
@@ -324,7 +348,7 @@ class DirectoryWatcher
     return if running?
 
     @stop = false
-    @thread = Thread.new(self) {|dw| dw.send :run}
+    @thread = Thread.new(self) {|dw| dw.__send__ :run}
     self
   end
 
@@ -500,12 +524,12 @@ class DirectoryWatcher
   # The file events array is cleared at the end of this method call.
   #
   def notify_observers
-    unless @events.empty? or !@observer_peers
-      @observer_peers.dup.each do |observer|
-        begin; observer.update(*@events); rescue Exception; end
+    unless @events.empty?
+      @observer_peers.each do |observer, func|
+        begin; observer.send(func, *@events); rescue Exception; end
       end
+      @events.clear
     end
-    @events.clear
   end
 
 end  # class DirectoryWatcher

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: directory_watcher
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-08-21 00:00:00 -06:00
+  version: 1.1.0
+date: 2007-11-28 00:00:00 -07:00
 summary: A class for watching files within a directory and generating events when those files change
 require_paths: 
 - lib
@@ -55,5 +55,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: