jpmobile 1.0.0.pre.5 → 1.0.0.pre.6

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: pre.5
 :major: 1
-:patch: 0
 :minor: 0
+:patch: 0
+:build: pre.6

data/lib/jpmobile/mail.rb

@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'mail'
 
-module Jpmobile
-  module Mail
-    module_function
-  end
-end
-
 module Mail
   # encoding patch
   if self.const_defined?(:Ruby19)
@@ -21,6 +15,12 @@ module Mail
         # if str contains some emoticon, the following line raises Encoding error
         str.encode("utf-8", :invalid => :replace, :replace => "") rescue Jpmobile::Util.ascii_8bit(str)
       end
+
+      # change encoding
+      def self.b_value_encode(str, encoding)
+        str = Jpmobile::Util.encode(str, encoding)
+        [Ruby19.encode_base64(str), encoding]
+      end
     end
   elsif self.const_defined?(:Ruby18)
     Ruby18.class_eval do
@@ -32,6 +32,12 @@ module Mail
         end
         str
       end
+
+      # change encoding
+      def self.b_value_encode(str, encoding)
+        str = Jpmobile::Util.encode(str, encoding)
+        [Encodings::Base64.encode(str), encoding]
+      end
     end
   end
 
@@ -39,7 +45,7 @@ module Mail
     attr_accessor :mobile
 
     def mobile=(m)
-      if @mobile  = m
+      if @mobile = m
         @charset = m.mail_charset(@charset)
 
         if @body
@@ -52,6 +58,8 @@ module Mail
     def encoded_with_jpmobile
       if @mobile
         header['subject'].mobile = @mobile if header['subject']
+        header['from'].mobile    = @mobile if header['from']
+        header['to'].mobile      = @mobile if header['to']
         self.charset             = @mobile.mail_charset(@charset)
 
         ready_to_send!
@@ -132,37 +140,41 @@ module Mail
     private
     def convert_encoding_jpmobile
       # decide mobile carrier
-      if self.header['From']
-        mobile_class = Jpmobile::Email.detect_from_mail_header(self.header['From'].value)
+      if self.header[:from]
+        mobile_class = Jpmobile::Email.detect_from_mail_header(self.header[:from].value)
         @mobile ||= mobile_class.new(nil, nil) if mobile_class
       end
 
       # override charset
-      if self.header['Content-Type']
-        content_type_charset = Jpmobile::Util.extract_charset(self.header['Content-Type'].value)
+      if self.header[:content_type]
+        content_type_charset = Jpmobile::Util.extract_charset(self.header[:content_type].value)
         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
+          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?
+        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)
+      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?
+        self.header[:subject].charset = subject_charset unless subject_charset.blank?
 
         if @mobile
           v = @mobile.to_mail_internal(
-            Encodings.value_decode(self.header['Subject'].value), subject_charset)
-          self.header['Subject'].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(@charset), Jpmobile::Util::UTF8)
+            Encodings.value_decode(self.header[:subject].value), subject_charset)
+          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
         end
       end
 
@@ -239,6 +251,9 @@ module Mail
 
     def decode_transfer_encoding
       _raw_source = Encodings.get_encoding(encoding).decode(@raw_source)
+      unless Jpmobile::Util.extract_charset(_raw_source) == @charset
+        @charset = Jpmobile::Util.extract_charset(_raw_source)
+      end
       _raw_source = Jpmobile::Util.set_encoding(_raw_source, @charset)
       @raw_source = @mobile.decode_transfer_encoding(_raw_source, @charset)
     end
@@ -303,7 +318,6 @@ module Mail
 
   # for subject
   class SubjectField < UnstructuredField
-    # FIXME: not folding subject -> folding
     def encoded_with_jpmobile
       if @mobile
         if @mobile.to_mail_subject_encoded?(value)
@@ -321,6 +335,77 @@ module Mail
     alias_method :encoded, :encoded_with_jpmobile
   end
 
+  class StructuredField
+    attr_accessor :mobile
+  end
+
+  class FromField < StructuredField
+    def initialize_with_jpmobile(value = nil, charset = 'utf-8')
+      @jpmobile_raw_text = value
+      initialize_without_jpmobile(value, charset)
+    end
+
+    alias_method :initialize_without_jpmobile, :initialize
+    alias_method :initialize, :initialize_with_jpmobile
+
+    def mobile=(m)
+      if @mobile = m
+        self.charset = @mobile.mail_charset(@charset)
+        self.value = @jpmobile_raw_text
+        self.parse
+      end
+    end
+
+    def encoded_with_jpmobile
+      if @mobile
+        self.charset = @mobile.mail_charset(@charset)
+      end
+
+      encoded_without_jpmobile
+    end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+  end
+
+  class ToField < StructuredField
+    def initialize_with_jpmobile(value = nil, charset = 'utf-8')
+      @jpmobile_raw_text = value
+      initialize_without_jpmobile(value, charset)
+    end
+
+    alias_method :initialize_without_jpmobile, :initialize
+    alias_method :initialize, :initialize_with_jpmobile
+
+    def mobile=(m)
+      if @mobile = m
+        self.charset = @mobile.mail_charset(@charset)
+        self.value = @jpmobile_raw_text
+        self.parse
+      end
+    end
+
+    def encoded_with_jpmobile
+      if @mobile
+        self.charset = @mobile.mail_charset(@charset)
+      end
+
+      encoded_without_jpmobile
+    end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+  end
+
+  class Address
+    def encoded_with_jpmobile
+      encoded_without_jpmobile
+    end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+  end
+
   class Sendmail
     def Sendmail.call(path, arguments, destinations, mail)
       encoded_mail = mail.encoded

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -102,7 +102,8 @@ module Jpmobile::Mobile
       to_mail_encoding(str)
     end
     def mail_charset(charset = nil)
-      (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
+      # (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
+      self.class::MAIL_CHARSET
     end
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)

data/spec/unit/mail_spec.rb

@@ -10,7 +10,7 @@ describe "Jpmobile::Mail" do
     @mail         = Mail.new
     @mail.subject = "万葉"
     @mail.body    = "ほげ"
-    @mail.from    = "info@jpmobile-rails.org"
+    @mail.from    = "ちはやふる <info@jpmobile-rails.org>"
   end
 
   context "Mail#to" do
@@ -23,7 +23,7 @@ describe "Jpmobile::Mail" do
     before(:each) do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
       @mail.mobile = @mobile
-      @mail.to = "info+to@jpmobile-rails.org"
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
     end
 
     context "to_s" do
@@ -34,6 +34,18 @@ describe "Jpmobile::Mail" do
       it "should contain encoded body" do
         ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
       end
+
+      it "should contain encoded from"do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
+      end
+
+      it "should contain encoded to" do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
+      end
+
+      it "should contain correct Content-Type:" do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("charset=ISO-2022-JP"))))
+      end
     end
   end
 
@@ -41,7 +53,7 @@ describe "Jpmobile::Mail" do
     before(:each) do
       @mobile = Jpmobile::Mobile::Docomo.new(nil, nil)
       @mail.mobile = @mobile
-      @mail.to = "info+to@jpmobile-rails.org"
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
     end
 
     context "to_s" do
@@ -53,6 +65,14 @@ describe "Jpmobile::Mail" do
         @mail.to_s.should match(Regexp.escape(utf8_to_sjis("ほげ")))
       end
 
+      it "should contain encoded from" do
+        @mail.to_s.should match(sjis_regexp("gr+CzYLigtOC6Q=="))
+      end
+
+      it "should contain encoded to" do
+        @mail.to_s.should match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
+      end
+
       it "should contains encoded emoticon" do
         @mail.subject += "&#xe63e;"
         @mail.body = "#{@mail.body}&#xe63e;"
@@ -67,7 +87,7 @@ describe "Jpmobile::Mail" do
     before(:each) do
       @mobile = Jpmobile::Mobile::Au.new(nil, nil)
       @mail.mobile = @mobile
-      @mail.to = "info+to@jpmobile-rails.org"
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
     end
 
     context "to_s" do
@@ -79,6 +99,14 @@ describe "Jpmobile::Mail" do
         ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
       end
 
+      it "should contain encoded from" do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
+      end
+
+      it "should contain encoded to" do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
+      end
+
       it "should contain encoded emoticon" do
         @mail.subject += "&#xe63e;"
         @mail.body = "#{@mail.body}&#xe63e;"
@@ -93,7 +121,7 @@ describe "Jpmobile::Mail" do
     before(:each) do
       @mobile = Jpmobile::Mobile::Softbank.new(nil, nil)
       @mail.mobile = @mobile
-      @mail.to = "info+to@jpmobile-rails.org"
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
     end
 
     context "to_s" do
@@ -105,6 +133,14 @@ describe "Jpmobile::Mail" do
         @mail.to_s.should match(Regexp.escape(utf8_to_sjis("ほげ")))
       end
 
+      it "should contain encoded from" do
+        @mail.to_s.should match(sjis_regexp("gr+CzYLigtOC6Q=="))
+      end
+
+      it "should contain encoded to" do
+        @mail.to_s.should match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
+      end
+
       it "should contains encoded emoticon" do
         @mail.subject += "&#xe63e;"
         @mail.body = "#{@mail.body}&#xe63e;"
@@ -127,7 +163,7 @@ describe "Jpmobile::Mail" do
       before(:each) do
         @mobile = Jpmobile::Mobile::Docomo.new(nil, nil)
         @mail.mobile = @mobile
-        @mail.to = "info+to@jpmobile-rails.org"
+        @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
       end
 
       it "should contain encoded subject" do
@@ -144,7 +180,7 @@ describe "Jpmobile::Mail" do
       before(:each) do
         @mobile = Jpmobile::Mobile::Au.new(nil, nil)
         @mail.mobile = @mobile
-        @mail.to = "info+to@jpmobile-rails.org"
+        @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
       end
 
       it "should contain encoded subject" do
@@ -161,7 +197,7 @@ describe "Jpmobile::Mail" do
       before(:each) do
         @mobile = Jpmobile::Mobile::Softbank.new(nil, nil)
         @mail.mobile = @mobile
-        @mail.to = "info+to@jpmobile-rails.org"
+        @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
       end
 
       it "should contain encoded subject" do
@@ -178,7 +214,7 @@ describe "Jpmobile::Mail" do
       before(:each) do
         @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
         @mail.mobile = @mobile
-        @mail.to = "info+to@jpmobile-rails.org"
+        @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
       end
 
       context "to_s" do

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jpmobile
 version: !ruby/object:Gem::Version 
-  hash: 1923831939
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - pre
-  - 5
-  version: 1.0.0.pre.5
+  version: 1.0.0.pre.6
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -18,271 +11,196 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +09:00
+date: 2011-06-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id001
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 0
-        - 9
         version: 3.0.9
-  prerelease: false
   type: :development
-  requirement: *id002
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  prerelease: false
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  prerelease: false
   type: :development
-  requirement: *id004
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webrat
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id005
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: geokit
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id006
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id007
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id008
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
-  prerelease: false
   type: :development
-  requirement: *id009
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
-  prerelease: false
   type: :development
-  requirement: *id010
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
-  prerelease: false
   type: :development
-  requirement: *id011
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: webrat
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
         version: 0.7.2
-  prerelease: false
   type: :development
-  requirement: *id012
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: geokit
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
-  prerelease: false
   type: :development
-  requirement: *id013
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
         version: 1.3.2
-  prerelease: false
   type: :development
-  requirement: *id014
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
-  prerelease: false
   type: :development
-  requirement: *id015
+  prerelease: false
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: git
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
         version: 1.2.5
-  prerelease: false
   type: :development
-  requirement: *id016
+  prerelease: false
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rails
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
-  prerelease: false
   type: :development
-  requirement: *id017
+  prerelease: false
+  version_requirements: *id017
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -501,20 +419,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []