jpmobile 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a59b2d91b6623e62be44818ffad569c1a30bb3f
-  data.tar.gz: a4737c7bfa0e802747202254c43162022213c3c0
+  metadata.gz: 9b84db317e22ca18e365aa0902ffc9aabe50ea0c
+  data.tar.gz: 5e126ef0948bde5be5bed2fce66c88ed51b06b55
 SHA512:
-  metadata.gz: 478a46e5f1d336ad58d7cf51605cd51fe11c5e5159b507e7c602d054d2bd953d1939b713b130bae46a5f1425afd921470dcf37e133042d149269a2ec7d614776
-  data.tar.gz: 40699b70bfb7eeefc58dc071effa2abcafae6484ab0a59adb0f84e793313a8e15e63ef5e24b9ce6d861415f97bbda074ae908ad69e465968e4d2e3a0a100b870
+  metadata.gz: 2a5e414cd3fb607ba5f9bf7280f425f19a4709161126371627d0521dad2cee55205828206d17522213a07fdbc936742d7f7eaf6558d43b5dac6780b5f024ae71
+  data.tar.gz: 84250d25c5b909b8343aea70f3240fa4698314103ae381c0a48bb85b7c79a37e8c5997582c95540b4caa119c6fe35a3432e551a29a475e8e23368b6324119a32

data/.gitignore

@@ -15,5 +15,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-.ruby-version
-.envrc
+.envrc

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/Gemfile.lock

@@ -6,46 +6,46 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.3)
-      actionpack (= 5.0.3)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.0)
+      actionpack (= 5.1.0)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
+    actionmailer (5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.3)
-      activesupport (= 5.0.3)
+    activejob (5.1.0)
+      activesupport (= 5.1.0)
       globalid (>= 0.3.6)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
-      arel (~> 7.0)
-    activesupport (5.0.3)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
     ast (2.3.0)
     builder (3.2.3)
     capybara (2.13.0)
@@ -61,7 +61,7 @@ GEM
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    erubis (2.7.0)
+    erubi (1.6.0)
     geokit (1.11.0)
     git (1.3.0)
     globalid (0.4.0)
@@ -78,9 +78,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.2)
+    minitest (5.10.1)
     nio4r (2.0.0)
-    nokogiri (1.7.2)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     onkcop (0.48.1.1)
       rubocop (~> 0.48.1)
