jpmobile 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c3a91d387a147b06a1e8698b4ddcbba1e62c52
-  data.tar.gz: 51c89371e9075628a87c5cdf03cff1922da39466
+  metadata.gz: 154aabed283366bd8c6fba6825b99d62e96cf78c
+  data.tar.gz: b62fa66625f4f710930f00fa3ff20bd2997ed8a9
 SHA512:
-  metadata.gz: 5897e0d386accbb2ba9aee29161317c44e550974cf021775badcd932ab77c58475feff381e6da9cff37f0cfb57fb7246cd224916fa0dcbc0255dee34bf430f83
-  data.tar.gz: 78e415d4aea5194564eaaf04dd6a1c5b06cc4c862868bd644555a82433bd127dfd9f8f2c02bd7f6ef7d5f5d6ae1f3ad1118ed9ab1d75d4707c6a8cd831c95096
+  metadata.gz: 3fa80365078d094087533cf1b1b70d1aa84f3f0336bbf98c7e5ca6ce18d607b35d277b103ac9ea8f3782dfd44f77d17bff4ec8d1dfad2e14a3ae1d575bfaa969
+  data.tar.gz: 09c776d1b5e90bcaaf563dee8c2b87b6b1f275df76d31b116292d5521e84899d019fb30a1d30c2557330618ebf5daebcc2f1dad709b2e967d1bbfa168a58af50

data/jpmobile.gemspec

@@ -16,12 +16,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rails'
+  gem.add_development_dependency 'rails', '~> 4.0.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'webrat'
   gem.add_development_dependency 'geokit'
   gem.add_development_dependency 'sqlite3-ruby'
+  gem.add_development_dependency 'nokogiri', '1.6.2.1'
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
 end

data/lib/jpmobile/filter.rb

@@ -2,12 +2,10 @@
 # = 半角変換フィルター
 # thanks to masuidrive <masuidrive (at) masuidrive.jp>
 
-class ActionController::Base #:nodoc:
+ActiveSupport.on_load(:action_controller) do
   def self.hankaku_filter(options={})
-    options = {:input => false}.update(options)
-
-    before_filter lambda {|controller| Jpmobile::HankakuFilter.before(controller, options)}
-    after_filter  lambda {|controller| Jpmobile::HankakuFilter.after(controller, options)}
+    before_action Jpmobile::HankakuFilter.new(options)
+    after_action  Jpmobile::HankakuFilter.new(options)
   end
 
   def self.mobile_filter(options={})
@@ -18,43 +16,99 @@ class ActionController::Base #:nodoc:
 end
 
 module Jpmobile
-  module HankakuFilter
-    module_function
+  class HankakuFilter
+    cattr_accessor(:zen_to_han_table) do
+      {
+        "ガ" => "ｶﾞ", "ギ" => "ｷﾞ", "グ" => "ｸﾞ", "ゲ" => "ｹﾞ", "ゴ" => "ｺﾞ",
+        "ザ" => "ｻﾞ", "ジ" => "ｼﾞ", "ズ" => "ｽﾞ", "ゼ" => "ｾﾞ", "ゾ" => "ｿﾞ",
+        "ダ" => "ﾀﾞ", "ヂ" => "ﾁﾞ", "ヅ" => "ﾂﾞ", "デ" => "ﾃﾞ", "ド" => "ﾄﾞ",
+        "バ" => "ﾊﾞ", "ビ" => "ﾋﾞ", "ブ" => "ﾌﾞ", "ベ" => "ﾍﾞ", "ボ" => "ﾎﾞ",
+        "パ" => "ﾊﾟ", "ピ" => "ﾋﾟ", "プ" => "ﾌﾟ", "ペ" => "ﾍﾟ", "ポ" => "ﾎﾟ",
+        "ヴ" => "ｳﾞ",
+        "ア" => "ｱ", "イ" => "ｲ", "ウ" => "ｳ", "エ" => "ｴ", "オ" => "ｵ",
+        "カ" => "ｶ", "キ" => "ｷ", "ク" => "ｸ", "ケ" => "ｹ", "コ" => "ｺ",
+        "サ" => "ｻ", "シ" => "ｼ", "ス" => "ｽ", "セ" => "ｾ", "ソ" => "ｿ",
+        "タ" => "ﾀ", "チ" => "ﾁ", "ツ" => "ﾂ", "テ" => "ﾃ", "ト" => "ﾄ",
+        "ナ" => "ﾅ", "ニ" => "ﾆ", "ヌ" => "ﾇ", "ネ" => "ﾈ", "ノ" => "ﾉ",
+        "ハ" => "ﾊ", "ヒ" => "ﾋ", "フ" => "ﾌ", "ヘ" => "ﾍ", "ホ" => "ﾎ",
+        "マ" => "ﾏ", "ミ" => "ﾐ", "ム" => "ﾑ", "メ" => "ﾒ", "モ" => "ﾓ",
+        "ヤ" => "ﾔ", "ユ" => "ﾕ", "ヨ" => "ﾖ",
+        "ラ" => "ﾗ", "リ" => "ﾘ", "ル" => "ﾙ", "レ" => "ﾚ", "ロ" => "ﾛ",
+        "ワ" => "ﾜ", "ヲ" => "ｦ", "ン" => "ﾝ",
+        "ャ" => "ｬ", "ュ" => "ｭ", "ョ" => "ｮ",
+        "ァ" => "ｧ", "ィ" => "ｨ", "ゥ" => "ｩ", "ェ" => "ｪ", "ォ" => "ｫ",
+        "ッ" => "ｯ",
+        "゛" => "ﾞ", "゜" => "ﾟ", "ー" => "ｰ", "。" => "｡",
+        "「" => "｢", "」" => "｣",
+        "、" => "､", "・" => "･", "！" => "!", "？" => "?",
+      }
+    end
 
-    # 入出力フィルタの適用条件
-    def apply_incoming?(controller)
-      controller.request.mobile?
+    class << self
+      def hankaku_format(str)
+        replace_chars(str, zen_to_han_table)
+      end
+
+      def zenkaku_format(str)
+        replace_chars(str, han_to_zen_table)
+      end
+
+      private
+
+      def replace_chars(str, table)
+        @regexp_cache ||= {}
+        str.gsub(@regexp_cache[table.object_id] ||= Regexp.union(table.keys), table)
+      end
+
+      def han_to_zen_table
+        @han_to_zen_table ||= zen_to_han_table.invert
+      end
     end
-    def apply_outgoing?(controller)
-      controller.request.mobile? and
-        [nil, "text/html", "application/xhtml+xml"].include?(controller.response.content_type)
+
+    def initialize(options = {})
+      @options = {
+        :input => false,
+      }.merge(options)
+
+      @controller = nil
     end
 
-    def before(controller, options = {})
-      if apply_incoming?(controller)
-        Util.deep_apply(controller.params) do |value|
-          value = to_internal(value, options)
+    def before(controller)
+      @controller = controller
+      if apply_incoming?
+        Util.deep_apply(@controller.params) do |value|
+          value = to_internal(value)
         end
       end
     end
+
     # 内部コードから外部コードに変換
-    def after(controller, options = {})
-      if apply_outgoing?(controller) and controller.response.body.is_a?(String)
-        if controller.request.mobile?
-          options.merge!(:charset => controller.request.mobile.default_charset)
-        end
-        controller.response.body = to_external(controller.response.body, options)
+    def after(controller)
+      @controller = controller
+      if apply_outgoing? and @controller.response.body.is_a?(String)
+        @controller.response.body = to_external(@controller.response.body)
       end
     end
 
-    @@internal = %w(ガ ギ グ ゲ ゴ ザ ジ ズ ゼ ゾ ダ ヂ ヅ デ ド バ ビ ブ ベ ボ パ ピ プ ペ ポ ヴ ア イ ウ エ オ カ キ ク ケ コ サ シ ス セ ソ タ チ ツ テ ト ナ ニ ヌ ネ ノ ハ ヒ フ ヘ ホ マ ミ ム メ モ ヤ ユ ヨ ラ リ ル レ ロ ワ ヲ ン ャ ュ ョ ァ ィ ゥ ェ ォ ッ ゛ ゜ ー 。 「 」 、 ・ ！ ？).freeze
-    @@external = %w(ｶﾞ ｷﾞ ｸﾞ ｹﾞ ｺﾞ ｻﾞ ｼﾞ ｽﾞ ｾﾞ ｿﾞ ﾀﾞ ﾁﾞ ﾂﾞ ﾃﾞ ﾄﾞ ﾊﾞ ﾋﾞ ﾌﾞ ﾍﾞ ﾎﾞ ﾊﾟ ﾋﾟ ﾌﾟ ﾍﾟ ﾎﾟ ｳﾞ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ｦ ﾝ ｬ ｭ ｮ ｧ ｨ ｩ ｪ ｫ ｯ ﾞ ﾟ ｰ ｡ ｢ ｣ ､ ･ ! ?).freeze
-    def to_internal(str, options = {})
-      filter(str, @@external, @@internal)
+    private
+
+    # 入出力フィルタの適用条件
+    def apply_incoming?
+      @controller.request.mobile?
     end
-    def to_external(str, options = {})
-      unless options[:input]
-        filter(str, @@internal, @@external)
+
+    def apply_outgoing?
+      @controller.request.mobile? and
+        [nil, "text/html", "application/xhtml+xml"].include?(@controller.response.content_type)
+    end
+
+    def to_internal(str)
+      filter(:zenkaku, str)
+    end
+
+    def to_external(str)
+      unless @options[:input]
+        filter(:hankaku, str)
       else
         encoding = (str =~ /^\s*<[^Hh>]*html/) and str.respond_to?(:encoding)
         nokogiri_klass =
@@ -68,12 +122,12 @@ module Jpmobile
         doc = convert_text_content(doc)
 
         html = doc.to_html.gsub("\xc2\xa0","&nbsp;")
-        html = html.gsub(/charset=[a-z0-9\-]+/i, "charset=#{options[:charset]}") if options[:charset]
+        html = html.gsub(/charset=[a-z0-9\-]+/i, "charset=#{default_charset}") if default_charset
         html
       end
     end
 
-    def filter(str, from, to)
+    def filter(method, str)
       str = str.clone
 
       # 一度UTF-8に変換
@@ -83,9 +137,7 @@ module Jpmobile
         str.force_encoding("UTF-8")
       end
 
-      from.each_with_index do |int, i|
-        str.gsub!(int, to[i])
-      end
+      str = self.class.send("#{method}_format", str)
 
       # 元に戻す
       if before_encoding
@@ -101,11 +153,11 @@ module Jpmobile
         if element.kind_of?(Nokogiri::XML::Text)
           unless element.parent.node_name == "textarea"
             # textarea 以外のテキストなら content を変換
-            element.content = filter(element.content, @@internal, @@external)
+            element.content = filter(:hankaku, element.content)
           end
         elsif element.node_name == "input" and ["submit", "reset", "button"].include?(element["type"])
           # テキスト以外でもボタンの value は変換
-          element["value"] = filter(element["value"], @@internal, @@external)
+          element["value"] = filter(:hankaku, element["value"])
         elsif element.children.any?
           # 子要素があれば再帰的に変換
           element = convert_text_content(element)
@@ -114,5 +166,11 @@ module Jpmobile
 
       document
     end
+
+    def default_charset
+      if @controller.request.mobile?
+        @controller.request.mobile.default_charset
+      end
+    end
   end
 end

data/lib/jpmobile/mail.rb

@@ -29,12 +29,6 @@ module Mail
     def mobile=(m)
       if @mobile = m
         @charset = m.mail_charset(@charset)
-
-        if self.body
-          self.body.content_type_with_jpmobile = self.content_type
-          self.body.charset = @charset
-          self.body.mobile = m
-        end
       end
     end
 
@@ -47,7 +41,6 @@ module Mail
 
         ready_to_send!
 
-        self.body.charset = @charset
         self.body.mobile  = @mobile
         self.header['Content-Transfer-Encoding'].value = @mobile.content_transfer_encoding(self.header)
         if @mobile.decorated?
@@ -84,6 +77,18 @@ module Mail
       self.body   = body_part
     end
 
+    def init_with_hash_with_jpmobile(hash)
+      if hash[:body_raw]
+        @mobile = hash[:mobile]
+        init_with_string(hash[:body_raw])
+      else
+        init_with_hash_without_jpmobile(hash)
+      end
+    end
+
+    alias_method :init_with_hash_without_jpmobile, :init_with_hash
+    alias_method :init_with_hash, :init_with_hash_with_jpmobile
+
     def init_with_string(string)
       # convert to ASCII-8BIT for ascii incompatible encodings
       s = Jpmobile::Util.ascii_8bit(string)
@@ -97,7 +102,6 @@ module Mail
       process_body_raw_without_jpmobile
 
       if @mobile
-        @body.charset = @charset
         @body.mobile = @mobile
         @body.content_type_with_jpmobile = self.content_type
 
@@ -121,6 +125,11 @@ module Mail
       @raw_source = value.to_crlf
     end
 
+    def separate_parts_with_jpmobile
+      @body.mobile = @mobile
+      separate_parts_without_jpmobile
+    end
+
     alias_method :encoded_without_jpmobile, :encoded
     alias_method :encoded, :encoded_with_jpmobile
 
@@ -130,6 +139,9 @@ module Mail
     alias_method :process_body_raw_without_jpmobile, :process_body_raw
     alias_method :process_body_raw, :process_body_raw_with_jpmobile
 
+    alias_method :separate_parts_without_jpmobile, :separate_parts
+    alias_method :separate_parts, :separate_parts_with_jpmobile
+
 # -- docomo
 # multipart/mixed
 #   |- multipart/related
@@ -230,34 +242,23 @@ module Mail
       # override charset
       if self.header[:content_type]
         content_type_charset = Jpmobile::Util.extract_charset(self.header[:content_type].value)
+        @charset = content_type_charset
         unless content_type_charset.blank?
-          @charset = content_type_charset
           self.header[:content_type].parameters[:charset] = @charset
           @mobile_main_type = self.header[:content_type].main_type
         end
-
-        if !Jpmobile::Email.convertable?(self.header[:content_type].value) and content_type_charset.blank?
-          @charset = ''
-        end
       end
 
       # convert header(s)
       if self.header[:subject]
         subject_charset = Jpmobile::Util.extract_charset(self.header[:subject].value)
-
-        # override subject encoding if @charset is blank
-        @charset = subject_charset if !subject_charset.blank? # and @charset.blank?
         self.header[:subject].charset = subject_charset unless subject_charset.blank?
 
         if @mobile
           subject_value = Encodings.value_decode(self.header[:subject].value)
           subject_converting_encoding = Jpmobile::Util.detect_encoding(subject_value)
           v = @mobile.to_mail_internal(subject_value, subject_converting_encoding)
-          if @charset == subject_charset and @mobile.mail_charset != @charset
-            self.header[:subject].value = Jpmobile::Util.force_encode(v, @charset, Jpmobile::Util::UTF8)
-          else
-            self.header[:subject].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(@charset), Jpmobile::Util::UTF8)
-          end
+          self.header[:subject].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(subject_charset), Jpmobile::Util::UTF8)
         end
       end
 
@@ -322,25 +323,18 @@ module Mail
     # convert encoding
     def encoded_with_jpmobile(transfer_encoding = '8bit')
       if @mobile and !multipart?
-        if @mobile.to_mail_body_encoded?(@raw_source)
-          @raw_source
-        elsif Jpmobile::Util.ascii_8bit?(@raw_source)
+        case transfer_encoding
+        when /base64/
           _raw_source = if transfer_encoding == encoding
-                          @raw_source
+                          @raw_source.dup
                         else
-                          enc = Mail::Encodings::get_encoding(get_best_encoding(transfer_encoding))
-                          enc.encode(@raw_source)
+                          get_best_encoding(transfer_encoding).encode(@raw_source)
                         end
-          Jpmobile::Util.force_encode(_raw_source, nil, @charset)
+          Jpmobile::Util.set_encoding(_raw_source, @mobile.mail_charset(@charset))
+        when /quoted-printable/
+          Jpmobile::Util.set_encoding([@mobile.to_mail_body(@raw_source)].pack("M").gsub(/\n/, "\r\n"), @mobile.mail_charset(@charset))
         else
-          case transfer_encoding
-          when /quoted-printable/
-            # [str].pack("M").gsub(/\n/, "\r\n")
-            Jpmobile::Util.force_encode([@mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))].pack("M").gsub(/\n/, "\r\n"), Jpmobile::Util::BINARY, @charset)
-            # @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))
-          else
-            @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))
-          end
+          @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, nil, Jpmobile::Util::UTF8))
         end
       else
         encoded_without_jpmobile(transfer_encoding)
@@ -366,9 +360,7 @@ module Mail
 
       if self.multipart? and @mobile
         self.parts.each do |part|
-          part.charset      = @mobile.mail_charset(part.charset)
           part.mobile       = @mobile
-          part.body.charset = part.charset
           part.body.mobile  = @mobile
         end
       end
@@ -382,7 +374,7 @@ module Mail
 
     def preamble_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(@preamble, @charset)
+        Jpmobile::Util.encode(@preamble, @mobile.mail_charset(@charset))
       else
         preamble_without_jpmobile
       end
@@ -390,7 +382,7 @@ module Mail
 
     def epilogue_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(@epilogue, @charset)
+        Jpmobile::Util.encode(@epilogue, @mobile.mail_charset(@charset))
       else
         epilogue_without_jpmobile
       end
@@ -398,7 +390,7 @@ module Mail
 
     def crlf_boundary_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @charset)
+        Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @mobile.mail_charset(@charset))
       else
         crlf_boundary_without_jpmobile
       end
@@ -406,7 +398,7 @@ module Mail
 
     def end_boundary_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(end_boundary_without_jpmobile, @charset)
+        Jpmobile::Util.encode(end_boundary_without_jpmobile, @mobile.mail_charset(@charset))
       else
         end_boundary_without_jpmobile
       end
@@ -435,6 +427,17 @@ module Mail
 
     alias_method :epilogue_without_jpmobile, :epilogue
     alias_method :epilogue, :epilogue_with_jpmobile
