middleman-core 3.2.1 → 3.2.2

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

@@ -17,10 +17,10 @@ module Middleman
       def render
         content_tag :div, :class => 'resource-details' do
           content_tag :table do
-            content = ""
+            content = ''
             resource_properties.each do |label, value|
               content << content_tag(:tr) do
-                row_content = ""
+                row_content = ''
                 row_content << content_tag(:th, label)
                 row_content << content_tag(:td, value)
                 row_content.html_safe

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

@@ -13,7 +13,7 @@ module Middleman
       end
 
       def render
-        content = ""
+        content = ''
         @children.keys.sort do |a,b|
           a_subtree = @children[a]
           b_subtree = @children[b]
@@ -35,11 +35,11 @@ module Middleman
         end.each do |path_part|
           subtree = @children[path_part]
           content << "<details class='#{subtree.css_classes.join(' ')}'>"
-          content << "<summary>"
+          content << '<summary>'
           content << "<i class='icon-folder-open'></i>" unless subtree.is_a? SitemapResource
           content << "#{path_part}</summary>"
           content << subtree.render
-          content << "</details>"
+          content << '</details>'
         end
         content
       end
@@ -66,7 +66,7 @@ module Middleman
       end
 
       def to_s
-        "Sitemap Tree"
+        'Sitemap Tree'
       end
     end
   end

data/lib/middleman-core/preview_server.rb

@@ -1,5 +1,6 @@
-require "webrick"
+require 'webrick'
 require 'middleman-core/meta_pages'
+require 'middleman-core/logger'
 
 module Middleman
   module PreviewServer
@@ -29,7 +30,7 @@ module Middleman
 
           # Save the last-used @options so it may be re-used when
           # reloading later on.
-          ::Middleman::Profiling.report("server_start")
+          ::Middleman::Profiling.report('server_start')
 
           loop do
             @webrick.start
@@ -50,7 +51,7 @@ module Middleman
       # @return [void]
       def stop
         begin
-          logger.info "== The Middleman is shutting down"
+          logger.info '== The Middleman is shutting down'
         rescue
           # if the user closed their terminal STDOUT/STDERR won't exist
         end
@@ -65,20 +66,20 @@ module Middleman
       # Simply stop, then start the server
       # @return [void]
       def reload
-        logger.info "== The Middleman is reloading"
+        logger.info '== The Middleman is reloading'
 
         begin
           app = new_app
         rescue Exception => e
           logger.error "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
-          logger.info "== The Middleman is still running the application from before the error"
+          logger.info '== The Middleman is still running the application from before the error'
           return
         end
 
         unmount_instance
         mount_instance(app)
 
-        logger.info "== The Middleman has reloaded"
+        logger.info '== The Middleman has reloaded'
       end
 
       # Stop the current instance, exit Webrick
@@ -90,7 +91,7 @@ module Middleman
 
     private
       def new_app
-        opts = @options
+        opts = @options.dup
         server = ::Middleman::Application.server
 
         # Add in the meta pages application
@@ -100,11 +101,14 @@ module Middleman
         end
 
         @app = server.inst do
+          ::Middleman::Logger.singleton(
+            opts[:debug] ? 0 : 1,
+            opts[:instrumenting] || false
+          )
+
           if opts[:environment]
             config[:environment] = opts[:environment].to_sym
           end
-
-          logger(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
         end
       end
 
@@ -115,7 +119,7 @@ module Middleman
 
         if first_run
           # Watcher Library
-          require "listen"
+          require 'listen'
           @listener = Listen.to(Dir.pwd, :relative_paths => true, :force_polling => @options[:force_polling])
           @listener.latency(@options[:latency])
         end
@@ -190,13 +194,13 @@ module Middleman
         start_file_watcher
 
         rack_app = app.class.to_rack_app
-        @webrick.mount "/", ::Rack::Handler::WEBrick, rack_app
+        @webrick.mount '/', ::Rack::Handler::WEBrick, rack_app
       end
 
       # Detach the current Middleman::Application instance
       # @return [void]
       def unmount_instance
-        @webrick.unmount "/"
+        @webrick.unmount '/'
         @app = nil
       end
 

data/lib/middleman-core/profiling.rb

@@ -46,7 +46,7 @@ module Middleman
         result = RubyProf.stop
 
         printer = RubyProf::GraphHtmlPrinter.new(result)
-        outfile = File.join("profile", report_name)
+        outfile = File.join('profile', report_name)
         outfile = (outfile + '.html') unless outfile.end_with? '.html'
         FileUtils.mkdir_p(File.dirname(outfile))
         File.open(outfile, 'w') do |f|

data/lib/middleman-core/renderers/coffee_script.rb

@@ -1,5 +1,5 @@
 # Require gem
-require "coffee_script"
+require 'coffee_script'
 
 module Middleman
   module Renderers

data/lib/middleman-core/renderers/erb.rb

@@ -21,7 +21,7 @@ module Middleman
             # Convert symbols to classes
             if config[:erb_engine].is_a? Symbol
               engine = engine.to_s
-              engine = engine == "erb" ? "ERB" : engine.camelize
+              engine = engine == 'erb' ? 'ERB' : engine.camelize
               config[:erb_engine] = config[:erb_engine_prefix].const_get("#{engine}Template")
             end
 

data/lib/middleman-core/renderers/haml.rb

@@ -1,5 +1,5 @@
 # Require gem
-require "haml"
+require 'haml'
 
 module Middleman
   module Renderers

data/lib/middleman-core/renderers/kramdown.rb

@@ -1,4 +1,4 @@
-require "kramdown"
+require 'kramdown'
 
 module Middleman
   module Renderers
@@ -30,7 +30,7 @@ module Middleman
 
         if el.attr['href'] =~ /\Amailto:/
           mail_addr = el.attr['href'].sub(/\Amailto:/, '')
-          href = obfuscate('mailto') << ":" << obfuscate(mail_addr)
+          href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
           content = obfuscate(content) if content == mail_addr
           return %Q{<a href="#{href}">#{content}</a>}
         end

data/lib/middleman-core/renderers/less.rb

@@ -1,4 +1,4 @@
-require "less"
+require 'less'
 
 module Middleman
   module Renderers
@@ -37,7 +37,7 @@ module Middleman
           if ::Less.const_defined? :Engine
             @engine = ::Less::Engine.new(data)
           else
-            parser  = ::Less::Parser.new(options.merge :filename => eval_file, :line => line, :paths => [".", File.dirname(eval_file)])
+            parser  = ::Less::Parser.new(options.merge :filename => eval_file, :line => line, :paths => ['.', File.dirname(eval_file)])
             @engine = parser.parse(data)
           end
         end

data/lib/middleman-core/renderers/liquid.rb

@@ -1,5 +1,5 @@
 # Require Gem
-require "liquid"
+require 'liquid'
 
 module Middleman
   module Renderers

data/lib/middleman-core/renderers/markdown.rb

@@ -28,18 +28,18 @@ module Middleman
             begin
               # Look for the user's preferred engine
               if config[:markdown_engine] == :redcarpet
-                require "middleman-core/renderers/redcarpet"
+                require 'middleman-core/renderers/redcarpet'
                 ::Tilt.prefer(::Middleman::Renderers::RedcarpetTemplate, *markdown_exts)
                 MiddlemanRedcarpetHTML.middleman_app = self
               elsif config[:markdown_engine] == :kramdown
-                require "middleman-core/renderers/kramdown"
+                require 'middleman-core/renderers/kramdown'
                 ::Tilt.prefer(::Middleman::Renderers::KramdownTemplate, *markdown_exts)
                 MiddlemanKramdownHTML.middleman_app = self
               elsif !config[:markdown_engine].nil?
                 # Map symbols to classes
                 markdown_engine_klass = if config[:markdown_engine].is_a? Symbol
                   engine = config[:markdown_engine].to_s
-                  engine = engine == "rdiscount" ? "RDiscount" : engine.camelize
+                  engine = engine == 'rdiscount' ? 'RDiscount' : engine.camelize
                   config[:markdown_engine_prefix].const_get("#{engine}Template")
                 else
                   config[:markdown_engine_prefix]

data/lib/middleman-core/renderers/redcarpet.rb

@@ -1,4 +1,4 @@
-require "redcarpet"
+require 'redcarpet'
 
 module Middleman
   module Renderers

data/lib/middleman-core/renderers/sass.rb

@@ -1,4 +1,4 @@
-require "sass"
+require 'sass'
 
 module Middleman
   module Renderers
@@ -40,12 +40,12 @@ module Middleman
 
         def initialize(*args, &block)
           super
-          
+
           if @options.has_key?(:context)
             @context = @options[:context]
           end
         end
-        
+
         # Define the expected syntax for the template
         # @return [Symbol]
         def syntax
@@ -73,15 +73,15 @@ module Middleman
         # @return [Hash]
         def sass_options
           more_opts = { :filename => eval_file, :line => line, :syntax => syntax }
-          
+
           if @context.is_a?(::Middleman::Application) && file
             location_of_sass_file = @context.source_dir
-          
+
             parts = basename.split('.')
             parts.pop
-            more_opts[:css_filename] = File.join(location_of_sass_file, @context.config[:css_dir], parts.join("."))
+            more_opts[:css_filename] = File.join(location_of_sass_file, @context.config[:css_dir], parts.join('.'))
           end
-          
+
           options.merge(more_opts)
         end
       end

data/lib/middleman-core/renderers/slim.rb

@@ -1,5 +1,5 @@
 # Load gem
-require "slim"
+require 'slim'
 
 module Middleman
   module Renderers
@@ -23,7 +23,7 @@ module Middleman
             :generator => ::Temple::Generators::RailsOutputBuffer,
             :disable_escape => true
           )
-          
+
           app.after_configuration do
             context_hack = {
               :context => self

data/lib/middleman-core/renderers/stylus.rb

@@ -1,5 +1,5 @@
-require "stylus"
-require "stylus/tilt"
+require 'stylus'
+require 'stylus/tilt'
 
 module Middleman
   module Renderers

data/lib/middleman-core/sitemap.rb

@@ -1,11 +1,11 @@
-require "middleman-core/sitemap/store"
-require "middleman-core/sitemap/resource"
-
-require "middleman-core/sitemap/extensions/on_disk"
-require "middleman-core/sitemap/extensions/redirects"
-require "middleman-core/sitemap/extensions/request_endpoints"
-require "middleman-core/sitemap/extensions/proxies"
-require "middleman-core/sitemap/extensions/ignores"
+require 'middleman-core/sitemap/store'
+require 'middleman-core/sitemap/resource'
+
+require 'middleman-core/sitemap/extensions/on_disk'
+require 'middleman-core/sitemap/extensions/redirects'
+require 'middleman-core/sitemap/extensions/request_endpoints'
+require 'middleman-core/sitemap/extensions/proxies'
+require 'middleman-core/sitemap/extensions/ignores'
 
 # Core Sitemap Extensions
 module Middleman

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -28,7 +28,7 @@ module Middleman
           def ignored?
             @app.ignore_manager.ignored?(path) ||
             (!proxy? &&
-              @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ""))
+              @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ''))
             )
           end
         end
@@ -64,7 +64,7 @@ module Middleman
               @ignored_callbacks << Proc.new {|p| p =~ path }
             elsif path.is_a? String
               path_clean = ::Middleman::Util.normalize_path(path)
-              if path_clean.include?("*") # It's a glob
+              if path_clean.include?('*') # It's a glob
                 @ignored_callbacks << Proc.new {|p| File.fnmatch(path_clean, p) }
               else
                 # Add a specific-path ignore unless that path is already covered

data/lib/middleman-core/sitemap/extensions/redirects.rb

@@ -78,7 +78,10 @@ module Middleman
           end
 
           def render(*args, &block)
-            url = ::Middleman::Util.url_for(store.app, @request_path, :relative => false, :find_resource => true)
+            url = ::Middleman::Util.url_for(store.app, @request_path, {
+              :relative => false,
+              :find_resource => true
+            })
 
             if output
               output.call(path, url)

data/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -8,7 +8,7 @@ module Middleman
         # This resource's parent resource
         # @return [Middleman::Sitemap::Resource, nil]
         def parent
-          parts = path.split("/")
+          parts = path.split('/')
           parts.pop if path.include?(app.index_file)
 
           return nil if parts.length < 1
@@ -16,7 +16,7 @@ module Middleman
           parts.pop
           parts << app.index_file
 
