machined 0.8.0 → 0.9.0

data/lib/machined.rb

@@ -10,6 +10,7 @@ module Machined
   autoload :Sprocket,               'machined/sprocket'
   autoload :StaticCompiler,         'machined/static_compiler'
   autoload :Utils,                  'machined/utils'
+  autoload :Watcher,                'machined/watcher'
   
   module Helpers
     autoload :AssetTagHelpers,      'machined/helpers/asset_tag_helpers'
@@ -19,6 +20,10 @@ module Machined
     autoload :RenderHelpers,        'machined/helpers/render_helpers'
   end
   
+  module Middleware
+    autoload :Static,               'machined/middleware/static'
+  end
+  
   module Processors
     autoload :FrontMatterProcessor, 'machined/processors/front_matter_processor'
     autoload :LayoutProcessor,      'machined/processors/layout_processor'

data/lib/machined/environment.rb

@@ -2,6 +2,8 @@ require 'ostruct'
 require 'pathname'
 require 'active_support/cache'
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/string_inquirer'
 require 'crush'
 require 'tilt'
 
@@ -9,12 +11,18 @@ module Machined
   class Environment
     include Initializable
     
+    # Delegate some common configuration accessors
+    # to the config object.
+    delegate :root, :config_path, :output_path, :lib_path, :environment,
+             :to => :config
+    
     # Default options for a Machined environment.
     DEFAULT_OPTIONS = {
       # Global configuration
       :root           => '.',
       :config_path    => 'machined.rb',
       :output_path    => 'public',
+      :lib_path       => 'lib',
       :environment    => 'development',
       :cache          => nil,
       :skip_bundle    => false,
@@ -70,27 +78,19 @@ module Machined
     # through the `#helpers` method.
     attr_reader :context_helpers
     
-    # When the Machined environment is compiling static files,
-    # this will reference the `Machined::StaticCompiler` which handles
-    # looping through the available files and generating them.
-    attr_reader :static_compiler
-    
-    # A reference to the root directory the Machined
-    # environment is run from.
-    attr_reader :root
-    
-    # A reference to the directory the Machined environment
-    # compiles its files to.
-    attr_reader :output_path
+    # When the Machined environment is used as a Rack server, this
+    # will reference the actual `Machined::Server` instance that handles
+    # the requests.
+    attr_reader :server
     
     # An `Array` of the Sprockets environments (actually `Machined::Sprocket`
     # instances) that are the core of a Machined environment.
     attr_reader :sprockets
     
-    # When the Machined environment is used as a Rack server, this
-    # will reference the actual `Machined::Server` instance that handles
-    # the requests.
-    attr_reader :server
+    # When the Machined environment is compiling static files,
+    # this will reference the `Machined::StaticCompiler` which handles
+    # looping through the available files and generating them.
+    attr_reader :static_compiler
     
     # Creates a new Machined environment. It sets up three default
     # sprockets:
@@ -102,11 +102,14 @@ module Machined
     # layouts and partials go.
     #
     def initialize(options = {})
-      @config          = OpenStruct.new DEFAULT_OPTIONS.dup.merge(options)
-      @root            = Pathname.new(config.root).expand_path
-      @output_path     = root.join config.output_path
-      @sprockets       = []
-      @context_helpers = []
+      @config            = OpenStruct.new DEFAULT_OPTIONS.dup.merge(options)
+      @sprockets         = []
+      @context_helpers   = []
+      config.root        = Pathname.new(config.root).expand_path
+      config.config_path = root.join config.config_path
+      config.output_path = root.join config.output_path
+      config.lib_path    = root.join config.lib_path
+      config.environment = ActiveSupport::StringInquirer.new(config.environment)
       
       run_initializers self
     end
@@ -120,10 +123,20 @@ module Machined
       if File.exist? ENV['BUNDLE_GEMFILE']
         require 'bundler/setup'
         require 'sprockets'
-        Bundler.require :default, config.environment.to_sym
+        Bundler.require :default, environment.to_sym
       end
     end
     
+    # Appends the lib directory to the load path.
+    # Changes to files in this directory will trigger a reload
+    # of the Machined environment.
+    initializer :setup_autoloading do
+      next if config.skip_autoloading || !lib_path.exist?
+      
+      require 'active_support/dependencies'
+      ActiveSupport::Dependencies.autoload_paths = [lib_path.to_s]
+    end
+    
     # Create and append the default `assets` sprocket.
     # This sprocket mimics the asset pipeline in Rails 3.1.
     initializer :create_assets_sprocket do
@@ -159,11 +172,10 @@ module Machined
     # available at this point, but not fully configured. This is so
     # you can actually configure the sprockets with this file.
     initializer :eval_config_file do
-      config_file = root.join config.config_path
-      instance_eval config_file.read if config_file.exist?
+      instance_eval config_path.read if config_path.exist?
       
       # This could be changed in the config file
-      @output_path = root.join config.output_path
+      config.output_path = root.join config.output_path
       remove_sprocket(:pages) if config.assets_only && @pages
     end
     
@@ -291,6 +303,22 @@ module Machined
       static_compiler.compile
     end
     
+    # Reloads the environment. This will re-evaluate the config file &
+    # clear the current cache.
+    def reload
+      # Make sure we have a fresh cache after we reload
+      config.cache.clear if config.cache.respond_to?(:clear)
+      
+      # Reload dependencies as well, if necessary
+      ActiveSupport::Dependencies.clear if defined?(ActiveSupport::Dependencies)
+      
+      # Use current configuration, but skip bundle and autoloading initializers
+      current_config = config.marshal_dump.dup
+      current_config.merge! :skip_bundle => true#, :skip_autoloading => true)
+      
+      initialize current_config
+    end
+    
     # Creates a Machined sprocket with the given +name+ and +options+
     # and appends it to the #sprockets list. This will also create
     # an accessor with the given name that references the created sprocket.
@@ -306,7 +334,6 @@ module Machined
     def append_sprocket(name, options = {}, &block)
       create_sprocket(name, options, &block).tap do |sprocket|
         sprockets.push(sprocket).uniq!
-        server and server.remap
       end
     end
     
@@ -315,7 +342,6 @@ module Machined
     def prepend_sprocket(name, options = {}, &block)
       create_sprocket(name, options, &block).tap do |sprocket|
         sprockets.unshift(sprocket).uniq!
-        server and server.remap
       end
     end
     
@@ -325,7 +351,6 @@ module Machined
       if sprocket = get_sprocket(name)
         sprockets.delete sprocket
         set_sprocket(name, nil)
-        server and server.remap
       end
     end
     

data/lib/machined/initializable.rb

@@ -60,11 +60,11 @@ module Machined
     # Run each initializer with the given args
     # yielded to each initializer's block.
     def run_initializers(*args)
-      return if @initializers_run
+      # return if @initializers_run
       self.class.initializers.each do |initializer|
         initializer.run self, *args
       end
-      @initializers_run = true
+      # @initializers_run = true
     end
   end
 end

data/lib/machined/middleware/static.rb

@@ -0,0 +1,46 @@
+require 'rack'
+
+module Machined
+  module Middleware
+    # Machined::Middleware::Static serves static files
+    # from the given directory. If no static file is
+    # found, the request gets passed on to the next
+    # middleware or application. It's basically
+    # a simplified version of ActionDispatch::Static.
+    class Static
+      def initialize(app, root = '.', cache_control = nil)
+        @app           = app
+        @root          = File.expand_path(root)
+        @compiled_root = /^#{Regexp.escape(@root)}/
+        @file_server   = ::Rack::File.new(@root, cache_control)
+      end
+      
+      def call(env)
+        case env['REQUEST_METHOD']
+        when 'GET', 'HEAD'
+          path = env['PATH_INFO'].chomp('/')
+          if match = match?(path)
+            env['PATH_INFO'] = match
+            return @file_server.call(env)
+          end
+        end
+        
+        @app.call(env)
+      end
+      
+      protected
+      
+      def match?(path)
+        full_path = path.empty? ? @root : File.join(@root, path)
+        matches   = Dir[full_path + '{,.html,/index.html}']
+        match     = matches.detect { |f| File.file?(f) }
+        
+        if match
+          ::Rack::Utils.escape match.sub(@compiled_root, '')
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/machined/server.rb

@@ -1,3 +1,4 @@
+require 'active_support/file_update_checker'
 require 'rack'
 
 module Machined
@@ -10,37 +11,59 @@ module Machined
     # up the processed files.
     def initialize(machined)
       @machined = machined
-      @files    = Rack::File.new(machined.output_path)
-      remap
+      
+      if machined.environment.development?
+        # Configure watchable files
+        files = []
+        files << machined.config_path if machined.config_path.exist?
+        
+        # Configure watchable dirs
+        dirs = {}
+        dirs[machined.lib_path.to_s] = [:rb] if machined.lib_path.exist?
+        
+        # Setup file watching using ActiveSupport::FileUpdateChecker
+        @reloader = ActiveSupport::FileUpdateChecker.new(files, dirs) do
+          machined.reload
+          reload
+        end
+      end
+      
+      reload
     end
     
     # Using the URLMap, determine which sprocket
     # should handle the request and then...let it
     # handle it.
     def call(env)
-      refresh if machined.config.environment == 'development'
-      response = @url_map.call(env)
-      response = @files.call(env) if response.first == 404
-      response
+      @reloader.execute_if_updated if machined.environment.development?
+      @app.call(env)
     end
     
-    # Remaps the Machined environment's current
-    # sprockets using `Rack::URLMap`.
-    def remap
-      map = {}
-      machined.sprockets.each do |sprocket|
-        next unless sprocket.compile?
-        map[sprocket.config.url] = sprocket
-      end
-      @url_map = Rack::URLMap.new map
+    # Rebuilds the Rack app with the current Machined
+    # configuration.
+    def reload
+      @app = to_app
     end
     
     protected
     
-    # Refreshes the environment
-    def refresh
-      machined.sprockets.each do |sprocket|
-        sprocket.send :expire_index!
+    # Creates a Rack app with the current Machined
+    # environment configuration.
+    def to_app # :nodoc:
+      Rack::Builder.new.tap do |app|
+        app.use Middleware::Static, machined.output_path
+        app.run Rack::URLMap.new(sprockets_map)
+      end
+    end
+    
+    # Maps the Machined environment's current
+    # sprockets for use with `Rack::URLMap`.
+    def sprockets_map # :nodoc:
+      {}.tap do |map|
+        machined.sprockets.each do |sprocket|
+          next unless sprocket.compile?
+          map[sprocket.config.url] = sprocket
+        end
       end
     end
   end

data/lib/machined/templates/site/machined.rb

@@ -1,7 +1,4 @@
-require 'bundler'
-Bundler.require :default, config.environment.to_sym
-
-if config.environment == 'production'
+if environment.production?
   # Compress javascripts and stylesheets
   config.compress = true
   

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/spec/machined/cli_spec.rb

@@ -104,10 +104,7 @@ describe Machined::CLI do
       within_construct do |c|
         machined_cli 'new my_site'
         File.read('my_site/machined.rb').should == <<-CONTENT.unindent
-          require 'bundler'
-          Bundler.require :default, config.environment.to_sym
-          
-          if config.environment == 'production'
+          if environment.production?
             # Compress javascripts and stylesheets
             config.compress = true
             

data/spec/machined/context_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe Machined::Context do
   describe '#machined' do
     it 'returns a reference to the Machined environment' do
-      context.machined.should be(machined)
+      build_context.machined.should be(machined)
     end
   end
   
   describe '#config' do
     it "returns a reference to the Machined environment's configuration" do
       machined.config.layout = 'application'
-      context.config.layout.should == 'application'
+      build_context.config.layout.should == 'application'
     end
   end
 end

data/spec/machined/environment_spec.rb

@@ -8,7 +8,7 @@ describe Machined::Environment do
           config.output_path = 'site'
           append_sprocket :updates
         CONTENT
-        machined.config.output_path.should == 'site'
+        machined.config.output_path.should == Pathname.new('site').expand_path
         machined.updates.should be_a(Machined::Sprocket)
       end
     end
@@ -83,7 +83,7 @@ describe Machined::Environment do
         end
       end
       
-      context.hello.should == 'world'
+      build_context.hello.should == 'world'
     end
     
     it 'adds methods defined in the given module to the Context' do
@@ -93,7 +93,81 @@ describe Machined::Environment do
         end
       end
       machined.helpers helper
-      context.hello.should == 'world'
+      build_context.hello.should == 'world'
+    end
+  end
+  
+  describe '#reload' do
+    it 'knows when helpers are changed' do
+      within_construct do |c|
+        c.file 'machined.rb', 'helpers do; def hello; "hello"; end; end'
+        build_context.hello.should == 'hello'
+      
+        modify 'machined.rb', 'helpers do; def hello; "world"; end; end'
+        machined.reload
+        build_context.hello.should == 'world'
+      end
+    end
+  
+    it 'knows when configuration is changed' do
+      within_construct do |c|
+        c.file 'machined.rb'
+        machined.output_path.should == c.join('public')
+      
+        modify 'machined.rb', 'config.output_path = "output"'
+        machined.reload
+        machined.output_path.should == c.join('output')
+      end
+    end
+  
+    it 'does not re-append sprockets' do
+      within_construct do |c|
+        c.file 'machined.rb'
+        machined.sprockets.length.should == 3
+      
+        modify 'machined.rb', 'config.output_path = "output"'
+        machined.reload
+        machined.sprockets.length.should == 3
+      end
+    end
+  
+    it 're-evaluates assets when configuration changes' do
+      within_construct do |c|
+        c.file 'machined.rb', 'helpers do; def hello; "hello"; end; end'
+        c.file 'pages/index.html.erb', '<%= hello %>'
+        machined.pages['index.html'].to_s.should == 'hello'
+      
+        modify 'machined.rb', 'helpers do; def hello; "world"; end; end'
+        machined.reload
+        machined.pages['index.html'].to_s.should == 'world'
+      end
+    end
+    
+    it 'knows when a lib file changes' do
+      within_construct do |c|
+        c.file 'lib/hello.rb', 'module Hello; def hello; "hello"; end; end'
+        c.file 'machined.rb', 'helpers Hello'
+        machined :skip_autoloading => false
+        build_context.hello.should == 'hello'
+        
+        modify 'lib/hello.rb', 'module Hello; def hello; "world"; end; end'
+        machined.reload
+        build_context.hello.should == 'world'
+      end
+    end
+  end
+  
+  describe '#environment' do
+    it 'is wrapped in String inquirer' do
+      machined :environment => 'development'
+      machined.environment.development?.should be_true
+      machined.environment.production?.should be_false
+      machined.environment.test?.should be_false
+      
+      machined :environment => 'production', :reload => true
+      machined.environment.development?.should be_false
+      machined.environment.production?.should be_true
+      machined.environment.test?.should be_false
     end
   end
   
@@ -246,16 +320,25 @@ describe Machined::Environment do
         end
       end
     end
+    
+    context 'with a js_compressor set' do
+      it 'compresses using that compressor' do
+        within_construct do |c|
+          c.file 'assets/javascripts/main.js', 'var app = {};'
+          c.file 'machined.rb', 'config.js_compressor = :packr'
+          Crush::Packr.should_receive(:compress).with("var app = {};\n").and_return('compressed')
+          machined.assets['main.js'].to_s.should == 'compressed'
+        end
+      end
+    end
   end
   
-  context 'with a js_compressor set' do
-    it 'compresses using that compressor' do
-      within_construct do |c|
-        c.file 'assets/javascripts/main.js', 'var app = {};'
-        c.file 'machined.rb', 'config.js_compressor = :packr'
-        Crush::Packr.should_receive(:compress).with("var app = {};\n").and_return('compressed')
-        machined.assets['main.js'].to_s.should == 'compressed'
-      end
+  it 'autoloads files from the lib directory' do
+    within_construct do |c|
+      c.file 'lib/hello.rb', 'module Hello; def hello; "hello"; end; end'
+      c.file 'machined.rb', 'helpers Hello'
+      machined :skip_autoloading => false
+      build_context.hello.should == 'hello'
     end
   end
 end

data/spec/machined/helpers/asset_tag_helpers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Machined::Helpers::AssetTagHelpers do
+  let(:context) { build_context }
+  
   describe '#asset_path' do
     context 'with URIs' do
       it 'returns URIs untouched' do

data/spec/machined/helpers/locals_helper_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Machined::Helpers::LocalsHelpers do
+  let(:context) { build_context }
+  
   describe '#locals=' do
     it 'sets psuedo local variables' do
       context.locals = { :text => 'Hello World', :body => nil }

data/spec/machined/initializable_spec.rb

@@ -19,14 +19,14 @@ describe Machined::Initializable do
     array.should == [ 1, 2, 3 ]
   end
   
-  it 'runs initializers only once' do
-    count = 0
-    BasicInitializer.initializer(:count) { count += 1 }
-    basic = BasicInitializer.new
-    basic.run_initializers
-    basic.run_initializers
-    count.should == 1
-  end
+  # it 'runs initializers only once' do
+  #   count = 0
+  #   BasicInitializer.initializer(:count) { count += 1 }
+  #   basic = BasicInitializer.new
+  #   basic.run_initializers
+  #   basic.run_initializers
+  #   count.should == 1
+  # end
   
   it 'executes in the instance scope' do
     BasicInitializer.initializer(:init_count) { @count = 0 }

data/spec/machined/middleware/static_spec.rb

@@ -0,0 +1,56 @@
+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.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'
+    get('/index').body.should      == 'Static Index Content'
+    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'
+    get('/foo/bar/').body.should     == 'HTML Content in Directory'
+    get('/foo/bar').body.should      == 'HTML Content in Directory'
+  end
+end

data/spec/machined/server_spec.rb

@@ -25,7 +25,7 @@ describe Machined::Server do
     end
   end
   
-  it 'serves up pages as the base url' do
+  it 'serves up pages at the base url' do
     within_construct do |c|
       c.file 'pages/index.html', "<h1>Hello World</h1>\n"
       c.file 'pages/about.html', "<h1>About Us</h1>\n"
@@ -57,8 +57,6 @@ describe Machined::Server do
       dir = c.directory 'updates'
       dir.file 'new-site.html', "<h1>Hello World</h1>\n"
       
-      get '/'
-      
       machined.append_sprocket :updates, :url => '/updates' do |updates|
         updates.append_path dir
         updates.register_mime_type 'text/html', '.html'
@@ -94,4 +92,30 @@ describe Machined::Server do
       last_response.body.should == "<h1>Hello World</h1>\n"
     end
   end
+  
+  context 'reloading' do
+    it 'knows when the configuration changes' do
+      within_construct do |c|
+        c.file 'machined.rb', 'helpers do; def hello; "hello"; end; end'
+        c.file 'pages/index.html.erb', '<%= hello %>'
+        get('/').body.should == 'hello'
+        
+        modify 'machined.rb', 'helpers do; def hello; "world"; end; end'
+        get('/').body.should == 'world'
+      end
+    end
+    
+    it 'knows when a lib file changes' do
+      within_construct do |c|
+        c.file 'lib/hello.rb', 'module Hello; def hello; "hello"; end; end'
+        c.file 'machined.rb', 'helpers Hello'
+        c.file 'pages/index.html.erb', '<%= hello %>'
+        machined :skip_autoloading => false
+        get('/').body.should == 'hello'
+        
+        modify 'lib/hello.rb', 'module Hello; def hello; "world"; end; end'
+        get('/').body.should == 'world'
+      end
+    end
+  end
 end

data/spec/support/helpers.rb

@@ -5,7 +5,8 @@ module Machined
   module SpecHelpers
     # Convenience method for creating a new Machined environment
     def machined(config = {})
-      @machined ||= Machined::Environment.new(config.reverse_merge(:skip_bundle => true))
+      @machined = nil if config.delete(:reload)
+      @machined ||= Machined::Environment.new(config.reverse_merge(:skip_bundle => true, :skip_autoloading => true))
     end
     
     # Convenience method for creating a new Machined sprocket,
@@ -16,13 +17,11 @@ module Machined
     end
   
     # Returns a fresh context, that can be used to test helpers.
-    def context(logical_path = 'application.js', options = {})
-      @context ||= begin
-        pathname = options[:pathname] || Pathname.new(File.join('assets', logical_path)).expand_path
-        env      = options[:env] || machined.assets
-        
-        env.context_class.new env, logical_path, pathname
-      end
+    def build_context(logical_path = 'application.js', options = {})
+      pathname = options[:pathname] || Pathname.new('assets').join(logical_path).expand_path
+      env      = options[:env] || machined.assets
+      
+      env.context_class.new env, logical_path, pathname
     end
     
     # Runs the CLI with the given args.
@@ -32,6 +31,15 @@ module Machined
       }
     end
     
+    # Modifies the given file
+    def modify(file, content = nil)
+      Pathname.new(file).tap do |file|
+        file.open('w') { |f| f.write(content) } if content
+        future = Time.now + 60
+        file.utime future, future
+      end
+    end
+    
     # Captures the given stream and returns it:
     #
     #   stream = capture(:stdout) { puts 'Cool' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machined
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &-1071292608 !ruby/object:Gem::Requirement
+  requirement: &70108802349040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *-1071292608
+  version_requirements: *70108802349040
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: &-1071293098 !ruby/object:Gem::Requirement
+  requirement: &70108802344840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *-1071293098
+  version_requirements: *70108802344840
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &-1071293648 !ruby/object:Gem::Requirement
+  requirement: &70108802341200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *-1071293648
+  version_requirements: *70108802341200
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
-  requirement: &-1071294118 !ruby/object:Gem::Requirement
+  requirement: &70108802338900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.5
   type: :runtime
   prerelease: false
-  version_requirements: *-1071294118
+  version_requirements: *70108802338900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &-1071294378 !ruby/object:Gem::Requirement
+  requirement: &70108802336740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *-1071294378
+  version_requirements: *70108802336740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &-1071294698 !ruby/object:Gem::Requirement
+  requirement: &70108802334600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *-1071294698
+  version_requirements: *70108802334600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &-1071295248 !ruby/object:Gem::Requirement
+  requirement: &70108802333200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *-1071295248
+  version_requirements: *70108802333200
 - !ruby/object:Gem::Dependency
   name: crush
-  requirement: &-1071295628 !ruby/object:Gem::Requirement
+  requirement: &70108802331000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *-1071295628
+  version_requirements: *70108802331000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &-1071295908 !ruby/object:Gem::Requirement
+  requirement: &70108802329400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *-1071295908
+  version_requirements: *70108802329400
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &-1071296548 !ruby/object:Gem::Requirement
+  requirement: &70108802327300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *-1071296548
+  version_requirements: *70108802327300
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &-1071833678 !ruby/object:Gem::Requirement
+  requirement: &70108802325260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *-1071833678
+  version_requirements: *70108802325260
 - !ruby/object:Gem::Dependency
   name: unindent
-  requirement: &-1071834008 !ruby/object:Gem::Requirement
+  requirement: &70108802324420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *-1071834008
+  version_requirements: *70108802324420
 - !ruby/object:Gem::Dependency
   name: sprockets-plugin
-  requirement: &-1071834328 !ruby/object:Gem::Requirement
+  requirement: &70108802323340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *-1071834328
+  version_requirements: *70108802323340
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &-1071834568 !ruby/object:Gem::Requirement
+  requirement: &70108802322060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071834568
+  version_requirements: *70108802322060
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &-1071834818 !ruby/object:Gem::Requirement
+  requirement: &70108802320040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071834818
+  version_requirements: *70108802320040
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &-1071835058 !ruby/object:Gem::Requirement
+  requirement: &70108802317920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071835058
+  version_requirements: *70108802317920
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &-1071835298 !ruby/object:Gem::Requirement
+  requirement: &70108802316100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071835298
+  version_requirements: *70108802316100
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &-1071835618 !ruby/object:Gem::Requirement
+  requirement: &70108802314360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071835618
+  version_requirements: *70108802314360
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &-1071835948 !ruby/object:Gem::Requirement
+  requirement: &70108802312700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071835948
+  version_requirements: *70108802312700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &-1071836178 !ruby/object:Gem::Requirement
+  requirement: &70108802310780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *-1071836178
+  version_requirements: *70108802310780
 description: Why another static site generator? Machined is for the developers who
   know and love the asset pipeline of Rails 3.1 and want to develop blazingly fast
   static websites. It's built from the ground up using Sprockets 2.0.
