jpmobile 0.1.6 → 1.0.0.pre

data/lib/tasks/jpmobile_tasks.rake

@@ -29,61 +29,56 @@ rescue LoadError
 end
 
 namespace :test do
-  desc "run jpmobile legacy tests"
-  Rake::TestTask.new(:legacy) do |t|
-    t.libs << 'lib'
-    t.pattern = 'test/legacy/**/*_test.rb'
-    t.verbose = true
-  end
   desc "Generate rails app and run jpmobile tests in the app"
-  task :rails, [:versions] do |t, args|
+  task :rails, [:skip] do |t, args|
     rails_root     = "test/rails/rails_root"
     relative_root  = "../../../"
-    rails_versions = args.versions.split("/") rescue ["3.0.x"]
 
-    puts "Running tests in Rails #{rails_versions.join(', ')}"
+    puts "Running tests in Rails"
+    skip = args.skip == "true"
 
-    rails_versions.each do |rails_version|
-      puts "  for #{rails_version}"
+    unless skip
       # generate rails app
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      system "rails new #{rails_root}"
+      `rails new #{rails_root}`
+    end
 
-      # setup jpmobile
-      plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
+    # setup jpmobile
+    plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
+    FileUtils.mkdir_p(plugin_path)
+    FileList["*"].exclude("test").exclude("spec").each do |file|
+      FileUtils.cp_r(file, plugin_path)
+    end
+
+    # setup jpmobile-ipaddresses
+    begin
+      plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
-      FileList["*"].exclude("test").exclude("spec").each do |file|
+      FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
+    rescue LoadError
+      puts "IP Address test requires jpmobile-ipaddresses module"
+    end
 
-      # setup jpmobile-ipaddresses
-      begin
-        plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-ipaddresses')
-        FileUtils.mkdir_p(plugin_path)
-        FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
-          FileUtils.cp_r(file, plugin_path)
-        end
-      rescue LoadError
-        puts "IP Address test requires jpmobile-ipaddresses module"
-      end
-
-      # setup jpmobile-terminfo
-      begin
-        plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-terminfo')
-        FileUtils.mkdir_p(plugin_path)
-        FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
-          FileUtils.cp_r(file, plugin_path)
-        end
-      rescue LoadError
-        puts "Terminal display information test requires jpmobile-terminfo module"
+    # setup jpmobile-terminfo
+    begin
+      plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-terminfo')
+      FileUtils.mkdir_p(plugin_path)
+      FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
+        FileUtils.cp_r(file, plugin_path)
       end
+    rescue LoadError
+      puts "Terminal display information test requires jpmobile-terminfo module"
+    end
 
-      # setup tests
-      FileList["test/rails/overrides/*"].each do |file|
-        FileUtils.cp_r(file, rails_root)
-      end
+    # setup tests
+    FileList["test/rails/overrides/*"].each do |file|
+      FileUtils.cp_r(file, rails_root)
+    end
 
+    unless skip
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
       File.open(config_path, 'w') do |file|
@@ -92,16 +87,14 @@ Rails.application.config.session_store :active_record_store, :key => '_session_i
 Rails.application.config.session_options = {:cookie_only => false}
 END
       end
-
-      # run tests in rails
-      cd rails_root
-      # ruby "-S bundle install"
-      ruby "-S rake db:migrate test"
-      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の中では半角に変換されないこと'"
-
-      cd relative_root
     end
+
+    # run tests in rails
+    cd rails_root
+    # ruby "-S bundle install"
+    ruby "-S rake db:migrate 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
   desc "Run sinatra on jpmobile tests"
   Rake::TestTask.new(:sinatra) do |t|

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -4,6 +4,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.r
 describe "絵文字が" do
   include Rack::Test::Methods
   include Jpmobile::RackHelper
+  include Jpmobile::Util
 
   before(:each) do
     @docomo_cr          = "";
@@ -77,10 +78,7 @@ describe "絵文字が" do
     end
 
     it "パラメータが変換されること" do
-      query_string = "q=" + URI.encode(sjis("\xf8\x9f"))
-      if query_string.respond_to?(:force_encoding)
-        query_string.force_encoding("ASCII-8BIT")
-      end
+      query_string = ascii_8bit("q=" + URI.encode(sjis("\xf8\x9f")))
 
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",
@@ -127,10 +125,7 @@ describe "絵文字が" do
     end
 
     it "パラメータが変換されること" do
-      query_string = "q=" + URI.encode(sjis("\xf6\x60"))
-      if query_string.respond_to?(:force_encoding)
-        query_string.force_encoding("ASCII-8BIT")
-      end
+      query_string = ascii_8bit("q=" + URI.encode(sjis("\xf6\x60")))
 
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",

data/spec/rack/jpmobile/filter_spec.rb

@@ -7,7 +7,7 @@ describe Jpmobile::Rack::Filter do
 
   context "漢字コード変換" do
     before(:each) do
-      @utf8 = "ゆーてぃーえふえいとの\n日本語ですが何か"
+      @utf8 = "ゆーてぃーえふえいとの\n日本語〜ですが何か"
       @sjis = utf8_to_sjis(@utf8)
     end
 

data/spec/rack/jpmobile/params_filter_spec.rb

@@ -10,21 +10,21 @@ describe Jpmobile::Rack::ParamsFilter do
     before(:each) do
       @query_params = {
         "hoge"       => "ほげ",
-        "パラメータ" => "テストです■",
+        "パラメータ" => "テストです〜■",
       }
       @form_params = {
         "bar"        => "万葉集",
-        "アジャイル" => "僕の♪",
+        "アジャイル" => "僕の〜♪",
       }
     end
 
     context "Shift_JIS 変換の " do
       before(:each) do
         @query_string = @query_params.map {|k, v|
-          "%s=%s" % [::Rack::Utils.escape(NKF.nkf("-sWx", k)), ::Rack::Utils.escape(NKF.nkf("-sWx", v))]
+          "%s=%s" % [::Rack::Utils.escape(utf8_to_sjis(k)), ::Rack::Utils.escape(utf8_to_sjis(v))]
         }.join("&")
         @form_string = @form_params.map {|k, v|
-          "%s=%s" % [NKF.nkf("-sWx", k), NKF.nkf("-sWx", v)]
+          "%s=%s" % [utf8_to_sjis(k), utf8_to_sjis(v)]
         }.join("&")
       end
 

data/spec/rack_helper.rb

@@ -19,15 +19,14 @@ rescue LoadError
 end
 
 RSpec.configure do |config|
-  config.include Rack::Test::Methods
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.color_enabled = true
 end
 
 class UnitApplication
   def initialize(body = nil)
-    @body = body || "Body"
-    if @body.respond_to?(:force_encoding)
-      @body.force_encoding("UTF-8")
-    end
+    @body = Jpmobile::Util.utf8(body || "Body")
   end
 
   def call(env)
@@ -53,10 +52,7 @@ end
 class RenderParamApp
   def call(env)
     request = Rack::Request.new(env)
-    q = request.params['q']
-    if q.respond_to?(:force_encoding)
-      q.force_encoding("UTF-8")
-    end
+    q = Jpmobile::Util.utf8(request.params['q'])
 
     [200, env, q]
   end

data/spec/unit/detect_by_email_spec.rb

@@ -11,6 +11,8 @@ describe 'Jpmobile::Email' do
     ['dadaea@pdx.ne.jp.jp'       , nil                        ],
     ['xxxe@dj.pdx.ne.jp'         , Jpmobile::Mobile::Willcom  ],
     ['xxxe@dj.pdx.ne.jp.jp'      , nil                        ],
+    ['xxxe@willcom.com'          , Jpmobile::Mobile::Willcom  ],
+    ['xxxe@willcom.com.jp'       , nil                        ],
     ['oeeikx@softbank.ne.jp'     , Jpmobile::Mobile::Softbank ],
     ['oeeikx@softbank.ne.jp.jp'  , nil                        ],
     ['eaae@disney.ne.jp'         , Jpmobile::Mobile::Softbank ],
@@ -22,4 +24,31 @@ describe 'Jpmobile::Email' do
       Jpmobile::Email.detect(email_addr).should == carrier
     end
   end
+
+  [
+    ['From: Jpmobile Rails <example@example.ne.jp>'     , nil                        ],
+    ['From: Jpmobile Rails <test@docomo.ne.jp>'         , Jpmobile::Mobile::Docomo   ],
+    ['From: test@docomo.ne.jp'                          , Jpmobile::Mobile::Docomo   ],
+    ['From: Jpmobile Rails <test@docomo.ne.jp.jp>'      , nil                        ],
+    ['From: Jpmobile Rails <a(--)l@ezweb.ne.jp>'        , Jpmobile::Mobile::Au       ],
+    ['From: a(--)l@ezweb.ne.jp'                         , Jpmobile::Mobile::Au       ],
+    ['From: Jpmobile Rails <a(--)l@ezweb.ne.jp.jp>'     , nil                        ],
+    ['From: Jpmobile Rails <dadaea@pdx.ne.jp>'          , Jpmobile::Mobile::Willcom  ],
+    ['From: Jpmobile Rails <dadaea@pdx.ne.jp.jp>'       , nil                        ],
+    ['From: Jpmobile Rails <xxxe@dj.pdx.ne.jp>'         , Jpmobile::Mobile::Willcom  ],
+    ['From: Jpmobile Rails <xxxe@dj.pdx.ne.jp.jp>'      , nil                        ],
+    ['From: Jpmobile Rails <xxxe@willcom.com>'          , Jpmobile::Mobile::Willcom  ],
+    ['From: Jpmobile Rails <xxxe@willcom.com.jp>'       , nil                        ],
+    ['From: Jpmobile Rails <oeeikx@softbank.ne.jp>'     , Jpmobile::Mobile::Softbank ],
+    ['From: oeeikx@softbank.ne.jp'                      , Jpmobile::Mobile::Softbank ],
+    ['From: Jpmobile Rails <oeeikx@softbank.ne.jp.jp>'  , nil                        ],
+    ['From: Jpmobile Rails <eaae@disney.ne.jp>'         , Jpmobile::Mobile::Softbank ],
+    ['From: Jpmobile Rails <eaae@disney.ne.jp.jp>'      , nil                        ],
+    ['From: Jpmobile Rails <iiiaa@r.vodafone.ne.jp>'    , Jpmobile::Mobile::Vodafone ],
+    ['From: Jpmobile Rails <iiiaa@r.vodafone.ne.jp.jp>' , nil                        ],
+  ].each do |line, carrier|
+    it "#detect should return #{carrier} when take mail header #{line}}" do
+      Jpmobile::Email.detect_from_mail_header(line).should == carrier
+    end
+  end
 end

data/spec/unit/emoticon_spec.rb

