jpmobile 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7afdd073603c4cd21bb29179a79d69ae6c510b
-  data.tar.gz: 019c1675536713dbd71faeb3f9e6ee51e1bb0325
+  metadata.gz: c642e8e056bb3640414207b90b5f708bbbbb381b
+  data.tar.gz: b81621cee3f51f931acb99fe373950eeb8a2f167
 SHA512:
-  metadata.gz: 0ffd252eb6afb2a17ea2c4b516a0d783c2d097c8aa2a73f1512f030f1a6587afaa3255f679c5122e97e793da3299d9ce25b02b38ad04aafbbc8c016cca29c786
-  data.tar.gz: 9057c72035500a9e822a61f633039cc1a75c93bbe2b09534028866329a149bfe204d7254448cda8c04d73c298b4419a05952276d0277908cc1f2d840b3333f63
+  metadata.gz: 14337a48b6e5432ee5f4d2df98e1b3224722a9c72d70bbeb47f2b99c47b6e204ce551d9e5093ac42c83650a6a5c7c8e1d2965720e3245229db669c18d5b5cb37
+  data.tar.gz: de4719aad80730b8817ba8d197a67861584c42192f025f7226a5ff88b78df14706fdaa806710aae6570da80a9e1d020f8c5093408a18dd182f8d71947eaed407

data/.gitignore

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

data/jpmobile.gemspec

@@ -16,7 +16,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'
+  gem.add_development_dependency 'rails', '~> 4.2'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'
@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
   gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'mail', '2.5.5'
 end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # desc "Explaining what the task does"
 # task :jpmobile do
 #   # Task goes here
@@ -19,21 +18,19 @@ begin
     end
   end
 rescue LoadError
-  warn "RSpec is not installed. Some tasks were skipped. please install rspec"
+  warn 'RSpec is not installed. Some tasks were skipped. please install rspec'
 end
 
 namespace :test do
-  desc "Generate rails app and run jpmobile tests in the app"
-  task :rails, [:skip] do |t, args|
-    rails_root     = "test/rails/rails_root"
-    relative_root  = "../../../"
+  desc 'Generate rails app and run jpmobile tests in the app'
+  task :rails, [:skip] do |_, args|
+    rails_root = 'test/rails/rails_root'
 
-    puts "Running tests in Rails"
-    skip = args.skip == "true"
+    puts 'Running tests in Rails'
+    skip = args.skip == 'true'
 
     unless skip
       # generate rails app
-      FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
       `rails new #{rails_root} --skip-bundle`
@@ -42,7 +39,7 @@ namespace :test do
     # setup jpmobile
     plugin_path = File.join(rails_root, 'vendor', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
-    FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
+    FileList['*'].exclude('test').exclude('spec').exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
     end
 
@@ -50,26 +47,37 @@ namespace :test do
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
-      FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").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"
+      puts 'IP Address test requires jpmobile-ipaddresses module'
     end
 
     # setup jpmobile-terminfo
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-terminfo')
       FileUtils.mkdir_p(plugin_path)
-      FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
+      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"
+      puts 'Terminal display information test requires jpmobile-terminfo module'
+    end
+
+    # setup activerecord-session_store
+    begin
+      plugin_path = File.join(rails_root, 'vendor', 'activerecord-session_store')
+      FileUtils.mkdir_p(plugin_path)
+      FileList['../activerecord-session_store/*'].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|
+    FileList['test/rails/overrides/*'].each do |file|
       FileUtils.cp_r(file, rails_root)
     end
 
@@ -77,10 +85,10 @@ namespace :test do
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
       File.open(config_path, 'w') do |file|
-        file.write <<-END
-Rails.application.config.session_store :active_record_store, :key => '_session_id'
-Rails.application.config.session_options = {:cookie_only => false}
-END
+        file.write <<-SESSION_CONFIG
+        Rails.application.config.session_store :active_record_store, :key => '_session_id'
+        Rails.application.config.session_options = { :cookie_only => false }
+        SESSION_CONFIG
       end
     end
 
@@ -88,20 +96,29 @@ END
       # add gems for jpmobile spec
       config_path = File.join(rails_root, 'Gemfile')
       File.open(config_path, 'a+') do |file|
-        file.write <<-END
-instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
-END
+        file.write <<-GEMFILE
+        instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
+        GEMFILE
       end
     end
 
     # run tests in rails
-    cd rails_root
-    ruby "-S bundle install"
-    ruby "-S rake db:migrate RAILS_ENV=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の中では半角に変換されないこと'"
+    Dir.chdir(rails_root) do
+      Bundler.with_clean_env do
+        original_env = ENV.to_hash
+
+        ENV.update('RBENV_VERSION' => nil)
+        ENV.update('RBENV_DIR' => nil)
+
+        system 'bundle install'
+        system 'bin/rake db:migrate RAILS_ENV=test' unless skip
+        system 'bin/rake spec'
+
+        ENV.replace(original_env)
+      end
+    end
   end
-  desc "Run sinatra on jpmobile tests"
+  desc 'Run sinatra on jpmobile tests'
   Rake::TestTask.new(:sinatra) do |t|
     t.libs << 'lib'
     t.libs << 'test/sinatra'

data/spec/unit/mail_spec.rb

@@ -342,7 +342,16 @@ describe "Jpmobile::Mail" do
     end
 
     it "delivers through SMTP" do
-      @mail.delivery_method :smtp, {:enable_starttls_auto => false}
+      @mail.delivery_method :smtp, {
+                              enable_starttls_auto: false,
+                              user_name: ENV['MAILTRAP_USERNAME'],
+                              password: ENV['MAILTRAP_PASSWORD'],
+                              address: 'smtp.mailtrap.io',
+                              domain: 'smtp.mailtrap.io',
+                              port: '2525',
+                              authentication: :cram_md5
+                            }
+
       expect {
         @mail.deliver
       }.not_to raise_error

data/test/rails/overrides/Gemfile.jpmobile

@@ -6,11 +6,12 @@ gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
 gem 'activerecord-session_store'
 
+gem 'mail', '2.5.5'
+
 # Bundle gems for certain environments:
 group :development, :test do
   gem "rspec"
   gem "rspec-rails"
-  gem 'capybara'
   gem 'capybara-webkit'
   gem 'pry'
 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('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
+      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
     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('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
+      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.5
 description: A Rails plugin for mobile devices in Japan
 email:
 - rust.stnard@gmail.com
@@ -281,6 +295,7 @@ 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
@@ -434,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A Rails plugin for mobile devices in Japan
@@ -495,6 +510,7 @@ 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