+
+    def split!(boundary)
+      self.boundary = boundary
+      parts = raw_source.split(/(?:\A|\r\n)--#{Regexp.escape(boundary)}(?=(?:--)?\s*$)/)
+      # Make the preamble equal to the preamble (if any)
+      self.preamble = parts[0].to_s.strip
+      # Make the epilogue equal to the epilogue (if any)
+      self.epilogue = parts[-1].to_s.sub('--', '').strip
+      parts[1...-1].to_a.each { |part| @parts << Mail::Part.new(:body_raw => part, :mobile => @mobile) }
+      self
+    end
   end
 
   class UnstructuredField

data/lib/jpmobile/mailer.rb

@@ -28,7 +28,6 @@ module Jpmobile
         m = super(headers, &block)
 
         m.mobile  = @mobile
-        m.charset = @mobile.mail_charset
 
         # for decorated-mail manipulation
         m.rearrange! if @mobile.decorated?

data/lib/jpmobile/trans_sid.rb

@@ -130,8 +130,10 @@ module Jpmobile::TransSid #:nodoc:
     key
   end
   # session_idを返す
+  # rack 1.4 (rails3) request.session_options[:id]
+  # rack 1.5 (rails4) request.session.id
   def jpmobile_session_id
-    request.session_options[:id] rescue session.session_id
+    request.session_options[:id] || request.session.id
   end
   # session_idを埋め込むためのhidden fieldを出力する。
   def sid_hidden_field_tag

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/spec/unit/email-fixtures/pc-mail-attached-without-subject.eml

@@ -0,0 +1,45 @@
+X-Account-Key: account2
+X-UIDL: UID44724-1271041990
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 10000000
+X-Mozilla-Keys:                                                                                 
+Return-Path: <info@jp.mobile>
+X-Original-To: info+to@jp.mobile
+Delivered-To: info+to@jp.mobile
+Received: from localhost (localhost [127.0.0.1])
+	by mx1.jp.mobile (Postfix) with ESMTP id 916D982D3C
+	for <info+to@jp.mobile>; Mon, 17 Jan 2011 16:43:00 +0900 (JST)
+Received: from mx1.jp.mobile ([127.0.0.1])
+	by localhost (mx1.jp.mobile [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 4c+D+lqN6aOJ for <info+to@jp.mobile>;
+	Mon, 17 Jan 2011 16:43:00 +0900 (JST)
+Received: by mx1.jp.mobile (Postfix, from userid 58)
+	id 68BFD82D33; Mon, 17 Jan 2011 16:43:00 +0900 (JST)
+Message-ID: <4D33F300.8050702@jpmobile.jp>
+Date: Mon, 17 Jan 2011 16:42:56 +0900
+From: Shin-ichiro OGAWA <info@jpmobile.jp>
+User-Agent: Mozilla-Thunderbird 2.0.0.24 (X11/20100329)
+MIME-Version: 1.0
+To: info+to@jp.mobile
+Subject:
+Content-Type: multipart/mixed;
+ boundary="------------010605060509040104050402"
+
+This is a multi-part message in MIME format.
+--------------010605060509040104050402
+Content-Type: text/plain; charset=ISO-2022-JP
+Content-Transfer-Encoding: 7bit
+
+$BK\J8$G$9(B
+
+
+--------------010605060509040104050402
+Content-Transfer-Encoding: base64
+Content-Type: image/gif;
+ name="Transparent.gif"
+Content-Disposition: attachment;
+ filename="Transparent.gif"
+
+R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7
+--------------010605060509040104050402--
+

data/spec/unit/receive_mail_spec.rb

@@ -67,6 +67,21 @@ describe "Jpmobile::Mail#receive" do
       end
     end
 
+    describe "PC mail without subject" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/pc-mail-attached-without-subject.eml")).read)
+      end
+
+      it "body should be parsed correctly" do
+        @mail.body.parts.size.should == 2
+        @mail.body.parts.first.body.to_s.should == "本文です\n\n"
+      end
+
+      it "should encode correctly" do
+        ascii_8bit(@mail.to_s).should match(/GODlhAQABAIAAAAAAAP/)
+      end
+    end
+
     describe "Docomo" do
       before(:each) do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml")).read)
@@ -258,7 +273,7 @@ describe "Jpmobile::Mail#receive" do
 
       it 'should be encoded correctly' do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
-        @mail.encoded
+        @mail.encoded.should match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
     end
 
@@ -271,14 +286,14 @@ describe "Jpmobile::Mail#receive" do
 
       it 'should be encoded correctly' do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
-        @mail.encoded
+        @mail.encoded.should match(/BK\\J82~9T\$J\$7!2#5#1#2J8;z!2/)
       end
     end
 
     it 'should not raise when parsing attached email' do
       lambda {
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/au-attached.eml")).read)
-        @mail.encoded
+        @mail.encoded.should match('/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPQAA')
       }.should_not raise_error
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.2.1
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +242,7 @@ files:
 - spec/unit/email-fixtures/docomo-jis.eml
 - spec/unit/email-fixtures/iphone-mail3.eml
 - spec/unit/email-fixtures/iphone-message.eml
+- spec/unit/email-fixtures/pc-mail-attached-without-subject.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
 - spec/unit/email-fixtures/photo.jpg
@@ -400,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Rails plugin for mobile devices in Japan
@@ -434,6 +449,7 @@ test_files:
 - spec/unit/email-fixtures/docomo-jis.eml
 - spec/unit/email-fixtures/iphone-mail3.eml
 - spec/unit/email-fixtures/iphone-message.eml
+- spec/unit/email-fixtures/pc-mail-attached-without-subject.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
 - spec/unit/email-fixtures/photo.jpg