rack-revision 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 572e54825a1905f7d369a997922a7d6c3d9031f7
+  data.tar.gz: a5411935f6ae46862d16ddcee5efc3c0643325f7
+SHA512:
+  metadata.gz: f771123d5a308206c920696f2c152d22cc40b99f7f13ea977a071edeb8d5dc0de42b160dd8b19a9b0f467fd643c579d5eb416b65a121221b804d10a86b1bd901
+  data.tar.gz: 5dbd53b2ecc0322bbe2cce1a62b2d6736f20a8b5a59bdba61480e2e7aab5f900e7fb2b07a01b3644c9b83264e1e8e0769ef08f4a96ace13a60e1b8ad4f351817

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -3,22 +3,22 @@
 Rack::Revision is a quick drop-in component to enable code revision tracking. 
 It adds `X-Revision` header with the code revision from capistrano's REVISION file.
 
+[![Build Status](https://travis-ci.org/sosedoff/rack-revision.png?branch=master)](https://travis-ci.org/sosedoff/rack-revision)
+
 ## Installation
 
-From rubygems:
+Add dependency to your Gemfile:
 
 ```
-gem install rack-revision
+gem "rack-revision"
 ```
 
-Or install with bundler:
+Install gem:
 
 ```
-gem 'rack-revision'
+bundle install
 ```
 
-And run `bundle install`
-
 ## Usage
 
 Rack::Revision is implemented as a piece of Rack middleware and can be used with
@@ -26,17 +26,18 @@ any Rack-based application. If you have a `config.ru` rackup file you can
 drop the following snippet (for sinatra app):
 
 ```ruby
-require 'rack/revision'
+require "rack/revision"
 
 # Basic example
 use Rack::Revision
 
 # With custom revision header
-use Rack::Revision, :header => 'X-CODE-VERSION'
+use Rack::Revision, :header => "X-CODE-VERSION"
 
 # With custom filename and default value
-use Rack::Revision, :filename => '.version', :default => 'n/a'
+use Rack::Revision, :filename => ".version", :default => "n/a"
 
+# Execute application
 run Sinatra::Application
 ```
 
@@ -57,10 +58,21 @@ rake test
 
 ## License
 
-Copyright (c) 2012 Dan Sosedoff.
+Copyright (c) 2012-2013 Dan Sosedoff.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/rack/revision.rb

@@ -6,20 +6,22 @@ module Rack
     @@revision = nil
 
     def initialize(app, options={})
-      @options = {
-        :header   => options[:header].nil? ? 'X-Revision' : options[:header],
-        :filename => options[:filename] || 'REVISION',
-        :default  => options[:default]  || 'UNDEFINED',
-        :rack_env => options[:rack_env].nil? ? 'rack.app_revision' : options[:rack_env]
-      }
+      initialize_options(options)
 
       @app = app
     end
  
     def call(env)
-      env[@options[:rack_env]] = revision if @options[:rack_env]
+      if @options[:rack_env]
+        env[@options[:rack_env]] = revision
+      end
+
       status, headers, body = @app.call(env)
-      headers[@options[:header]] = revision if @options[:header]
+
+      if @options[:header]
+        headers[@options[:header]] = revision
+      end
+
       [status, headers, body]
     end
 
@@ -34,11 +36,24 @@ module Rack
     end
  
     def read_revision
-      File.exists?(detected_filename) ? File.read(detected_filename).strip : @options[:default]
+      if File.exists?(detected_filename)
+        File.read(detected_filename).strip
+      else
+        @options[:default]
+      end
     end
 
     def detected_filename
       @file ||= (@options[:filename] =~ /\A\// ? @options[:filename] : File.join(Dir.pwd, @options[:filename]))
     end
+
+    def initialize_options(options)
+      @options = {
+        :header   => options[:header].nil? ? "X-Revision" : options[:header],
+        :rack_env => options[:rack_env].nil? ? "rack.app_revision" : options[:rack_env],
+        :filename => options[:filename] || "REVISION",
+        :default  => options[:default]  || "UNDEFINED"
+      }
+    end
   end
 end

data/lib/rack/revision/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Revision
-    VERSION = '1.0.1'
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rack-revision
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157761320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157761320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2157759940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157759940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds an extra X-REVISION header with source code revision string (git,
   svn, etc)
 email:
@@ -52,28 +57,26 @@ files:
 - test/test_revision.rb
 homepage: http://github.com/sosedoff/rack-revision
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Code ravision rack middleware
 test_files:
 - test/test_revision.rb
-has_rdoc: