middleman-core 3.2.1 → 3.2.2

data/lib/middleman-core/core_extensions/external_helpers.rb

@@ -9,8 +9,8 @@ module Middleman
         # once registered
         def registered(app)
           # Setup a default helpers paths
-          app.config.define_setting :helpers_dir, "helpers", 'Directory to autoload helper modules from'
-          app.config.define_setting :helpers_filename_glob, "**.rb", 'Glob pattern for matching helper ruby files'
+          app.config.define_setting :helpers_dir, 'helpers', 'Directory to autoload helper modules from'
+          app.config.define_setting :helpers_filename_glob, '**.rb', 'Glob pattern for matching helper ruby files'
           app.config.define_setting :helpers_filename_to_module_name_proc, Proc.new { |filename|
             basename = File.basename(filename, File.extname(filename))
             basename.camelcase

data/lib/middleman-core/core_extensions/file_watcher.rb

@@ -1,5 +1,5 @@
-require "pathname"
-require "set"
+require 'pathname'
+require 'set'
 
 # API for watching file change events
 module Middleman
@@ -128,7 +128,7 @@ module Middleman
             path = Pathname(path)
             return unless path.exist?
 
-            glob = (path + "**").to_s
+            glob = (path + '**').to_s
             subset = @known_paths.select { |p| p.fnmatch(glob) }
 
             ::Middleman::Util.all_files_under(path).each do |filepath|

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -1,11 +1,11 @@
-require "active_support/core_ext/hash/keys"
+require 'active_support/core_ext/hash/keys'
 require 'pathname'
 
 # Parsing YAML frontmatter
-require "yaml"
+require 'yaml'
 
 # Parsing JSON frontmatter
-require "active_support/json"
+require 'active_support/json'
 
 # Extensions namespace
 module Middleman::CoreExtensions
@@ -48,7 +48,7 @@ module Middleman::CoreExtensions
         { :options => data, :page => ::Middleman::Util.recursively_enhance(fmdata).freeze }
       end
     end
-    
+
     module ResourceInstanceMethods
       def ignored?
         if !proxy? && raw_data[:ignored] == true
@@ -108,9 +108,9 @@ module Middleman::CoreExtensions
       # Copied from Sitemap::Store#file_to_path, but without
       # removing the file extension
       file = File.join(app.root, file)
-      prefix = app.source_dir.sub(/\/$/, "") + "/"
+      prefix = app.source_dir.sub(/\/$/, '') + '/'
       return unless file.include?(prefix)
-      path = file.sub(prefix, "").sub(/\.frontmatter$/, "")
+      path = file.sub(prefix, '').sub(/\.frontmatter$/, '')
 
       @cache.delete(path)
     end
@@ -122,7 +122,7 @@ module Middleman::CoreExtensions
     def parse_yaml_front_matter(content, full_path)
       yaml_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
       if content =~ yaml_regex
-        content = content.sub(yaml_regex, "")
+        content = content.sub(yaml_regex, '')
 
         begin
           data = YAML.load($1) || {}
@@ -144,10 +144,10 @@ module Middleman::CoreExtensions
       json_regex = /\A(;;;\s*\n.*?\n?)^(;;;\s*$\n?)/m
 
       if content =~ json_regex
-        content = content.sub(json_regex, "")
+        content = content.sub(json_regex, '')
 
         begin
-          json = ($1+$2).sub(";;;", "{").sub(";;;", "}")
+          json = ($1+$2).sub(';;;', '{').sub(';;;', '}')
           data = ActiveSupport::JSON.decode(json).symbolize_keys
         rescue => e
           app.logger.error "JSON Exception parsing #{full_path}: #{e.message}"
@@ -178,7 +178,7 @@ module Middleman::CoreExtensions
       return [data, nil] if !app.files.exists?(full_path) || ::Middleman::Util.binary?(full_path)
 
       content = File.read(full_path)
-      
+
       begin
         if content =~ /\A.*coding:/
           lines = content.split(/\n/)
@@ -196,7 +196,7 @@ module Middleman::CoreExtensions
     end
 
     def normalize_path(path)
-      path.sub(%r{^#{Regexp.escape(app.source_dir)}\/}, "")
+      path.sub(%r{^#{Regexp.escape(app.source_dir)}\/}, '')
     end
   end
 end

data/lib/middleman-core/core_extensions/rendering.rb

@@ -28,65 +28,65 @@ module Middleman
           require 'active_support/core_ext/string/output_safety'
 
           # Activate custom renderers
-          require "middleman-core/renderers/erb"
+          require 'middleman-core/renderers/erb'
           app.register Middleman::Renderers::ERb
 
           # CoffeeScript Support
           begin
-            require "middleman-core/renderers/coffee_script"
+            require 'middleman-core/renderers/coffee_script'
             app.register Middleman::Renderers::CoffeeScript
           rescue LoadError
           end
 
           # Haml Support
           begin
-            require "middleman-core/renderers/haml"
+            require 'middleman-core/renderers/haml'
             app.register Middleman::Renderers::Haml
           rescue LoadError
           end
 
           # Sass Support
           begin
-            require "middleman-core/renderers/sass"
+            require 'middleman-core/renderers/sass'
             app.register Middleman::Renderers::Sass
           rescue LoadError
           end
 
           # Markdown Support
-          require "middleman-core/renderers/markdown"
+          require 'middleman-core/renderers/markdown'
           app.register Middleman::Renderers::Markdown
 
           # AsciiDoc Support
           begin
-            require "middleman-core/renderers/asciidoc"
+            require 'middleman-core/renderers/asciidoc'
             app.register Middleman::Renderers::AsciiDoc
           rescue LoadError
           end
 
           # Liquid Support
           begin
-            require "middleman-core/renderers/liquid"
+            require 'middleman-core/renderers/liquid'
             app.register Middleman::Renderers::Liquid
           rescue LoadError
           end
 
           # Slim Support
           begin
-            require "middleman-core/renderers/slim"
+            require 'middleman-core/renderers/slim'
             app.register Middleman::Renderers::Slim
           rescue LoadError
           end
 
           # Less Support
           begin
-            require "middleman-core/renderers/less"
+            require 'middleman-core/renderers/less'
             app.register Middleman::Renderers::Less
           rescue LoadError
           end
 
           # Stylus Support
           begin
-            require "middleman-core/renderers/stylus"
+            require 'middleman-core/renderers/stylus'
             app.register Middleman::Renderers::Stylus
           rescue LoadError
           end
@@ -198,7 +198,7 @@ module Middleman
             engine = File.extname(resource.source_file)[1..-1].to_sym
 
             # Look for partials relative to the current path
-            relative_dir = File.join(current_dir.sub(%r{^#{Regexp.escape(self.source_dir)}/?}, ""), data)
+            relative_dir = File.join(current_dir.sub(%r{^#{Regexp.escape(self.source_dir)}/?}, ''), data)
 
             # Try to use the current engine first
             found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true)
@@ -244,9 +244,9 @@ module Middleman
 
           # Store last engine for later (could be inside nested renders)
           context.current_engine, engine_was = engine, context.current_engine
-          
+
           # Save current buffer for later
-          @_out_buf, _buf_was = "", @_out_buf
+          @_out_buf, _buf_was = '', @_out_buf
 
           # Read from disk or cache the contents of the file
           body = if opts[:template_body]
@@ -284,7 +284,7 @@ module Middleman
             content = callback.call(content, path, locs, template_class)
           end
 
-          output = ::ActiveSupport::SafeBuffer.new ""
+          output = ::ActiveSupport::SafeBuffer.new ''
           output.safe_concat content
           output
         ensure
@@ -400,7 +400,7 @@ module Middleman
         # @return [void]
         def wrap_layout(layout_name, &block)
           # Save current buffer for later
-          @_out_buf, _buf_was = "", @_out_buf
+          @_out_buf, _buf_was = '', @_out_buf
 
           layout_path = locate_layout(layout_name, self.current_engine)
 
@@ -414,7 +414,7 @@ module Middleman
             content = if block_given?
               capture_html(&block)
             else
-              ""
+              ''
             end
           ensure
             # Reset stored buffer
@@ -450,7 +450,7 @@ module Middleman
             on_disk_path  = File.expand_path(relative_path, self.source_dir)
 
             # By default, any engine will do
-            preferred_engine = "*"
+            preferred_engine = '*'
 
             # Unless we're specifically looking for a preferred engine
             if options.has_key?(:preferred_engine)
@@ -466,14 +466,14 @@ module Middleman
 
               # Change the glob to only look for the matched extensions
               if matched_exts.length > 0
-                preferred_engine = "{" + matched_exts.join(",") + "}"
+                preferred_engine = '{' + matched_exts.join(',') + '}'
               else
                 return false
               end
             end
 
             # Look for files that match
-            path_with_ext = on_disk_path + "." + preferred_engine
+            path_with_ext = on_disk_path + '.' + preferred_engine
 
             found_path = Dir[path_with_ext].find do |path|
               ::Tilt[path]
@@ -481,8 +481,8 @@ module Middleman
 
             if !found_path && options[:try_without_underscore] &&
               path_no_underscore = path_with_ext.
-                sub(relative_path, relative_path.sub(/^_/, "").
-                sub(/\/_/, "/"))
+                sub(relative_path, relative_path.sub(/^_/, '').
+                sub(/\/_/, '/'))
               found_path = Dir[path_no_underscore].find do |path|
                 ::Tilt[path]
               end

data/lib/middleman-core/core_extensions/request.rb

@@ -1,8 +1,10 @@
 # Built on Rack
-require "rack"
-require "rack/file"
-require "rack/lint"
-require "rack/head"
+require 'rack'
+require 'rack/file'
+require 'rack/lint'
+require 'rack/head'
+
+require 'middleman-core/util'
 
 module Middleman
   module CoreExtensions
@@ -77,7 +79,7 @@ module Middleman
             end
 
             inner_app = inst(&block)
-            app.map("/") { run inner_app }
+            app.map('/') { run inner_app }
 
             Array(@mappings).each do |path, block|
               app.map(path, &block)
@@ -227,11 +229,11 @@ module Middleman
           start_time = Time.now
           current_path = nil
 
-          request_path = URI.decode(env["PATH_INFO"].dup)
+          request_path = URI.decode(env['PATH_INFO'].dup)
           if request_path.respond_to? :force_encoding
             request_path.force_encoding('UTF-8')
           end
-          request_path = full_path(request_path)
+          request_path = ::Middleman::Util.full_path(request_path, self)
 
           # Run before callbacks
           run_hook :before
@@ -296,7 +298,7 @@ module Middleman
           # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
           # Rack will throw an error (500)
           if !(100..199).include?(status) && ![204, 205, 304].include?(status)
-            response[1]['Content-Type'] = resource.content_type || "application/octet-stream"
+            response[1]['Content-Type'] = resource.content_type || 'application/octet-stream'
           end
           halt response
         end

data/lib/middleman-core/core_extensions/routing.rb

@@ -35,7 +35,7 @@ module Middleman
           opts[:layout] = config[:layout] if opts[:layout].nil?
 
           # If the url is a regexp
-          if url.is_a?(Regexp) || url.include?("*")
+          if url.is_a?(Regexp) || url.include?('*')
 
             # Use the metadata loop for matching against paths at runtime
             sitemap.provides_metadata_for_path(url) do |_|

data/lib/middleman-core/extensions.rb

@@ -1,5 +1,5 @@
-require "active_support/core_ext/class/attribute"
-require "active_support/core_ext/module/delegation"
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/delegation'
 
 module Middleman
 
@@ -53,7 +53,7 @@ module Middleman
   end
 
   # Where to look in gems for extensions to auto-register
-  EXTENSION_FILE = File.join("lib", "middleman_extension.rb") unless const_defined?(:EXTENSION_FILE)
+  EXTENSION_FILE = File.join('lib', 'middleman_extension.rb') unless const_defined?(:EXTENSION_FILE)
 
   class << self
     # Automatically load extensions from available RubyGems
@@ -61,7 +61,7 @@ module Middleman
     #
     # @private
     def load_extensions_in_path
-      require "rubygems"
+      require 'rubygems'
 
       extensions = rubygems_latest_specs.select do |spec|
         spec_has_file?(spec, EXTENSION_FILE)
@@ -130,7 +130,7 @@ module Middleman
       end
 
       def extension_name
-        self.ext_name || self.name.underscore.split("/").last.to_sym
+        self.ext_name || self.name.underscore.split('/').last.to_sym
       end
 
       def register(n=self.extension_name)

data/lib/middleman-core/load_paths.rb

@@ -1,5 +1,5 @@
 # Core Pathname library used for traversal
-require "pathname"
+require 'pathname'
 
 module Middleman
 
@@ -8,20 +8,20 @@ module Middleman
       @_is_setup ||= begin
 
         # Only look for config.rb if MM_ROOT isn't set
-        if !ENV["MM_ROOT"] && found_path = locate_root
-          ENV["MM_ROOT"] = found_path
+        if !ENV['MM_ROOT'] && found_path = locate_root
+          ENV['MM_ROOT'] = found_path
         end
 
         is_bundler_setup = false
 
         # If we've found the root, try to setup Bundler
-        if ENV["MM_ROOT"]
+        if ENV['MM_ROOT']
 
-          root_gemfile = File.expand_path('Gemfile', ENV["MM_ROOT"])
+          root_gemfile = File.expand_path('Gemfile', ENV['MM_ROOT'])
           ENV['BUNDLE_GEMFILE'] ||= root_gemfile
 
           if !File.exists?(ENV['BUNDLE_GEMFILE'])
-            git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + "Gemfile"
+            git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + 'Gemfile'
             ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
           end
 
@@ -32,7 +32,7 @@ module Middleman
         end
 
         # Automatically discover extensions in RubyGems
-        require "middleman-core/extensions"
+        require 'middleman-core/extensions'
 
         if is_bundler_setup
           Bundler.require

data/lib/middleman-core/logger.rb

@@ -7,6 +7,18 @@ module Middleman
 
   # The Middleman Logger
   class Logger < ActiveSupport::BufferedLogger
+
+    def self.singleton(*args)
+      if !@_logger || args.length > 0
+        if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
+          args = [0, false, args.first]
+        end
+        @_logger = new(*args)
+      end
+
+      @_logger
+    end
+
     def initialize(log_level=1, is_instrumenting=false, target=$stdout)
       super(target)
 
@@ -27,7 +39,7 @@ module Middleman
     end
 
     def call(message, *args)
-      return if @instrumenting.is_a?(String) && @instrumenting != "instrument" && !message.include?(@instrumenting)
+      return if @instrumenting.is_a?(String) && @instrumenting != 'instrument' && !message.include?(@instrumenting)
 
       evt = ActiveSupport::Notifications::Event.new(message, *args)
       self.info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms"

data/lib/middleman-core/meta_pages.rb

@@ -19,7 +19,7 @@ module Middleman
         meta_pages = self
         @rack_app = Rack::Builder.new do
           # Serve assets from metadata/assets
-          use Rack::Static, :urls => ["/assets"], :root => File.join(File.dirname(__FILE__), 'meta_pages')
+          use Rack::Static, :urls => ['/assets'], :root => File.join(File.dirname(__FILE__), 'meta_pages')
 
           map '/' do
             run meta_pages.method(:index)
@@ -96,7 +96,7 @@ module Middleman
 
       # Respond to an HTML request
       def response(content)
-        [ 200, {"Content-Type" => "text/html"}, Array(content) ]
+        [ 200, {'Content-Type' => 'text/html'}, Array(content) ]
       end
 
       def extension_options(extension)

data/lib/middleman-core/meta_pages/config_setting.rb

@@ -10,18 +10,18 @@ module Middleman
       end
 
       def render
-        content = ""
+        content = ''
         key_classes = ['key']
         key_classes << 'modified' if @setting.value_set?
         content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' '))
-        content << " = "
+        content << ' = '
         content << content_tag(:span, @setting.value.inspect, :class => 'value')
         if @setting.default
           content << content_tag(:span, :class => 'default') do
             if @setting.value_set?
               "Default: #{@setting.default.inspect}"
             else
-              "(Default)"
+              '(Default)'
             end
           end
         end