@@ -93,66 +93,66 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rack (2.0.2)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.3)
-      actioncable (= 5.0.3)
-      actionmailer (= 5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
-      activemodel (= 5.0.3)
-      activerecord (= 5.0.3)
-      activesupport (= 5.0.3)
+    rails (5.1.0)
+      actioncable (= 5.1.0)
+      actionmailer (= 5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.3)
+      railties (= 5.1.0)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
+    rubocop-rspec (1.15.0)
       rubocop (>= 0.42.0)
     ruby-progressbar (1.8.1)
     slop (3.6.0)
@@ -188,7 +188,7 @@ DEPENDENCIES
   jpmobile!
   onkcop
   pry
-  rails (~> 5.0.0)
+  rails (~> 5.1.0)
   rspec
   rspec-its
   rspec-rails

data/jpmobile.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'rails', '~> 5.0.0'
+  gem.add_development_dependency 'rails', '~> 5.1.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/lib/jpmobile.rb

@@ -64,7 +64,6 @@ module Jpmobile
 
   autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
 
-  autoload :ParamsOverCookie,    'jpmobile/trans_sid'
   autoload :TransSidRedirecting, 'jpmobile/trans_sid'
   autoload :TransSid,            'jpmobile/trans_sid'
 

data/lib/jpmobile/mail.rb

@@ -54,8 +54,7 @@ module Mail
     end
 
     def parse_message_with_jpmobile
-      _crlf_raw_source = raw_source.encode(raw_source.encoding, universal_newline: true).encode!(raw_source.encoding, crlf_newline: true)
-      header_part, body_part = _crlf_raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m, 2)
+      header_part, body_part = raw_source.lstrip.split(/#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m, 2)
       # header_part, body_part = raw_source.lstrip.split(HEADER_SEPARATOR, 2)
 
       self.header = header_part
@@ -82,9 +81,6 @@ module Mail
     def init_with_string(string)
       # convert to ASCII-8BIT for ascii incompatible encodings
       s = Jpmobile::Util.ascii_8bit(string)
-      unless s.ascii_only?
-        s = s.kind_of?(String) ? s.to_str.encode(s.encoding, :universal_newline => true).encode!(s.encoding, :crlf_newline => true) : ''
-      end
       self.raw_source = s
       set_envelope_header
       parse_message
@@ -316,7 +312,7 @@ module Mail
           _raw_source = if transfer_encoding == encoding
                           @raw_source.dup
                         else
-                          negotiate_best_encoding(transfer_encoding).encode(@raw_source)
+                          get_best_encoding(transfer_encoding).encode(@raw_source)
                         end
           Jpmobile::Util.set_encoding(_raw_source, @mobile.mail_charset(@charset))
         when /quoted-printable/
@@ -335,7 +331,7 @@ module Mail
 
     # fix charset
     def set_charset_with_jpmobile
-      @charset ||= ascii_only? ? 'US-ASCII' : nil
+      @charset ||= only_us_ascii? ? 'US-ASCII' : nil
     end
 
     def mobile=(m)
@@ -513,15 +509,6 @@ module Mail
     def encoded_with_jpmobile
       if @mobile
         self.charset = @mobile.mail_charset
-
-        _value = address_list.addresses.map { |_a|
-          if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
-            _a.to_s
-          else
-            "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
-          end
-        }.join(", ")
-        @address_list = AddressList.new(_value)
       end
 
       encoded_without_jpmobile
@@ -552,15 +539,6 @@ module Mail
     def encoded_with_jpmobile
       if @mobile
         self.charset = @mobile.mail_charset
-
-        _value = address_list.addresses.map { |_a|
-          if Utilities.blank?(_a.display_name) || _a.display_name.ascii_only?
-            _a.to_s
-          else
-            "#{@mobile.to_mail_subject(_a.display_name)} <#{_a.address}>"
-          end
-        }.join(", ")
-        @address_list = AddressList.new(_value)
       end
 
       encoded_without_jpmobile

data/lib/jpmobile/resolver.rb

@@ -14,27 +14,11 @@ module Jpmobile
     def query(path, details, formats, outside_app_allowed)
       query = build_query(path, details)
 
-      begin
-        template_paths = find_template_paths query
-        template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
-      rescue NoMethodError
-        self.class_eval do
-          def find_template_paths(query)
-            # deals with case-insensitive file systems.
-            sanitizer = Hash.new { |h, dir| h[dir] = Dir["#{dir}/*"] }
+      template_paths = find_template_paths(query)
+      template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
 
-            Dir[query].reject { |filename|
-              File.directory?(filename) ||
-                !sanitizer[File.dirname(filename)].include?(filename)
-            }
-          end
-        end
-
-        retry
-      end
-
-      template_paths.map { |template|
-        handler, format, variant = extract_handler_and_format_and_variant(template, formats)
+      template_paths.map do |template|
+        handler, format, variant = extract_handler_and_format_and_variant(template)
         contents = File.binread(template)
 
         virtual_path = if format
@@ -56,7 +40,7 @@ module Jpmobile
           variant: variant,
           updated_at: mtime(template)
         )
-      }
+      end
     end
   end
 end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -34,7 +34,7 @@ namespace :test do
       # generate rails app
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails _5.0.3_ new #{rails_root} --skip-bundle`
+      `rails _5.1.0_ new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile

data/spec/unit/mail_spec.rb

@@ -347,8 +347,8 @@ describe 'Jpmobile::Mail' do
                               enable_starttls_auto: false,
                               user_name: ENV['MAILTRAP_USERNAME'],
                               password: ENV['MAILTRAP_PASSWORD'],
-                              address: 'smtp.mailtrap.io',
-                              domain: 'smtp.mailtrap.io',
+                              address: 'mailtrap.io',
+                              domain: 'mailtrap.io',
                               port: '2525',
                               authentication: :cram_md5,
                             }

data/spec/unit/receive_mail_spec.rb

@@ -207,7 +207,7 @@ describe 'Jpmobile::Mail#receive' do
     end
 
     it 'body should be parsed correctly' do
-      expect(@mail.body.to_s).to eq("本文\r\nFor docomo\r\n\r\n")
+      expect(@mail.body.to_s).to eq("本文\nFor docomo\n\n")
     end
 
     context 'to_s' do
@@ -352,7 +352,7 @@ describe 'Jpmobile::Mail#receive' do
     end
 
     it 'body should be parsed correctly' do
-      expect(@mail.body.to_s).to eq("本文\r\nFor softbank\r\n\r\n")
+      expect(@mail.body.to_s).to eq("本文\nFor softbank\n\n")
     end
 
     context 'to_s' do

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,7 +4,7 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store'
+gem 'activerecord-session_store', git: 'https://github.com/rust/activerecord-session_store', branch: 'rails-5.1-only'
 
 gem 'pry'
 gem 'pry-byebug'
@@ -12,6 +12,5 @@ gem 'pry-byebug'
 # Bundle gems for certain environments:
 group :development, :test do
   gem "rspec-rails"
-  gem 'capybara-webkit'
   gem 'rails-controller-testing'
 end

data/test/rails/overrides/spec/features/filter_spec.rb

@@ -18,7 +18,7 @@ describe 'jpmobile integration spec', type: :feature do
     end
     it 'は 変換されない' do
       visit "/#{controller}/nbsp_char"
-      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 
@@ -33,7 +33,7 @@ describe 'jpmobile integration spec', type: :feature do
     end
     it 'は 変換されない' do
       visit "/#{controller}/nbsp_char"
-      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -281,7 +282,6 @@ files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
 - test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb
@@ -436,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan
@@ -497,7 +497,6 @@ test_files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
 - test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb

data/test/rails/overrides/Gemfile

@@ -1,54 +0,0 @@
-source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.3'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.3.6'
-# Use Puma as the app server
-gem 'puma', '~> 3.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 3.0'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platform: :mri
-end
-
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
-  gem 'listen', '~> 3.0.5'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')