rack-dev-mark 0.7.4 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a173b3197798c1b4bed2595c70a02d19a2cdfc6c
-  data.tar.gz: dbb27824100c85d43e182b4db0013276f640a5fb
+  metadata.gz: 5e1a655c2468e1c6f30cefe314b3c41d55668b87
+  data.tar.gz: 1e0267dc11b3cc3714c8d54709ecb0f7258227d5
 SHA512:
-  metadata.gz: 64944f433a68c065feb9618dc55172391bd1c5d761845ef8cf4a1d9086ba4657d71a3614cdb3fa4a01978d964755d756120c9b288a0fa6465154a52dddaa83a1
-  data.tar.gz: 602fa4ab9b0bfd1e04bea2d8ef8dafb107e98705ecd3c389ee1809467635bb93a5102ad6b6d27f4dfcd0138d81b5778deb86d4f0d88bf430e13800e915a72861
+  metadata.gz: 93032feab22d84a7780d5c7f465f7b147b86dd17dcf1f1c9ec1bcd3e6d9c3769ca6c2c0051fca619f9037b94b4cfa94d0fc700452eab4603f06f4c6c6fa77bb3
+  data.tar.gz: e84bda81dff22e7bf577ec8f33b19b22fad4e9232f8824941b758d3959908d593f25e4535f61803fcdd94970aaffcbdfcb37541ec43e4dee9f0309c7eed0b2ed

data/.travis.yml

@@ -1,25 +1,46 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+
+install:
+  - "gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true"
+  - "gem install bundler -v '< 2'"
+  - "bundle install --jobs=3 --retry=3"
 
 env:
   -
-  - RACK_VERSION=1.1.0
-  - RACK_VERSION=1.2.0
   - RACK_VERSION=1.3.0
   - RACK_VERSION=1.4.0
   - RACK_VERSION=1.5.0
   - RACK_VERSION=1.6.0
-  - RAILS_VERSION=3.2.0
+  - RACK_VERSION=2.0.0
   - RAILS_VERSION=4.0.0
   - RAILS_VERSION=4.1.0
   - RAILS_VERSION=4.2.0
+  - RAILS_VERSION=5.0.0
+  - RAILS_VERSION=5.1.0
+  - RAILS_VERSION=5.2.0
   - I18N_VERSION=0.6.0
 
+matrix:
+  allow_failures:
+    - rvm: 2.4
+      env: RAILS_VERSION=4.0.0
+    - rvm: 2.4
+      env: RAILS_VERSION=4.1.0
+    - rvm: 2.5
+      env: RAILS_VERSION=4.0.0
+    - rvm: 2.5
+      env: RAILS_VERSION=4.1.0
+    - rvm: 2.6
+      env: RAILS_VERSION=4.0.0
+    - rvm: 2.6
+      env: RAILS_VERSION=4.1.0
+
 script: "bundle exec rake spec"
 
 branches:

data/Gemfile

@@ -4,4 +4,6 @@ gem "rack", "~> #{ENV['RACK_VERSION']}" if ENV['RACK_VERSION'].to_s != ''
 gem "rails", "~> #{ENV['RAILS_VERSION']}" if ENV['RAILS_VERSION'].to_s != ''
 gem "i18n", "~> #{ENV['I18N_VERSION']}" if ENV['I18N_VERSION'].to_s != ''
 
+gem 'gem-release', '~> 2.0.0.dev.5'
+
 gemspec

data/README.md

@@ -1,6 +1,7 @@
 # rack-dev-mark
 
 [![Gem Version][gem-image]][gem-link]
+[![Download][download-image]][download-link]
 [![Dependency Status][deps-image]][deps-link]
 [![Build Status][build-image]][build-link]
 [![Coverage Status][cov-image]][cov-link]
@@ -232,12 +233,14 @@ Copyright (c) 2014 Daisuke Taniwaki. See [LICENSE](LICENSE) for details.
 
 [gem-image]:   https://badge.fury.io/rb/rack-dev-mark.svg
 [gem-link]:    http://badge.fury.io/rb/rack-dev-mark
-[build-image]: https://secure.travis-ci.org/dtaniwaki/rack-dev-mark.png
+[download-image]:https://img.shields.io/gem/dt/rack-dev-mark.svg
+[download-link]:https://rubygems.org/gems/rack-dev-mark
+[build-image]: https://secure.travis-ci.org/dtaniwaki/rack-dev-mark.svg
 [build-link]:  http://travis-ci.org/dtaniwaki/rack-dev-mark
 [deps-image]:  https://gemnasium.com/dtaniwaki/rack-dev-mark.svg
 [deps-link]:   https://gemnasium.com/dtaniwaki/rack-dev-mark
 [cov-image]:   https://coveralls.io/repos/dtaniwaki/rack-dev-mark/badge.png
 [cov-link]:    https://coveralls.io/r/dtaniwaki/rack-dev-mark
-[gpa-image]:   https://codeclimate.com/github/dtaniwaki/rack-dev-mark.png
+[gpa-image]:   https://codeclimate.com/github/dtaniwaki/rack-dev-mark.svg
 [gpa-link]:    https://codeclimate.com/github/dtaniwaki/rack-dev-mark
 

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.9

data/lib/rack/dev-mark/action_controller_helpers.rb

@@ -3,7 +3,8 @@ module Rack
     module ActionControllerHelpers
       module ClassMethods
         def skip_rack_dev_mark(options = {})
