machined 0.9.2 → 0.9.3

data/lib/machined/middleware/static.rb

@@ -8,11 +8,11 @@ module Machined
     # middleware or application. It's basically
     # a simplified version of ActionDispatch::Static.
     class Static
-      def initialize(app, root = '.', cache_control = nil)
+      def initialize(app, root = '.', headers = {})
         @app = app
         @root = File.expand_path(root)
         @compiled_root = /^#{Regexp.escape(@root)}/
-        @file_server = ::Rack::File.new(@root, 'Cache-Control' => cache_control)
+        @file_server = ::Rack::File.new(@root, headers)
       end
 
       def call(env)

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/spec/machined/middleware/static_spec.rb

@@ -2,36 +2,36 @@ require 'spec_helper'
 
 describe Machined::Middleware::Static do
   include Rack::Test::Methods
-  
+
   let(:root)    { create_construct }
   after(:each)  { root.destroy! }
-  
+
   let(:app) do
     Rack::Builder.new.tap do |app|
-      app.use Machined::Middleware::Static, root, 'public, max-age=60'
+      app.use Machined::Middleware::Static, root, 'Cache-control' => 'public, max-age=60'
       app.run Proc.new { |env| [200, {'Content-Type' => 'text/plain'}, ['Hello, World!']] }
     end.to_app
   end
-  
+
   it 'serves dynamic content' do
     get('/nofile').body.should == 'Hello, World!'
   end
-  
+
   it 'sets cache control headers' do
     root.file 'file.txt', 'File Content'
     get('/file.txt').headers['Cache-Control'].should == 'public, max-age=60'
   end
-  
+
   it 'serves static files in the root directory' do
     root.file 'file.txt', 'File Content'
     get('/file.txt').body.should == 'File Content'
   end
-  
+
   it 'serves static files in a subdirectory' do
     root.file 'sub/directory/file.txt', 'Subdirectory File Content'
     get('/sub/directory/file.txt').body.should == 'Subdirectory File Content'
   end
-  
+
   it 'serves static index file in the root directory' do
     root.file 'index.html', 'Static Index Content'
     get('/index.html').body.should == 'Static Index Content'
@@ -39,14 +39,14 @@ describe Machined::Middleware::Static do
     get('/').body.should           == 'Static Index Content'
     get('').body.should            == 'Static Index Content'
   end
-  
+
   it 'serves static index file in directory' do
     root.file 'foo/index.html', 'Static Index Content in Directory'
     get('/foo/index.html').body.should == 'Static Index Content in Directory'
     get('/foo/').body.should           == 'Static Index Content in Directory'
     get('/foo').body.should            == 'Static Index Content in Directory'
   end
-  
+
   it 'serves static html file in directory' do
     root.file 'foo/bar.html', 'HTML Content in Directory'
     get('/foo/bar.html').body.should == 'HTML Content in Directory'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machined
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -428,7 +428,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1758282341700844957
+      hash: 3230074138858488384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1758282341700844957
+      hash: 3230074138858488384
 requirements: []
 rubyforge_project: machined
 rubygems_version: 1.8.23