rack-dev-mark 0.6.0 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFjOWI5ZjJlNDdiODE0ZWY3NDM3NzE2NjdkODk2OGI3MWNiZDBiOQ==
+    M2VlN2RhM2Y4NWFiNmUyM2IwMDEwY2IxOWQ1YjUxNDk0NGFlNzc2NA==
   data.tar.gz: !binary |-
-    YmZkNjY3MjZlMmRiZTk3NTU4N2Q5YzMyYWNlNWIwM2U4ZTg1MzQ1NQ==
+    YjFkMTc4YzY4ZTRhMTk4MTc1MDY1MmQ4YjMyYjVlNWViY2JiMDRkMA==
 SHA512:
   metadata.gz: !binary |-
-    YjM4ZDUzM2Y1N2FmMDJlYjBkNzQ3MjkyY2U3NzVlZDZiOWJiZTQzOTU1ZjIy
-    ZTgwNjgxNmVkYmU2ZTI3ZTZhMmZhY2FjYzE0ZWM1Nzc2M2NiYTlmZjUyNTI1
-    NDE4OTVhZWQwMDdhOWY3YWJhZGQ3ODE5MmU5NzYyZDNhNGRmMTc=
+    YjA4ZjQ2N2Q0ZDUxNTg2MWQ4NGZjYzA4ZDM3ZTRjYmIwOWY1ODJjNmU0MjMw
+    MDYyZjhlYWZmZjQwOGQyYzQ0YTE1ZWYwODIzNTg2YzcxYzU5OWZjMGMwMjBl
+    NmI4N2I3YWExMTg3NTVhYWZkNDBhYjE0Mzk1MTczODE1YzUxNzI=
   data.tar.gz: !binary |-
-    ZWI3Mzc0NTk3M2VlNzhjNmM1MDJjNTA5NzJhZjEzYzI2ZDBkNjYzMzkyMzI2
-    NDg2MjlkZDNmMzY3NzYyMWM3YjEzYjcwOGRjZTZlNDEzNzU4YTk2ZmVjYzU4
-    MjhlNTg2YTc2NGM2YzYzMTgyMjM3MDg0YjNhODNkMmM4MTgxYjA=
+    YzBkZTFhYWQzYmVkNjRlY2RkNzExNDNiOWQyYzk5NGYxYWVkOWJhNmQzNWJm
+    M2Q3NTc2Y2MyMzEwMGRkMGY1NmI0ZjUzZGNjOTFiNzRlMTdiYjIyYmFjMmM1
+    MmM4ZWU0ZjFkMDMxNTAxZWVkODU2ZWZhNDk3YjcyODg4MTEzNTA=

data/.travis.yml

@@ -3,16 +3,17 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-gemfile:
-  - gemfiles/gemfile
-  - gemfiles/rack.1.4.x.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
+  - 2.1
+
+env:
+  -
+  - RACK_VERSION=1.1.0
+  - RACK_VERSION=1.2.0
+  - RACK_VERSION=1.3.0
+  - RACK_VERSION=1.4.0
+  - RAILS_VERSION=3.2.0
+  - RAILS_VERSION=4.0.0
+  - RAILS_VERSION=4.1.0
 
 script: "bundle exec rake spec"
 

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+gem "rack", "~> #{ENV['RACK_VERSION']}" if ENV['RACK_VERSION'].to_s != ''
+gem "rails", "~> #{ENV['RAILS_VERSION']}" if ENV['RAILS_VERSION'].to_s != ''
+
 gemspec

data/README.md

@@ -44,7 +44,7 @@ run MyApp
 In `config/environments/development.rb`
 
 ```ruby
-MyApp::Application.configure do
+Rails.application.configure do
   config.rack_dev_mark.enable = true
 end
 ```
@@ -83,25 +83,16 @@ module MyApp
 end
 ```
 
-#### Heroku
+#### Rails on Heroku
 
-Since Heroku [uses production env for staging](https://devcenter.heroku.com/articles/multiple-environments). You can use this settings instead.
-
-```ruby
-module MyApp
-  class Application < Rails::Application
-    Rack::DevMark.env = ENV['RACK_DEV_MARK']
-    config.rack_dev_mark.enable = !Rails.env.production? || ENV['RACK_DEV_MARK']
-  end
-end
-```
-
-And set the environment variable.
+Since Heroku [uses production env for staging](https://devcenter.heroku.com/articles/multiple-environments). You can't use the settings above. However, the gem provide an easier way to set it up on Heroku. Just set the environment variable on the environment in which you want to show the mark.
 
 ```bash
-heroku config:set RACK_DEV_MARK=staging
+heroku config:set RACK_DEV_MARK_ENV=staging
 ```
 
+That's it!
+
 ## Custom Theme
 
 Although the default themes are `title` and `github_fork_ribbon`, you can create your own themes inheriting `Rack::DevMark::Theme::Base`.

data/VERSION

@@ -0,0 +1 @@
+0.6.2

data/lib/rack/dev-mark.rb

@@ -7,28 +7,35 @@ require 'rack/dev-mark/version'
 
 module Rack
   module DevMark
-    def self.env
-      @env ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-    end
+    class << self
+      def env
+        @env ||= rack_dev_mark_env || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      end
 
-    def self.env=(env)
-      @env = env
-    end
+      def env=(env)
+        @env = env
+      end
 
-    def self.revision
-      @revision ||= (::File.open('REVISION') { |f| f.read.strip } rescue nil)
-    end
+      def revision
+        @revision ||= (::File.open('REVISION') { |f| f.read.strip } rescue nil)
+      end
 
-    def self.revision=(revision)
-      @revision = revision
-    end
+      def revision=(revision)
+        @revision = revision
+      end
 
-    def self.timestamp
-      @timestamp ||= (::File.open('REVISION') { |f| f.ctime } rescue nil)
-    end
+      def timestamp
+        @timestamp ||= (::File.open('REVISION') { |f| f.mtime } rescue nil)
+      end
+
+      def timestamp=(timestamp)
+        @timestamp = timestamp.is_a?(Time) ? timestamp : Time.parse(timestamp)
+      end
 
-    def self.timestamp=(timestamp)
-      @timestamp = timestamp
+      def rack_dev_mark_env
+        s = ENV['RACK_DEV_MARK_ENV']
+        s.to_s == '' ? nil : s
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Rack
       config.rack_dev_mark = ActiveSupport::OrderedOptions.new
 
       initializer "rack-dev-mark.configure_rails_initialization" do |app|
-        if app.config.rack_dev_mark.enable
+        if app.config.rack_dev_mark.enable || Rack::DevMark.rack_dev_mark_env
           racks = [ActionDispatch::ShowExceptions, Rack::DevMark::Middleware]
           if theme = app.config.rack_dev_mark.theme || app.config.rack_dev_mark.custom_theme
             racks << theme

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

@@ -5,6 +5,6 @@ module Rack
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), 'theme', '*.rb')].each do |f|
+Dir[::File.join(::File.dirname(__FILE__), 'theme', '*.rb')].each do |f|
   require f
 end

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

@@ -1,5 +1,5 @@
 module Rack
   module DevMark
-    VERSION = '0.6.0'
+    VERSION = ::File.read(::File.expand_path('../../../../VERSION', __FILE__)).to_s.strip
   end
 end

data/rack-dev-mark.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Daisuke Taniwaki"]
   gem.email       = ["daisuketaniwaki@gmail.com"]
   gem.homepage    = "https://github.com/dtaniwaki/rack-dev-mark"
-  gem.summary     = "Differentiate development environemt from production"
-  gem.description = "Differentiate development environemt from production"
+  gem.summary     = "Differentiate development environment from production"
+  gem.description = "Differentiate development environment from production"
   gem.license     = "MIT"
 
   gem.files       = `git ls-files`.split("\n")

data/spec/rack/dev-mark/railtie_spec.rb

@@ -12,29 +12,38 @@ describe Rack::DevMark::Railtie do
   context "rack_dev_mark enable" do
     before do
       @app.config.rack_dev_mark.enable = true
-      @app.initialize!
     end
     it 'inserts the middleware' do
+      @app.initialize!
       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
+      @app.initialize!
       expect(@app.middleware.middlewares).not_to include(Rack::DevMark::Middleware)
     end
+    context "with rack_dev_mark_env" do
+      before do
+        ENV['RACK_DEV_MARK_ENV'] = 'test'
+      end
+      it 'inserts the middleware' do
+        @app.initialize!
+        expect(@app.middleware.middlewares).to include(Rack::DevMark::Middleware)
+      end
+    end
   end
   context "rack_dev_mark theme" do
     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.theme = [theme]
-      @app.initialize!
     end
     it 'inserts the middleware' do
+      @app.initialize!
       expect(theme).to receive(:setup)
     end
   end
@@ -43,9 +52,9 @@ describe Rack::DevMark::Railtie do
     before do
       @app.config.rack_dev_mark.enable = true
       @app.config.rack_dev_mark.custom_theme = [theme]
-      @app.initialize!
     end
     it 'inserts the middleware' do
+      @app.initialize!
       expect(theme).to receive(:setup)
     end
   end

data/spec/rack/dev-mark_spec.rb

@@ -27,6 +27,12 @@ describe Rack::DevMark do
       ENV['RAILS_ENV'] = 'def'
       expect(subject.env).to eq('def')
     end
+    it "returns rack_dev_mark_env instead of rails_env" do
+      ENV['RACK_ENV'] = 'abc'
+      ENV['RAILS_ENV'] = 'def'
+      ENV['RACK_DEV_MARK_ENV'] = 'ghi'
+      expect(subject.env).to eq('ghi')
+    end
   end
   describe "::env=" do
     it "sets custom env" do
@@ -55,4 +61,43 @@ describe Rack::DevMark do
       expect(subject.revision).to eq('custom')
     end
   end
+  describe "::timestamp" do
+    let(:time) { Time.new(2000, 1, 2) }
+    after do
+      ::File.delete('REVISION') if ::File.exists?('REVISION')
+      subject.instance_variable_set("@timestamp", nil)
+    end
+    it "returns timestamp" do
+      ::FileUtils.touch 'REVISION', mtime: time
+      expect(subject.timestamp).to eq(time)
+    end
+    it "returns nil if REVISION does not exist" do
+      expect(subject.timestamp).to eq(nil)
+    end
+  end
+  describe "::timestamp=" do
+    it "sets custom timestamp by string" do
+      subject.timestamp = '2014/3/1'
+      expect(subject.timestamp).to eq(Time.new(2014, 3, 1))
+    end
+
+    it "sets custom timestamp by time object" do
+      subject.timestamp = Time.new(2014, 4, 1)
+      expect(subject.timestamp).to eq(Time.new(2014, 4, 1))
+    end
+  end
+  describe "::rack_dev_mark_env" do
+    it "returns nil" do
+      ENV['RACK_DEV_MARK_ENV'] = nil
+      expect(subject.rack_dev_mark_env).to eq(nil)
+    end
+    it "returns nil" do
+      ENV['RACK_DEV_MARK_ENV'] = ''
+      expect(subject.rack_dev_mark_env).to eq(nil)
+    end
+    it "returns custom value" do
+      ENV['RACK_DEV_MARK_ENV'] = 'abc'
+      expect(subject.env).to eq('abc')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-dev-mark
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,7 +66,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Differentiate development environemt from production
+description: Differentiate development environment from production
 email:
 - daisuketaniwaki@gmail.com
 executables: []
@@ -80,14 +80,7 @@ files:
 - README.md
 - Rakefile
 - THEME.md
-- gemfiles/gemfile
-- gemfiles/rack.1.1.x.gemfile
-- gemfiles/rack.1.2.x.gemfile
-- gemfiles/rack.1.3.x.gemfile
-- gemfiles/rack.1.4.x.gemfile
-- gemfiles/rails.3.2.x.gemfile
-- gemfiles/rails.4.0.x.gemfile
-- gemfiles/rails.4.1.x.gemfile
+- VERSION
 - lib/generators/rack/dev-mark/install_generator.rb
 - lib/rack-dev-mark.rb
 - lib/rack/dev-mark.rb
@@ -145,7 +138,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Differentiate development environemt from production
+summary: Differentiate development environment from production
 test_files:
 - spec/generators/rack/dev-mark/install_generator_spec.rb
 - spec/rack/dev-mark/middleware_spec.rb

data/gemfiles/gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '../'

data/gemfiles/rack.1.1.x.gemfile

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

data/gemfiles/rack.1.2.x.gemfile

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

data/gemfiles/rack.1.3.x.gemfile

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

data/gemfiles/rack.1.4.x.gemfile

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

data/gemfiles/rails.3.2.x.gemfile

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

data/gemfiles/rails.4.0.x.gemfile

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

data/gemfiles/rails.4.1.x.gemfile

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