middleman-core 4.1.0.rc.1 → 4.1.0.rc.2

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

@@ -3,46 +3,48 @@ require 'active_support/core_ext/hash/deep_merge'
 require 'monitor'
 require 'hamster'
 
+require 'middleman-core/extensions'
+
 # Files on Disk
-Middleman::Extensions.register :sitemap_ondisk, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_ondisk, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/on_disk'
-  Middleman::Sitemap::Extensions::OnDisk
+  ::Middleman::Sitemap::Extensions::OnDisk
 end
 
 # Files on Disk (outside the project root)
-Middleman::Extensions.register :sitemap_import, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_import, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/import'
-  Middleman::Sitemap::Extensions::Import
+  ::Middleman::Sitemap::Extensions::Import
 end
 
 # Endpoints
-Middleman::Extensions.register :sitemap_endpoint, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_endpoint, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/request_endpoints'
-  Middleman::Sitemap::Extensions::RequestEndpoints
+  ::Middleman::Sitemap::Extensions::RequestEndpoints
 end
 
 # Proxies
-Middleman::Extensions.register :sitemap_proxies, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_proxies, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/proxies'
-  Middleman::Sitemap::Extensions::Proxies
+  ::Middleman::Sitemap::Extensions::Proxies
 end
 
 # Redirects
-Middleman::Extensions.register :sitemap_redirects, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_redirects, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/redirects'
-  Middleman::Sitemap::Extensions::Redirects
+  ::Middleman::Sitemap::Extensions::Redirects
 end
 
 # Move Files
-Middleman::Extensions.register :sitemap_move_files, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_move_files, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/move_file'
-  Middleman::Sitemap::Extensions::MoveFile
+  ::Middleman::Sitemap::Extensions::MoveFile
 end
 
 # Ignores
-Middleman::Extensions.register :sitemap_ignore, auto_activate: :before_configuration do
+::Middleman::Extensions.register :sitemap_ignore, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/ignores'
-  Middleman::Sitemap::Extensions::Ignores
+  ::Middleman::Sitemap::Extensions::Ignores
 end
 
 require 'middleman-core/contracts'
@@ -73,6 +75,7 @@ module Middleman
       def initialize(app)
         @app = app
         @resources = []
+        @rebuild_reasons = [:first_run]
         @update_count = 0
 
         @resource_list_manipulators = ::Hamster::Vector.empty
@@ -113,9 +116,10 @@ module Middleman
 
       # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
-      Contract Maybe[Symbol] => Any
-      def rebuild_resource_list!(name=nil)
+      Contract Symbol => Any
+      def rebuild_resource_list!(name)
         @lock.synchronize do
+          @rebuild_reasons << name
           @app.logger.debug "== Requesting resource list rebuilding: #{name}"
           @needs_sitemap_rebuild = true
         end
@@ -196,29 +200,36 @@ module Middleman
       def ensure_resource_list_updated!
         @lock.synchronize do
           return unless @needs_sitemap_rebuild
-          @needs_sitemap_rebuild = false
 
-          @app.logger.debug '== Rebuilding resource list'
+          ::Middleman::Util.instrument 'sitemap.update', reasons: @rebuild_reasons.uniq do
+            @needs_sitemap_rebuild = false
+
+            @app.logger.debug '== Rebuilding resource list'
+
+            @resources = []
 
-          @resources = []
+            @resource_list_manipulators.each do |m|
+              ::Middleman::Util.instrument 'sitemap.manipulator', name: m[:name] do
+                @app.logger.debug "== Running manipulator: #{m[:name]}"
+                @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
 
-          @resource_list_manipulators.each do |m|
-            @app.logger.debug "== Running manipulator: #{m[:name]}"
-            @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
+                # Reset lookup cache
+                reset_lookup_cache!
 
-            # Reset lookup cache
-            reset_lookup_cache!
+                # Rebuild cache
+                @resources.each do |resource|
+                  @_lookup_by_path[resource.path] = resource
+                  @_lookup_by_destination_path[resource.destination_path] = resource
+                end
 
-            # Rebuild cache
-            @resources.each do |resource|
-              @_lookup_by_path[resource.path] = resource
-              @_lookup_by_destination_path[resource.destination_path] = resource
+                invalidate_resources_not_ignored_cache!
+              end
             end
 
-            invalidate_resources_not_ignored_cache!
-          end
+            @update_count += 1
 
-          @update_count += 1
+            @rebuild_reasons = []
+          end
         end
       end
 

data/lib/middleman-core/sources.rb

@@ -15,10 +15,10 @@ module Middleman
     include Contracts
 
     # Types which could cause output to change.
-    OUTPUT_TYPES = [:source, :locales, :data]
+    OUTPUT_TYPES = [:source, :locales, :data].freeze
 
     # Types which require a reload to eval ruby
-    CODE_TYPES = [:reload]
+    CODE_TYPES = [:reload].freeze
 
     Matcher = Or[Regexp, RespondTo[:call]]
 
@@ -213,12 +213,12 @@ module Middleman
     # Manually poll all watchers for new content.
     #
     # @return [void]
-    Contract Any
+    Contract ArrayOf[Pathname]
     def find_new_files!
-      return unless @update_count != @last_update_count
+      return [] unless @update_count != @last_update_count
 
       @last_update_count = @update_count
-      watchers.each(&:poll_once!)
+      watchers.reduce([]) { |sum, w| sum + w.poll_once! }
     end
 
     # Start up all listeners.
@@ -257,11 +257,11 @@ module Middleman
     #
     # @param [nil,Regexp] matcher A Regexp to match the change path against
     Contract Maybe[Matcher] => Any
-    def changed(matcher=nil, &block)
+    def changed(matcher=nil, &_block)
       on_change OUTPUT_TYPES do |updated, _removed|
         updated
           .select { |f| matcher.nil? ? true : matches?(matcher, f) }
-          .each { |f| block.call(f[:relative_path]) }
+          .each { |f| yield f[:relative_path] }
       end
     end
 
@@ -269,11 +269,11 @@ module Middleman
     #
     # @param [nil,Regexp] matcher A Regexp to match the change path against
     Contract Maybe[Matcher] => Any
-    def deleted(matcher=nil, &block)
+    def deleted(matcher=nil, &_block)
       on_change OUTPUT_TYPES do |_updated, removed|
         removed
           .select { |f| matcher.nil? ? true : matches?(matcher, f) }
-          .each { |f| block.call(f[:relative_path]) }
+          .each { |f| yield f[:relative_path] }
       end
     end
 

data/lib/middleman-core/sources/source_watcher.rb

@@ -91,7 +91,7 @@ module Middleman
 
       stop_listener! if @listener
 
-      update([], @files.values)
+      update([], @files.values.map { |source_file| source_file[:full_path] })
 
       poll_once!
 
@@ -180,17 +180,19 @@ module Middleman
     # Manually trigger update events.
     #
     # @return [void]
-    Contract Any
+    Contract ArrayOf[Pathname]
     def poll_once!
       updated = ::Middleman::Util.all_files_under(@directory.to_s)
       removed = @files.keys.reject { |p| updated.include?(p) }
 
       update(updated, removed)
 
-      return unless @waiting_for_existence && @directory.exist?
+      if @waiting_for_existence && @directory.exist?
+        @waiting_for_existence = false
+        listen!
+      end
 
-      @waiting_for_existence = false
-      listen!
+      updated + removed
     end
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
@@ -200,7 +202,7 @@ module Middleman
     def to_s
       "#<Middleman::SourceWatcher:0x#{object_id} type=#{@type.inspect} directory=#{@directory.inspect}>"
     end
-    alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
+    alias inspect to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
     protected
 
@@ -254,17 +256,19 @@ module Middleman
                       end
 
       execute_callbacks(:on_change, [
-        valid_updates,
-        valid_removes,
-        self
-      ]) unless valid_updates.empty? && valid_removes.empty?
+                          valid_updates,
+                          valid_removes,
+                          self
+                        ]) unless valid_updates.empty? && valid_removes.empty?
     end
 
