jpmobile 4.0.1 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154aabed283366bd8c6fba6825b99d62e96cf78c
-  data.tar.gz: b62fa66625f4f710930f00fa3ff20bd2997ed8a9
+  metadata.gz: 2b0f241ba03225004123b6f08d987f2311f75d2f
+  data.tar.gz: 8fcff8ad38f8f22b37fe56af7352273abe3ee07a
 SHA512:
-  metadata.gz: 3fa80365078d094087533cf1b1b70d1aa84f3f0336bbf98c7e5ca6ce18d607b35d277b103ac9ea8f3782dfd44f77d17bff4ec8d1dfad2e14a3ae1d575bfaa969
-  data.tar.gz: 09c776d1b5e90bcaaf563dee8c2b87b6b1f275df76d31b116292d5521e84899d019fb30a1d30c2557330618ebf5daebcc2f1dad709b2e967d1bbfa168a58af50
+  metadata.gz: 61351a0a29f21d528b49697814707a8da681029bf86e55681ab0453013e809709136c320653d21ba85567539aaa6d9a8c6c95f14427427c5b117dcf2ddc0890f
+  data.tar.gz: b93a1d05668f5d752a713139aa41d8a7c860a491fc3e633c37c1cd0051667b84014f49eea2c796ecd6d6a326fd995b26f21cc23dfa0f8a132c3b1b0a0f18f4f8

data/.gitignore

@@ -17,3 +17,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+.ruby-version

data/jpmobile.gemspec

@@ -16,13 +16,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rails', '~> 4.0.0'
+  gem.add_development_dependency 'rails'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'webrat'
+  gem.add_development_dependency 'capybara-webkit'
   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

@@ -157,7 +157,7 @@ module Jpmobile
           end
         elsif element.node_name == "input" and ["submit", "reset", "button"].include?(element["type"])
           # テキスト以外でもボタンの value は変換
-          element["value"] = filter(:hankaku, element["value"])
+          element["value"] = filter(:zenkaku, element["value"])
         elsif element.children.any?
           # 子要素があれば再帰的に変換
           element = convert_text_content(element)

data/lib/jpmobile/hook_action_controller.rb

@@ -17,8 +17,8 @@ module ActionController
   end
 end
 
-module AbstractController
-  module Rendering
+module ActionController
+  module Renderers
     def render_to_body_with_jpmobile(options)
       if Jpmobile.config.fallback_view_selector and
           lookup_context.mobile.present? and !lookup_context.mobile.empty?

data/lib/jpmobile/mail.rb

@@ -29,6 +29,12 @@ 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
 
@@ -41,6 +47,7 @@ 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?
@@ -77,18 +84,6 @@ 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)
@@ -102,6 +97,7 @@ module Mail
       process_body_raw_without_jpmobile
 
       if @mobile
+        @body.charset = @charset
         @body.mobile = @mobile
         @body.content_type_with_jpmobile = self.content_type
 
@@ -125,11 +121,6 @@ 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
 
@@ -139,9 +130,6 @@ 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
@@ -242,23 +230,34 @@ 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)
-          self.header[:subject].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(subject_charset), Jpmobile::Util::UTF8)
+          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
 
@@ -323,18 +322,25 @@ module Mail
     # convert encoding
     def encoded_with_jpmobile(transfer_encoding = '8bit')
       if @mobile and !multipart?
-        case transfer_encoding
-        when /base64/
+        if @mobile.to_mail_body_encoded?(@raw_source)
+          @raw_source
+        elsif Jpmobile::Util.ascii_8bit?(@raw_source)
           _raw_source = if transfer_encoding == encoding
-                          @raw_source.dup
+                          @raw_source
                         else
-                          get_best_encoding(transfer_encoding).encode(@raw_source)
+                          enc = Mail::Encodings::get_encoding(get_best_encoding(transfer_encoding))
+                          enc.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.force_encode(_raw_source, nil, @charset)
         else
-          @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, nil, Jpmobile::Util::UTF8))
+          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
         end
       else
         encoded_without_jpmobile(transfer_encoding)
@@ -360,7 +366,9 @@ 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
@@ -374,7 +382,7 @@ module Mail
 
     def preamble_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(@preamble, @mobile.mail_charset(@charset))
+        Jpmobile::Util.encode(@preamble, @charset)
       else
         preamble_without_jpmobile
       end
@@ -382,7 +390,7 @@ module Mail
 
     def epilogue_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(@epilogue, @mobile.mail_charset(@charset))
+        Jpmobile::Util.encode(@epilogue, @charset)
       else
         epilogue_without_jpmobile
       end
@@ -390,7 +398,7 @@ module Mail
 
     def crlf_boundary_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @mobile.mail_charset(@charset))
+        Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @charset)
       else
         crlf_boundary_without_jpmobile
       end
@@ -398,7 +406,7 @@ module Mail
 
     def end_boundary_with_jpmobile
       if @mobile
-        Jpmobile::Util.encode(end_boundary_without_jpmobile, @mobile.mail_charset(@charset))
+        Jpmobile::Util.encode(end_boundary_without_jpmobile, @charset)
       else
         end_boundary_without_jpmobile
       end
@@ -427,17 +435,6 @@ 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,6 +28,7 @@ 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/rails.rb

@@ -14,7 +14,8 @@ end
 
 ActiveSupport.on_load(:before_configuration) do
   # MobileCarrierのみデフォルトで有効
-  ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::MobileCarrier)
+  config.middleware.insert_before ActionDispatch::ParamsParser, Jpmobile::Rack::MobileCarrier
+
   module Rails
     class Application
       class Configuration

data/lib/jpmobile/resolver.rb

@@ -11,27 +11,6 @@ module Jpmobile
 
     private
 
-    # Helper for building query glob string based on resolver's pattern.
-    def build_query(path, details)
-      if path.prefix.match(/^\//) and !File.exists?(path.prefix)
-        path = Path.build(path.name, File.join(@path, path.prefix), path.partial)
-      end
-
-      query = @pattern.dup
-
-      prefix = path.prefix.empty? ? "" : "#{escape_entry(path.prefix)}\\1"
-      query.gsub!(/\:prefix(\/)?/, prefix)
-
-      partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
-      query.gsub!(/\:action/, partial)
-
-      details.each do |ext, variants|
-        query.gsub!(/\:#{ext}/, "{#{variants.compact.uniq.join(',')}}")
-      end
-
-      File.expand_path(query, @path)
-    end
-
     def query(path, details, formats)
       query = build_query(path, details)
 
@@ -48,8 +27,8 @@ module Jpmobile
         contents = File.binread template
 
         if format
-          variant = template.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
-          virtual_path = variant.blank? ? path.virtual : path.to_str + variant
+          jpmobile_variant = template.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
+          virtual_path = jpmobile_variant.blank? ? path.virtual : path.to_str + jpmobile_variant
         else
           virtual_path = path.virtual
         end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.0.1"
+  VERSION = "4.1.0.rc1"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -93,7 +93,7 @@ END
     # run tests in rails
     cd rails_root
     ruby "-S bundle install"
-    ruby "-S rake db:migrate" unless skip
+    ruby "-S rake db:migrate RAILS_ENV=test" unless skip
     ruby "-S rake spec"
     # ruby "-S rspec -b --color spec/requests/filter_spec.rb -e 'jpmobile integration spec HankakuInputFilterController SoftBank 910T からのアクセス it should behave like hankaku_filter :input => true のとき はtextareaの中では半角に変換されないこと'"
   end

data/spec/unit/receive_mail_spec.rb

@@ -67,21 +67,6 @@ 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)
@@ -273,7 +258,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.should match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
+        @mail.encoded
       end
     end
 
@@ -286,14 +271,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.should match(/BK\\J82~9T\$J\$7!2#5#1#2J8;z!2/)
+        @mail.encoded
       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.should match('/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPQAA')
+        @mail.encoded
       }.should_not raise_error
     end
   end

data/test/rails/overrides/app/controllers/filter_controller_base.rb

@@ -9,6 +9,13 @@ class FilterControllerBase < ApplicationController
   end
   def index
     @q = params[:q]
+    render :text => @q
+  end
+  def index_hankaku
+    render :text => 'ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ' == params[:q]
+  end
+  def index_zenkaku
+    render :text => 'アブラカダブラ' == params[:q]
   end
   def empty
     render :text => ""

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+
+shared_examples_for "docomo_guid が起動しないとき" do
+  render_views
+
+  it "で link_to の自動書き換えが行われない" do
+    get :link
+
+    expect(response.body).to match(/href=\".+\/link\"/)
+  end
+end
+
+shared_examples_for "docomo_guid が起動するとき" do
+  it "で link_to の自動書き換えが行われる" do
+    get :link
+
+    expect(response.body).to match(/href=\".+\/link\?guid=ON\"/)
+  end
+end
+
+describe DocomoGuidBaseController do
+  before(:each) do
+    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+  end
+
+  it "の docomo_guid_mode は nil" do
+    get :link
+
+    controller.docomo_guid_mode.should be_nil
+  end
+  it_should_behave_like "docomo_guid が起動しないとき"
+end
+
+describe DocomoGuidAlwaysController do
+  before(:each) do
+    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+  end
+
+  it "の docomo_guid_always は :always" do
+    get :link
+
+    controller.docomo_guid_mode.should == :always
+  end
+  it_should_behave_like "docomo_guid が起動するとき"
+end
+
+describe DocomoGuidDocomoController do
+  before(:each) do
+    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+  end
+
+  it "の docomo_guid_mode は :docomo" do
+    get :link
+
+    controller.docomo_guid_mode.should == :docomo
+  end
+
+  shared_examples_for 'describe_mobile_with_ua' do |user_agent, example_name|
+    before do
+      request.user_agent = user_agent
+    end
+
+    it_should_behave_like example_name
+  end
+
+  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "docomo_guid が起動するとき"
+  it_should_behave_like 'describe_mobile_with_ua', "J-PHONE/3.0/V301D", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/1.0/N505i/c20/TB/W20H10 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/2.0/SO502i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)", "docomo_guid が起動しないとき"
+end