-          before_filter options do
+          before_action_method_name = respond_to?(:before_action) ? :before_action : :before_filter
+          public_send(before_action_method_name, options) do
             disable_rack_dev_mark
           end
         end

data/lib/rack/dev-mark/middleware.rb

@@ -33,7 +33,7 @@ module Rack
             end
           end
           response.close if response.respond_to?(:close)
-          headers['Content-Length'] &&= bytesize(new_body).to_s
+          headers['Content-Length'] &&= new_body.bytesize.to_s
           response = [new_body]
         end
 

data/lib/rack/dev-mark/railtie.rb

@@ -20,7 +20,7 @@ module Rack
             racks << theme
           end
 
-          app.config.app_middleware.send(insert_method, *racks)
+          app.config.middleware.send(insert_method, *racks)
         end
       end
 

data/lib/rack/dev-mark/theme/github_fork_ribbon.rb

@@ -17,15 +17,20 @@ module Rack
           title << timestamp if timestamp.to_s != ''
           title = title.join("&#10;")
 
-          s = <<-EOS
+          style_tag_str = <<-EOS
 #{stylesheet_link_tag "github-fork-ribbon-css/gh-fork-ribbon.css"}
 <!--[if lt IE 9]>
 #{stylesheet_link_tag "github-fork-ribbon-css/gh-fork-ribbon.ie.css"}
 <![endif]-->
+          EOS
+
+          div_tag_str = <<-EOS
 <div class="github-fork-ribbon-wrapper #{position}#{fixed}" onClick="this.style.display='none'" title="#{title}"><div class="github-fork-ribbon #{color}"><span class="github-fork-ribbon-text">#{env}</span></div></div>
           EOS
 
-          html.sub %r{(<body[^>]*>)}i, "\\1#{s.strip}"
+          html
+            .sub(%r{(</head>)}i, "#{style_tag_str.strip}\\1")
+            .sub(%r{(<body[^>]*>)}i, "\\1#{div_tag_str.strip}")
         end
       end
     end

data/rack-dev-mark.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "rack", ">= 1.1"
+  gem.required_ruby_version = ['>= 2.3']
+
+  gem.add_dependency "rack", ['>= 1.1', '< 2.3']
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", ">= 3.0"

data/spec/rack/dev-mark/theme/github_fork_ribbon_spec.rb

@@ -5,11 +5,10 @@ describe Rack::DevMark::Theme::GithubForkRibbon do
   it_behaves_like "theme" do
     let :out do
       s = <<-EOS
-<html><head>head<title>title</title></head><body><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
+<html><head>head<title>title</title><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
 <!--[if lt IE 9]>
 <style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.ie.css"}</style>
-<![endif]-->
-<div class="github-fork-ribbon-wrapper left" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
+<![endif]--></head><body><div class="github-fork-ribbon-wrapper left" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
       EOS
       s.strip
     end
@@ -20,11 +19,10 @@ describe Rack::DevMark::Theme::GithubForkRibbon do
     it_behaves_like "theme" do
       let :out do
         s = <<-EOS
-<html><head>head<title>title</title></head><body><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
+<html><head>head<title>title</title><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
 <!--[if lt IE 9]>
 <style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.ie.css"}</style>
-<![endif]-->
-<div class="github-fork-ribbon-wrapper right" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
+<![endif]--></head><body><div class="github-fork-ribbon-wrapper right" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
         EOS
         s.strip
       end
@@ -36,11 +34,10 @@ describe Rack::DevMark::Theme::GithubForkRibbon do
     it_behaves_like "theme" do
       let :out do
         s = <<-EOS
-<html><head>head<title>title</title></head><body><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
+<html><head>head<title>title</title><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
 <!--[if lt IE 9]>
 <style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.ie.css"}</style>
-<![endif]-->
-<div class="github-fork-ribbon-wrapper left" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon orange"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
+<![endif]--></head><body><div class="github-fork-ribbon-wrapper left" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon orange"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
         EOS
         s.strip
       end
@@ -52,11 +49,10 @@ describe Rack::DevMark::Theme::GithubForkRibbon do
     it_behaves_like "theme" do
       let :out do
         s = <<-EOS
-<html><head>head<title>title</title></head><body><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
+<html><head>head<title>title</title><style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.css"}</style>
 <!--[if lt IE 9]>
 <style>#{read_stylesheet "github-fork-ribbon-css/gh-fork-ribbon.ie.css"}</style>
-<![endif]-->
-<div class="github-fork-ribbon-wrapper left fixed" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
+<![endif]--></head><body><div class="github-fork-ribbon-wrapper left fixed" onClick="this.style.display='none'" title="rev&#10;time"><div class="github-fork-ribbon red"><span class="github-fork-ribbon-text">env</span></div></div>body</body></html>
         EOS
         s.strip
       end

data/spec/support/fork_helper.rb

@@ -11,6 +11,7 @@ shared_context 'forked spec' do
     Process.waitpid2 pid
     res = Marshal.load(read)
     example.example.send :set_exception, res if res && res.to_s != ''
+    example.instance_variable_set('@executed', true)
     read.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-dev-mark
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.9
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -142,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Differentiate development environment from production
@@ -162,4 +168,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/fork_helper.rb
 - spec/support/theme_helper.rb
-has_rdoc: