jpmobile 5.2.5 → 6.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585b9e071125feef265a6766b2acd3c5712a62a766a021e779509932be267ba6
-  data.tar.gz: f8537c94f81cb7204073804469cac44f68dd679712dbe3e5834e3d9332d6125e
+  metadata.gz: 4d72106e4eade4a0d0c017d02fbad34f7bcf5cb3dadf94f460f41e877c5d66dc
+  data.tar.gz: 2eea7e031ab65c9ce39f95521bc17b4e1929fc3bf4c3bd52588b4825145a51d2
 SHA512:
-  metadata.gz: cb2ba84963e1b447fdb422b023ae283424ebff780e454b287ee0c7795c8d63dd9062b1b64b74bbd4c8b67d1c69b7a484622c51b1a7538f4d77966cdcff2a1a58
-  data.tar.gz: 105df200c744ac957dad1be0bf74ad44ff62699569b0d9027bb9d32b9e1aa46dc71cf7747909a39c7b4b9bebef3e93095f103450d23f6d53f26c374710dfc5c1
+  metadata.gz: 7f9f71bc3516f152146927f3034962bd0da171236d1190fd18696b99897a6a6901f2ec1c8d125cd29d2b018be20bd124d03ba289d6cdf84b6879ff937672b238
+  data.tar.gz: f5cfa29eee46c9bf236e8e25038fe20e14c9ce768f74c0a6813bcdf794011aa78352d138b3658ae9654c34c34af5c1378df3bb7ec7269967f4d9eb4a87b9838a

data/.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   test-job:
     working_directory: ~/jpmobile
     docker:
-      - image: circleci/ruby:2.5-node-browsers
+      - image: circleci/ruby:2.6-node-browsers
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.3

data/Gemfile.lock

@@ -1,81 +1,96 @@
 PATH
   remote: .
   specs:
-    jpmobile (5.2.2)
+    jpmobile (6.0.0.beta)
       mail (~> 2.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actiontext (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activestorage (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (6.0.0.rc1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    capybara (3.0.1)
+    capybara (3.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
-    capybara-webkit (1.15.0)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-webkit (1.15.1)
       capybara (>= 2.3, < 4.0)
       json
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    geokit (1.11.0)
-    git (1.3.0)
-    globalid (0.4.1)
+    erubi (1.8.0)
+    geokit (1.13.1)
+    git (1.5.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     hpricot (0.8.6)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    jaro_winkler (1.5.2)
+    json (2.2.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -84,87 +99,89 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    onkcop (0.53.0.0)
-      rubocop (~> 0.53.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    onkcop (0.53.0.3)
+      rubocop (>= 0.53.0)
       rubocop-rspec (>= 1.24.0)
-    parallel (1.12.1)
-    parser (2.5.0.5)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    rack (2.0.6)
+    public_suffix (3.0.3)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (6.0.0.rc1)
+      actioncable (= 6.0.0.rc1)
+      actionmailbox (= 6.0.0.rc1)
+      actionmailer (= 6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actiontext (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 6.0.0.rc1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (12.3.2)
+    regexp_parser (1.4.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.8.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.53.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.5, != 2.5.1.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.25.0)
-      rubocop (>= 0.53.0)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-rspec (1.32.0)
+      rubocop (>= 0.60.0)
+    ruby-progressbar (1.10.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -172,19 +189,20 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.1)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.5.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.1.6)
 
 PLATFORMS
   ruby
@@ -197,7 +215,7 @@ DEPENDENCIES
   jpmobile!
   onkcop
   pry
-  rails (~> 5.2.0)
+  rails (~> 6.0.0.rc1)
   rspec
   rspec-its
   rspec-rails
@@ -205,4 +223,4 @@ DEPENDENCIES
   sqlite3-ruby
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

data/jpmobile.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'git'
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'rails', '~> 5.2.0'
+  gem.add_development_dependency 'rails', '~> 6.0.0.rc1'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rspec-rails'

data/lib/jpmobile/hook_action_view.rb

@@ -11,18 +11,12 @@ end
 # :stopdoc:
 # accept-charset に charset を変更できるようにする
 module Jpmobile
-  module ActionView
-    module HtmlOptionsWithAcceptCharset
-      private
-
-      def html_options_for_form(url_for_options, options, *parameters_for_url)
-        super.tap do |o|
-          o['accept-charset'] = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || o['accept-charset']
-        end
+  module HtmlOptionsWithAcceptCharset
+    def html_options_for_form(url_for_options, options)
+      super.tap do |o|
+        o['accept-charset'] = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || o['accept-charset']
       end
     end
   end
 end
-
-::ActionView::Helpers::FormTagHelper.send :prepend, Jpmobile::ActionView::HtmlOptionsWithAcceptCharset
 #:startdoc:

data/lib/jpmobile/rails.rb

@@ -12,6 +12,8 @@ end
 
 ActiveSupport.on_load(:action_view) do
   require 'jpmobile/hook_action_view'
+
+  self.prepend Jpmobile::HtmlOptionsWithAcceptCharset
 end
 
 ActiveSupport.on_load(:after_initialize) do

data/lib/jpmobile/resolver.rb

@@ -5,43 +5,9 @@ module Jpmobile
 
     def initialize(path, pattern = nil)
       raise ArgumentError, 'path already is a Resolver class' if path.is_a?(Resolver)
-
-      super(path, pattern || DEFAULT_PATTERN)
+      super
+      @pattern = DEFAULT_PATTERN
       @path = File.expand_path(path)
     end
-
-    private
-
-    def query(path, details, formats, outside_app_allowed)
-      query = build_query(path, details)
-
-      template_paths = find_template_paths(query)
-      template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
-
-      template_paths.map do |template|
-        handler, format, variant = extract_handler_and_format_and_variant(template)
-        contents = File.binread(template)
-
-        virtual_path = if format
-                         if template =~ /.+#{path}(.+)\.#{format.to_sym.to_s}.*$/
-                           path.to_str + Regexp.last_match(1)
-                         else
-                           path.virtual
-                         end
-                       else
-                         path.virtual
-                       end
-
-        ::ActionView::Template.new(
-          contents,
-          File.expand_path(template),
-          handler,
-          virtual_path: virtual_path,
-          format: format,
-          variant: variant,
-          updated_at: mtime(template),
-        )
-      end
-    end
   end
 end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '5.2.5'.freeze
+  VERSION = '6.0.0.beta'.freeze
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -94,8 +94,8 @@ namespace :test do
 
     unless skip
       # add gems for jpmobile spec
-      config_path = File.join(rails_root, 'Gemfile')
-      File.open(config_path, 'a+') do |file|
+      gemfile_path = File.join(rails_root, 'Gemfile')
+      File.open(gemfile_path, 'a+') do |file|
         file.write <<-GEMFILE
         instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
         GEMFILE

data/spec/unit/receive_mail_spec.rb

@@ -84,7 +84,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Docomo' do
       context 'with sjis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -129,7 +129,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'Au' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/au-decomail.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')).read)
       end
 
       it 'subject should be parsed correctly' do
@@ -151,7 +151,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Softbank' do
       context 'Shift_JIS' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -170,7 +170,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'UTF-8' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-utf8.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -304,13 +304,13 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'From au iPhone' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::Au)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.encoded).to match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
 
@@ -435,7 +435,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'bounced mail' do
     context 'has jp address' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')).read)
       end
 
       it 'mobile should abstract mobile' do
@@ -447,7 +447,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'non-Japanese mail' do
     context 'us-ascii' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/non-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')).read)
       end
 
       it 'mobile should be nil' do
@@ -458,7 +458,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'no From header' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/no-from.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')).read)
       end
 
       it 'mobile should be nil' do