em-imap 0.1 → 0.1.1

data/lib/em-imap/connection.rb

@@ -20,7 +20,7 @@ module EventMachine
       #                     first response was BYE.
       #
       def self.connect(host, port, ssl=false)
-        conn = EventMachine.connect(host, port, self).tap do |conn|
+        EventMachine.connect(host, port, self).tap do |conn|
           conn.start_tls if ssl
         end
       end
@@ -97,12 +97,17 @@ module EventMachine
       end
 
       # Called when the connection is closed.
-      # If there are any listeners left, we fail them.
-      # (TODO: Should we actually succeed them if the connection was
-      # explicitly closed by us?)
       # TODO: Figure out how to send a useful error...
       def unbind
-        @listeners.each{ |listener| listener.fail EOFError.new("Connection to IMAP server was unbound") }
+        fail_all EOFError.new("Connection to IMAP server was unbound"), true
+      end
+
+      def fail_all(error, closed=false)
+        # NOTE: Take a shallow clone of the listeners here so that we get guaranteed
+        # behaviour. We want to fail any listeners that may be added by the errbacks
+        # of other listeners.
+        @listeners.clone.each{ |listener| listener.fail error } while @listeners.size > 0
+        close_connection unless closed
       end
 
       def add_to_listener_pool(listener)
@@ -113,7 +118,9 @@ module EventMachine
       # EM::IMAP::ResponseParser. Each response is a Net::IMAP response
       # object. (FIXME)
       def receive_response(response)
-        @listeners.each{ |listener| listener.receive_event response }
+        # NOTE: Take a shallow clone of the listeners so that if receiving an
+        # event causes a new listener to be added, it won't receive this response!
+        @listeners.clone.each{ |listener| listener.receive_event response }
       end
 
       # Await the response that marks the completion of this command,

data/lib/em-imap/continuation_synchronisation.rb

@@ -59,8 +59,12 @@ module EventMachine
       # continuation responses onto the currently awaiting block.
       def listen_for_continuation
         add_response_handler do |response|
-          if awaiting_continuation? && response.is_a?(Net::IMAP::ContinuationRequest)
-            @awaiting_continuation.receive_event response
+          if response.is_a?(Net::IMAP::ContinuationRequest)
+            if awaiting_continuation?
+              @awaiting_continuation.receive_event response
+            else
+              fail_all Net::IMAP::ResponseError.new("Unexpected continuation response from server")
+            end
           end
         end
       end

data/lib/em-imap/listener.rb

@@ -92,12 +92,15 @@ module EventMachine
       # Register a block to be called when receive_event is called.
       def listen(&block)
         listeners << block
+        stopback{ |*args| listeners.delete block }
         self
       end
 
       # Pass arguments onto any blocks registered with listen.
       def receive_event(*args, &block)
-        listeners.each{ |l| l.call *args, &block }
+        # NOTE: Take a clone of listeners, so any listeners added by listen
+        # blocks won't receive these events.
+        listeners.clone.each{ |l| l.call *args, &block }
       end
 
       # Register a block to be called when the ListeningDeferrable is stopped.

data/lib/em-imap/response_parser.rb

@@ -39,10 +39,15 @@ module EventMachine
       # Callback used by receive data.
       def receive_response(response); end
 
+      # Callback used if something goes wrong.
+      def fail_all(error); end
+
       private
 
       def parse(line)
         @parser.parse(line)
+      rescue Net::IMAP::ResponseParseError => e
+        fail_all e
       end
     end
   end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: em-imap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Conrad Irwin
@@ -13,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -07:00
+date: 2011-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -32,9 +36,11 @@ dependencies:
   name: deferrable_gratification
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -44,9 +50,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,12 +72,12 @@ extra_rdoc_files: []
 files: 
 - lib/em-imap.rb
 - lib/em-imap/listener.rb
-- lib/em-imap/client.rb
-- lib/em-imap/continuation_synchronisation.rb
-- lib/em-imap/response_parser.rb
-- lib/em-imap/connection.rb
 - lib/em-imap/command_sender.rb
 - lib/em-imap/authenticators.rb
+- lib/em-imap/connection.rb
+- lib/em-imap/continuation_synchronisation.rb
+- lib/em-imap/client.rb
+- lib/em-imap/response_parser.rb
 - LICENSE.MIT
 - README.md
 has_rdoc: true
@@ -82,25 +90,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An EventMachine based IMAP client.