jpmobile 5.0.0 → 5.0.1

data/lib/jpmobile/mailer.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'jpmobile/mail'
 require 'jpmobile/lookup_context'
 
@@ -8,9 +7,9 @@ module Jpmobile
   module Mailer
     class Base < ActionMailer::Base
       self._view_paths = self._view_paths.dup
-      self.view_paths.unshift(Jpmobile::Resolver.new(File.join(::Rails.root, "app/views")))
+      self.view_paths.unshift(Jpmobile::Resolver.new(File.join(::Rails.root, 'app/views')))
 
-      def mail(headers={}, &block)
+      def mail(headers = {}, &block)
         tos = headers[:to] || self.default_params[:to]
         tos = tos.split(/,/)
 
@@ -27,7 +26,7 @@ module Jpmobile
 
         m = super(headers, &block)
 
-        m.mobile  = @mobile
+        m.mobile = @mobile
 
         # for decorated-mail manipulation
         m.rearrange! if @mobile.decorated?
@@ -37,6 +36,7 @@ module Jpmobile
 
       class << self
         protected
+
         def set_payload_for_mail(payload, mail) #:nodoc:
           super
 

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 require 'ipaddr'
 
 module Jpmobile::Mobile
   # 携帯電話の抽象クラス。
   class AbstractMobile
     # メールのデフォルトのcharset
-    MAIL_CHARSET = "ISO-2022-JP"
+    MAIL_CHARSET = 'ISO-2022-JP'.freeze
 
     def initialize(env, request)
       @env            = env
@@ -20,17 +19,27 @@ module Jpmobile::Mobile
     # 対応するメールアドレスの正規表現
     MAIL_ADDRESS_REGEXP = nil
     # テキスト部分の content-transfer-encoding
-    MAIL_CONTENT_TRANSFER_ENCODING = '7bit'
+    MAIL_CONTENT_TRANSFER_ENCODING = '7bit'.freeze
 
     # 緯度経度があれば Position のインスタンスを返す。
-    def position; return nil; end
+    def position
+      nil
+    end
 
     # 契約者又は端末を識別する文字列があれば返す。
-    def ident; ident_subscriber || ident_device; end
+    def ident
+      ident_subscriber || ident_device
+    end
+
     # 契約者を識別する文字列があれば返す。
-    def ident_subscriber; nil; end
+    def ident_subscriber
+      nil
+    end
+
     # 端末を識別する文字列があれば返す。
-    def ident_device; nil; end
+    def ident_device
+      nil
+    end
 
     def valid_ip?
       @__valid_ip ||= self.class.valid_ip? @request.ip
@@ -40,12 +49,12 @@ module Jpmobile::Mobile
     def display
       @__displlay ||= Jpmobile::Mobile::Terminfo.new(self, @env)
     rescue LoadError
-      puts "display method require jpmobile-terminfo plugin."
+      puts 'display method require jpmobile-terminfo plugin.'
     end
 
     # クッキーをサポートしているか。
     def supports_cookie?
-      return false
+      false
     end
 
     # smartphone かどうか
@@ -72,78 +81,86 @@ module Jpmobile::Mobile
     def to_internal(str)
       str
     end
+
     def to_external(str, content_type, charset)
       [str, charset]
     end
+
     def default_charset
-      "UTF-8"
+      'UTF-8'
     end
 
     # for view selector
     def variants
       return @_variants if @_variants
 
-      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/}.map do |klass|
+      @_variants = self.class.ancestors.select { |c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/ }.map do |klass|
         klass = klass.to_s.
-          gsub(/Jpmobile::/, '').
-          gsub(/AbstractMobile::/, '').
-          gsub(/Mobile::SmartPhone/, 'smart_phone').
-          gsub(/Mobile::Tablet/, 'tablet').
-          gsub(/::/, '_').
-          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-          gsub(/([a-z\d])([A-Z])/, '\1_\2').
-          downcase
-        klass =~ /abstract/ ? "mobile" : klass
+                  gsub(/Jpmobile::/, '').
+                  gsub(/AbstractMobile::/, '').
+                  gsub(/Mobile::SmartPhone/, 'smart_phone').
+                  gsub(/Mobile::Tablet/, 'tablet').
+                  gsub(/::/, '_').
+                  gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+                  gsub(/([a-z\d])([A-Z])/, '\1_\2').
+                  downcase
+        (klass =~ /abstract/) ? 'mobile' : klass
       end
 
       if @_variants.include?('tablet')
-        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "tablet_")}
-      elsif @_variants.include?("smart_phone")
-        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "smart_phone_")}
+        @_variants = @_variants.reject { |v| v == 'mobile' }.map { |v| v.gsub(/mobile_/, 'tablet_') }
+      elsif @_variants.include?('smart_phone')
+        @_variants = @_variants.reject { |v| v == 'mobile' }.map { |v| v.gsub(/mobile_/, 'smart_phone_') }
       end
 
       @_variants || []
     end
