rack-dev-mark 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWYzMTgzODMzODRiNGNiNGFjM2NkYWE2OWZkZjcxZDJhYzhkNTM4NA==
+    MDZhYWU3YWUzMjdiM2MxMDc2ZmY3ODdjZDA2NTlmZDBjNDMwYzY0ZQ==
   data.tar.gz: !binary |-
-    YjViMzZiYzlkYmZlNjkzNmYwOGMwYjMyYzRlYTdjNzY3OWZiZmFjYw==
+    ZWIwMDliNmZmZmQ5NTg2NTNjNWNiODVlNGI3NDQ0YjM1MDQ5N2E4OA==
 SHA512:
   metadata.gz: !binary |-
-    Y2ZjNjQ5MTEwYzA3ZTAyOGM3Mzc3Y2E4ODY3M2UzNjllNjhmZjNiMWNlNTY4
-    NGUwNGVmNzI2Njg4MTBlOTYyYWRmNjU5NmQ2MWVkMTYyMDc2MTgzOWNjN2I1
-    ZDI1OWFjNDAwMjlkZDU3MGJlMjdkMGQ4N2I1MmI5MWUzMjI4OGY=
+    OTFjY2RiMDIzMmY2MGQwNjEzZjk4ZDZmNmFhNjI5NTJlYWZmMWFjYjg0YmU0
+    ZTYzNjhjZDkwYTA0ZTA5OWFkZTRiMDlmMjA3NTdiZjQ3ZGZkNWEwZjI3ZDQ4
+    MGYyZmMxYTZiMWZjNTk3ZGNmNzhjZmJmZmQ5ZjRiZTlkNWMxMmU=
   data.tar.gz: !binary |-
-    N2IwMTg3MWE4Yjg5ODViZWFjYWQ1OTNmMjUyNWE1ZjkxMDc4ZDRhNzVkYzQz
-    MWRkMmQyM2Y2YzFhMjRmYzVkOGExZmRjYTdjZDEzMDg1YzliNWRkNDYzMmY0
-    MmZjMWI1YTk1YTU3ZjgwNTkyNDA5NDVlNGY5NjM1M2IzOThkNjU=
+    YzliN2QzODAzMmM2OTdkZWFmNTY5YWQzNDVmYTFhN2RjYjFhY2ZlYjI3YjAw
+    Njg1MDJlYzc1N2IxZmE0MjM1Mzk3MzAyMGZmN2RmNzljYTMyOTJkZTY2OTAy
+    OWY5ZDc1MmMzMDQ3YmUwMzM0MjkyYjY5YmRjMzc2ZDA0NzBmNmI=

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

@@ -7,7 +7,9 @@ module Rack
       def initialize(app, themes = [:title, :github_fork_ribbon])
         @app = app
         @themes = [themes].flatten.map do |theme|
-          theme.is_a?(Symbol) ? Rack::DevMark::Theme.const_get(camelize(theme.to_s)).new : theme
+          theme = theme.is_a?(Symbol) ? Rack::DevMark::Theme.const_get(camelize(theme.to_s)).new : theme
+          theme.setup Rack::DevMark.env, Rack::DevMark.revision
+          theme
         end
       end
       
@@ -39,7 +41,7 @@ module Rack
 
       def insert_dev_marks(body)
         @themes.each do |theme|
-          body = theme.insert_into(body, Rack::DevMark.env, Rack::DevMark.revision)
+          body = theme.insert_into(body)
         end
         body
       end

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

@@ -8,6 +8,12 @@ e.g.
 
 `My Homepage` on development env will be `(development) My Homepage`
 
+### options
+
+`type`: `prefix` (default) or `postfix`
+
+`upcase`: `true` or `false` (default)
+
 ## 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)

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

@@ -2,15 +2,20 @@ module Rack
   module DevMark
     module Theme
       class Base
+        attr_reader :env, :revision
+
         def initialize(*args)
           raise RuntimeError, 'Abstract class can not be instantiated' if self.class == Rack::DevMark::Theme::Base
         end
 
-        def insert_into(html, env, revision)
-
+        def setup(env, revision)
+          @env = env
+          @revision = revision
         end
 
-        private
+        def insert_into(html)
+
+        end
 
         def stylesheet_link_tag(path)
           %Q~<style>#{::File.open(::File.join(::File.dirname(__FILE__), '../../../../vendor/assets/stylesheets', path)).read}</style>~

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

@@ -9,7 +9,7 @@ module Rack
           @options = options
         end
 
-        def insert_into(html, env, revision)
+        def insert_into(html)
           position = @options[:position] || 'left'
           color = @options[:color] || 'red'
           fixed = @options[:fixed] ? ' fixed' : ''

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

@@ -1,9 +1,19 @@
 module Rack
   module DevMark
     module Theme
-      class Title
-        def insert_into(html, env, revision)
-          html.sub %r{(<title[^>]*>)}i, "\\1(#{env}) "
+      class Title < Base
+        def initialize(options = {})
+          @options = options
+        end
+
+        def insert_into(html)
+          s = env.to_s
+          s = s.upcase if @options[:upcase]
+          if @options[:type].to_s == 'postfix'
+            html.sub %r{(</title[^>]*>)}i, " (#{s})\\1"
+          else
+            html.sub %r{(<title[^>]*>)}i, "\\1(#{s}) "
+          end
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Rack
   module DevMark
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Rack::DevMark::Middleware do
   let(:headers) { {'Content-Type' => 'text/html; charset=utf-8'} }
   let(:body) { ['response'] }
-  let(:theme) { d = double; allow(d).to receive(:insert_into){ |b, _, _| "#{b} dev-mark" }; d }
+  let(:theme) { d = double setup: nil; allow(d).to receive(:insert_into){ |b| "#{b} dev-mark" }; d }
   let(:app) { double call: [200, headers, body] }
   subject { Rack::DevMark::Middleware.new(app, theme) }
   before do
@@ -21,8 +21,15 @@ describe Rack::DevMark::Middleware do
     _, headers, _ = subject.call({})
     expect(headers).to include('X-Rack-Dev-Mark-Env' => 'test')
   end
+  context "symbol theme" do
+    let(:theme) { :title }
+    it "uses title" do 
+      expect_any_instance_of(Rack::DevMark::Theme::Title).to receive(:insert_into).once.and_return('')
+      subject.call({})
+    end
+  end
   context "multiple themes" do
-    let(:_theme) { d = double; allow(d).to receive(:insert_into){ |b, _, _| "#{b} dev-mark" }; d }
+    let(:_theme) { d = double setup: nil; allow(d).to receive(:insert_into){ |b| "#{b} dev-mark" }; d }
     let(:theme) { [_theme] * 3 }
     it "uses title and github_fork_ribbon" do
       theme.each_with_index do |theme, idx|

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

@@ -6,4 +6,12 @@ describe Rack::DevMark::Theme::Base do
       Rack::DevMark::Theme::Base.new
     }.to raise_error(Rack::DevMark::RuntimeError)
   end
+  describe "subclass" do
+    subject { Class.new(Rack::DevMark::Theme::Base).new }
+    it "sets up" do
+      subject.setup 'env', 'rev'
+      expect(subject.env).to eq('env')
+      expect(subject.revision).to eq('rev')
+    end
+  end
 end

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Rack::DevMark::Theme::GithubForkRibbon do
+  include_context "theme context"
   it_behaves_like "theme" do
     let :out do
       s = <<-EOS

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

@@ -1,15 +1,36 @@
 require 'spec_helper'
 
 describe Rack::DevMark::Theme::Title do
+  include_context "theme context"
   it_behaves_like "theme" do
     let (:out) { %Q~<html><head>head<title>(env) title</title></head><body>body</body></html>~ }
     subject { Rack::DevMark::Theme::Title.new }
   end
+  context "upcase is true" do
+    let (:out) { %Q~<html><head>head<title>(ENV) title</title></head><body>body</body></html>~ }
+    subject { Rack::DevMark::Theme::Title.new(upcase: true) }
+    it_behaves_like "theme"
+  end
+  context "upcase is true" do
+    let (:out) { %Q~<html><head>head<title>(env) title</title></head><body>body</body></html>~ }
+    subject { Rack::DevMark::Theme::Title.new(upcase: false) }
+    it_behaves_like "theme"
+  end
+  context "type is prefix" do
+    let (:out) { %Q~<html><head>head<title>(env) title</title></head><body>body</body></html>~ }
+    subject { Rack::DevMark::Theme::Title.new(type: 'prefix') }
+    it_behaves_like "theme"
+  end
+  context "type is postfix" do
+    let (:out) { %Q~<html><head>head<title>title (env)</title></head><body>body</body></html>~ }
+    subject { Rack::DevMark::Theme::Title.new(type: 'postfix') }
+    it_behaves_like "theme"
+  end
   context "no title tag" do
     let (:src) { %Q~<html><head>head</head><body>body</body></html>~ }
     let (:out) { %Q~<html><head>head</head><body>body</body></html>~ }
     it "does not insert anything" do
-      expect(subject.insert_into(src, 'env', 'rev')).to eq(src)
+      expect(subject.insert_into(src)).to eq(src)
     end
   end
 end

data/spec/support/theme_helper.rb

@@ -1,10 +1,16 @@
-RSpec.shared_examples "theme" do
+RSpec.shared_context "theme context" do
   def read_stylesheet(path)
     ::File.open(::File.join(::File.dirname(__FILE__), '../../vendor/assets/stylesheets', path)).read
   end
 
+  before do
+    subject.setup 'env', 'rev'
+  end
+end
+
+RSpec.shared_examples "theme" do
   let (:src) { %Q~<html><head>head<title>title</title></head><body>body</body></html>~ }
-  it "insert env mark" do
-    expect(subject.insert_into(src, 'env', 'rev')).to eq(out)
+  it "inserts env mark" do
+    expect(subject.insert_into(src)).to eq(out)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-dev-mark
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack