jpmobile 5.0.0.beta1 → 5.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcc78220f8ee88ca102524a012cb278a111af2b
-  data.tar.gz: 7578e413d0afb4020c51127f6b6e15a5c7c57c4d
+  metadata.gz: bb4d8766b1ea417201147e466f2084b48f794cac
+  data.tar.gz: a4a672f26c05452639406937df52be1b3406c6cc
 SHA512:
-  metadata.gz: 1d8730c91d837df4c844138703365232a8d339e4b0cd0c0438d3812f44644fe2c9be4ee9478294e8aad2afa72195acd5458c18d0a774b0307e50138d0f94fc1d
-  data.tar.gz: 3c72edb2d3fbe357cfcdeb6a6d6a6e4a769be0bae1ba9883e4f20841da5a00f7de2497c9a2d105c2336ecd2ec52a0297c1255c449cea972398e051971680713b
+  metadata.gz: d00c714192c78351c8c3eb345fee00d76a6911c33a962e91614b6a6117a2ae9f483d4e65e68f2cdde4502c8c8172a610fe82307962880a90dddccb01e0598dc8
+  data.tar.gz: dd5018b73e174846580146ad799aeefb66fb6fb501c65c9bf0f449f4221b2a8a6cefaca9ac60d49b15ee3c10e10c984673fff8fe00f225805916ed2e91e389a5

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', '5.0.0.beta1'
+  gem.add_development_dependency 'rails', '5.0.0.beta2'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/lib/jpmobile/filter.rb

@@ -121,7 +121,7 @@ module Jpmobile
     end
 
     def filter(method, str)
-      str = str.clone
+      str = str.dup
 
       # 一度UTF-8に変換
       before_encoding = nil

data/lib/jpmobile/resolver.rb

@@ -1,7 +1,7 @@
 module Jpmobile
   class Resolver < ActionView::FileSystemResolver
     EXTENSIONS = [:locale, :formats, :handlers, :mobile]
-    DEFAULT_PATTERN = ":prefix/:action{_:mobile,}{.:locale,}{.:formats,}{.:handlers,}"
+    DEFAULT_PATTERN = ":prefix/:action{_:mobile,}{.:locale,}{.:formats,}{+:variants,}{.:handlers,}"
 
     def initialize(path, pattern=nil)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
@@ -11,11 +11,12 @@ module Jpmobile
 
     private
 
-    def query(path, details, formats)
+    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)

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "5.0.0.beta1"
+  VERSION = "5.0.0.beta2"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -36,7 +36,7 @@ namespace :test do
       FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails _5.0.0.beta1_ new #{rails_root} --skip-bundle`
+      `rails _5.0.0.beta2_ new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile
@@ -108,8 +108,8 @@ 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 rails db:migrate RAILS_ENV=test" unless skip
+    ruby "-S rails spec"
     # ruby "-S rspec -b --color spec/features/filter_spec.rb"
   end
   desc "Run sinatra on jpmobile tests"

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,15 +4,14 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', path: './vendor/activerecord-session_store'
+gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store'
 
 gem 'pry'
 gem 'pry-byebug'
 
 # Bundle gems for certain environments:
 group :development, :test do
-  gem "rspec"
-  gem "rspec-rails"
+  gem "rspec-rails", '3.5.0.beta1'
   gem 'capybara'
   gem 'capybara-webkit'
   gem 'rails-controller-testing'

data/test/rails/overrides/spec/rails_helper.rb

@@ -1,7 +1,9 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 
@@ -18,9 +20,9 @@ require 'rspec/rails'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
-# Checks for pending migrations before tests are run.
+# Checks for pending migration and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
@@ -50,6 +52,10 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.color = true

data/test/rails/overrides/spec/spec_helper.rb

@@ -1,14 +1,16 @@
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
 #
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # will add to the boot time of your test suite on EVERY test run, even for an
 # individual file that may not need all of that loaded. Instead, consider making
 # a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
+# the additional setup, and require it from the spec files that actually need
+# it.
 #
 # The `.rspec` file also contains a few flags that are not defaults but that
 # users commonly want.
@@ -22,10 +24,10 @@ RSpec.configure do |config|
     # This option will default to `true` in RSpec 4. It makes the `description`
     # and `failure_message` of custom matchers include text for helper methods
     # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
     # ...rather than:
-    #   # => "be bigger than 2"
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
@@ -48,11 +50,16 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
   config.disable_monkey_patching!
 
   # Many RSpec users commonly either run the entire suite or an individual

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-02-25 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.beta1
+        version: 5.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1
+        version: 5.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement