jpmobile 3.0.9 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541349c0b2076a81078620a75a7c8748bf0a3f2e
-  data.tar.gz: 2022c410ccc6d3b2d023a944a26035c69858f6c3
+  metadata.gz: 86c3a91d387a147b06a1e8698b4ddcbba1e62c52
+  data.tar.gz: 51c89371e9075628a87c5cdf03cff1922da39466
 SHA512:
-  metadata.gz: 24ac8b306c0935e458450b28d44161119d5b290eb472b51e968347ba78f34856bd087ecd9437a182d3866d9dc417a34ab5340c9358b07ad18caa151e758f1cbc
-  data.tar.gz: 643a14da839b80dd0ae84c2cfb14d21b41da8d86b85e6b8717d24f3df7fd64b77782bbac84c555dd35cf800717e23a9215c98cd655a98294768c7de95326dabf
+  metadata.gz: 5897e0d386accbb2ba9aee29161317c44e550974cf021775badcd932ab77c58475feff381e6da9cff37f0cfb57fb7246cd224916fa0dcbc0255dee34bf430f83
+  data.tar.gz: 78e415d4aea5194564eaaf04dd6a1c5b06cc4c862868bd644555a82433bd127dfd9f8f2c02bd7f6ef7d5f5d6ae1f3ad1118ed9ab1d75d4707c6a8cd831c95096

data/.gitignore

@@ -0,0 +1,19 @@
+doc
+tmp
+pkg
+.bundle
+Gemfile
+Gemfile.lock
+vendor
+*.gem
+*.rbc
+.config
+.yardoc
+InstalledFiles
+_yardoc
+coverage
+lib/bundler/man
+rdoc
+spec/reports
+test/tmp
+test/version_tmp

data/Gemfile

@@ -1,12 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'jeweler'
-  gem 'rails', '~> 3.2.8'
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'webrat'
-  gem 'geokit'
-  gem 'sqlite3-ruby'
-  gem 'hpricot'
-end
+# Specify your gem's dependencies in jpmobile.gemspec
+gemspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Yoji Shidara
+Copyright (c) 2006-2012 Yoji Shidara
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.rdoc

@@ -1,7 +1,7 @@
 = jpmobile: A Rails plugin for Japanese mobile-phones
 
 == jpmobileとは
-携帯電話特有の機能を Rails 3.2 や Rack middleware で利用するためのプラグイン。
+携帯電話特有の機能を Rails 4.0 や Rack middleware で利用するためのプラグイン。
 以下の機能を備える。
 
 * 携帯電話のキャリア判別
@@ -18,7 +18,7 @@
 * メールの受信(experimental)
   * 絵文字と漢字コードの変換
 
-また Rails 3.2 に以下の機能を追加する
+また Rails 4.0 に以下の機能を追加する
 * ビューへの自動振分け
 * 位置情報取得などのリンクヘルパーの追加
 * セッションIDをフォーム／リンクに付与(Trans SID)
@@ -247,8 +247,9 @@ Androidの場合はindex_smart_phone_android.html.erb、Windows Phoneの場合
     trans_sid :always
   end
 
-trans_sid 機能を使う場合には cookie session store を使用することができません。
-また Rails 3.2 では Cookie が使える場合にはそちらが優先されてしまうため、:always を指定した場合に問題になる場合があります。
+trans_sid 機能を使う場合には、cookie session store を使用することができず、
+active_record_storeのgemパッケージが必要です。
+また Rails 4.0 では Cookie が使える場合にはそちらが優先されてしまうため、:always を指定した場合に問題になる場合があります。
 trans_sid を使用する際には、例えば config/initializers/session_store.rb で
   Rails.application.config.session_store :active_record_store
   Rails.application.config.session_options = {:cookie_only => false}
@@ -305,8 +306,6 @@ trans_sid を使用する際には、例えば config/initializers/session_store
 
 == 作者
 
-Copyright 2006-2010 (c) Yoji Shidara, under MIT License.
+Copyright 2006-2012 (c) Yoji Shidara, under MIT License.
 
-Yoji Shidara <dara@shidara.net>
-
-http://d.hatena.ne.jp/darashi
+Shin-ichiro OGAWA <rust.stnard@gmail.com>, Yoji Shidara <dara@shidara.net>

data/Rakefile

@@ -1,55 +1,13 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
+require "bundler/gem_tasks"
 require 'rake/testtask'
-require 'rdoc/task'
 require 'fileutils'
 require 'pathname'
 require 'git'
 include FileUtils
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jpmobile"
-    gem.summary = "A Rails plugin for Japanese mobile-phones"
-    gem.description = "A Rails plugin for Japanese mobile-phones"
-    gem.email = "dara@shidara.net"
-    gem.homepage = "http://jpmobile-rails.org"
-    gem.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
-
-    gem.files.exclude 'test'
-    gem.files.exclude 'spec'
-    gem.files.exclude 'vendor'
-
-    gem.add_development_dependency('rails', '>=3.2.0')
-    gem.add_development_dependency('jeweler', '>=1.5.1')
-    gem.add_development_dependency('rspec', '>=2.6.0')
-    gem.add_development_dependency('rspec-rails', '>=2.6.0')
-    gem.add_development_dependency('webrat', '>=0.7.2')
-    gem.add_development_dependency('geokit', '>=1.5.0')
-    gem.add_development_dependency('sqlite3-ruby', '>=1.3.2')
-    gem.add_development_dependency('hpricot', '>=0.8.3')
-    gem.add_development_dependency('git', '>=1.2.5')
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-Jeweler::GemcutterTasks.new
-
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Generate documentation for the jpmobile plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = 'Jpmobile'
-  rdoc.options << '--line-numbers' << '--inline-source' << '-c UTF-8'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('CHANGELOG')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Update misc tables"
 task :update do
   Dir.glob("tools/update_*.rb").each do |path|

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 3
 :minor: 0
-:patch: 9
+:patch: 7
 :build: 

data/jpmobile.gemspec

@@ -1,43 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'jpmobile/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{jpmobile}
-  s.version = "3.0.9"
+Gem::Specification.new do |gem|
+  gem.name          = "jpmobile"
+  gem.version       = Jpmobile::VERSION
+  gem.authors       = ["Shin-ichiro OGAWA", "Yoji Shidara"]
+  gem.email         = ["rust.stnard@gmail.com"]
+  gem.description   = %q{A Rails plugin for mobile devices in Japan}
+  gem.summary       = %q{A Rails plugin for mobile devices in Japan}
+  gem.homepage      = 'http://jpmobile-rails.org'
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
-  s.date = %q{2012-11-27}
-  s.description = %q{A Rails plugin for Japanese mobile-phones}
-  s.email = %q{dara@shidara.net}
-  s.extra_rdoc_files = [
-    "README",
-    "README.rdoc"
-  ]
-  s.files = Dir['CHANGELOG', 'MIT-LICENSE', 'README', 'README.rdoc', 'init.rb', 'install.rb', 'lib/**/*.*', 'tools/**/*.*']
-  s.homepage = %q{http://jpmobile-rails.org}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Rails plugin for Japanese mobile-phones}
-  s.test_files = Dir['spec/**/*.*', 'test/**/"."' 'tmp/**/*.*']
+  gem.files         = `git ls-files`.split($/)
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  s.add_development_dependency(%q<jeweler>, [">= 0"])
-  s.add_development_dependency(%q<rails>, [">= 3.2.8"])
-  s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 2.3.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0"])
-  s.add_development_dependency(%q<geokit>, [">= 0"])
-  s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-  s.add_development_dependency(%q<hpricot>, [">= 0"])
-  s.add_development_dependency(%q<jeweler>, [">= 1.5.1"])
-  s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 2.3.0"])
-  s.add_development_dependency(%q<webrat>, [">= 0.7.2"])
-  s.add_development_dependency(%q<geokit>, [">= 1.5.0"])
-  s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.2"])
-  s.add_development_dependency(%q<hpricot>, [">= 0.8.3"])
-  s.add_development_dependency(%q<git>, [">= 1.2.5"])
-  s.add_development_dependency(%q<rails>, [">= 3.0.3"])
+  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 'geokit'
+  gem.add_development_dependency 'sqlite3-ruby'
+  gem.add_development_dependency 'hpricot'
+  gem.add_development_dependency 'git'
 end

data/lib/jpmobile.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
                                           $:.include?(File.expand_path(File.dirname(__FILE__)))
+require "jpmobile/version"
 
 module Jpmobile
   autoload :Email,                    'jpmobile/email'
@@ -52,12 +53,13 @@ module Jpmobile
   end
 
   # autoload Rack middlewares
+  autoload :Rack, 'jpmobile/rack'
   module Rack
     autoload :MobileCarrier, 'jpmobile/rack/mobile_carrier'
     autoload :ParamsFilter,  'jpmobile/rack/params_filter'
     autoload :Filter,        'jpmobile/rack/filter'
   end
-  autoload :Configuration, 'jpmobile/rack'
+  autoload :Configuration, 'jpmobile/configuration'
 
   autoload :Mailer,   'jpmobile/mailer'
   autoload :Resolver, 'jpmobile/resolver'

data/lib/jpmobile/configuration.rb

@@ -0,0 +1,19 @@
+module Jpmobile
+  class Configuration
+    include Singleton
+
+    attr_accessor :form_accept_charset_conversion
+    attr_accessor :smart_phone_emoticon_compatibility
+    attr_accessor :fallback_view_selector
+
+    def initialize
+      @form_accept_charset_conversion     = false
+      @smart_phone_emoticon_compatibility = false
+      @fallback_view_selector             = false
+    end
+
+    def mobile_filter
+      ::Jpmobile::Rack.mount_middlewares
+    end
+  end
+end

data/lib/jpmobile/emoticon/z_combine.rb

@@ -1,7 +1,3 @@
-unless Object.const_defined?(:Encoding)
-  $KCODE = 'u'
-end
-
 module Jpmobile
   module Emoticon
     GETA_CODE = 0x3013

data/lib/jpmobile/hook_action_controller.rb

@@ -16,3 +16,30 @@ module ActionController
     end
   end
 end
+
+module AbstractController
+  module Rendering
+    def render_to_body_with_jpmobile(options)
+      if Jpmobile.config.fallback_view_selector and
+          lookup_context.mobile.present? and !lookup_context.mobile.empty?
+        begin
+          expected_view_file = lookup_context.find_template(options[:template], options[:prefixes])
+
+          _candidates = lookup_context.mobile.map { |variant|
+            target_templat = options[:template] + '_' + variant
+            expected_view_file.virtual_path.match(target_templat)
+          }.compact
+
+          if _candidates.empty?
+            lookup_context.mobile = []
+          end
+        rescue ActionView::MissingTemplate
+        end
+      end
+
+      render_to_body_without_jpmobile(options)
+    end
+
+    alias_method_chain :render_to_body, :jpmobile
+  end
+end

data/lib/jpmobile/mail.rb

@@ -3,41 +3,23 @@ require 'mail'
 
 module Mail
   # encoding patch
-  if self.const_defined?(:Ruby19)
-    Ruby19.class_eval do
-      def self.b_value_decode(str)
-        match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
-        if match
-          encoding = match[1]
-          str = self.decode_base64(match[2])
-          str.force_encoding(respond_to?(:pick_encoding) ? pick_encoding(encoding) : fix_encoding(encoding))
-        end
-        # 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.to_s)
-        [Ruby19.encode_base64(str), encoding]
+  Ruby19.class_eval do
+    def self.b_value_decode(str)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
+      if match
+        encoding = match[1]
+        str = self.decode_base64(match[2])
+        str.force_encoding(pick_encoding(encoding))
       end
+      # if str contains some emoticon, the following line raises Encoding error
+      str.encode("utf-8", :invalid => :replace, :replace => "") rescue Jpmobile::Util.ascii_8bit(str)
+      # decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
     end
-  elsif self.const_defined?(:Ruby18)
-    Ruby18.class_eval do
-      def self.b_value_decode(str)
-        match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
-        if match
-          encoding = match[1]
-          str = Ruby18.decode_base64(match[2])
-        end
-        str
-      end
 
-      # change encoding
-      def self.b_value_encode(str, encoding)
-        str = Jpmobile::Util.encode(str, encoding)
-        [Encodings::Base64.encode(str), encoding]
-      end
+    # change encoding
+    def self.b_value_encode(str, encoding)
+      str = Jpmobile::Util.encode(str, encoding.to_s)
+      [Ruby19.encode_base64(str), encoding]
     end
   end
 
@@ -47,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
 
@@ -59,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?
@@ -95,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)
@@ -120,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
 
@@ -143,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
 
@@ -157,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
@@ -260,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
 
@@ -341,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)
@@ -378,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
@@ -392,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
@@ -400,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
@@ -408,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
@@ -416,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
@@ -445,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