jpmobile 5.0.0 → 5.0.1

data/lib/jpmobile/hook_action_view.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #:stopdoc:
 # helperを追加
 ActionView::Base.class_eval { include Jpmobile::Helpers }
@@ -11,23 +10,24 @@ module ActionView
   module Helpers
     module FormTagHelper
       private
+
       def html_options_for_form(url_for_options, options, *parameters_for_url)
-        accept_charset = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || "UTF-8"
+        accept_charset = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || 'UTF-8'
 
         options.stringify_keys.tap do |html_options|
-          html_options["enctype"] = "multipart/form-data" if html_options.delete("multipart")
+          html_options['enctype'] = 'multipart/form-data' if html_options.delete('multipart')
           # The following URL is unescaped, this is just a hash of options, and it is the
           # responsability of the caller to escape all the values.
-          html_options["action"]  = url_for(url_for_options, *parameters_for_url)
-          html_options["accept-charset"] = accept_charset
-          html_options["data-remote"] = true if html_options.delete("remote")
+          html_options['action']  = url_for(url_for_options, *parameters_for_url)
+          html_options['accept-charset'] = accept_charset
+          html_options['data-remote'] = true if html_options.delete('remote')
         end
       end
     end
   end
 
   class Base
-    delegate :default_url_options, :to => :controller unless respond_to?(:default_url_options)
+    delegate :default_url_options, to: :controller unless respond_to?(:default_url_options)
   end
 end
 #:startdoc:

data/lib/jpmobile/hook_test_request.rb

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 require 'action_controller/test_case'
 ActionController::TestRequest.send :include, Jpmobile::RequestWithMobileTesting

data/lib/jpmobile/lookup_context.rb

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-ActionView::LookupContext.register_detail(:mobile) {[]}
+ActionView::LookupContext.register_detail(:mobile) { [] }

data/lib/jpmobile/mail.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'mail'
 
 module Mail
@@ -15,7 +14,8 @@ module Mail
     attr_accessor :mobile
 
     def mobile=(m)
-      if @mobile = m
+      @mobile = m
+      if @mobile
         @charset = m.mail_charset(@charset)
       end
     end
@@ -29,10 +29,10 @@ module Mail
 
         ready_to_send!
 
-        self.body.mobile  = @mobile
+        self.body.mobile = @mobile
         self.header['Content-Transfer-Encoding'].value = @mobile.content_transfer_encoding(self.header)
         if @mobile.decorated?
-          unless self.content_type.match(/image\//)
+          unless self.content_type =~ %r{image/}
             self.header['Content-ID'] = nil
           end
 
@@ -54,7 +54,8 @@ module Mail
     end
 
     def parse_message_with_jpmobile
-      header_part, body_part = raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m, 2)
+      _crlf_raw_source = raw_source.encode(raw_source.encoding, universal_newline: true).encode!(raw_source.encoding, crlf_newline: true)
+      header_part, body_part = _crlf_raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m, 2)
       # header_part, body_part = raw_source.lstrip.split(HEADER_SEPARATOR, 2)
 
       self.header = header_part
@@ -63,7 +64,7 @@ module Mail
       convert_encoding_jpmobile
       body_part = @body_part_jpmobile
 
-      self.body   = body_part
+      self.body = body_part
     end
 
     def init_with_hash_with_jpmobile(hash)
@@ -81,6 +82,9 @@ module Mail
     def init_with_string(string)
       # convert to ASCII-8BIT for ascii incompatible encodings
       s = Jpmobile::Util.ascii_8bit(string)
+      unless s.ascii_only?
+        s = s.kind_of?(String) ? s.to_str.encode(s.encoding, :universal_newline => true).encode!(s.encoding, :crlf_newline => true) : ''
+      end
       self.raw_source = s
       set_envelope_header
       parse_message
@@ -90,20 +94,20 @@ module Mail
     def process_body_raw_with_jpmobile
       process_body_raw_without_jpmobile
 