+    Contract IsA['Middleman::SourceFile'] => Any
     def add_file_to_cache(f)
       @files[f[:full_path]] = f
       @extensionless_files[strip_extensions(f[:full_path])] = f
     end
 
+    Contract IsA['Middleman::SourceFile'] => Any
     def remove_file_from_cache(f)
       @files.delete(f[:full_path])
       @extensionless_files.delete(strip_extensions(f[:full_path]))

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -4,22 +4,23 @@ require 'capybara/cucumber'
 
 Given /^a clean server$/ do
   @initialize_commands = []
+  @activation_commands = []
 end
 
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
-  @initialize_commands ||= []
+  @activation_commands ||= []
 
   if state == 'enabled'
-    @initialize_commands << lambda { activate(feature.to_sym) }
+    @activation_commands << lambda { activate(feature.to_sym) }
   end
 end
 
 Given /^"([^\"]*)" feature is "enabled" with "([^\"]*)"$/ do |feature, options_str|
-  @initialize_commands ||= []
+  @activation_commands ||= []
 
   options = eval("{#{options_str}}")
 
-  @initialize_commands << lambda { activate(feature.to_sym, options) }
+  @activation_commands << lambda { activate(feature.to_sym, options) }
 end
 
 Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
@@ -41,6 +42,7 @@ Given /^the Server is running$/ do
   ENV['MM_ROOT'] = root_dir
 
   initialize_commands = @initialize_commands || []
+  activation_commands = @activation_commands || []
 
   @server_inst = ::Middleman::Application.new do
     config[:watcher_disable] = true
@@ -49,6 +51,12 @@ Given /^the Server is running$/ do
     initialize_commands.each do |p|
       instance_exec(&p)
     end
+
+    app.after_configuration_eval do
+      activation_commands.each do |p|
+        config_context.instance_exec(&p)
+      end
+    end
   end
 
   Capybara.app = ::Middleman::Rack.new(@server_inst).to_app

data/lib/middleman-core/template_context.rb

@@ -162,7 +162,7 @@ module Middleman
       return nil unless current_path
       sitemap.find_resource_by_destination_path(current_path)
     end
-    alias_method :current_page, :current_resource
+    alias current_page current_resource
 
     protected
 

data/lib/middleman-core/template_renderer.rb

@@ -28,6 +28,75 @@ module Middleman
       @_cache ||= Cache.new
     end
 
+    # Find a layout on-disk, optionally using a specific engine
+    # @param [String] name
+    # @param [Symbol] preferred_engine
+    # @return [String]
+    Contract IsA['Middleman::Application'], Or[String, Symbol], Symbol => Maybe[IsA['Middleman::SourceFile']]
+    def self.locate_layout(app, name, preferred_engine=nil)
+      resolve_opts = {}
+      resolve_opts[:preferred_engine] = preferred_engine unless preferred_engine.nil?
+
+      # Check layouts folder
+      layout_file = resolve_template(app, File.join(app.config[:layouts_dir], name.to_s), resolve_opts)
+
+      # If we didn't find it, check root
+      layout_file = resolve_template(app, name, resolve_opts) unless layout_file
+
+      # Return the path
+      layout_file
+    end
+
+    # Find a template on disk given a output path
+    # @param [String] request_path
+    # @option options [Boolean] :preferred_engine If set, try this engine first, then fall back to any engine.
+    # @return [String, Boolean] Either the path to the template, or false
+    Contract IsA['Middleman::Application'], Or[Symbol, String], Maybe[Hash] => Maybe[IsA['Middleman::SourceFile']]
+    def self.resolve_template(app, request_path, options={})
+      # Find the path by searching
+      relative_path = Util.strip_leading_slash(request_path.to_s)
+
+      # By default, any engine will do
+      preferred_engines = []
+
+      # 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
+        preferred_engines += ::Tilt.mappings.select do |_, engines|
+          engines.include? extension_class
+        end.keys
+      end
+
+      preferred_engines << '*'
+      preferred_engines << nil if options[:try_static]
+
+      found_template = nil
+
+      preferred_engines.each do |preferred_engine|
+        path_with_ext = relative_path.dup
+        path_with_ext << ('.' + preferred_engine) unless preferred_engine.nil?
+
+        globbing = preferred_engine == '*'
+
+        # Cache lookups in build mode only
+        file = if app.build?
+          cache.fetch(path_with_ext, preferred_engine) do
+            app.files.find(:source, path_with_ext, globbing)
+          end
+        else
+          app.files.find(:source, path_with_ext, globbing)
+        end
+
+        found_template = file if file && (preferred_engine.nil? || ::Tilt[file[:full_path]])
+        break if found_template
+      end
+
+      # If we found one, return it
+      found_template
+    end
+
     # Custom error class for handling
     class TemplateNotFound < RuntimeError; end
 
@@ -132,14 +201,13 @@ module Middleman
         # Look for :layout of any extension
         # If found, use it. If not, continue
         locate_layout(:layout, layout_engine)
-      else
+      elsif layout_file = locate_layout(local_layout, layout_engine)
         # Look for specific layout
         # If found, use it. If not, error.
-        if layout_file = locate_layout(local_layout, layout_engine)
-          layout_file
-        else
-          raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate layout: #{local_layout}"
-        end
+
+        layout_file
+      else
+        raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate layout: #{local_layout}"
       end
     end
 
@@ -152,25 +220,6 @@ module Middleman
       self.class.locate_layout(@app, name, preferred_engine)
     end
 
-    # Find a layout on-disk, optionally using a specific engine
-    # @param [String] name
-    # @param [Symbol] preferred_engine
-    # @return [String]
-    Contract IsA['Middleman::Application'], Or[String, Symbol], Symbol => Maybe[IsA['Middleman::SourceFile']]
-    def self.locate_layout(app, name, preferred_engine=nil)
-      resolve_opts = {}
-      resolve_opts[:preferred_engine] = preferred_engine unless preferred_engine.nil?
-
-      # Check layouts folder
-      layout_file = resolve_template(app, File.join(app.config[:layouts_dir], name.to_s), resolve_opts)
-
-      # If we didn't find it, check root
-      layout_file = resolve_template(app, name, resolve_opts) unless layout_file
-
-      # Return the path
-      layout_file
-    end
-
     # Find a template on disk given a output path
     # @param [String] request_path
     # @param [Hash] options
@@ -179,55 +228,5 @@ module Middleman
     def resolve_template(request_path, options={})
       self.class.resolve_template(@app, request_path, options)
     end
-
-    # Find a template on disk given a output path
-    # @param [String] request_path
-    # @option options [Boolean] :preferred_engine If set, try this engine first, then fall back to any engine.
-    # @return [String, Boolean] Either the path to the template, or false
-    Contract IsA['Middleman::Application'], Or[Symbol, String], Maybe[Hash] => Maybe[IsA['Middleman::SourceFile']]
-    def self.resolve_template(app, request_path, options={})
-      # Find the path by searching
-      relative_path = Util.strip_leading_slash(request_path.to_s)
-
-      # By default, any engine will do
-      preferred_engines = []
-
-      # 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
-        preferred_engines += ::Tilt.mappings.select do |_, engines|
-          engines.include? extension_class
-        end.keys
-      end
-
-      preferred_engines << '*'
-      preferred_engines << nil if options[:try_static]
-
-      found_template = nil
-
-      preferred_engines.each do |preferred_engine|
-        path_with_ext = relative_path.dup
-        path_with_ext << ('.' + preferred_engine) unless preferred_engine.nil?
-
-        globbing = preferred_engine == '*'
-
-        # Cache lookups in build mode only
-        file = if app.build?
-          cache.fetch(path_with_ext, preferred_engine) do
-            app.files.find(:source, path_with_ext, globbing)
-          end
-        else
-          app.files.find(:source, path_with_ext, globbing)
-        end
-
-        found_template = file if file && (preferred_engine.nil? || ::Tilt[file[:full_path]])
-        break if found_template
-      end
-
-      # If we found one, return it
-      found_template
-    end
   end
 end