Merge 502a8d6 into 791b0a7

.travis.yml

@@ -10,6 +10,9 @@ gemfile:
   - gemfiles/rack.1.3.x.gemfile
   - gemfiles/rack.1.2.x.gemfile
   - gemfiles/rack.1.1.x.gemfile
+  - gemfiles/rails.3.2.x.gemfile
+  - gemfiles/rails.4.0.x.gemfile
+  - gemfiles/rails.4.1.x.gemfile
 
 script: "bundle exec rake spec"
 

README.md

@@ -25,15 +25,15 @@ gem "rack-dev-mark"
 
 And run `bundle install`.
 
-### For your Rack app
+### For Rack App
 
 ```ruby
 require 'rack/dev-mark'
 use Rack::DevMark::Middleware
 run MyApp
 ```
 
-### For your Rails app
+### For Rails App
 
 In `config/environments/development.rb`
 
@@ -79,7 +79,7 @@ end
 
 ## Custom Theme
 
-Define a sub class of `Rack::DevMark::Theme::Base` somewhere in your app.
+Create your own theme class inheriting `Rack::DevMark::Theme::Base`.
 
 ```ruby
 require 'rack/dev-mark/theme/base'
@@ -101,25 +101,25 @@ end
 
 Then, insert them in your app.
 
-### For your Rack app
+### For Rack App
 
 ```ruby
 use Rack::DevMark::Middleware, [NewTheme.new, AnotherTheme.new]
 ```
 
-### For your Rails app
+### For Rails App
 
 In `config/application.rb`
 
 ```ruby
 module MyApp
   class Application < Rails::Application
-    config.rack_dev_mark.custom_theme = [NewTheme.new, AnotherTheme.new]
+    config.rack_dev_mark.theme = [NewTheme.new, AnotherTheme.new]
   end
 end
 ```
 
-You can add any combination of themes.
+You can add any combination of themes. See more about [themes](lib/rack/dev-mark/theme/README.md).
 
 ## Contributing
 

gemfiles/rails.3.2.x.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'rails', '~> 3.2'
+gemspec :path => '../'

gemfiles/rails.4.0.x.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'rails', '~> 4.0'
+gemspec :path => '../'

gemfiles/rails.4.1.x.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'rails', '~> 4.1'
+gemspec :path => '../'

lib/generators/rack/dev-mark/install_generator.rb

@@ -1,3 +1,4 @@
+require 'rails/generators'
 require 'rails/generators/base'
 
 module Rack
@@ -7,15 +8,21 @@ class InstallGenerator < ::Rails::Generators::Base
 
       desc "Install rack-dev-mark."
       def insert_enable
-        insert_into_file 'config/application.rb', after: "< Rails::Application\n" do <<-EOS
+        insert_into_file target_path, after: "< Rails::Application\n" do <<-EOS
     # Enable rack-dev-mark
     config.rack_dev_mark.enable = !Rails.env.production?
     # Customize themes if you want to do so
-    # config.rack_dev_mark.custom_theme = [:title, :github_fork_ribbon]
+    # config.rack_dev_mark.theme = [:title, :github_fork_ribbon]
 
         EOS
         end
       end
+
+      private
+
+      def target_path
+        'config/application.rb'
+      end
     end
   end
 end

lib/rack/dev-mark/railtie.rb

@@ -8,7 +8,9 @@ class Railtie < Rails::Railtie
       initializer "rack-dev-mark.configure_rails_initialization" do |app|
         if app.config.rack_dev_mark.enable
           racks = [ActionDispatch::ShowExceptions, Rack::DevMark::Middleware]
-          racks << app.config.rack_dev_mark.custom_theme if app.config.rack_dev_mark.custom_theme
+          if theme = app.config.rack_dev_mark.theme || app.config.rack_dev_mark.custom_theme
+            racks << theme
+          end
           app.config.app_middleware.insert_before *racks
         end
       end

lib/rack/dev-mark/theme/README.md

@@ -2,20 +2,20 @@
 
 You can set options when you add the themes into your app. Otherwise, just put the symbol of the theme filename.
 
-### For your Rack app
+### For Rack App
 
 ```ruby
 use Rack::DevMark::Middleware, [:title, Rack::DevMark::Theme::GithubForkRibbon.new(position: 'right')]
 ```
 
-### For your Rails app
+### For Rails App
 
 In config/application.rb
 
 ```ruby
 module MyApp
   class Application < Rails::Application
-    config.rack_dev_mark.custom_theme = [:title, Rack::DevMark::Theme::GithubForkRibbon.new(position: 'right')]
+    config.rack_dev_mark.theme = [:title, Rack::DevMark::Theme::GithubForkRibbon.new(position: 'right')]
   end
 end
 ```
@@ -34,11 +34,11 @@ e.g.
 
 `upcase`: `true` or `false` (default)
 
-## github-fork-ribbon
+## github_fork_ribbon
 
 ["Fork Me on GitHub" like ribbon](https://github.com/simonwhitaker/github-fork-ribbon-css) originally created by [simonwhitaker](https://github.com/simonwhitaker)
 
-![github-fork-ribbon](screenshots/github_fork_ribbon.png)
+![github_fork_ribbon](screenshots/github_fork_ribbon.png)
 
 ### options
 

spec/generators/rack/dev-mark/install_generator_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+if defined?(::Rails)
+require 'tempfile'
+require 'generators/rack/dev-mark/install_generator'
+describe Rack::DevMark::InstallGenerator do
+  include_context 'forked spec'
+
+  context "config/application.rb" do
+    let(:application_rb) { Tempfile.new('config_application.rb') }
+    before do
+      application_rb.write <<-EOS
+module MyApp
+  class Application < Rails::Application
+    # ...
+  end
+end
+      EOS
+      application_rb.rewind
+      allow_any_instance_of(Rack::DevMark::InstallGenerator).to receive(:target_path).and_return(application_rb.path)
+    end
+    after do
+      application_rb.close
+      application_rb.unlink
+    end
+
+    it 'inserts rack-dev-mark settings' do
+      Rails::Generators.invoke("rack:dev-mark:install")
+      application_rb.rewind
+      expect(application_rb.read).to eq <<-EOS
+module MyApp
+  class Application < Rails::Application
+    # Enable rack-dev-mark
+    config.rack_dev_mark.enable = !Rails.env.production?
+    # Customize themes if you want to do so
+    # config.rack_dev_mark.theme = [:title, :github_fork_ribbon]
+
+    # ...
+  end
+end
+      EOS
+    end
+  end
+end
+end

spec/rack/dev-mark/railtie_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+if defined?(::Rails)
+describe Rack::DevMark::Railtie do
+  include_context 'forked spec'
+
+  before do
+    puts 'initialize rails'
+    @app = Class.new(::Rails::Application)
+    @app.config.active_support.deprecation = :stderr
+  end
+  context "rack_dev_mark enable" do
+    before do
+      @app.config.rack_dev_mark.enable = true
+      @app.initialize!
+    end
+    it 'inserts the middleware' do
+      expect(@app.middleware.middlewares).to include(Rack::DevMark::Middleware)
+    end
+  end
+  context "rack_dev_mark disable" do
+    before do
+      @app.config.rack_dev_mark.enable = false
+      @app.initialize!
+    end
+    it 'does not insert the middleware' do
+      expect(@app.middleware.middlewares).not_to include(Rack::DevMark::Middleware)
+    end
+  end
+  context "rack_dev_mark theme" do
+    let(:setting_key) { 'theme' }
+    let(:theme) { d = double setup: nil; allow(d).to receive(:insert_into){ |b| "#{b} dev-mark" }; d }
+    before do
+      @app.config.rack_dev_mark.enable = true
+      @app.config.rack_dev_mark.send "#{setting_key}=", [theme]
+      @app.initialize!
+    end
+    it 'inserts the middleware' do
+      expect(theme).to receive(:setup)
+    end
+    context "rack_dev_mark custom_theme alias" do
+      let(:setting_key) { 'custom_theme' }
+      it 'inserts the middleware' do
+        expect(theme).to receive(:setup)
+      end
+    end
+  end
+end
+end

spec/spec_helper.rb

@@ -1,13 +1,35 @@
 require 'rubygems'
+require 'simplecov'
 require 'coveralls'
 Coveralls.wear!
 
+resultset_path = SimpleCov::ResultMerger.resultset_path
+FileUtils.rm resultset_path if File.exists? resultset_path
+SimpleCov.use_merging true
+SimpleCov.at_exit do
+  SimpleCov.command_name "fork-#{$$}"
+  SimpleCov.result.format!
+end
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+if ENV['COVERAGE']
+  SimpleCov.start
+end
+
+ENV['RACK_ENV'] = 'test'
+
 require 'rack'
+begin
+  require 'rails'
+  $stdout.write "* Rails has been loaded.\n"
+rescue LoadError
+end
 require 'rack-dev-mark'
 
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
-ENV['RACK_ENV'] = 'test'
 RSpec.configure do |config|
 end
 

spec/support/fork_helper.rb

@@ -0,0 +1,17 @@
+shared_context 'forked spec' do
+  around do |example|
+    read, write = IO.pipe
+    pid = fork do
+      $stdout.sync = true
+      $stderr.sync = true
+      res = example.run
+      Marshal.dump(res, write)
+      write.close
+    end
+    Process.waitpid2 pid
+    res = Marshal.load(read)
+    example.example.send :set_exception, res
+    read.close
+    #fail "Forked spec failed" if $? >> 8 != 0
+  end
+end