-      if @mobile
-        @body.mobile = @mobile
-        @body.content_type_with_jpmobile = self.content_type
+      return unless @mobile
 
-        if has_content_transfer_encoding? and
-            ["base64", "quoted-printable"].include?(self.content_transfer_encoding) and
-            ["text"].include?(@mobile_main_type)
-          @body.decode_transfer_encoding
-        end
+      @body.mobile = @mobile
+      @body.content_type_with_jpmobile = self.content_type
 
-        if @body.multipart?
-          @body.parts.each do |p|
-            p.mobile  = @mobile
-          end
+      if has_content_transfer_encoding? &&
+         ['base64', 'quoted-printable'].include?(self.content_transfer_encoding) &&
+         ['text'].include?(@mobile_main_type)
+        @body.decode_transfer_encoding
+      end
+
+      if @body.multipart?
+        @body.parts.each do |p|
+          p.mobile = @mobile
         end
       end
     end
@@ -137,78 +141,78 @@ module Mail
     alias_method :add_charset_without_jpmobile, :add_charset
     alias_method :add_charset, :add_charset_with_jpmobile
 
-# -- docomo
-# multipart/mixed
-#   |- multipart/related
-#   |    |- multipart/alternative
-#   |    |    |- text/plain
-#   |    |    |- text/html
-#   |    |- image/xxxx (インライン画像)
-#   |- image/xxxx (添付画像)
-
-# -- au
-# multipart/mixed
-#   |- multipart/alternative
-#   |    |- text/plain
-#   |    |- text/html
-#   |- image/xxxx (インライン画像)
-#   |- image/xxxx (添付画像)
-
-# -- normal
-# multipart/mixed
-#   |- multipart/alternative
-#   |    |- text/plain
-#   |    |- text/html
-#   |    |- image/xxxx (インライン画像)
-#   |- image/xxxx (添付画像)
+    # -- docomo
+    # multipart/mixed
+    #   |- multipart/related
+    #   |    |- multipart/alternative
+    #   |    |    |- text/plain
+    #   |    |    |- text/html
+    #   |    |- image/xxxx (インライン画像)
+    #   |- image/xxxx (添付画像)
+
+    # -- au
+    # multipart/mixed
+    #   |- multipart/alternative
+    #   |    |- text/plain
+    #   |    |- text/html
+    #   |- image/xxxx (インライン画像)
+    #   |- image/xxxx (添付画像)
+
+    # -- normal
+    # multipart/mixed
+    #   |- multipart/alternative
+    #   |    |- text/plain
+    #   |    |- text/html
+    #   |    |- image/xxxx (インライン画像)
+    #   |- image/xxxx (添付画像)
 
     def rearrange!
-      if @mobile and @mobile.decoratable?
-        @mobile.decorated = true
-        text_body_part = find_part_by_content_type("text/plain").first
-        html_body_part = find_part_by_content_type("text/html").first
-        html_body_part.transport_encoding = 'quoted-printable' if html_body_part
-        inline_images  = []
-        attached_files = []
-        attachments.each do |p|
-          if p.content_type.match(/^image\//)  and p.content_disposition.match(/^inline/)
-            if p.header['Content-Type'].parameters['filename']
-              p.header['Content-Type'].parameters['name'] = p.header['Content-Type'].parameters['filename'].to_s
-            end
-            inline_images << p
-          elsif p.content_disposition
-            attached_files << p
+      return unless @mobile && @mobile.decoratable?
+
+      @mobile.decorated = true
+      text_body_part = find_part_by_content_type('text/plain').first
+      html_body_part = find_part_by_content_type('text/html').first
+      html_body_part.transport_encoding = 'quoted-printable' if html_body_part
+      inline_images  = []
+      attached_files = []
+      attachments.each do |p|
+        if p.content_type.match(%r{^image/}) && p.content_disposition.match(/^inline/)
+          if p.header['Content-Type'].parameters['filename']
+            p.header['Content-Type'].parameters['name'] = p.header['Content-Type'].parameters['filename'].to_s
           end
+          inline_images << p
+        elsif p.content_disposition
+          attached_files << p
         end
+      end
 
-        alternative_part = Mail::Part.new{content_type 'multipart/alternative'}
-        alternative_part.add_part(text_body_part) if text_body_part
-        alternative_part.add_part(html_body_part) if html_body_part
+      alternative_part = Mail::Part.new { content_type 'multipart/alternative' }
+      alternative_part.add_part(text_body_part) if text_body_part
+      alternative_part.add_part(html_body_part) if html_body_part
 
-        if @mobile.require_related_part?
-          related_part = Mail::Part.new{content_type 'multipart/related'}
-          related_part.add_part(alternative_part)
-          inline_images.each do |inline_image|
-            related_part.add_part(inline_image)
-          end
-          inline_images.clear
-        else
-          related_part = alternative_part
+      if @mobile.require_related_part?
+        related_part = Mail::Part.new { content_type 'multipart/related' }
+        related_part.add_part(alternative_part)
+        inline_images.each do |inline_image|
+          related_part.add_part(inline_image)
         end
+        inline_images.clear
+      else
+        related_part = alternative_part
+      end
 
-        unless self.header['Content-Type'].sub_type == 'mixed'
-          self.header['Content-Type'] = self.content_type.gsub(/#{self.header['Content-Type'].sub_type}/, 'mixed')
-        end
-        self.parts.clear
-        self.body = nil
+      unless self.header['Content-Type'].sub_type == 'mixed'
+        self.header['Content-Type'] = self.content_type.gsub(/#{self.header['Content-Type'].sub_type}/, 'mixed')
+      end
+      self.parts.clear
+      self.body = nil
 
-        self.add_part(related_part)
-        inline_images.each do |inline_image|
-          self.add_part(inline_image)
-        end
-        attached_files.each do |attached_file|
-          self.add_part(attached_file)
-        end
+      self.add_part(related_part)
+      inline_images.each do |inline_image|
+        self.add_part(inline_image)
+      end
+      attached_files.each do |attached_file|
+        self.add_part(attached_file)
       end
     end
 
@@ -218,7 +222,7 @@ module Mail
       self.parts.each do |part|
         if part.multipart?
           finded_parts << part.find_part_by_content_type(content_type)
-        elsif part.content_type.match(/^#{content_type}/)
+        elsif part.content_type =~ /^#{content_type}/
           finded_parts << part
         end
       end
@@ -227,6 +231,7 @@ module Mail
     end
 
     private
+
     def convert_encoding_jpmobile
       # decide mobile carrier
       if self.header[:from]
@@ -248,14 +253,14 @@ module Mail
         header[:subject].value = header[:subject].decoded
       end
 
-      if @body_part_jpmobile and @mobile and !@charset.empty?
-        if ["base64", "quoted-printable"].include?(self.content_transfer_encoding) and
-            self.content_type.match(/text/)
-          @body_part_jpmobile = Jpmobile::Util.decode(@body_part_jpmobile, self.content_transfer_encoding, @charset)
-          self.content_transfer_encoding = @mobile.class::MAIL_CONTENT_TRANSFER_ENCODING
-        end
-        @body_part_jpmobile = @mobile.decode_transfer_encoding(@body_part_jpmobile, @charset)
+      return unless @body_part_jpmobile && @mobile && !@charset.empty?
+
+      if ['base64', 'quoted-printable'].include?(self.content_transfer_encoding) &&
+         self.content_type.match(/text/)
+        @body_part_jpmobile = Jpmobile::Util.decode(@body_part_jpmobile, self.content_transfer_encoding, @charset)
+        self.content_transfer_encoding = @mobile.class::MAIL_CONTENT_TRANSFER_ENCODING
       end
+      @body_part_jpmobile = @mobile.decode_transfer_encoding(@body_part_jpmobile, @charset)
     end
 
     def ascii_compatible!(str)
@@ -274,22 +279,23 @@ module Mail
     def parse_message_with_jpmobile
       header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
 
-      if header_part =~ HEADER_LINE
-        self.header = header_part
-      else
-        self.header = "Content-Type: text/plain\r\n"
-      end
+      self.header = if header_part && header_part.match(HEADER_LINE)
+                      header_part
+                    else
+                      "Content-Type: text/plain\r\n"
+                    end
 
       @body_part_jpmobile = body_part
       convert_encoding_jpmobile
       body_part = @body_part_jpmobile
-      self.body   = body_part
+      self.body = body_part
     end
 
     alias_method :parse_message_without_jpmobile, :parse_message
     alias_method :parse_message, :parse_message_with_jpmobile
 
     private
+
     def ascii_compatible!(str)
       str
     end
@@ -304,17 +310,17 @@ module Mail
 
     # convert encoding
     def encoded_with_jpmobile(transfer_encoding = '8bit')
-      if @mobile and !multipart?
+      if @mobile && !multipart?
         case transfer_encoding
         when /base64/
           _raw_source = if transfer_encoding == encoding
                           @raw_source.dup
                         else
-                          get_best_encoding(transfer_encoding).encode(@raw_source)
+                          negotiate_best_encoding(transfer_encoding).encode(@raw_source)
                         end
           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))
+          Jpmobile::Util.set_encoding([@mobile.to_mail_body(@raw_source)].pack('M').gsub(/\n/, "\r\n"), @mobile.mail_charset(@charset))
         else
           @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, nil, Jpmobile::Util::UTF8))
         end
@@ -329,18 +335,18 @@ module Mail
 
     # fix charset
     def set_charset_with_jpmobile
-      @charset ||= only_us_ascii? ? 'US-ASCII' : nil
+      @charset ||= ascii_only? ? 'US-ASCII' : nil
     end
 
     def mobile=(m)
       @mobile = m
 
-      if ["base64", "quoted-printable"].include?(self.encoding) and
-          /text/.match(self.content_type_with_jpmobile)
+      if ['base64', 'quoted-printable'].include?(self.encoding) &&
+         /text/.match(self.content_type_with_jpmobile)
         self.decode_transfer_encoding
       end
 
-      if self.multipart? and @mobile
+      if self.multipart? && @mobile
         self.parts.each do |part|
           part.mobile       = @mobile
           part.body.mobile  = @mobile
@@ -417,7 +423,7 @@ module Mail
       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) }
+      parts[1...-1].to_a.each { |part| @parts << Mail::Part.new(body_raw: part, mobile: @mobile) }
       self
     end
   end
@@ -428,7 +434,7 @@ module Mail
 
   class OptionalField
     def charset
-      @charset =~ /iso-2022-jp/i ? 'UTF-8' : @charset
+      (@charset =~ /iso-2022-jp/i) ? 'UTF-8' : @charset
     end
   end
 
@@ -450,15 +456,15 @@ module Mail
     def decoded_with_jpmobile
       if @mobile
         return value unless value =~ /\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi
-        Encodings.collapse_adjacent_encodings(value).each do |line|
+        Encodings.collapse_adjacent_encodings(value).each { |line|
           line.gsub!(/\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi) do |string|
-            case $1
-            when 'B','b' then decode_b_value_for_mobile(string)
-            when 'Q','q' then Encodings.q_value_decode(string)
+            case Regexp.last_match(1)
+            when 'B', 'b' then decode_b_value_for_mobile(string)
+            when 'Q', 'q' then Encodings.q_value_decode(string)
             else line
             end
           end
-        end.join("")
+        }.join('')
       else
         decoded_without_jpmobile
       end
@@ -496,7 +502,8 @@ module Mail
     alias_method :initialize, :initialize_with_jpmobile
 
     def mobile=(m)
-      if @mobile = m
+      @mobile = m
+      if @mobile
         self.charset = @mobile.mail_charset
         self.value   = @jpmobile_raw_text
         self.parse
