jpmobile 0.0.6 → 0.0.7

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -19,4 +19,8 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "118.152.214.192/26",
  "118.159.131.0/25",
  "118.159.133.0/25",
- "118.159.132.160/27"].map {|ip| IPAddr.new(ip) }
+ "118.159.132.160/27",
+ "111.86.142.0/26",
+ "111.86.141.64/26",
+ "111.86.141.128/26",
+ "111.86.141.192/26"].map {|ip| IPAddr.new(ip) }

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_softbank.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # = IPアドレス帯域テーブル(手動更新分)
 # == SoftBank
 # http://developers.softbankmobile.co.jp/dp/tech_svc/web/ip.php
@@ -10,8 +11,7 @@ Jpmobile::Mobile::Softbank::IP_ADDRESSES = %w(
 210.146.7.192/26
 210.146.60.192/26
 210.151.9.128/26
-210.169.130.112/28
 210.175.1.128/25
-210.228.189.0/24
 211.8.159.128/25
+210.175.1.128/25
 ).map {|ip| IPAddr.new(ip) }

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -56,12 +56,28 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "61.204.93.0/24",
  "61.204.94.0/24",
  "61.204.95.0/24",
+ "114.20.49.0/24",
+ "114.20.50.0/24",
+ "114.20.51.0/24",
+ "114.20.52.0/24",
+ "114.20.53.0/24",
+ "114.20.54.0/24",
+ "114.20.55.0/24",
+ "114.20.56.0/24",
+ "114.20.57.0/24",
+ "114.20.58.0/24",
+ "114.20.59.0/24",
+ "114.20.60.0/24",
+ "114.20.61.0/24",
+ "114.20.62.0/24",
+ "114.20.63.0/24",
+ "114.20.64.0/24",
+ "114.20.65.0/24",
+ "114.20.66.0/24",
+ "114.20.67.0/24",
+ "114.21.255.0/27",
  "125.28.0.0/24",
  "125.28.1.0/24",
- "125.28.11.0/24",
- "125.28.12.0/24",
- "125.28.13.0/24",
- "125.28.14.0/24",
  "125.28.15.0/24",
  "125.28.16.0/24",
  "125.28.17.0/24",
@@ -69,8 +85,6 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "125.28.3.0/24",
  "125.28.4.0/24",
  "125.28.5.0/24",
- "125.28.6.0/24",
- "125.28.7.0/24",
  "125.28.8.0/24",
  "210.168.246.0/24",
  "210.168.247.0/24",
@@ -89,17 +103,12 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "211.18.235.0/24",
  "211.18.236.0/24",
  "211.18.237.0/24",
- "211.18.238.0/24",
- "211.18.239.0/24",
  "219.108.10.0/24",
  "219.108.11.0/24",
  "219.108.12.0/24",
  "219.108.13.0/24",
  "219.108.14.0/24",
  "219.108.15.0/24",
- "219.108.4.0/24",
- "219.108.5.0/24",
- "219.108.6.0/24",
  "219.108.7.0/24",
  "219.108.8.0/24",
  "219.108.9.0/24",
@@ -108,10 +117,41 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "221.119.2.0/24",
  "221.119.3.0/24",
  "221.119.4.0/24",
- "221.119.5.0/24",
  "221.119.6.0/24",
  "221.119.7.0/24",
  "221.119.8.0/24",
  "221.119.9.0/24",
+ "114.20.49.0/24",
+ "114.20.50.0/24",
+ "114.20.51.0/24",
+ "114.20.52.0/24",
+ "114.20.53.0/24",
+ "114.20.54.0/24",
+ "114.20.55.0/24",
+ "114.20.56.0/24",
+ "114.20.57.0/24",
+ "114.20.58.0/24",
+ "114.20.59.0/24",
+ "114.20.60.0/24",
+ "114.20.61.0/24",
+ "114.20.62.0/24",
+ "114.20.63.0/24",
+ "114.20.64.0/24",
+ "114.20.65.0/24",
+ "114.20.66.0/24",
+ "114.20.67.0/24",
+ "114.21.255.0/27",
  "219.108.2.0/24",