+
     def mail_variants
       return @_mail_variants if @_mail_variants
 
-      @_mail_variants = variants == ['mobile'] ? [] : variants
+      @_mail_variants = (variants == ['mobile']) ? [] : variants
     end
 
     # メール送信用
     def to_mail_subject(str)
       Jpmobile::Util.fold_text(Jpmobile::Emoticon.unicodecr_to_utf8(str)).
-        map{|text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').gsub(/\n/, '') + "?=" }.
+        map { |text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').delete("\n") + '?=' }.
         join("\n\s")
     end
+
     def to_mail_body(str)
       to_mail_encoding(str)
     end
+
     def mail_charset(charset = nil)
       # (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
       # self.class::MAIL_CHARSET
-      charset.nil? || charset == '' || charset =~ /US-ASCII/i ? self.class::MAIL_CHARSET : charset
+      (charset.nil? || charset == '' || charset =~ /US-ASCII/i) ? self.class::MAIL_CHARSET : charset
     end
+
     def content_transfer_encoding(headers)
       transfer_encoding = headers['Content-Transfer-Encoding']
       case headers['Content-Type'].to_s
-      when /text\/plain/
-        transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
-      when /text\/html/
+      when %r{text/plain}
+        (transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING) ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
+      when %r{text/html}
         if self.decorated?
           'quoted-printable'
         else
-          transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
+          (transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING) ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
         end
       else
         transfer_encoding
       end
     end
+
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
       Jpmobile::Util.encode(str, mail_charset)
     end
+
     def utf8_to_mail_encode(str)
       case mail_charset
       when /ISO-2022-JP/i
@@ -154,29 +171,35 @@ module Jpmobile::Mobile
         str
       end
     end
+
     def to_mail_internal(str, charset)
       str
     end
+
     def to_mail_subject_encoded?(str)
       str.match(/\=\?#{mail_charset}\?B.+\?\=/i)
     end
+
     def to_mail_body_encoded?(str)
       Jpmobile::Util.jis?(str)
     end
+
     def decode_transfer_encoding(body, charset)
       body = Jpmobile::Util.set_encoding(body, charset)
       body = to_mail_internal(body, nil)
       Jpmobile::Util.force_encode(body, charset, Jpmobile::Util::UTF8)
     end
+
     def decoratable?
       false
     end
+
     def require_related_part?
       false
     end
-    def decorated=(boolean)
-      @decorated = boolean
-    end
+
+    attr_writer :decorated
+
     def decorated?
       @decorated
     end
@@ -185,7 +208,7 @@ module Jpmobile::Mobile
       # 当該キャリアのIPアドレス帯域からのアクセスであれば +true+ を返す。
       # そうでなければ +false+ を返す。
       # IP空間が定義されていない場合は +nil+ を返す。
-      def valid_ip? remote_addr
+      def valid_ip?(remote_addr)
         @ip_list ||= ip_address_class
         return false unless @ip_list
 
@@ -220,11 +243,13 @@ module Jpmobile::Mobile
 
       #
       def ip_address_class
-        eval("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new rescue nil
+        Object.const_get("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new
+      rescue
+        nil
       end
     end
 
-    #XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
+    # XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
     Jpmobile::Mobile.carriers.each do |carrier|
       carrier_class = Jpmobile::Mobile.const_get(carrier)
       next if carrier_class == self
@@ -235,6 +260,7 @@ module Jpmobile::Mobile
     end
 
     private
+
     # リクエストのパラメータ。
     def params
       if @request.respond_to? :parameters

data/lib/jpmobile/mobile/android.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # =Android
 
 module Jpmobile::Mobile

data/lib/jpmobile/mobile/android_tablet.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # =Android
 
 module Jpmobile::Mobile

data/lib/jpmobile/mobile/au.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # =au携帯電話
 
 module Jpmobile::Mobile
@@ -7,52 +6,52 @@ module Jpmobile::Mobile
   class Au < AbstractMobile
     # 対応するUser-Agentの正規表現
     # User-Agent文字列中に "UP.Browser" を含むVodafoneの端末があるので注意が必要
-    USER_AGENT_REGEXP = /^(?:KDDI|UP.Browser\/.+?)-(.+?) /
+    USER_AGENT_REGEXP = %r{^(?:KDDI|UP.Browser/.+?)-(.+?) }
     # 対応するメールアドレスの正規表現
     MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/
     # 簡易位置情報取得に対応していないデバイスID
     # http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
-    LOCATION_UNSUPPORTED_DEVICE_ID = ["PT21", "TS25", "KCTE", "TST9", "KCU1", "SYT5", "KCTD", "TST8", "TST7", "KCTC", "SYT4", "KCTB", "KCTA", "TST6", "KCT9", "TST5", "TST4", "KCT8", "SYT3", "KCT7", "MIT1", "MAT3", "KCT6", "TST3", "KCT5", "KCT4", "SYT2", "MAT1", "MAT2", "TST2", "KCT3", "KCT2", "KCT1", "TST1", "SYT1"]
+    LOCATION_UNSUPPORTED_DEVICE_ID = %w[PT21 TS25 KCTE TST9 KCU1 SYT5 KCTD TST8 TST7 KCTC SYT4 KCTB KCTA TST6 KCT9 TST5 TST4 KCT8 SYT3 KCT7 MIT1 MAT3 KCT6 TST3 KCT5 KCT4 SYT2 MAT1 MAT2 TST2 KCT3 KCT2 KCT1 TST1 SYT1].freeze
     # GPS取得に対応していないデバイスID
-    GPS_UNSUPPORTED_DEVICE_ID = ["PT21", "KC26", "SN28", "SN26", "KC23", "SA28", "TS25", "SA25", "SA24", "SN23", "ST14", "KC15", "SN22", "KC14", "ST13", "SN17", "SY15", "CA14", "HI14", "TS14", "KC13", "SN15", "SN16", "SY14", "ST12", "TS13", "CA13", "MA13", "HI13", "SN13", "SY13", "SN12", "SN14", "ST11", "DN11", "SY12", "KCTE", "TST9", "KCU1", "SYT5", "KCTD", "TST8", "TST7", "KCTC", "SYT4", "KCTB", "KCTA", "TST6", "KCT9", "TST5", "TST4", "KCT8", "SYT3", "KCT7", "MIT1", "MAT3", "KCT6", "TST3", "KCT5", "KCT4", "SYT2", "MAT1", "MAT2", "TST2", "KCT3", "KCT2", "KCT1", "TST1", "SYT1"]
+    GPS_UNSUPPORTED_DEVICE_ID = %w[PT21 KC26 SN28 SN26 KC23 SA28 TS25 SA25 SA24 SN23 ST14 KC15 SN22 KC14 ST13 SN17 SY15 CA14 HI14 TS14 KC13 SN15 SN16 SY14 ST12 TS13 CA13 MA13 HI13 SN13 SY13 SN12 SN14 ST11 DN11 SY12 KCTE TST9 KCU1 SYT5 KCTD TST8 TST7 KCTC SYT4 KCTB KCTA TST6 KCT9 TST5 TST4 KCT8 SYT3 KCT7 MIT1 MAT3 KCT6 TST3 KCT5 KCT4 SYT2 MAT1 MAT2 TST2 KCT3 KCT2 KCT1 TST1 SYT1].freeze
 
     # EZ番号(サブスクライバID)があれば返す。無ければ +nil+ を返す。
     def subno
-      @request.env["HTTP_X_UP_SUBNO"]
+      @request.env['HTTP_X_UP_SUBNO']
     end
-    alias :ident_subscriber :subno
+    alias_method :ident_subscriber, :subno
 
     # 位置情報があれば Position のインスタンスを返す。無ければ +nil+ を返す。
     def position
       return @__posotion if defined? @__posotion
-      return @__posotion = nil if ( params["lat"].nil? || params['lat'] == '' || params["lon"].nil? || params["lon"] == '' )
+      return @__posotion = nil if params['lat'].nil? || params['lat'] == '' || params['lon'].nil? || params['lon'] == ''
       l = Jpmobile::Position.new
-      l.options = params.reject {|x,v| !["ver", "datum", "unit", "lat", "lon", "alt", "time", "smaj", "smin", "vert", "majaa", "fm"].include?(x) }
-      case params["unit"]
-      when "1"
-        l.lat = params["lat"].to_f
-        l.lon = params["lon"].to_f
-      when "0", "dms"
-        raise "Invalid dms form" unless params["lat"] =~ /^([+-]?\d+)\.(\d+)\.(\d+\.\d+)$/
-        l.lat = Jpmobile::Position.dms2deg($1,$2,$3)
-        raise "Invalid dms form" unless params["lon"] =~ /^([+-]?\d+)\.(\d+)\.(\d+\.\d+)$/
-        l.lon = Jpmobile::Position.dms2deg($1,$2,$3)
+      l.options = params.select { |x, _| %w[ver datum unit lat lon alt time smaj smin vert majaa fm].include?(x) }
+      case params['unit']
+      when '1'
+        l.lat = params['lat'].to_f
+        l.lon = params['lon'].to_f
+      when '0', 'dms'
+        raise 'Invalid dms form' unless params['lat'] =~ /^([+-]?\d+)\.(\d+)\.(\d+\.\d+)$/
+        l.lat = Jpmobile::Position.dms2deg(Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3))
+        raise 'Invalid dms form' unless params['lon'] =~ /^([+-]?\d+)\.(\d+)\.(\d+\.\d+)$/
+        l.lon = Jpmobile::Position.dms2deg(Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3))
       else
         return @__posotion = nil
       end
-      if params["datum"] == "1"
+      if params['datum'] == '1'
         # ただし、params["datum"]=="tokyo"のとき(簡易位置情報)のときは、
         # 実際にはWGS84系のデータが渡ってくる
         # http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
         l.tokyo2wgs84!
       end
-      return @__posotion = l
+      @__posotion = l
     end
 
     # デバイスIDを返す
     def device_id
       if @request.env['HTTP_USER_AGENT'] =~ USER_AGENT_REGEXP
-        return $1
+        Regexp.last_match(1)
       else
         nil
       end
@@ -60,18 +59,28 @@ module Jpmobile::Mobile
 
     # 簡易位置情報取得に対応している場合は +true+ を返す。
     def supports_location?
-      ! LOCATION_UNSUPPORTED_DEVICE_ID.include?(device_id)
+      !LOCATION_UNSUPPORTED_DEVICE_ID.include?(device_id)
     end
 
     # GPS位置情報取得に対応している場合は +true+ を返す。
     def supports_gps?
-      ! GPS_UNSUPPORTED_DEVICE_ID.include?(device_id)
+      !GPS_UNSUPPORTED_DEVICE_ID.include?(device_id)
     end
 
     # cookieに対応しているか？
     def supports_cookie?
-      protocol = @request.respond_to?(:scheme) ? @request.scheme : @request.protocol rescue "none"
-      if protocol =~ /\Ahttps/
+      protocol =
+        begin
+          if @request.respond_to?(:scheme)
+            @request.scheme
+          else
+            @request.protocol
+          end
+        rescue
+          'none'
+        end
+
+      if protocol.start_with?('https')
         false
       else
         true
@@ -85,13 +94,14 @@ module Jpmobile::Mobile
       # 文字コードを UTF-8 に変換
       str = Jpmobile::Util.sjis_to_utf8(str)
       # 数値参照を UTF-8 に変換
-      Jpmobile::Emoticon::unicodecr_to_utf8(str)
+      Jpmobile::Emoticon.unicodecr_to_utf8(str)
     end
+
     def to_external(str, content_type, charset)
       # UTF-8を数値参照に
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       # 文字コードを Shift_JIS に変換
-      if [nil, "text/html", "application/xhtml+xml"].include?(content_type)
+      if [nil, 'text/html', 'application/xhtml+xml'].include?(content_type)
         str = Jpmobile::Util.utf8_to_sjis(str)
         charset = default_charset unless str.empty?
       end
@@ -100,8 +110,9 @@ module Jpmobile::Mobile
 
       [str, charset]
     end
+
     def default_charset
-      "Shift_JIS"
+      'Shift_JIS'
     end
 
     # メール送信用
@@ -110,7 +121,7 @@ module Jpmobile::Mobile
     end
 
     def to_mail_internal(str, charset)
-      if Jpmobile::Util.jis?(str) or Jpmobile::Util.ascii_8bit?(str) or charset == mail_charset
+      if Jpmobile::Util.jis?(str) || Jpmobile::Util.ascii_8bit?(str) || (charset == mail_charset)
         # 絵文字を数値参照に変換
         str = Jpmobile::Emoticon.external_to_unicodecr_au_mail(Jpmobile::Util.jis(str))
         str = Jpmobile::Util.jis_to_utf8(Jpmobile::Util.jis_win(str))
@@ -123,6 +134,7 @@ module Jpmobile::Mobile
     end
 
     private
+
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       str = Jpmobile::Util.utf8_to_jis(str)

data/lib/jpmobile/mobile/black_berry.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # =BlackBerry
 
 module Jpmobile::Mobile

data/lib/jpmobile/mobile/ddipocket.rb

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 # =DDI-POCKET
 module Jpmobile::Mobile
   # ==DDI-POCKET
   # スーパクラスはWillcom。
   class Ddipocket < Willcom
     # 対応するUser-Agentの正規表現
-    USER_AGENT_REGEXP = /^Mozilla\/3.0\(DDIPOCKET/
+    USER_AGENT_REGEXP = %r{^Mozilla/3.0\(DDIPOCKET}
 
     MAIL_ADDRESS_REGEXP = nil # DdipocketはEmail判定だとWillcomと判定させたい
   end