jpmobile 0.0.7 → 0.0.8

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

@@ -6,64 +6,77 @@ 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
+      def extract_session_id_with_jpmobile(env)
+        request = ActionDispatch::Request.new(env.dup)
+        if request.params[@key] and !@cookie_only
           sid = request.params[@key]
         end
         sid ||= request.cookies[@key]
-
-        sid, session = get_session(env, sid)
-        [sid, session]
+        sid
       end
-      alias_method_chain :load_session, :jpmobile
+      alias_method_chain :extract_session_id, :jpmobile
     end
   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)
+module ActionDispatch
+  module Session
+    class AbstractStore
+      include ParamsOverCookie
     end
+  end
+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}"
+module ActionController
+  module Redirecting
+    def redirect_to_with_jpmobile(options = {}, response_status = {})
+      if apply_trans_sid? and jpmobile_session_id
+        case options
+        when %r{^\w[\w+.-]*:.*}
+          # nothing to do
+        when String
+          unless options.match(/#{session_key}/)
+            url = URI.parse(options)
+            if url.query
+              url.query += "&#{session_key}=#{jpmobile_session_id}"
+            else
+              url.query = "#{session_key}=#{jpmobile_session_id}"
+            end
+            options = url.to_s
+          end
+        when :back
+          # nothing to do
+        when Hash
+          unless options[session_key.to_sym]
+            options[session_key.to_sym] = jpmobile_session_id
+          end
         else
-          uri.query = "#{session_key}=#{jpmobile_session_id}"
+          # nothing to do
         end
-        url = uri.to_s
       end
 
-      redirect_to_full_url_without_jpmobile(url, status)
+      redirect_to_without_jpmobile(options, response_status)
     end
 
+    alias_method_chain :redirect_to, :jpmobile
+  end
+
+  class Base #:nodoc:
+    class_inheritable_accessor :trans_sid_mode
+
     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?
+      # session_id が blank の場合は適用しない
+      return false if trans_sid_mode and jpmobile_session_id.blank?
+
       case trans_sid_mode
       when :always
         session.inspect
@@ -87,17 +100,20 @@ module Jpmobile::TransSid #:nodoc:
 
   protected
   # URLにsession_idを追加する。
-  def default_url_options(options=nil)
+  def default_url_options
     result = super || {}
     return result unless request # for test process
     return result unless apply_trans_sid?
-    return result.merge({ session_key => jpmobile_session_id })
+    return result.merge({session_key => jpmobile_session_id})
   end
 
   private
   # session_keyを返す。
   def session_key
-    ActionController::Base.session_options.merge(request.session_options || {})[:key]
+    unless key = Rails.application.config.session_options.merge(request.session_options || {})[:key]
+      key = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS[:key]
+    end
+    key
   end
   # session_idを返す
   def jpmobile_session_id
@@ -111,6 +127,7 @@ module Jpmobile::TransSid #:nodoc:
   def append_session_id_parameter
     return unless request # for test process
     return unless apply_trans_sid?
+    return unless jpmobile_session_id
     response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
 end

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

@@ -17,5 +17,73 @@ module Jpmobile
         proc.call(obj)
       end
     end
+
+    def deep_convert(obj, &proc)
+      case obj
+      when Hash
+        new_obj = {}
+        obj.each_pair do |key, value|
+          new_obj[deep_convert(key.dup, &proc)] = deep_convert(value, &proc)
+        end
+        new_obj
+      when Array
+        new_obj = obj.map do |value|
+          deep_convert(value, &proc)
+        end
+      when Symbol
+        new_obj = proc.call(obj.to_s).to_sym
+      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
+        new_obj = obj
+      else
+        obj = obj.to_param if obj.respond_to?(:to_param)
+        new_obj = proc.call(obj)
+      end
+
+      new_obj
+    end
+
+    def sjis(ascii_8bit)
+      if ascii_8bit.respond_to?(:force_encoding)
+        ascii_8bit.force_encoding("Shift_JIS")
+      end
+      ascii_8bit
+    end
+
+    def utf8(ascii_8bit)
+      if ascii_8bit.respond_to?(:force_encoding)
+        ascii_8bit.force_encoding("utf-8")
+      end
+      ascii_8bit
+    end
+
+    def ascii_8bit(str)
+      if str.respond_to?(:force_encoding)
+        str.force_encoding("ASCII-8BIT")
+      end
+      str
+    end
+
+    def utf8_to_sjis(utf8_str)
+      if utf8_str.respond_to?(:encode)
+        utf8_str.encode("Shift_JIS", :crlf_newline => true)
+      else
+        NKF.nkf("-m0 -x -Ws", utf8_str).gsub(/\n/, "\r\n")
+      end
+    end
+
+    def sjis_to_utf8(sjis_str)
+      if sjis_str.respond_to?(:encode)
+        sjis_str.encode("UTF-8", :universal_newline => true)
+      else
+        NKF.nkf("-m0 -x -Sw", sjis_str).gsub(/\r\n/, "\n")
+      end
+    end
+
+    def hash_to_utf8(hash)
+      new_hash = {}
+      hash.each do |keu, value|
+        new_hash[utf8(key)] = utf8(value)
+      end
+    end
   end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-unless Spec.const_defined?(:Rails)
+# -*- coding: utf-8 -*-
+unless RSpec.const_defined?(:Rails)
   dir = File.dirname(__FILE__)
 
   # jpmobileの読み込み
@@ -32,5 +33,5 @@ unless Spec.const_defined?(:Rails)
     map.connect ':controller/:action/:id'
   end
 
-  require 'spec/rails'
+  require 'rspec/rails'
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/detect_by_email_spec.rb

@@ -1,31 +1,25 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe 'Jpmobile::Email' do
-
-  Spec::Fixture::Base.new self, :email_addr => :carrier do
-
-    it '#detect should return :carrier when take :email_addr as EmailAddr' do |email_addr, carrier|
-      Jpmobile::Email.detect(email_addr).should == carrier 
+  [
+    ['example@example.ne.jp'     , nil                        ],
+    ['test@docomo.ne.jp'         , Jpmobile::Mobile::Docomo   ],
+    ['test@docomo.ne.jp.jp'      , nil                        ],
+    ['a(--)l@ezweb.ne.jp'        , Jpmobile::Mobile::Au       ],
+    ['a(--)l@ezweb.ne.jp.jp'     , nil                        ],
+    ['dadaea@pdx.ne.jp'          , Jpmobile::Mobile::Willcom  ],
+    ['dadaea@pdx.ne.jp.jp'       , nil                        ],
+    ['xxxe@dj.pdx.ne.jp'         , Jpmobile::Mobile::Willcom  ],
+    ['xxxe@dj.pdx.ne.jp.jp'      , nil                        ],
+    ['oeeikx@softbank.ne.jp'     , Jpmobile::Mobile::Softbank ],
+    ['oeeikx@softbank.ne.jp.jp'  , nil                        ],
+    ['eaae@disney.ne.jp'         , Jpmobile::Mobile::Softbank ],
+    ['eaae@disney.ne.jp.jp'      , nil                        ],
+    ['iiiaa@r.vodafone.ne.jp'    , Jpmobile::Mobile::Vodafone ],
+    ['iiiaa@r.vodafone.ne.jp.jp' , nil                        ],
+  ].each do |email_addr, carrier|
+    it "#detect should return #{carrier} when take #{email_addr} as EmailAddr" do
+      Jpmobile::Email.detect(email_addr).should == carrier
     end
-
-    set_fixtures([
-      ['example@example.ne.jp'  => nil                        ],
-      ['test@docomo.ne.jp'      => Jpmobile::Mobile::Docomo   ],
-      ['test@docomo.ne.jp.jp'   => nil                        ],
-      ['a(--)l@ezweb.ne.jp'     => Jpmobile::Mobile::Au       ],
-      ['a(--)l@ezweb.ne.jp.jp'  => nil                        ],
-      ['dadaea@pdx.ne.jp'       => Jpmobile::Mobile::Willcom  ],
-      ['dadaea@pdx.ne.jp.jp'    => nil                        ],
-      ['xxxe@dj.pdx.ne.jp'      => Jpmobile::Mobile::Willcom  ],
-      ['xxxe@dj.pdx.ne.jp.jp'   => nil                        ],
-      ['oeeikx@softbank.ne.jp'  => Jpmobile::Mobile::Softbank ],
-      ['oeeikx@softbank.ne.jp.jp' => nil                      ],
-      ['eaae@disney.ne.jp'      => Jpmobile::Mobile::Softbank ],
-      ['eaae@disney.ne.jp.jp'   => nil                        ],
-      ['iiiaa@r.vodafone.ne.jp' => Jpmobile::Mobile::Vodafone ],
-      ['iiiaa@r.vodafone.ne.jp.jp' => nil                     ],
-      ['aaaaa.aaaa@jp-h.ne.jp'  => Jpmobile::Mobile::Jphone    ],
-      ['aaaaa.aaaa@jp-h.ne.jp.jp' => nil                      ],
-    ])
-  end.run
+  end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/is_carrier_spec.rb

@@ -1,93 +1,65 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe 'Jpmobile::Mobile' do
-  Spec::Fixture::Base.new self, [ :klass, :carrier ] => :expected do
-    filters({
-      :klass => proc {|val| Jpmobile::Mobile.const_get(val) },
-      :carrier => proc {|val| "#{val}?" },
-    })
+  [
+    [ %w[ Docomo docomo    ] , true ],
+    [ %w[ Docomo au        ] , false ],
+    [ %w[ Docomo softbank  ] , false ],
+    [ %w[ Docomo vodafone  ] , false ],
+    [ %w[ Docomo emobile   ] , false ],
+    [ %w[ Docomo willcom   ] , false ],
+    [ %w[ Docomo ddipocket ] , false ],
 
-    desc_filters({
-      :klass => proc {|val| "::#{val.to_s}" },
-      :carrier => proc {|val| "#{val}?" },
-    })
+    [ %w[ Au docomo    ] , false ],
+    [ %w[ Au au        ] , true ],
+    [ %w[ Au softbank  ] , false ],
+    [ %w[ Au vodafone  ] , false ],
+    [ %w[ Au emobile   ] , false ],
+    [ %w[ Au willcom   ] , false ],
+    [ %w[ Au ddipocket ] , false ],
 
-    it ":klass#:carrier should be return :expected" do |input, expected|
-      input[:klass].new({}).__send__(input[:carrier]).should == expected
-    end
-
-    set_fixtures([
-      [ %w[ Docomo docomo    ] => true ],
-      [ %w[ Docomo au        ] => false ],
-      [ %w[ Docomo softbank  ] => false ],
-      [ %w[ Docomo vodafone  ] => false ],
-      [ %w[ Docomo jphone    ] => false ],
-      [ %w[ Docomo emobile   ] => false ],
-      [ %w[ Docomo willcom   ] => false ],
-      [ %w[ Docomo ddipocket ] => false ],
-
-      [ %w[ Au docomo    ] => false ],
-      [ %w[ Au au        ] => true ],
-      [ %w[ Au softbank  ] => false ],
-      [ %w[ Au vodafone  ] => false ],
-      [ %w[ Au jphone    ] => false ],
-      [ %w[ Au emobile   ] => false ],
-      [ %w[ Au willcom   ] => false ],
-      [ %w[ Au ddipocket ] => false ],
+    [ %w[ Softbank docomo    ] , false ],
+    [ %w[ Softbank au        ] , false ],
+    [ %w[ Softbank softbank  ] , true ],
+    [ %w[ Softbank vodafone  ] , false ],
+    [ %w[ Softbank emobile   ] , false ],
+    [ %w[ Softbank willcom   ] , false ],
+    [ %w[ Softbank ddipocket ] , false ],
 
-      [ %w[ Softbank docomo    ] => false ],
-      [ %w[ Softbank au        ] => false ],
-      [ %w[ Softbank softbank  ] => true ],
-      [ %w[ Softbank vodafone  ] => false ],
-      [ %w[ Softbank jphone    ] => false ],
-      [ %w[ Softbank emobile   ] => false ],
-      [ %w[ Softbank willcom   ] => false ],
-      [ %w[ Softbank ddipocket ] => false ],
+    [ %w[ Vodafone docomo    ] , false ],
+    [ %w[ Vodafone au        ] , false ],
+    [ %w[ Vodafone softbank  ] , true  ],
+    [ %w[ Vodafone vodafone  ] , true  ],
+    [ %w[ Vodafone emobile   ] , false ],
+    [ %w[ Vodafone willcom   ] , false ],
+    [ %w[ Vodafone ddipocket ] , false ],
 
-      [ %w[ Vodafone docomo    ] => false ],
-      [ %w[ Vodafone au        ] => false ],
-      [ %w[ Vodafone softbank  ] => true  ],
-      [ %w[ Vodafone vodafone  ] => true  ],
-      [ %w[ Vodafone jphone    ] => false ],
-      [ %w[ Vodafone emobile   ] => false ],
-      [ %w[ Vodafone willcom   ] => false ],
-      [ %w[ Vodafone ddipocket ] => false ],
+    [ %w[ Emobile docomo    ] , false ],
+    [ %w[ Emobile au        ] , false ],
+    [ %w[ Emobile softbank  ] , false ],
+    [ %w[ Emobile vodafone  ] , false ],
+    [ %w[ Emobile emobile   ] , true  ],
+    [ %w[ Emobile willcom   ] , false ],
+    [ %w[ Emobile ddipocket ] , false ],
 
-      [ %w[ Jphone docomo    ] => false ],
-      [ %w[ Jphone au        ] => false ],
-      [ %w[ Jphone softbank  ] => true  ],
-      [ %w[ Jphone vodafone  ] => true  ],
-      [ %w[ Jphone jphone    ] => true  ],
-      [ %w[ Jphone emobile   ] => false ],
-      [ %w[ Jphone willcom   ] => false ],
-      [ %w[ Jphone ddipocket ] => false ],
+    [ %w[ Willcom docomo    ] , false ],
+    [ %w[ Willcom au        ] , false ],
+    [ %w[ Willcom softbank  ] , false ],
+    [ %w[ Willcom vodafone  ] , false ],
+    [ %w[ Willcom emobile   ] , false ],
+    [ %w[ Willcom willcom   ] , true  ],
+    [ %w[ Willcom ddipocket ] , false ],
 
-      [ %w[ Emobile docomo    ] => false ],
-      [ %w[ Emobile au        ] => false ],
-      [ %w[ Emobile softbank  ] => false ],
-      [ %w[ Emobile vodafone  ] => false ],
-      [ %w[ Emobile jphone    ] => false ],
-      [ %w[ Emobile emobile   ] => true  ],
-      [ %w[ Emobile willcom   ] => false ],
-      [ %w[ Emobile ddipocket ] => false ],
-
-      [ %w[ Willcom docomo    ] => false ],
-      [ %w[ Willcom au        ] => false ],
-      [ %w[ Willcom softbank  ] => false ],
-      [ %w[ Willcom vodafone  ] => false ],
-      [ %w[ Willcom jphone    ] => false ],
-      [ %w[ Willcom emobile   ] => false ],
-      [ %w[ Willcom willcom   ] => true  ],
-      [ %w[ Willcom ddipocket ] => false ],
-
-      [ %w[ Ddipocket docomo    ] => false ],
-      [ %w[ Ddipocket au        ] => false ],
-      [ %w[ Ddipocket softbank  ] => false ],
-      [ %w[ Ddipocket vodafone  ] => false ],
-      [ %w[ Ddipocket jphone    ] => false ],
-      [ %w[ Ddipocket emobile   ] => false ],
-      [ %w[ Ddipocket willcom   ] => true  ],
-      [ %w[ Ddipocket ddipocket ] => true  ],
-    ])
-  end.run
+    [ %w[ Ddipocket docomo    ] , false ],
+    [ %w[ Ddipocket au        ] , false ],
+    [ %w[ Ddipocket softbank  ] , false ],
+    [ %w[ Ddipocket vodafone  ] , false ],
+    [ %w[ Ddipocket emobile   ] , false ],
+    [ %w[ Ddipocket willcom   ] , true  ],
+    [ %w[ Ddipocket ddipocket ] , true  ],
+  ].each do |carrier, expected|
+    it "#{carrier.first}##{carrier.last}? should be return #{expected}" do
+      Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?").should == expected
+    end
+  end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'spec'
-require 'spec/fixture' # gem rspec-fixture
+require 'rspec'
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
 require 'jpmobile'

data/test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/util_spec.rb

@@ -1,4 +1,7 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+# -*- coding: utf-8 -*-
+require 'stringio'
+require 'nkf'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe Jpmobile::Util, ".deep_apply" do
   it 'nilのときはnilを返すこと' do
@@ -24,5 +27,8 @@ describe Jpmobile::Util, ".deep_apply" do
     string_io = StringIO.new('test')
     Jpmobile::Util.deep_apply(string_io) {|obj| obj }.should equal(string_io)
   end
-end
 
+  it "utf8_to_sjis で改行コードが CRLF に変更されること" do
+    Jpmobile::Util.utf8_to_sjis("UTF8\nTEXT\n").should == Jpmobile::Util.sjis("UTF8\r\nTEXT\r\n")
+  end
+end