- "219.108.3.0/24"].map {|ip| IPAddr.new(ip) }
+ "219.108.3.0/24",
+ "125.28.6.0/24",
+ "125.28.7.0/24",
+ "125.28.11.0/24",
+ "125.28.12.0/24",
+ "125.28.13.0/24",
+ "125.28.14.0/24",
+ "211.18.238.0/24",
+ "211.18.239.0/24",
+ "219.108.4.0/24",
+ "219.108.5.0/24",
+ "219.108.6.0/24",
+ "221.119.5.0/24"].map {|ip| IPAddr.new(ip) }

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/auth.rb

@@ -0,0 +1,55 @@
+module Jpmobile
+  module Rack
+    # in your_app.ru
+    #
+    # check ip
+    #   require 'jpmobile/rack'
+    #   use Jpmobile::Rack::Auth::Docomo
+
+    # (but allow localhost), {
+    #      :ident => %w( xxxxxx ),
+    #      :check_ip => true,
+    #      :allow_ip => %w( 127.0.0.1 )
+    #   }    # you can use block
+
+    # req is Jpmobile::Rack::Request's subclass instance.
+    #   require 'jpmobile/rack'
+    #   use Jpmobile::Rack::Auth {|req|
+    #     Your::Model::AuSubno.count(:subno => req.ident) != 0
+    #   }
+    class Auth
+      FORBIDDEN = [403, {'Content-Type' => 'text/plain' }, 'Forbidden' ]
+
+      def initialize(app, hash=nil, &block)
+        @app = app
+        if hash
+          @allow_ip         = hash[:allow_ip]
+        end
+        @cond = block
+      end
+
+      def career
+      end
+
+      def call(env)
+        request = Request.new(env)
+
+        if request.mobile? and request.valid_ip?
+          @app.call(env)
+        else
+          FORBIDDEN
+        end
+      end
+
+      ::Jpmobile::Mobile.constants.each do |career|
+        klass = Class.new(self)
+        klass.class_eval do
+          define_method :career do
+            ::Jpmobile::Mobile.const_get(career)
+          end
+        end
+        const_set(career, klass)
+      end
+    end
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/combined_logger.rb

@@ -0,0 +1,54 @@
+module Jpmobile
+  module Rack
+    # Rack::CommonLogger show too few infomation to debugging mobile web application.
+    # So you can Rack::Jpmobile::CombinedLogger as alternate.
+    # SYNOPSIS
+    #   in your_app.up
+    #     require 'jpmobile/rack'
+    #     class Rack::CommonLogger
+    #       include Jpmobile::Rack::CombinedLogger
+    #     end
+    #
+    #     use Rack::CommonLogger, STDERR   # you need not write this when you use rackup on development.
+    #
+    module CombinedLogger
+
+      # XXX: It's evil way for replacing Rack::CommonLogger#each.
+      def self.included klass
+        klass.class_eval do
+          alias orig_each each
+          remove_method :each
+        end
+      end
+
+      def each
+        length = 0
+        @body.each { |part|
+          length += part.size
+          yield part
+        }
+
+        @now = Time.now
+
+        # Combined Log Format: http://httpd.apache.org/docs/1.3/logs.html#combined
+        # 127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"
+        #          "%h %l %u [%t] \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
+        @logger << %{%s - %s [%s] "%s %s%s %s" %d %s %s "%s" %0.4f\n} %
+          [
+           @env['HTTP_X_FORWARDED_FOR'] || @env["REMOTE_ADDR"] || "-",
+           @env["REMOTE_USER"] || @env["HTTP_X_DCMGUID"] || @env["HTTP_X_UP_SUBNO"] || @env["HTTP_X_JPHONE_UID"] || @env["HTTP_X_EM_UID"] || "-",
+           @now.strftime("%d/%b/%Y %H:%M:%S"),
+           @env["REQUEST_METHOD"],
+           @env["PATH_INFO"],
+           @env["QUERY_STRING"].empty? ? "" : "?"+@env["QUERY_STRING"],
+           @env["HTTP_VERSION"],
+           @status.to_s[0..3],
+           (length.zero? ? "-" : length.to_s),
+           @env["HTTP_REFERER"] ? %{"#{@env['Referer']}"} : '-',
+           @env["HTTP_USER_AGENT"],
+           @now - @time
+          ]
+      end
+    end
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/request.rb

@@ -0,0 +1,7 @@
+module Jpmobile
+  module Rack
+    class Request < ::Rack::Request
+      include ::Jpmobile::RequestWithMobile
+    end
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/trans_sid.rb