@@ -506,6 +513,15 @@ module Mail
     def encoded_with_jpmobile
       if @mobile
         self.charset = @mobile.mail_charset
+
+        _value = address_list.addresses.map { |_a|
+          if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
+            _a.to_s
+          else
+            "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
+          end
+        }.join(", ")
+        @address_list = AddressList.new(_value)
       end
 
       encoded_without_jpmobile
@@ -525,7 +541,8 @@ module Mail
     alias_method :initialize, :initialize_with_jpmobile
 
     def mobile=(m)
-      if @mobile = m
+      @mobile = m
+      if @mobile
         self.charset = @mobile.mail_charset
         self.value   = @jpmobile_raw_text
         self.parse
@@ -535,6 +552,15 @@ module Mail
     def encoded_with_jpmobile
       if @mobile
         self.charset = @mobile.mail_charset
+
+        _value = address_list.addresses.map { |_a|
+          if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
+            _a.to_s
+          else
+            "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
+          end
+        }.join(", ")
+        @address_list = AddressList.new(_value)
       end
 
       encoded_without_jpmobile
@@ -550,16 +576,12 @@ module Mail
     end
 
     def get_display_name_with_jpmobile
-      begin
-        get_display_name_without_jpmobile
-      rescue NoMethodError => ex
-        if ex.message.match(/undefined method `gsub' for nil:NilClass/)
-          name = unquote(tree.display_name.text_value.strip.to_s)
-          strip_all_comments(name.to_s)
-        else
-          raise ex
-        end
-      end
+      get_display_name_without_jpmobile
+    rescue NoMethodError => ex
+      raise ex unless ex.message =~ /undefined method `gsub' for nil:NilClass/
+
+      name = unquote(tree.display_name.text_value.strip.to_s)
+      strip_all_comments(name.to_s)
     end
 
     alias_method :encoded_without_jpmobile, :encoded
@@ -571,8 +593,8 @@ module Mail
 
   class ContentTypeElement # :nodoc:
     def initialize_with_jpmobile(string)
-      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
-          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+      if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
+         m[4].each_byte.detect { |b| (b == 0 || b > 127) }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -585,8 +607,8 @@ module Mail
 
   class ContentDispositionElement # :nodoc:
     def initialize_with_jpmobile(string)
-      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
-          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+      if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
+         m[4].each_byte.detect { |b| (b == 0 || b > 127) }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -599,8 +621,8 @@ module Mail
 
   class ContentLocationElement # :nodoc:
     def initialize_with_jpmobile(string)
-      if m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/) and
-          m[4].each_byte.detect { |b| (b == 0 || b > 127)}
+      if (m = string.match(/\A(.*?)(name|filename)=("|')(.+)("|')(.*?)\z/)) &&
+         m[4].each_byte.detect { |b| (b == 0 || b > 127) }
         name = [m[4]].pack('m').strip
         string = "#{m[1]}#{m[2]}=#{m[3]}#{name}#{m[5]}#{m[6]}"
       end
@@ -612,17 +634,17 @@ module Mail
   end
 
   class Sendmail
-    def Sendmail.call(path, arguments, destinations, mail)
-      if mail.respond_to?(:encoded)
-        encoded_mail = mail.encoded
-      else
-        encoded_mail = mail
-      end
+    def self.call(path, arguments, destinations, mail)
+      encoded_mail = if mail.respond_to?(:encoded)
+                       mail.encoded
+                     else
+                       mail
+                     end
       if Jpmobile::Util.jis?(encoded_mail)
         encoded_mail = Jpmobile::Util.ascii_8bit(encoded_mail)
       end
 
-      IO.popen("#{path} #{arguments} #{destinations}", "w+") do |io|
+      IO.popen("#{path} #{arguments} #{destinations}", 'w+') do |io|
         io.puts encoded_mail.gsub(/\r\r\n/, "\n").to_lf
         io.flush
       end