middleman-core 3.3.3 → 3.3.4

data/fixtures/partials-app/source/static_underscore.html.erb

@@ -0,0 +1 @@
+<%= partial "code_snippet.html" %>

data/fixtures/partials-app/source/svg.html.erb

@@ -0,0 +1 @@
+<%= partial "images/tiger.svg" %>

data/lib/middleman-core.rb

@@ -1,5 +1,6 @@
-# Setup our load paths
 # rubocop:disable FileName
+
+# Setup our load paths
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 

data/lib/middleman-core/cli/build.rb

@@ -168,10 +168,10 @@ module Middleman::Cli
         path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
 
-      if RUBY_PLATFORM =~ /darwin/
-        # handle UTF-8-MAC filename on MacOS
-        @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
-      end
+      return unless RUBY_PLATFORM =~ /darwin/
+
+      # handle UTF-8-MAC filename on MacOS
+      @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
     end
 
     # Actually build the app
@@ -220,14 +220,14 @@ module Middleman::Cli
 
       output_path = render_to_file(resource)
 
-      if should_clean? && output_path.exist?
-        if RUBY_PLATFORM =~ /darwin/
-          # handle UTF-8-MAC filename on MacOS
+      return unless should_clean? && output_path.exist?
 
-          @to_clean.delete(output_path.realpath.to_s.encode('UTF-8', 'UTF-8-MAC'))
-        else
-          @to_clean.delete(output_path.realpath)
-        end
+      if RUBY_PLATFORM =~ /darwin/
+        # handle UTF-8-MAC filename on MacOS
+
+        @to_clean.delete(output_path.realpath.to_s.encode('UTF-8', 'UTF-8-MAC'))
+      else
+        @to_clean.delete(output_path.realpath)
       end
     end
 
@@ -279,9 +279,7 @@ module Middleman::Cli
     end
 
     def binary_encode(string)
-      if string.respond_to?(:force_encoding)
-        string.force_encoding('ascii-8bit')
-      end
+      string.force_encoding('ascii-8bit') if string.respond_to?(:force_encoding)
       string
     end
   end

data/lib/middleman-core/cli/bundler.rb

@@ -11,7 +11,7 @@ module Middleman::Cli
 
     # The setup task
     def bundle
-      run('bundle install')# , :capture => true)
+      run('bundle install') # , :capture => true)
     end
   end
 
@@ -27,7 +27,7 @@ module Middleman::Cli
     # The upgrade task
     def upgrade
       inside(ENV['MM_ROOT']) do
-        run('bundle update')# , :capture => true)
+        run('bundle update') # , :capture => true)
       end
     end
   end

data/lib/middleman-core/cli/init.rb

@@ -15,13 +15,13 @@ module Middleman::Cli
                   default: 'default',
                   desc: "Use a project template: #{available_templates}"
     method_option 'css_dir',
-      # :default => "stylesheets",
+                  # :default => "stylesheets",
                   desc: 'The path to the css files'
     method_option 'js_dir',
-      # :default => "javascripts",
+                  # :default => "javascripts",
                   desc: 'The path to the javascript files'
     method_option 'images_dir',
-      # :default => "images",
+                  # :default => "images",
                   desc: 'The path to the image files'
     method_option 'rack',
                   type: :boolean,

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

@@ -188,9 +188,7 @@ module Middleman
               logger.debug "== Extension: #{ext}"
             end
 
-            if klass.is_a?(::Middleman::Extension)
-              ::Middleman::Extension.activated_extension(klass)
-            end
+            ::Middleman::Extension.activated_extension(klass) if klass.is_a?(::Middleman::Extension)
           end
         end
       end

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

@@ -183,12 +183,33 @@ module Middleman
         # @param [Hash] options
         # @return [String]
         def render(_, data, options={}, &block)
-          data = data.to_s
+          partial_name = data.to_s
+          found_partial = locate_partial(partial_name, false) || locate_partial(partial_name, true)
+
+          # Look in the partials_dir for the partial with the current engine
+          unless found_partial
+            partials_path = File.join(config[:partials_dir], partial_name)
+            found_partial = locate_partial(partials_path, false) || locate_partial(partials_path, true)
+          end
+
+          raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate partial: #{data}" unless found_partial
 
           locals = options[:locals]
 
-          found_partial = false
-          resolve_opts = { try_without_underscore: true }
+          if ::Tilt[found_partial]
+            # Render the partial if found, otherwide throw exception
+            render_individual_file(found_partial, locals, options, self, &block)
+          else
+            File.read(found_partial)
+          end
+        end
+
+        # Partial locator.
+        #
+        # @param [String] partial_name
+        # @return [String]
+        def locate_partial(partial_name, try_static=true)
+          resolve_opts = { try_without_underscore: true, try_static: try_static }
 
           # If the path is known to the sitemap
           if resource = sitemap.find_resource_by_path(current_path)
@@ -196,21 +217,12 @@ module Middleman
             resolve_opts[:preferred_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(source_dir)}/?}, ''), data)
-
-            found_partial = resolve_template(relative_dir, resolve_opts)
-          end
+            relative_dir = File.join(current_dir.sub(%r{^#{Regexp.escape(source_dir)}/?}, ''), partial_name)
 
-          # Look in the partials_dir for the partial with the current engine
-          unless found_partial
-            partials_path = File.join(config[:partials_dir], data)
-            found_partial = resolve_template(partials_path, resolve_opts)
+            resolve_template(relative_dir, resolve_opts) || resolve_template(partial_name, resolve_opts)
+          else
+            resolve_template(partial_name, resolve_opts)
           end
-
-          raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate partial: #{data}" unless found_partial
-
-          # Render the partial if found, otherwide throw exception
-          render_individual_file(found_partial, locals, options, self, &block)
         end
 
         # Render an on-disk file. Used for everything, including layouts.
@@ -253,7 +265,7 @@ module Middleman
           # Overwrite with frontmatter options
           options = options.deep_merge(options[:renderer_options]) if options[:renderer_options]
 
-          template_class = Tilt[path]
+          template_class = ::Tilt[path]
           # Allow hooks to manipulate the template before render
           self.class.callbacks_for_hook(:before_render).each do |callback|
             # Uber::Options::Value doesn't respond to call
@@ -428,6 +440,7 @@ module Middleman
         # @param [String] request_path
         # @option options [Boolean] :preferred_engine If set, try this engine first, then fall back to any engine.
         # @option options [Boolean] :try_without_underscore
+        # @option options [Boolean] :try_static
         # @return [Array<String, Symbol>, Boolean]
         def resolve_template(request_path, options={})
           # Find the path by searching or using the cache
@@ -436,26 +449,33 @@ module Middleman
             relative_path = Util.strip_leading_slash(request_path)
             on_disk_path  = File.expand_path(relative_path, source_dir)
 
-            # By default, any engine will do
-            preferred_engines = ['*']
+            preferred_engines = if options[:try_static]
+              [nil]
+            else
+              possible_engines = ['*'] # By default, any engine will do
 
-            # If we're specifically looking for a preferred engine
-            if options.key?(:preferred_engine)
-              extension_class = ::Tilt[options[:preferred_engine]]
+              # If we're specifically looking for a preferred engine
+              if options.key?(:preferred_engine)
+                extension_class = ::Tilt[options[:preferred_engine]]
 
-              # Get a list of extensions for a preferred engine
-              matched_exts = ::Tilt.mappings.select do |_, engines|
-                engines.include? extension_class
-              end.keys
+                # Get a list of extensions for a preferred engine
+                matched_exts = ::Tilt.mappings.select do |_, engines|
+                  engines.include? extension_class
+                end.keys
 
-              # Prefer to look for the matched extensions
-              unless matched_exts.empty?
-                preferred_engines.unshift('{' + matched_exts.join(',') + '}')
+                # Prefer to look for the matched extensions
+                unless matched_exts.empty?
+                  possible_engines.unshift('{' + matched_exts.join(',') + '}')
+                end
               end
+
+              possible_engines
             end
 
             search_paths = preferred_engines.flat_map do |preferred_engine|
-              path_with_ext = on_disk_path + '.' + preferred_engine
+              path_with_ext = on_disk_path.dup
+              path_with_ext << ('.' + preferred_engine) unless preferred_engine.nil?
+
               paths = [path_with_ext]
               if options[:try_without_underscore]
                 paths << path_with_ext.sub(relative_path, relative_path.sub(/^_/, '').sub(/\/_/, '/'))
@@ -468,10 +488,15 @@ module Middleman
               found_path = Dir[path_with_ext].find do |path|
                 ::Tilt[path]
               end
+
+              unless found_path
+                found_path = path_with_ext if File.exist?(path_with_ext)
+              end
+
               break if found_path
             end
 
-            # If we found one, return it and the found engine
+            # If we found one, return it
             if found_path
               found_path
             elsif File.exist?(on_disk_path)

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

@@ -281,7 +281,7 @@ module Middleman
         # Halt request and return 404
         def not_found(res, path)
           res.status = 404
-          res.write "<html><body><h1>File Not Found</h1><p>#{path}</p></body>"
+          res.write "<html><head></head><body><h1>File Not Found</h1><p>#{path}</p></body></html>"
           res.finish
         end
 

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

@@ -2,15 +2,15 @@
 module Middleman
   module CoreExtensions
     module Routing
-        # Takes a block which allows many pages to have the same layout
-        #
-        #   with_layout :admin do
-        #     page "/admin/"
-        #     page "/admin/login.html"
-        #   end
-        #
-        # @param [String, Symbol] layout_name
-        # @return [void]
+      # Takes a block which allows many pages to have the same layout
+      #
+      #   with_layout :admin do
+      #     page "/admin/"
+      #     page "/admin/login.html"
+      #   end
+      #
+      # @param [String, Symbol] layout_name
+      # @return [void]
       def with_layout(layout_name, &block)
         old_layout = config[:layout]
 
@@ -20,14 +20,14 @@ module Middleman
         config[:layout] = old_layout
       end
 
-        # The page method allows the layout to be set on a specific path
-        #
-        #   page "/about.html", :layout => false
-        #   page "/", :layout => :homepage_layout
-        #
-        # @param [String] url
-        # @param [Hash] opts
-        # @return [void]
+      # The page method allows the layout to be set on a specific path
+      #
+      #   page "/about.html", :layout => false
+      #   page "/", :layout => :homepage_layout
+      #
+      # @param [String] url
+      # @param [Hash] opts
+      # @return [void]
       def page(url, opts={}, &block)
         blocks = Array(block)
 

data/lib/middleman-core/extension.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/class/attribute'
+require 'middleman-core/configuration'
 
 module Middleman
   class Extension
@@ -117,10 +118,10 @@ module Middleman
 
     def bind_before_configuration
       ext = self
-      if ext.respond_to?(:before_configuration)
-        @klass.before_configuration do
-          ext.before_configuration
-        end
+      return unless ext.respond_to?(:before_configuration)
+
+      @klass.before_configuration do
+        ext.before_configuration
       end
     end
 
@@ -138,26 +139,26 @@ module Middleman
 
     def bind_before_build
       ext = self
-      if ext.respond_to?(:before_build)
-        @klass.before_build do |builder|
-          if ext.method(:before_build).arity == 1
-            ext.before_build(builder)
-          else
-            ext.before_build
-          end
+      return unless ext.respond_to?(:before_build)
+
+      @klass.before_build do |builder|
+        if ext.method(:before_build).arity == 1
+          ext.before_build(builder)
+        else
+          ext.before_build
         end
       end
     end
 
     def bind_after_build
       ext = self
-      if ext.respond_to?(:after_build)
-        @klass.after_build do |builder|
-          if ext.method(:after_build).arity == 1
-            ext.after_build(builder)
-          else
-            ext.after_build
-          end
+      return unless ext.respond_to?(:after_build)
+
+      @klass.after_build do |builder|
+        if ext.method(:after_build).arity == 1
+          ext.after_build(builder)
+        else
+          ext.after_build
         end
       end
     end

data/lib/middleman-core/preview_server.rb

@@ -23,26 +23,25 @@ module Middleman
         logger.info "== Inspect your site configuration at http://#{host}:#{port}/__middleman/"
 
         @initialized ||= false
-        unless @initialized
-          @initialized = true
+        return if @initialized
+        @initialized = true
 
-          register_signal_handlers
+        register_signal_handlers
 
-          # Save the last-used @options so it may be re-used when
-          # reloading later on.
-          ::Middleman::Profiling.report('server_start')
+        # Save the last-used @options so it may be re-used when
+        # reloading later on.
+        ::Middleman::Profiling.report('server_start')
 
-          loop do
-            @webrick.start
+        loop do
+          @webrick.start
 
-            # $mm_shutdown is set by the signal handler
-            if $mm_shutdown
-              shutdown
-              exit
-            elsif $mm_reload
-              $mm_reload = false
-              reload
-            end
+          # $mm_shutdown is set by the signal handler
+          if $mm_shutdown
+            shutdown
+            exit
+          elsif $mm_reload
+            $mm_reload = false
+            reload
           end
         end
       end
@@ -107,25 +106,20 @@ module Middleman
             opts[:instrumenting] || false
           )
 
-          if opts[:environment]
-            config[:environment] = opts[:environment].to_sym
-          end
+          config[:environment] = opts[:environment].to_sym if opts[:environment]
         end
       end
 
       def start_file_watcher
-        return if @options[:disable_watcher]
+        return if @listener || @options[:disable_watcher]
 
-        first_run = !@listener
+        # Watcher Library
+        require 'listen'
 
-        if first_run
-          # Watcher Library
-          require 'listen'
-          @listener = Listen.to(Dir.pwd, relative_paths: true, force_polling: @options[:force_polling])
-          @listener.latency(@options[:latency])
-        end
+        options = { force_polling: @options[:force_polling] }
+        options[:latency] = @options[:latency] if @options[:latency]
 
-        @listener.change do |modified, added, removed|
+        @listener = Listen.to(Dir.pwd, options) do |modified, added, removed|
           added_and_modified = (modified + added)
 
           # See if the changed file is config.rb or lib/*.rb
@@ -134,31 +128,33 @@ module Middleman
             @webrick.stop
           else
             added_and_modified.each do |path|
-              next if app.files.ignored?(path)
-              app.files.did_change(path)
+              relative_path = Pathname(path).relative_path_from(Pathname(Dir.pwd)).to_s
+              next if app.files.ignored?(relative_path)
+              app.files.did_change(relative_path)
             end
 
             removed.each do |path|
-              next if app.files.ignored?(path)
-              app.files.did_delete(path)
+              relative_path = Pathname(path).relative_path_from(Pathname(Dir.pwd)).to_s
+              next if app.files.ignored?(relative_path)
+              app.files.did_delete(relative_path)
             end
           end
         end
 
         # Don't block this thread
-        @listener.start if first_run
+        @listener.start
       end
 
       # Trap some interupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers
         %w(INT HUP TERM QUIT).each do |sig|
-          if Signal.list[sig]
-            Signal.trap(sig) do
-              # Do as little work as possible in the signal context
-              $mm_shutdown = true
-              @webrick.stop
-            end
+          next unless Signal.list[sig]
+
+          Signal.trap(sig) do
+            # Do as little work as possible in the signal context
+            $mm_shutdown = true
+            @webrick.stop
           end
         end
       end
@@ -234,9 +230,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        unless data =~ %r{Could not determine content-length of response body.}
-          super(level, data)
-        end
+        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
       end
     end
   end