@@ -0,0 +1,14 @@
+# = セッションID を QUERY_STRING などから上書きする処理
+module Jpmobile
+  module Rack
+    class TransSid
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/trans_sid.rb

@@ -1,58 +1,81 @@
+# -*- coding: utf-8 -*-
 # = セッションIDの付与
-#
-# based on http://moriq.tdiary.net/20070209.html#p01
-# by moriq <moriq@moriq.com>
-#
-# cookie support detection inspired by takai http://recompile.net/
-#
-# Rails 2.0.2 support is based on the code contributed
-# by masuidrive <masuidrive (at) masuidrive.jp>
+require 'active_support/version'
 
-# FastCGI環境では(どういうわけか) cgi.query_string でクエリ文字列を取得できないので
-# ENV['QUERY_STRING'] に代入しておく。
-module ActionController
-  class CgiRequest
-    alias_method :initialize_without_ext, :initialize
-    def initialize(cgi, options = {})
-      initialize_without_ext(cgi, options)
-      ENV['QUERY_STRING'] = query_string
+module ParamsOverCookie
+  def self.included(base)
+    base.class_eval do
+      # cookie よりも params を先に見るパッチ
+      def load_session_with_jpmobile(env)
+        request = Rack::Request.new(env)
+        unless @cookie_only
+          sid = request.params[@key]
+        end
+        sid ||= request.cookies[@key]
+
+        sid, session = get_session(env, sid)
+        [sid, session]
+      end
+      alias_method_chain :load_session, :jpmobile
     end
   end
 end
 
-class ActionController::Base #:nodoc:
-  class_inheritable_accessor :trans_sid_mode
-  def transit_sid_mode(*args)
-    STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
-    trans_sid_mode(*args)
-  end
-  class << self
-    def trans_sid(mode=:mobile)
-      include Jpmobile::TransSid
-      self.trans_sid_mode = mode
-      unless mode == :none
-        # CSRF対策への対策
-        session :cookie_only => false
-        # url/postからsession_keyを取得できるようhookを追加する
-        unless ::CGI::Session.private_method_defined?(:initialize_without_session_key_fixation)
-          ::CGI::Session.class_eval do
-            alias_method :initialize_without_session_key_fixation, :initialize
-            def initialize(cgi, options = {})
-              key = options['session_key']
-              if cgi.cookies[key].empty?
-                session_id = (CGI.parse(cgi.env_table['RAW_POST_DATA'])[key] rescue nil) ||
-                  (CGI.parse(ENV['QUERY_STRING'] || cgi.query_string)[key] rescue nil)
-                cgi.params[key] = session_id unless session_id.blank?
-              end
-              initialize_without_session_key_fixation(cgi, options)
-            end
-          end
+module ActionController
+  # cookie よりも params を先に見るパッチ
+  Session::AbstractStore.send :include, ParamsOverCookie
+
+  class Base #:nodoc:
+    class_inheritable_accessor :trans_sid_mode
+    alias :redirect_to_full_url_without_jpmobile :redirect_to_full_url
+
+    def transit_sid_mode(*args)
+      STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
+      trans_sid_mode(*args)
+    end
+
+    def redirect_to_full_url(url, status)
+      if apply_trans_sid? and !url.match(/#{session_key}/)
+        uri = URI.parse(url)
+        if uri.query
+          uri.query += "&#{session_key}=#{jpmobile_session_id}"
+        else
+          uri.query = "#{session_key}=#{jpmobile_session_id}"
         end
+        url = uri.to_s
       end
+
+      redirect_to_full_url_without_jpmobile(url, status)
     end
-    def transit_sid(*args)
-      STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
-      trans_sid(*args)
+
+    class << self
+      # 2.3.x or higher
+      def trans_sid(mode = :mobile)
+        include Jpmobile::TransSid
+        self.trans_sid_mode = mode
+      end
+
+      def transit_sid(*args)
+        STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
+        trans_sid(*args)
+      end
+    end
+
+    private
+    # trans_sidを適用すべきかを返す。
+    def apply_trans_sid?
+      case trans_sid_mode
+      when :always
+        session.inspect
+        return true
+      when :mobile
+        if request.mobile? and !request.mobile.supports_cookie?
+          session.inspect
+          return true
+        end
+      end
+
+      return false
     end
   end
 end
@@ -68,19 +91,21 @@ module Jpmobile::TransSid #:nodoc:
     result = super || {}
     return result unless request # for test process
     return result unless apply_trans_sid?
-    return result.merge({ session_key => session.session_id })
+    return result.merge({ session_key => jpmobile_session_id })
   end
 
   private
   # session_keyを返す。
   def session_key
-    if session_enabled?
-      session_key = request.session_options[:session_key] || '_session_id'
-    end
+    ActionController::Base.session_options.merge(request.session_options || {})[:key]
+  end
+  # session_idを返す
+  def jpmobile_session_id
+    request.session_options[:id] rescue session.session_id
   end
   # session_idを埋め込むためのhidden fieldを出力する。
   def sid_hidden_field_tag
-    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML session.session_id}\" />"
+    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML jpmobile_session_id}\" />"
   end
   # formにsession_idを追加する。
   def append_session_id_parameter
@@ -88,18 +113,4 @@ module Jpmobile::TransSid #:nodoc:
     return unless apply_trans_sid?
     response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
-  # trans_sidを適用すべきかを返す。
-  def apply_trans_sid?
-    return false unless session_enabled?
-    return false if trans_sid_mode == :none
-    return true if trans_sid_mode == :always
-    if trans_sid_mode == :mobile
-      if request.mobile?
-        return !request.mobile.supports_cookie?
-      else
-        return false
-      end
-    end
-    return false
-  end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/version.rb

@@ -2,7 +2,7 @@ module Jpmobile #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/rails/rails_root/vendor/plugins/jpmobile/tasks/jpmobile_tasks.rake

@@ -27,15 +27,18 @@ namespace :test do
   end
   desc "Generate rails app and run jpmobile tests in the app"
   task :rails, [:versions] do |t, args|
-    rails_versions = args.versions.split(",") rescue ["2.2.2"]
-    rails_versions.each do |rails_version|
-      puts "Running tests in Rails #{rails_version}"
+    rails_root     = "test/rails/rails_root"
+    relative_root  = "../../../"
+    rails_versions = args.versions.split("/") rescue ["2.3.5"]
+
+    puts "Running tests in Rails #{rails_versions.join(', ')}"
 
+    rails_versions.each do |rails_version|
+      puts "  for #{rails_version}"
       # generate rails app
-      rails_root = "test/rails/rails_root"
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      system "rails _#{rails_version}_ -q --force #{rails_root}"
+      system "rails _#{rails_version}_ --force #{rails_root}"
 
       # setup jpmobile
       plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
@@ -49,11 +52,28 @@ namespace :test do
         FileUtils.cp_r(file, rails_root)
       end
 
+      # for 2.3.2
+      if rails_version == "2.3.2"
+        FileList["test/rails/2.3.2/*"].each do |file|
+          FileUtils.cp_r(file, rails_root)
+        end
+      end
+
+      # for cookie_only option
+      config_path = File.join(rails_root, 'config', 'environment.rb')
+      File.open(config_path, 'a') do |file|
+        file.write <<-END
+
+ActionController::Base.session = {:key => "_session_id", :cookie_only => false}
+END
+      end
+
       # run tests in rails
       cd rails_root
       sh "rake db:migrate"
       sh "rake spec"
+
+      cd relative_root
     end
   end
 end
-

data/test/rails/rails_root/vendor/plugins/jpmobile/tools/{update_display_info_docomo.rb → disabled_update_display_info_docomo.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -Ku
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'open-uri'
-require 'kconv'
 require 'hpricot'
 require 'pp'
 
@@ -12,19 +12,24 @@ user_agents = {}
 (Hpricot(src)/"//div[@id='maincol']//table").each do |table|
   (table/"tr[@class='acenter']").each do |tr|
     a = (tr/:td).map {|x| x.inner_text }
+    i = 0
     if a.size == 7
-      a.shift # remove rowspan
+      if a[0] =~ /[A-Z]{1,2}\-\d{2}A/ # iモードブラウザ2.0
+        i = 1
+      else
+        a.shift # remove rowspan
+      end
     elsif a.size != 6
       raise "something is wrong"
     end
     a[0].sub!(/（.*）/,"")
     a[0].sub!(/\(.+\)/,"")
     a[0].sub!(/-/,'') # F-01A -> F01A
+    a[0].sub!(/$/,'3') if i == 1 # iモードブラウザ2.0
 
-    a[3].sub!(/^.*?(\d+×\d+).*$/,'\1')
-    width, height = a[3].split(/×/,2).map{|x| x.to_i}
-
-    case a[5]
+    a[3+i].sub!(/^.*?(\d+×\d+).*$/,'\1')
+    width, height = a[3+i].split(/×/,2).map{|x| x.to_i}
+    case a[5+i]
     when /^カラー\s*(\d+)色$/
       color_p = true
       colors = $1.to_i

data/test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_docomo_emoticon_table.rb

@@ -1,4 +1,3 @@
-require 'kconv'
 require 'rubygems'
 require 'hpricot'
 require 'open-uri'

data/test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_softbank_emoticon_table.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'hpricot'
-require 'kconv'
 require 'cgi'
 require 'open-uri'
 

data/test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_au.rb

@@ -1,21 +1,22 @@
 #!/usr/bin/env ruby -Ku
+# -*- coding: utf-8 -*-
 # auのwebページからIPリストを抽出する場当たり的なスクリプト。
 
-require 'kconv'
 require 'open-uri'
 require 'pp'
 require 'rubygems'
 require 'hpricot'
+require 'nkf'
 
 ips = []
 
-src = open("http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html").read.toutf8
+src = NKF.nkf("-m0 -Sw", open("http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html").read)
 doc = Hpricot(src)
 (doc/'//table').each do |table|
   trs = (table/'tr')
   next if trs.first && (trs.first/'td[2]').inner_text != 'IPアドレス'
   trs.each do |tr|
-    a = (tr/'td').to_a.map(&:inner_text)
+    a = (tr/'td').to_a.map{|t| t.inner_text}
     next if a[1] == 'IPアドレス'
     ips << a[1..2].join if a[3] != '廃止'
   end

data/test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_willcom.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby -Ku
 # willcomのwebページからIPリストを抽出する場当たり的なスクリプト。
 
-require 'kconv'
 require 'open-uri'
 require 'pp'
+require 'nkf'
 
-src = open("http://www.willcom-inc.com/ja/service/contents_service/create/center_info/index.html").read.toutf8
+src = NKF.nkf("-m0 -Sw", open("http://www.willcom-inc.com/ja/service/contents_service/create/center_info/index.html").read)
 
 src.sub!(%r{^.*<b>Webアクセス時のIPアドレス帯域</b>(.+?)</table>.*$}m, '\\1')
 ips = src.scan(/(\d+\.\d+\.\d+\.\d+\/\d+)/).flatten

data/tools/{update_display_info_docomo.rb → disabled_update_display_info_docomo.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -Ku
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'open-uri'
-require 'kconv'
 require 'hpricot'
 require 'pp'
 
@@ -12,19 +12,24 @@ user_agents = {}
 (Hpricot(src)/"//div[@id='maincol']//table").each do |table|
   (table/"tr[@class='acenter']").each do |tr|
     a = (tr/:td).map {|x| x.inner_text }
+    i = 0
     if a.size == 7
-      a.shift # remove rowspan
+      if a[0] =~ /[A-Z]{1,2}\-\d{2}A/ # iモードブラウザ2.0
+        i = 1
+      else
+        a.shift # remove rowspan
+      end
     elsif a.size != 6
       raise "something is wrong"
     end
     a[0].sub!(/（.*）/,"")
     a[0].sub!(/\(.+\)/,"")
     a[0].sub!(/-/,'') # F-01A -> F01A
+    a[0].sub!(/$/,'3') if i == 1 # iモードブラウザ2.0
 
-    a[3].sub!(/^.*?(\d+×\d+).*$/,'\1')
-    width, height = a[3].split(/×/,2).map{|x| x.to_i}
-
-    case a[5]
+    a[3+i].sub!(/^.*?(\d+×\d+).*$/,'\1')
+    width, height = a[3+i].split(/×/,2).map{|x| x.to_i}
+    case a[5+i]
     when /^カラー\s*(\d+)色$/
       color_p = true
       colors = $1.to_i

data/tools/generate_docomo_emoticon_table.rb

@@ -1,4 +1,3 @@
-require 'kconv'
 require 'rubygems'
 require 'hpricot'
 require 'open-uri'

data/tools/generate_softbank_emoticon_table.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'hpricot'
-require 'kconv'
 require 'cgi'
 require 'open-uri'