em-imap 0.2 → 0.2.1

data/lib/em-imap/client.rb

@@ -310,7 +310,7 @@ module EventMachine
       # The same as fetch, but keyed of UIDs instead of sequence numbers.
       #
       def uid_fetch(seq, attr="FULL")
-        fetch_internal("UID", "FETCH", seq, attr)
+        fetch_internal("UID FETCH", seq, attr)
       end
 
       # Update the flags on a message.
@@ -371,20 +371,50 @@ module EventMachine
 
       private
 
-      # Convert a string to the modified UTF-7 required by IMAP for mailbox naming.
-      # See RFC 3501 Section 5.1.3 for more information.
+      # Decode a string from modified UTF-7 format to UTF-8.
       #
-      def to_utf7(text)
-        Net::IMAP.encode_utf7(text)
+      # UTF-7 is a 7-bit encoding of Unicode [UTF7].  IMAP uses a
+      # slightly modified version of this to encode mailbox names
+      # containing non-ASCII characters; see [IMAP] section 5.1.3.
+      #
+      # Net::IMAP does _not_ automatically encode and decode
+      # mailbox names to and from utf7.
+      def to_utf8(s)
+        return force_encoding(s.gsub(/&(.*?)-/n) {
+          if $1.empty?
+            "&"
+          else
+            base64 = $1.tr(",", "/")
+            x = base64.length % 4
+            if x > 0
+              base64.concat("=" * (4 - x))
+            end
+            base64.unpack("m")[0].unpack("n*").pack("U*")
+          end
+        }, "UTF-8")
       end
 
-      # Convert a string from the modified UTF-7 required by IMAP for mailbox naming.
-      # See RFC 3501 Section 5.1.3 for more information.
-      #
-      def to_utf8(text)
-        Net::IMAP.decode_utf7(text)
+      # Encode a string from UTF-8 format to modified UTF-7.
+      def to_utf7(s)
+        return force_encoding(force_encoding(s, 'UTF-8').gsub(/(&)|([^\x20-\x7e]+)/u) {
+          if $1
+            "&-"
+          else
+            base64 = [$&.unpack("U*").pack("n*")].pack("m")
+            "&" + base64.delete("=\n").tr("/", ",") + "-"
+          end
+        }, "ASCII-8BIT")
       end
-      
+
+      # FIXME: I haven't thought through the ramifications of this yet.
+      def force_encoding(s, encoding)
+        if s.respond_to?(:force_encoding)
+          s.force_encoding(encoding)
+        else
+          s
+        end
+      end
+
       # Send a command that should return a deferrable that succeeds with
       # a tagged_response.
       #
@@ -459,7 +489,7 @@ module EventMachine
 
         set = Net::IMAP::MessageSet.new(set)
 
-        multi_data_response(cmd, set, attr).transform do |untagged_responses|
+        collect_untagged_responses('FETCH', cmd, set, attr).transform do |untagged_responses|
           untagged_responses.map(&:data)
         end
       end
@@ -486,7 +516,7 @@ module EventMachine
           when "*", -1, Range
             Net::IMAP::MessageSet.new(arg)
           when Array
-            if Array.all?{ |item| item.is_a?(Number) || item.is_a?(Range) }
+            if arg.inject(true){|bool,item| bool and (item.is_a?(Integer) or item.is_a?(Range))}
               Net::IMAP::MessageSet.new(arg)
             else
               normalize_search_criteria(arg)

data/lib/em-imap/connection.rb

@@ -44,7 +44,7 @@ module EventMachine
           if response.is_a?(Net::IMAP::UntaggedResponse) && response.name != "BYE"
             hello_listener.succeed response
           else
-            hello_listener.fail Net::IMAP::ResponseParseError.new(response.raw_data)
+            hello_listener.fail Net::IMAP::ResponseParseError.new((RUBY_VERSION[0,3] == "1.8" ? response.raw_data : response))
           end
         end.errback do |e|
           hello_listener.fail e
@@ -121,9 +121,9 @@ module EventMachine
           if response.is_a?(Net::IMAP::TaggedResponse) && response.tag == command.tag
             case response.name
             when "NO"
-              command.fail Net::IMAP::NoResponseError.new(response.data.text)
+              command.fail Net::IMAP::NoResponseError.new((RUBY_VERSION[0,3] == "1.8" ? response.data.text : response))
             when "BAD"
-              command.fail Net::IMAP::BadResponseError.new(response.data.text)
+              command.fail Net::IMAP::BadResponseError.new((RUBY_VERSION[0,3] == "1.8" ? response.data.text : response))
             else
               command.succeed response
             end
@@ -155,7 +155,7 @@ module EventMachine
         # to hear any more, so we fail all our listeners.
         add_response_handler do |response|
           if response.is_a?(Net::IMAP::UntaggedResponse) && response.name == "BYE"
-            fail Net::IMAP::ByeResponseError.new(response.raw_data)
+            fail Net::IMAP::ByeResponseError.new((RUBY_VERSION[0,3] == "1.8" ? response.raw_data : response))
           end
         end
       end

data/lib/em-imap.rb

@@ -1,4 +1,3 @@
-require 'net/imap'
 require 'set'
 
 require 'rubygems'
@@ -6,6 +5,7 @@ require 'eventmachine'
 require 'deferrable_gratification'
 
 $:.unshift File.dirname( __FILE__ )
+require 'net/imap'
 require 'em-imap/listener'
 require 'em-imap/continuation_synchronisation'
 require 'em-imap/formatter'

metadata

@@ -1,74 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-imap
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
 platform: ruby
-authors: 
+authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &15589320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: deferrable_gratification
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *15589320
+- !ruby/object:Gem::Dependency
+  name: deferrable_gratification
+  requirement: &15588820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *15588820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &15588400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *15588400
 description: Allows you to connect to an IMAP4rev1 server in a non-blocking fashion.
-email: 
+email:
 - conrad@rapportive.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/em-imap.rb
 - lib/em-imap/listener.rb
 - lib/em-imap/formatter.rb
@@ -80,41 +62,29 @@ files:
 - lib/em-imap/response_parser.rb
 - LICENSE.MIT
 - README.md
-has_rdoc: true
 homepage: http://github.com/rapportive-oss/em-imap
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An EventMachine based IMAP client.
 test_files: []
-