@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe Jpmobile::Emoticon do
+  include Jpmobile::Util
+
+  describe "unicodecr_to_external" do
+    context "should convert unicodecr to docomo encoding" do
+      it "when no options" do
+        Jpmobile::Emoticon::unicodecr_to_external("").should == sjis("\xf8\x9f")
+      end
+
+      it "in multiple convertion" do
+        Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true).should == sjis("\xf8\x9f\xf8\xa0")
+      end
+    end
+
+    context "should convert unicodecr to au encoding" do
+      it "when no options" do
+        Jpmobile::Emoticon::unicodecr_to_external("").should == sjis("\xf6\x59")
+      end
+    end
+
+    context "should convert unicodecr to softbank encoding" do
+      it "when no opptions" do
+        Jpmobile::Emoticon::unicodecr_to_external("").should == [0xe001].pack('U')
+      end
+
+      it "in multiple convertion" do
+        Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true).should == [0xe04a, 0xe049].pack('U*')
+      end
+    end
+  end
+
+  describe "unicodecr_to_utf8" do
+    it "should convert unicodecr to internal utf8 encoding" do
+      # docomo codepoint
+      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\356\230\276")
+      # au codepoint
+      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\356\222\201")
+      # softbank codepoint
+      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\xef\x80\x81")
+    end
+  end
+
+  describe "utf8_to_unicodecr" do
+    it "should convert utf8 encoding to unicodecr" do
+      # docomo codepoint
+      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\230\276")).should == ""
+      # au codepoint
+      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\222\201")).should == ""
+      # softbank codepoint
+      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\xef\x80\x81")).should == ""
+    end
+  end
+
+  describe "external_to_unicodecr" do
+    it "should convert docomo encoding to unicodecr" do
+      Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\xf8\x9f")).should == ""
+    end
+
+    it "should convert au encoding to unicodecr" do
+      Jpmobile::Emoticon::external_to_unicodecr_au(sjis("\xf6\x59")).should == ""
+    end
+
+    it "should convert softbank encoding to unicodecr" do
+      Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U')).should == ""
+    end
+
+    it "should not convert docomo encoding of koukai-sjis emoticons to unicodecr" do
+      Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a")).should == sjis("\x8c\xf6\x8a\x4a")
+    end
+  end
+
+  context "for email" do
+    describe "au" do
+      it "should not convert 助助 that does not contain emoticons" do
+        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("助助")).should_not match(/e484/i)
+      end
+
+      it "should not convert exterior of 2byte Kanji-code" do
+        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("abcd=uしから=uずんば=u")).should_not match(/e484/i)
+      end
+
+      it "should not convert ascii string to unicodecr" do
+        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("-------=_NextPart_15793_72254_63179")).should_not match(/e5c2/i)
+      end
+    end
+  end
+end

data/spec/unit/encoding_spec.rb

@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe "Jpmobile::Mobile" do
+  include Jpmobile::Util
+
+  describe "AbstractMobile" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+    end
+
+    context "to_mail_subject" do
+      it "should convert string to ISO-2022-JP B-Encoding when string contains Japanese" do
+        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQg==?="
+      end
+    end
+
+    context "to_mail_body" do
+      it "should convert string to ISO-2022-JP when string contains Japanese" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_jis("ほげ")
+      end
+    end
+  end
+
+  describe "Docomo" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::Docomo.new(nil, nil)
+    end
+
+    context "to_mail_subject" do
+      it "should convert string to Shift_JIS B-Encoding when string contains Japanese" do
+        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsA==?="
+      end
+
+      it "should convert emoticon  to \xf8\x9f in B-Encoding" do
+        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsPif?="
+      end
+    end
+
+    context "to_mail_body" do
+      it "should convert string to Shift_JIS when string contains Japanese" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ")
+      end
+
+      it "should convert emoticon  to \xf8\x9f" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ") + sjis("\xf8\x9f")
+      end
+    end
+  end
+
+  describe "Au" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::Au.new(nil, nil)
+    end
+
+    context "to_mail_subject" do
+      it "should convert string to ISO-2022-JP B-Encoding when string contains Japanese" do
+        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQg==?="
+      end
+
+      it "should convert emoticon  to \x75\x41 in B-Encoding" do
+        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQhskQnVBGyhC?="
+      end
+    end
+
+    context "to_mail_body" do
+      it "should convert string to ISO-2022-JP when string contains Japanese" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_jis("ほげ")
+      end
+
+      it "should convert emoticon  to \x75\x41" do
+        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(utf8_to_jis("ほげ") + jis("\x1b\x24\x42\x75\x41\x1b\x28\x42"))
+      end
+    end
+  end
+
+  describe "Softbank" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::Softbank.new(nil, nil)
+    end
+
+    context "to_mail_subject" do
+      it "should convert string to Shift_JIS B-Encoding when string contains Japanese" do
+        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsA==?="
+      end
+
+      it "should convert emoticon  to \xf9\x8b in B-Encoding" do
+        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsPmL?="
+      end
+    end
+
+    context "to_mail_body" do
+      it "should convert string to Shift_JIS when string contains Japanese" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ")
+      end
+
+      it "should convert emoticon  to \xf9\x8b" do
+        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ") + sjis("\xf9\x8b")
+      end
+    end
+  end
+end