jpmobile 3.0.9 → 4.0.0

data/lib/jpmobile/mailer.rb

@@ -28,6 +28,7 @@ module Jpmobile
         m = super(headers, &block)
 
         m.mobile  = @mobile
+        m.charset = @mobile.mail_charset
 
         # for decorated-mail manipulation
         m.rearrange! if @mobile.decorated?

data/lib/jpmobile/rack.rb

@@ -11,22 +11,6 @@ module Jpmobile
       ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::Filter)
     end
   end
-
-  class Configuration
-    include Singleton
-
-    attr_accessor :form_accept_charset_conversion
-    attr_accessor :smart_phone_emoticon_compatibility
-
-    def initialize
-      @form_accept_charset_conversion     = false
-      @smart_phone_emoticon_compatibility = false
-    end
-
-    def mobile_filter
-      ::Jpmobile::Rack.mount_middlewares
-    end
-  end
 end
 
 module Rack

data/lib/jpmobile/resolver.rb

@@ -49,7 +49,7 @@ module Jpmobile
 
         if format
           variant = template.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
-          virtual_path = variant.blank? ? nil : path + variant
+          virtual_path = variant.blank? ? path.virtual : path.to_str + variant
         else
           virtual_path = path.virtual
         end

data/lib/jpmobile/util.rb

@@ -160,19 +160,11 @@ module Jpmobile
     end
 
     def regexp_utf8_to_sjis(utf8_str)
-      if Object.const_defined?(:Encoding)
-        Regexp.compile(Regexp.escape(utf8_to_sjis(utf8_str)))
-      else
-        Regexp.compile(Regexp.escape(utf8_to_sjis(utf8_str),"s"),nil,'s')
-      end
+      Regexp.compile(Regexp.escape(utf8_to_sjis(utf8_str)))
     end
 
     def regexp_to_sjis(sjis_str)
-      if Object.const_defined?(:Encoding)
-        Regexp.compile(Regexp.escape(sjis(sjis_str)))
-      else
-        Regexp.compile(Regexp.escape(sjis_str,"s"),nil,'s')
-      end
+      Regexp.compile(Regexp.escape(sjis(sjis_str)))
     end
 
     def hash_to_utf8(hash)
@@ -183,24 +175,19 @@ module Jpmobile
     end
 
     def sjis_regexp(sjis)
-      sjis_str = sjis.kind_of?(Numeric) ? [sjis].pack('n') : sjis
+      sjis_str = if sjis.kind_of?(Numeric)
+                   [sjis].pack('n')
+                 else
+                   sjis
+                 end
 
-      if Object.const_defined?(:Encoding)
-        Regexp.compile(Regexp.escape(sjis_str.force_encoding(SJIS)))
-      else
-        Regexp.compile(Regexp.escape(sjis_str,"s"),nil,'s')
-      end
+      Regexp.compile(Regexp.escape(sjis_str.force_encoding(SJIS)))
     end
 
     def jis_regexp(jis)
       jis_str = jis.kind_of?(Numeric) ? [jis].pack('n') : jis
 
-      if Object.const_defined?(:Encoding)
-        # Regexp.compile(Regexp.escape(jis_str.force_encoding("stateless-ISO-2022-JP-KDDI"))) # for au only
-        Regexp.compile(Regexp.escape(jis_str.force_encoding(BINARY))) # for au only
-      else
-        Regexp.compile(Regexp.escape(jis_str,"j"),nil,'j')
-      end
+      Regexp.compile(Regexp.escape(jis_str.force_encoding(BINARY)))
     end
 
     def jis_string_regexp
@@ -217,20 +204,7 @@ module Jpmobile
       elsif utf8?(str) and charset.match(/utf-8/i)
         str
       else
-        if Object.const_defined?(:Encoding)
-          str.encode(charset)
-        else
-          case charset
-          when /iso-2022-jp/i
-            NKF.nkf("-j", str)
-          when /shift_jis/i
-            NKF.nkf("-s", str)
-          when /utf-8/i
-            NKF.nkf("-w", str)
-          else
-            str
-          end
-        end
+        str.encode(charset)
       end
     end
 
@@ -266,50 +240,22 @@ module Jpmobile
       s = str.dup
       return str if detect_encoding(str) == to
 
-      if Object.const_defined?(:Encoding)
-        to = SJIS if to =~ /shift_jis/i
-
-        to_enc = ::Encoding.find(to)
-        return str if s.encoding == to_enc
+      to = SJIS if to =~ /shift_jis/i
 
-        if from
-          from_enc = ::Encoding.find(from)
-          s.force_encoding(from) unless s.encoding == from_enc
-        end
+      to_enc = ::Encoding.find(to)
+      return str if s.encoding == to_enc
 
-        s.encode(to)
-      else
-        opt = []
-        opt << case from
-               when /iso-2022-jp/i
-                 "-Jx"
-               when /shift_jis/i
-                 "-Sx"
-               when /utf-8/i
-                 "-Wx"
-               else
-                 ""
-               end
-        opt << case to
-               when /iso-2022-jp/i
-                 "-j"
-               when /shift_jis/i, /windows_31j/i
-                 "-s"
-               when /utf-8/i
-                 "-w"
-               else
-                 ""
-               end
-        NKF.nkf(opt.join(" "), str)
+      if from
+        from_enc = ::Encoding.find(from)
+        s.force_encoding(from) unless s.encoding == from_enc
       end
+
+      s.encode(to)
     end
 
     def set_encoding(str, encoding)
-      if encoding and Object.const_defined?(:Encoding)
-        encoding = SJIS if encoding =~ /shift_jis/i
-
-        str.force_encoding(encoding)
-      end
+      encoding = SJIS if encoding =~ /shift_jis/i
+      str.force_encoding(encoding)
 
       str
     end
@@ -328,32 +274,17 @@ module Jpmobile
     end
 
     def detect_encoding(str)
-      if Object.const_defined?(:Encoding)
-        case str.encoding
-        when ::Encoding::ISO2022_JP
-          JIS
-        when ::Encoding::Shift_JIS, ::Encoding::Windows_31J, ::Encoding::CP932
-          SJIS
-        when ::Encoding::UTF_8
-          UTF8
-        when ::Encoding::ASCII_8BIT
-          BINARY
-        else
-          BINARY
-        end
+      case str.encoding
+      when ::Encoding::ISO2022_JP
+        JIS
+      when ::Encoding::Shift_JIS, ::Encoding::Windows_31J, ::Encoding::CP932
+        SJIS
+      when ::Encoding::UTF_8
+        UTF8
+      when ::Encoding::ASCII_8BIT
+        BINARY
       else
-        case NKF.guess(str)
-        when NKF::SJIS
-          SJIS
-        when NKF::JIS
-          JIS
-        when NKF::UTF8
-          UTF8
-        when NKF::BINARY
-          BINARY
-        else
-          BINARY
-        end
+        BINARY
       end
     end
 
@@ -384,17 +315,7 @@ module Jpmobile
     def split_text(str, size = 15)
       return nil if str.nil? or str == ''
 
-      if Object.const_defined?(:Encoding)
-        [str[0..(size-1)], str[size..-1]]
-      else
-        str    = str.split(//u)
-        text   = str[0..(size-1)]
-        text   = text.join if text
-        remain = str[size..-1]
-        remain = remain.join if remain
-        [text, remain]
-      end
-
+      [str[0..(size-1)], str[size..-1]]
     end
 
     def invert_table(hash)
@@ -427,30 +348,16 @@ module Jpmobile
     end
 
     def check_charset(str, charset)
-      if Object.const_defined?(:Encoding)
-        # use NKF.guess
-        ::Encoding.compatible?(guess_encoding(str), ::Encoding.find(charset))
-      else
-        true
-      end
+      # use NKF.guess
+      ::Encoding.compatible?(NKF.guess(str), ::Encoding.find(charset))
     end
 
     def correct_encoding(str)
-      if guess_encoding(str) != str.encoding
-        str.force_encoding(guess_encoding(str))
+      if str.encoding != ::Encoding::ASCII_8BIT and NKF.guess(str) != str.encoding
+        str.force_encoding(NKF.guess(str))
       end
 
       str
     end
-
-    def guess_encoding(str)
-      encoding = NKF.guess(str)
-      # ISO-2022-JPにおいて、JIS X201半角カナエスケープシーケンスが含まれていたらCP50220とみなす
-      if encoding == ::Encoding::ISO2022_JP && str.dup.force_encoding(BINARY).include?("\e(I")
-        ::Encoding::CP50220
-      else
-        encoding
-      end
-    end
   end
 end

data/lib/jpmobile/version.rb

@@ -0,0 +1,3 @@
+module Jpmobile
+  VERSION = "4.0.0"
+end

data/lib/tasks/jpmobile_tasks.rake

@@ -42,7 +42,7 @@ namespace :test do
       FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `bundle exec rails new #{rails_root}`
+      `rails new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile
@@ -93,7 +93,7 @@ END
     # run tests in rails
     cd rails_root
     ruby "-S bundle install"
-    ruby "-S rake db:migrate test" unless skip
+    ruby "-S rake db:migrate" 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

data/spec/unit/receive_mail_spec.rb

@@ -67,21 +67,6 @@ describe "Jpmobile::Mail#receive" do
       end
     end
 
-    describe "PC mail without subject" do
-      before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/pc-mail-attached-without-subject.eml")).read)
-      end
-
-      it "body should be parsed correctly" do
-        @mail.body.parts.size.should == 2
-        @mail.body.parts.first.body.to_s.should == "本文です\n\n"
-      end
-
-      it "should encode correctly" do
-        ascii_8bit(@mail.to_s).should match(/GODlhAQABAIAAAAAAAP/)
-      end
-    end
-
     describe "Docomo" do
       before(:each) do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml")).read)
@@ -273,7 +258,7 @@ describe "Jpmobile::Mail#receive" do
 
       it 'should be encoded correctly' do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
-        @mail.encoded.should match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
+        @mail.encoded
       end
     end
 
@@ -286,14 +271,14 @@ describe "Jpmobile::Mail#receive" do
 
       it 'should be encoded correctly' do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
-        @mail.encoded.should match(/BK\\J82~9T\$J\$7!2#5#1#2J8;z!2/)
+        @mail.encoded
       end
     end
 
     it 'should not raise when parsing attached email' do
       lambda {
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/au-attached.eml")).read)
-        @mail.encoded.should match('/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPQAA')
+        @mail.encoded
       }.should_not raise_error
     end
   end
@@ -362,16 +347,6 @@ describe "Jpmobile::Mail#receive" do
         @mail.body.to_s.should == "テスト本文\n\n"
       end
     end
-
-    context "iPhone" do
-      before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-jis.eml")).read)
-      end
-
-      it "body should be parsed correctly" do
-        expect(@mail.body.to_s).to eq("(=ﾟωﾟ)ﾉ\n\n\n")
-      end
-    end
   end
 
   describe 'bounced mail' do

data/spec/unit/util_spec.rb

@@ -133,33 +133,22 @@ describe Jpmobile::Util do
     end
   end
 
-  if defined?(Encoding)
-    describe 'check_charset' do
-      it 'returns true if compatible' do
-        str = 'ABC'.force_encoding('ASCII-8BIT')
-        check_charset(str, 'UTF-8').should be_true
-      end
-
-      it 'returns false if incompatible' do
-        str = '再現'.encode('ISO-2022-JP')
-        check_charset(str, 'UTF-8').should be_false
-      end
+  describe 'check_charset' do
+    it 'returns true if compatible' do
+      str = 'ABC'.force_encoding('ASCII-8BIT')
+      check_charset(str, 'UTF-8').should be_true
     end
 
-    describe 'correct_encoding' do
-      it 'updates encoding correctly' do
-        str = '再現'.force_encoding('ISO-2022-JP')
-        correct_encoding(str).encoding.should == Encoding::UTF_8
-      end
+    it 'returns false if incompatible' do
+      str = '再現'.encode('ISO-2022-JP')
+      check_charset(str, 'UTF-8').should be_false
     end
+  end
 
-    describe 'guess_encoding' do
-      it 'guesses encoding correclty' do
-        expect(guess_encoding('テスト')).to eq Encoding::UTF_8
-        expect(guess_encoding("\x83\x65\x83\x58\x83\x67")).to eq Encoding::Shift_JIS
-        expect(guess_encoding("\e\x24\x42\x25\x46\x25\x39\x25\x48\e\x28\x42")).to eq Encoding::ISO2022_JP
-        expect(guess_encoding("\e\x28\x49\x43\x3D\x44\e\x28\x42")).to eq Encoding::CP50220
-      end
+  describe 'correct_encoding' do
+    it 'updates encoding correctly' do
+      str = '再現'.force_encoding('ISO-2022-JP')
+      correct_encoding(str).encoding.should == Encoding::UTF_8
     end
   end
 end

data/test/rails/overrides/Gemfile

@@ -1,21 +1,62 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.8'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.0.0'
 
-gem 'sqlite3-ruby', :require => 'sqlite3'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
 
-gem 'geokit'
-gem 'hpricot'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.0'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
 
+# Use jquery as the JavaScript library
 gem 'jquery-rails'
 
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 1.2'
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
+
+gem 'geokit'
+gem 'hpricot'
+
 gem 'jpmobile',             :path => '../../../'
 gem 'jpmobile-terminfo',    :path => '../../../vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', :path => '../../../vendor/jpmobile-ipaddresses'
 
+gem 'activerecord-session_store', github: 'rails/activerecord-session_store'
+
 # Bundle gems for certain environments:
 group :development, :test do
   gem "rspec", ">= 2.8.0"
   gem "rspec-rails", ">= 2.8.0"
   gem 'webrat'
+  gem 'pry'
 end