shack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742702322489166db2ac3b9dcc3c3d334ace1f34
-  data.tar.gz: a83c87895d35d86b00c91e34c7a85786c98250c9
+  metadata.gz: b00d119b5b428f8faf4ad091c542be01296cdafe
+  data.tar.gz: 7d349a657a6c59f0e43f4c29d867bbade88fa426
 SHA512:
-  metadata.gz: 184537f683380acacda210696328e5999771be90da3b69d9fd671a03e6639769955c28b2b39f8bf600c0382f98eb5d1d1e01b92e560763887be0db4a12159b84
-  data.tar.gz: b01ba9567034c0e0f5a237be0012a0054f11c32fef56133ca8094a0006c02d9898aa07976bdb6c08a89d0f2f9c0c3fed280501ce4ab9fcbcd9b0d42fd9a6ef31
+  metadata.gz: 7704e252d1172a064540d856d70fc84a58f145970e7a085f05e0ef5494b8ed38d6f48980cc5de71255ea1a952ced8be58304db26b464a59e3d5a8a0def481860
+  data.tar.gz: 39be1338d7d5b48c89ad6069119bdda6b96c08c7499c9d7e0b1243a0ef0339b299f5e4116f048545ffb325633836db722093c1545d16862d5171ed885220981e

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.0.3
+
+- Don't show shack on print pages.
+- Expose sha for easy access from app. (`Shack.sha`)
+- Allow placement of sha from the config
+
+```
+Shack::Middleware.configure do |shack|
+  shack.horizontal = :left # or :right
+  shack.vertical = :top # or :bottom
+ end
+```
+- Add ability to override CSS styles (use `#sha-stamp`)
+- Add quick way to fire up demo server (`rake demo`)
+- Don't inject on XHR requests.
+
 ## 0.0.2
 
 - Expose `{{short_sha}}` in custom content block. - 6180bbc

data/README.md

@@ -4,6 +4,8 @@
 
 A `Rack` middleware that will add a unique identifier (`sha`) to the application. It will set a custom header (`X-Shack-Sha`) containing the sha and will automagically insert a small banner in the HTML.
 
+Visit a live demo at https://canadiaweather.herokuapp.com or:
+
 ![Shack in action](http://cl.ly/image/2F1w1E0G2C3R/Screen%20Shot%202014-12-01%20at%2000.47.23.png)
 
 ```
@@ -47,6 +49,8 @@ end
 
 And since it's Rails, it can also be done automagically if a file called `REVISION` is found in the root of your project. No initializer required. Note: by default it won't show the banner in production environments, because that just feels wrong.
 
+It's also possible to get the sha, in the running app, `Shack.sha`. This could be helpful in passing the sha along to a service like Airbrake.
+
 ## Configuration
 
 You can either set the sha directly:
@@ -69,12 +73,42 @@ end
 
 There is also a `{{short_sha}}` substition available, which returns the first 8 chars of the set `sha`.
 
+## Styling
+
+If you define your own CSS for `#shack-stamp` and `#shack-stamp__content`, you can override the default styling. (It uses classes so your specificity should be higher)
+
+If you just want to change the position of the sha, you can do this in a configuration block:
+
+```ruby
+# Sets the sha to the top left corner
+Shack::Middleware.configure do |shack|
+  shack.horizontal = :left # or :right
+  shack.vertical = :top # or :bottom
+ end
+```
+
 ## How do I set the sha?
 
 Either write it to a `REVISION` file on deploy (Capistrano used to this by default, now you can [add a task](https://github.com/capistrano/capistrano/pull/757), in `mina` I'm waiting on this [pull request](https://github.com/mina-deploy/mina/pull/260)), or set an `ENV` variable containing the sha.
 
+So instead of using regular mina add this to your Gemfile:
+
+```
+gem "mina", git: "https://github.com/pjaspers/mina.git", branch: "pj-write-sha-to-revision-file"
+```
+
 Now you can set the sha in the configure block.
 
+## OK that's fine, but I'm on Heroku
+
+In [canadia](https://github.com/pjaspers/canadia) I made an after deploy hook that added an `ENV` variable which set the sha. The easiest way I could do this is with something like this:
+
+```
+curl -n -H "Authorization: Bearer $HEROKU_API_KEY" -X PATCH https://api.heroku.com/apps/canadiaweather/config-vars -H "Accept: application/vnd.heroku+json; version=3" -H "Content-Type: application/json" -d '{"SHA":"'"$TRAVIS_COMMIT"'"}'
+```
+
+(I used Travis to do the deploying, look [here](https://github.com/pjaspers/canadia/blob/8201454ed538ade36e133645bf1fcd1ee10e05a6/.travis.yml) for all the glorious details)
+
 ## Signed gem
 
 `shack` is cryptographically signed. To be sure the gem you install hasn’t been tampered with:

data/Rakefile

@@ -7,6 +7,7 @@ end
 
 task :default => :test
 
+desc "Drops you in a repl with Shack already loaded"
 task :console do
   require 'pry'
   require './lib/shack'
@@ -14,6 +15,28 @@ task :console do
   Pry.start Shack
 end
 
+desc "Starts a small webapp to see shack in action"
+task :demo do
+  require "rack"
+  require "./lib/shack"
+  app = Rack::Builder.new do
+    Shack::Middleware.configure do |shack|
+      shack.sha = "80adf8f24baee8d0feb43cdc1ce744c69a54ac99"
+      shack.content = "<a href='https://github.com/pjaspers/shack/commit/{{sha}}'>{{short_sha}}</a>"
+      shack.vertical = :top
+      shack.horizontal = :left
+    end
+    use Shack::Middleware
+    # 1.9 has a problem with `run -> (env)`, so that's why the -> is touching the (
+    # Yep. Annoys the hell out of me.
+    run ->(env) {
+      [200, {"Content-Type" => "text/html"}, ["<html><body>KAAAHN</body></html>"]]
+    }
+  end
+
+  Rack::Server.start app: app
+end
+
 task :checksum do
   require 'digest/sha2'
   abort_with_error "Set 'GEM' with name-0.x.x to calculate checksum" unless ENV["GEM"]

data/certs/pjaspers.pem

@@ -1,19 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+cEwq742XFnUzr0ltFTqM+g==
 -----END CERTIFICATE-----

data/lib/shack/configuration.rb

@@ -0,0 +1,58 @@
+module Shack
+  # Used to configure the middleware
+  class Configuration
+    # The sha that should be displayed
+    attr_accessor :sha
+
+    # A string (can be html) that will be displayed in the UI
+    attr_accessor :content
+
+    # Boolean. Show or hide the samp
+    attr_accessor :hide_stamp
+
+    # Sets the vertical placement.
+    # :top or : bottom (defaults to :bottom)
+    attr_accessor :vertical
+
+    # Sets the horizontal placement.
+    # :left or :right (default to :right)
+    attr_accessor :horizontal
+
+    def initialize
+      @vertical = :bottom
+      @horizontal = :right
+    end
+
+    def [](key)
+      if respond_to? key
+        public_send(key)
+      end
+    end
+
+    def to_hash
+      {content: content,
+       vertical: vertical,
+       horizontal: horizontal}
+    end
+
+    def hide_stamp?
+      !!hide_stamp
+    end
+
+    def horizontal=(thing)
+      if [:left, :right].include? thing
+        @horizontal = thing
+      else
+        fail ArgumentError.new("horizontal needs to be :left or :right")
+      end
+    end
+
+    def vertical=(thing)
+      if [:top, :bottom].include? thing
+        @vertical = thing
+      else
+        fail ArgumentError.new("vertical needs to be :top or :bottom")
+      end
+    end
+  end
+end

data/lib/shack/middleware.rb

@@ -8,6 +8,8 @@ module Shack
     end
 
     def call(env)
+      # Make it easy to get sha from other processes
+      Shack.sha = sha
       status, headers, body = @app.call(env)
       return [status, headers, body] unless sha
       headers[HEADER_NAME] = sha
@@ -19,8 +21,12 @@ module Shack
       end
     end
 
+    def config
+      self.class.config
+    end
+
     def inject_stamp(status, headers, body)
-      return nil if !!self.class.hide_stamp
+      return nil if !!config.hide_stamp?
       return nil unless Stamp.stampable?(headers)
       response = Rack::Response.new([], status, headers)
 
@@ -35,20 +41,31 @@ module Shack
       response.finish
     end
 
-    # Initialiser over class-sha.
+    # Initialiser over config-sha.
     def sha
-      @sha || self.class.sha
+      @sha || config.sha
     end
 
     def stamped(body)
-      Stamp.new(body, sha, self.class.content).result
+      Stamp.new(body, sha, config).result
     end
 
     class << self
-      attr_accessor :sha, :content, :hide_stamp
+      attr_writer :configuration
+
+      def config
+        @configuration ||= Configuration.new
+      end
 
+      # Allow configuration of the Middleware
+      #
+      #      Shack::Middleware.configure do |shack|
+      #        shack.sha = "thisiasha"
+      #        shack.hide_stamp = true
+      #      end
+      #
       def configure(&block)
-        block.call(self)
+        block.call(config)
       end
     end
   end

data/lib/shack/stamp.rb

@@ -1,18 +1,32 @@
 module Shack
   # Takes the body and adds a stamp to it, containing the supplied content.
-  # At the moment, it's just a red div with white text.
+  #
+  # Takes some additional options to set the sha in the correct position
+  #
+  #      Stamp.new("html body", "123", {vertical: :left, horizontal: :right}).html
+  #      # => HTML with the stamp set at the top left corner
+  #
   class Stamp
     # body - original body
     # content - gets added to view
-    def initialize(body, sha, custom_content = nil)
+    # options - Either a hash or a Configuration instance
+    def initialize(body, sha, options = {})
       @body = body
       @sha = sha || ""
       @short_sha = @sha[0..8]
-      @custom_content = custom_content if custom_content
+
+      options = Configuration.new.to_hash.merge(options || {})
+      @custom_content = options[:content] if options[:content]
+      @vertical = options[:vertical]
+      @horizontal = options[:horizontal]
     end
 
+    # Only inject html on html requests, also avoid xhr requests
+    #
+    #       headers - Headers from a Rack request
     def self.stampable?(headers)
-      !!(headers["Content-Type"] =~ %r{text/html})
+      !!(headers["Content-Type"] =~ %r{text/html}) &&
+        !!(headers["HTTP_X_REQUESTED_WITH"] != "XMLHttpRequest")
     end
 
     def result
@@ -30,12 +44,62 @@ module Shack
       end
     end
 
+    # Returns the CSS needed to round the correct corner
+    #
+    # `border-top-left-radius`
+    def rounded_corner(horizontal, vertical)
+      css = [] << "border"
+      attrs = {
+        top: "bottom", bottom: "top",
+        left: "right", right: "left" }
+      css << attrs.fetch(vertical)
+      css << attrs.fetch(horizontal)
+      css << "radius"
+      css.join("-")
+    end
+
+    # Returns the CSS needed for positioning the stamp
+    #
+    # `position: fixed; top: 0; left: 0;`
+    def position_css(horizontal, vertical)
+      attrs = {
+        top: "top: 0;", bottom: "bottom: 0;",
+        left: "left: 0;", right: "right: 0;" }
+      css = [] << "position: fixed;"
+      css << attrs.fetch(vertical)
+      css << attrs.fetch(horizontal)
+      css.join("")
+    end
+
     def html
       <<HTML
-<div id="sha-stamp" style="position: fixed; bottom: 0; right: 0; height: 16px; background: rgb(0, 0, 0) transparent; background-color: rgba(0, 0, 0, 0.2); padding: 0 5px; border-top-left-radius: 5px; z-index: 2147483647; font-size: 12px;">
-  <span style="text-align: center;">
-    <small style="color: white; font-weight: normal;font-size: 12px;">#{content}</small>
-  </span>
+<style>
+.sha-stamp {
+  #{position_css(@horizontal, @vertical)}
+  #{rounded_corner(@horizontal, @vertical)}: 5px;
+  height: 16px;
+  background: rgb(0, 0, 0) transparent; background-color: rgba(0, 0, 0, 0.2);
+  padding: 0 5px;
+  z-index: 2147483647; font-size: 12px;
+}
+.sha-stamp__content {
+  text-align: center;
+  color: white;
+  font-family: "Lucida Console", Monaco, monospace;
+  font-weight: normal;
+  font-size: 12px;
+  margin: 0;
+}
+.sha-stamp__content a {
+  text-decoration: none;
+  color: white;
+}
+@media print {
+  .sha-stamp { display: none; }
+}
+</style>
+<div id="shack-stamp" class="sha-stamp">
+  <p id="shack-stamp__content" class="sha-stamp__content">#{content}</p>
 </div>
 HTML
     end

data/lib/shack/version.rb

@@ -1,3 +1,3 @@
 module Shack
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/shack.rb

@@ -1,8 +1,19 @@
 require "shack/version"
+require "shack/configuration"
 require "shack/middleware"
 require "shack/stamp"
 require "shack/railtie" if defined?(Rails)
 
 module Shack
-  # Your code goes here...
+  # If the Middleware is called and initialized, this sha will be set
+  # This could be used for easy passing to something like `Airbrake`
+  def self.sha
+    if defined? @@sha
+      @@sha
+    end
+  end
+
+  def self.sha=(sha)
+    @@sha = sha
+  end
 end

data/shack.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "shack"
   spec.version       = Shack::VERSION
   spec.authors       = ["pjaspers"]
-  spec.email         = ["piet@jaspe.rs"]
+  spec.email         = ["piet@pjaspers.com"]
   spec.summary       = %q{Sha + Rack = Shack }
   spec.description   = %q{Rack middleware to expose a potential sha}
   spec.homepage      = ""

data/test/configration_test.rb

@@ -0,0 +1,28 @@
+require "helper.rb"
+
+describe Shack::Configuration do
+
+  it "defaults vertical to bottom" do
+    assert_equal :bottom, Shack::Configuration.new.vertical
+  end
+
+  it "defaults horizontal to right" do
+    assert_equal :right, Shack::Configuration.new.horizontal
+  end
+
+  it "has handy hide_stamp?" do
+    config = Shack::Configuration.new
+    config.hide_stamp = nil
+    refute config.hide_stamp?
+  end
+
+  it "raises for invalid horizontal settings" do
+    config = Shack::Configuration.new
+    assert_raises(ArgumentError) { config.horizontal = "Green Mile" }
+  end
+
+  it "raises for invalid vertical settings" do
+    config = Shack::Configuration.new
+    assert_raises(ArgumentError) { config.vertical = "Green Mile" }
+  end
+end

data/test/helper.rb

@@ -3,6 +3,7 @@
 require "minitest/autorun"
 require "minitest/pride"
 require "mocha"
+require "pry"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))

data/test/middleware_test.rb

@@ -4,6 +4,7 @@ require "rack/mock"
 describe Shack::Middleware do
   before do
     @app = ->(env) { [200, env, "app"] }
+    reset_config
   end
 
   describe "without a sha" do
@@ -28,13 +29,6 @@ describe Shack::Middleware do
       @middleware = Shack::Middleware.new(@app, @sha)
     end
 
-    after do
-      Shack::Middleware.configure do |shack|
-        shack.sha = nil
-        shack.content = nil
-      end
-    end
-
     it "doesn't break the original app" do
       status, _, _ = @middleware.call(fake_env("http://something.com"))
       assert_equal status, 200
@@ -44,6 +38,14 @@ describe Shack::Middleware do
       _, headers, _ = @middleware.call(fake_env("http://something.com"))
       assert_equal @sha, headers[Shack::Middleware::HEADER_NAME]
     end
+
+    it "exposes the sha to the top Shack module" do
+      if Shack.class_variable_defined? "@@sha"
+        Shack.remove_class_variable "@@sha"
+      end
+      _, headers, _ = @middleware.call(fake_env("http://something.com"))
+      assert_equal @sha, Shack.sha
+    end
   end
 
   describe "injecting html" do
@@ -53,19 +55,21 @@ describe Shack::Middleware do
       _, _, response = middleware.call(fake_env("http://something.com"))
       assert_match(/Rollo Tomassi/, response.body.first)
     end
+
+    it "doesn't inject on xhr requests" do
+      app = ->(_) { [200, { "Content-Type" => "text/html" }, fake_page] }
+      middleware = Shack::Middleware.new(app, "Rollo Tomassi")
+      _, _, response = middleware.call(xhr_env("http://something.com"))
+      assert_match(/Rollo Tomassi/, response.body.first)
+    end
+
   end
 
   describe ".configure" do
-    after do
-      Shack::Middleware.configure do |shack|
-        shack.sha = nil
-        shack.content = nil
-      end
-    end
 
     it "can set a sha" do
       Shack::Middleware.configure { |s| s.sha = "O'Sullivan" }
-      assert_equal Shack::Middleware.sha, "O'Sullivan"
+      assert_equal Shack::Middleware.config.sha, "O'Sullivan"
     end
 
     it "favors the initialized sha over the configured one" do
@@ -80,7 +84,21 @@ describe Shack::Middleware do
       Shack::Middleware.configure do |s|
         s.content = string
       end
-      assert_equal Shack::Middleware.content, string
+      assert_equal Shack::Middleware.config.content, string
+    end
+
+    it "can can set the horizontal orientation" do
+      response = response_from_configured_app do |c|
+        c.horizontal = :left
+      end
+      assert_match(/left: 0;/, response.body.first)
+    end
+
+    it "can can set the vertical orientation" do
+      response = response_from_configured_app do |c|
+        c.vertical = :top
+      end
+      assert_match(/top: 0;/, response.body.first)
     end
 
     it "sets the stamp with the configuration" do
@@ -93,7 +111,18 @@ describe Shack::Middleware do
       _, _, response = middleware.call(fake_env("http://something.com"))
       assert_match(/Ronnie The Rocket - abc123/, response.body.first)
     end
+
+    it "can set vertical to top" do
+      Shack::Middleware.configure { |s| s.vertical = :top }
+      assert_equal Shack::Middleware.config.vertical, :top
+    end
+
+    it "can set horizontal to left" do
+      Shack::Middleware.configure { |s| s.horizontal = :left }
+      assert_equal Shack::Middleware.config.horizontal, :left
+    end
   end
+
   def fake_page
     "<html><body></body></html>"
   end
@@ -101,4 +130,21 @@ describe Shack::Middleware do
   def fake_env(url, options = {})
     Rack::MockRequest.env_for(url, options)
   end
+
+  def xhr_env(url, options = {})
+    options = { "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest"}.merge(options || {})
+    Rack::MockRequest.env_for(url, options)
+  end
+
+  def reset_config
+    Shack::Middleware.configuration = nil
+  end
+
+  def response_from_configured_app(&block)
+    app = ->(_) { [200, { "Content-Type" => "text/html" }, fake_page] }
+    Shack::Middleware.configure { |s| block.call(s) }
+    middleware = Shack::Middleware.new(app, "sha")
+    _, _, response = middleware.call(fake_env("http://something.com"))
+    response
+  end
 end

data/test/shack_test.rb

@@ -1,7 +1,10 @@
 require "helper"
 
 describe Shack do
-  it "'s alive!" do
-    assert true
+  it "returns nil if it can't find a sha" do
+    if Shack.class_variable_defined? "@@sha"
+      Shack.remove_class_variable "@@sha"
+    end
+    assert_nil Shack.sha
   end
 end

data/test/stamp_test.rb

@@ -23,17 +23,17 @@ describe Shack::Stamp do
     end
 
     it "should use custom_content if provided" do
-      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", "Rollo Tomassi")
+      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", content: "Rollo Tomassi")
       assert_match(/Rollo Tomassi/, s.result)
     end
 
     it "should use sha in custom_content if provided" do
-      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", "Rollo Tomassi said {{sha}}")
+      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", content: "Rollo Tomassi said {{sha}}")
       assert_match(/Rollo Tomassi said Jack Vincennes/, s.result)
     end
 
     it "uses short sha in custom_content if wanted" do
-      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", "Rollo Tomassi said {{short_sha}}")
+      s = Shack::Stamp.new("<html><body></body></html>", "Jack Vincennes", content: "Rollo Tomassi said {{short_sha}}")
       assert_match(/Rollo Tomassi said Jack Vi/, s.result)
       refute_match(/Jack Vincennes/, s.result)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - pjaspers
@@ -10,25 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDKDCCAhCgAwIBAgIBADANBgkqhkiG9w0BAQUFADA6MQ0wCwYDVQQDDARwaWV0
-  MRUwEwYKCZImiZPyLGQBGRYFamFzcGUxEjAQBgoJkiaJk/IsZAEZFgJyczAeFw0x
-  NDA0MDcyMTQyMDNaFw0xNTA0MDcyMTQyMDNaMDoxDTALBgNVBAMMBHBpZXQxFTAT
-  BgoJkiaJk/IsZAEZFgVqYXNwZTESMBAGCgmSJomT8ixkARkWAnJzMIIBIjANBgkq
-  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+SQ5IzhMaUM/jrUBAP5l0/Z5ttLQb2lT
-  hotS1Yraz3hclbGhBhDcQilW11GSftUbWhaiMQwNXqaEN9ctmzE5JukOdwhtNSLq
-  IDw+TEEXbg/VImlFhryg9vunffPeOBUlnxdY484DOushNN50H/LA+jAoFST3+oZq
-  CXuA3yFi8ZTPqhHrEn1bkycUfLX+TOm07ZfCPly9fAVYhOYaVaPeYkHAO83+Ic63
-  9YGqD1sFeZ7hfSxqfYEBxpiM0+qztqHCVNrehkzX2oUmY06eVpSu2mzLYmcCD58f
-  inVDRBe/3ygkACxZCA7pjIuqHOpKxSbYMrgEkrAtpA7lkIMaveMY9QIDAQABozkw
-  NzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSSJbKSj/62BYq/1utxyqsShRum8jALBgNV
-  HQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBAJkG60vFt/GBuMvTdMtFCw4jJiRo
-  8n6dMQrL2kZdD0ZNeidLfTMzhflv+9ZrWfcFWzfqaGgKJckBd2wlfQiR78ts9zom
-  bX9B9n/Ad32womLnb0aeTuEHX6Vy4qs4zl+VnXy4g1NQ2lfcnksUsjBM8v8GYTjy
-  ssiOQnzrWxNyjR01uY5g/ON/IlRKNpihe7Qze1oGWdopZP6Lwfhir5ShbDETCKQv
-  CuJWUOdBRsHbSraLW8n/vc/fZGqVzDAghs26bxmwicw+4/VgO2soYka81t8pUuG6
-  vLWWrtmIv8+cmMgvltP5AR5j2oYHYPPA9YFXuO9t1JVqJiNHm9JNRseEoBc=
+  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
+  cEwq742XFnUzr0ltFTqM+g==
   -----END CERTIFICATE-----
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,7 +48,7 @@ dependencies:
         version: '1.7'
 description: Rack middleware to expose a potential sha
 email:
-- piet@jaspe.rs
+- piet@pjaspers.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,12 +64,14 @@ files:
 - checksum/shack-0.0.1.sha512
 - checksum/shack-0.0.2.sha512
 - lib/shack.rb
+- lib/shack/configuration.rb
 - lib/shack/middleware.rb
 - lib/shack/railtie.rb
 - lib/shack/stamp.rb
 - lib/shack/version.rb
 - shack.gemspec
 - test/benchmark.rb
+- test/configration_test.rb
 - test/helper.rb
 - test/middleware_test.rb
 - test/shack_test.rb
@@ -92,12 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sha + Rack = Shack
 test_files:
 - test/benchmark.rb
+- test/configration_test.rb
 - test/helper.rb
 - test/middleware_test.rb
 - test/shack_test.rb