-          parent_path = "/" + parts.join("/")
+          parent_path = '/' + parts.join('/')
 
           store.find_resource_by_destination_path(parent_path)
         end
@@ -30,7 +30,7 @@ module Middleman
             base_path = eponymous_directory_path
             prefix    = %r|^#{base_path.sub("/", "\\/")}|
           else
-            base_path = path.sub("#{app.index_file}", "")
+            base_path = path.sub("#{app.index_file}", '')
             prefix    = %r|^#{base_path.sub("/", "\\/")}|
           end
 
@@ -38,8 +38,8 @@ module Middleman
             if sub_resource.path == self.path || sub_resource.path !~ prefix
               false
             else
-              inner_path = sub_resource.path.sub(prefix, "")
-              parts = inner_path.split("/")
+              inner_path = sub_resource.path.sub(prefix, '')
+              parts = inner_path.split('/')
               if parts.length == 1
                 true
               elsif parts.length == 2
@@ -79,7 +79,7 @@ module Middleman
         # (e.g., for 'gallery.html' this would return 'gallery/')
         # @return [String]
         def eponymous_directory_path
-          path.sub(ext, '/').sub(/\/$/, "") + "/"
+          path.sub(ext, '/').sub(/\/$/, '') + '/'
         end
       end
     end

data/lib/middleman-core/sitemap/queryable.rb

@@ -1,8 +1,8 @@
-require "active_support/core_ext/object/inclusion"
+require 'active_support/core_ext/object/inclusion'
 
 module Middleman
   module Sitemap
-    
+
     # Code adapted from https://github.com/ralph/document_mapper/
     module Queryable
       OPERATOR_MAPPING = {
@@ -146,7 +146,7 @@ class Symbol
       end
     OPERATORS
   end
-  
+
   unless method_defined?(:"<=>")
     def <=>(other)
       self.to_s <=> other.to_s

data/lib/middleman-core/sitemap/resource.rb

@@ -1,5 +1,5 @@
-require "middleman-core/sitemap/extensions/traversal"
-require "middleman-core/sitemap/extensions/content_type"
+require 'middleman-core/sitemap/extensions/traversal'
+require 'middleman-core/sitemap/extensions/content_type'
 
 module Middleman
 
@@ -111,14 +111,14 @@ module Middleman
 
         relative_source = Pathname(source_file).relative_path_from(Pathname(app.root))
 
-        instrument "render.resource", :path => relative_source  do
+        instrument 'render.resource', :path => relative_source  do
           md   = metadata.dup
           opts = md[:options].deep_merge(opts)
 
           # Pass "renderer_options" hash from frontmatter along to renderer
-          if md[:page]["renderer_options"]
+          if md[:page]['renderer_options']
             opts[:renderer_options] = {}
-            md[:page]["renderer_options"].each do |k, v|
+            md[:page]['renderer_options'].each do |k, v|
               opts[:renderer_options][k.to_sym] = v
             end
           end
@@ -127,7 +127,7 @@ module Middleman
 
           # Forward remaining data to helpers
           if md.has_key?(:page)
-            app.data.store("page", md[:page])
+            app.data.store('page', md[:page])
           end
 
           blocks = Array(md[:blocks]).dup