@@ -258,6 +258,7 @@ files:
 - lib/machined/helpers/render_helpers.rb
 - lib/machined/index.rb
 - lib/machined/initializable.rb
+- lib/machined/middleware/static.rb
 - lib/machined/processors/front_matter_processor.rb
 - lib/machined/processors/layout_processor.rb
 - lib/machined/server.rb
@@ -284,6 +285,7 @@ files:
 - spec/machined/helpers/page_helpers_spec.rb
 - spec/machined/helpers/render_helpers_spec.rb
 - spec/machined/initializable_spec.rb
+- spec/machined/middleware/static_spec.rb
 - spec/machined/processors/front_matter_processor_spec.rb
 - spec/machined/processors/layout_processor_spec.rb
 - spec/machined/server_spec.rb
@@ -308,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878013729
+      hash: -2736667984857958042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -317,10 +319,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878013729
+      hash: -2736667984857958042
 requirements: []
 rubyforge_project: machined
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A static site generator and Rack server built using Sprockets 2.0
@@ -334,6 +336,7 @@ test_files:
 - spec/machined/helpers/page_helpers_spec.rb
 - spec/machined/helpers/render_helpers_spec.rb
 - spec/machined/initializable_spec.rb
+- spec/machined/middleware/static_spec.rb
 - spec/machined/processors/front_matter_processor_spec.rb
 - spec/machined/processors/layout_processor_spec.rb
 - spec/machined/server_spec.rb