middleman-core-with-external-sources-watch-fix 4.1.0 → 4.1.10

data/fixtures/dynamic-pages-app/config.rb

@@ -28,3 +28,7 @@ page "fake/*", locals: { glob_var: "I am one glob" }
 page "fake2/*", locals: { glob_var: "I am two glob" }
 page "fake3/*", locals: { glob_var: "I am three glob" }
 page "fake4/*", locals: { glob_var: "I am four glob" }
+
+["tom", "dick", "harry"].each do |name|
+  proxy "/about/#{name}.html", "/should_be_ignored9.html", locals: { person_name: name }, ignore: true
+end

data/fixtures/dynamic-pages-app/source/should_be_ignored9.html

@@ -0,0 +1 @@
+<h1>Ignore me! 9</h1>

data/fixtures/external-pipeline-error/config.rb

@@ -0,0 +1,5 @@
+activate :external_pipeline,
+  name: :failing,
+  command: "mv does-not-exist tmp/file.js",
+  source: "tmp",
+  latency: 2

data/fixtures/page-id-app/config.rb

@@ -0,0 +1,5 @@
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+end
+
+page "/overwrites/*", id: :"something-else"

data/fixtures/page-id-app/source/fm.html.erb

@@ -0,0 +1,5 @@
+---
+id: frontmatter
+---
+
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/index.html.erb

@@ -0,0 +1,6 @@
+I am: <%= current_resource.page_id %>
+
+URL1: <%= url_for "frontmatter" %>
+URL2: <%= url_for "page2" %>
+URL3: <%= link_to "Hi", "page3" %>
+URL4: <%= link_to "Sym", :"something-else" %>

data/fixtures/page-id-app/source/overwrites/from-default.html.erb

@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb

@@ -0,0 +1,5 @@
+---
+id: from_frontmatter
+---
+
+I am: <%= current_resource.page_id %>

data/fixtures/partials-app/source/_block.erb

@@ -0,0 +1,3 @@
+Start
+<%= yield %>
+End

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

@@ -0,0 +1,3 @@
+<% partial "block" do %>
+Contents 
+<% end %>

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

@@ -0,0 +1,3 @@
+<%= partial "shared/header" %>
+<%= partial "i_do_not_exist" %>
+<%= partial "shared/footer" %>

data/lib/middleman-core/application.rb

@@ -96,6 +96,10 @@ module Middleman
     # @return [String]
     define_setting :source, 'source', 'Name of the source directory'
 
+    # If we should not run the sitemap.
+    # @return [Boolean]
+    define_setting :disable_sitemap, false, 'If we should not run the sitemap.'
+
     # If we should exit before ready event.
     # @return [Boolean]
     define_setting :exit_before_ready, false, 'If we should exit before ready event.'
@@ -106,7 +110,7 @@ module Middleman
 
     # Middleman environment. Defaults to :development
     # @return [String]
-    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development'
+    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development', import: proc { |s| s.to_sym }
 
     # Which file should be used for directory indexes
     # @return [String]
@@ -156,6 +160,10 @@ module Middleman
     # @return [Array.<String>]
     define_setting :extensions_with_layout, %w(.htm .html .xhtml .php), 'Which file extensions have a layout by default.'
 
+    # Which file extensions are "assets."
+    # @return [Array.<String>]
+    define_setting :asset_extensions, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot .ico .map), 'Which file extensions are treated as assets.'
+
     # Default string encoding for templates and output.
     # @return [String]
     define_setting :encoding, 'utf-8', 'Default string encoding for templates and output'
@@ -183,13 +191,15 @@ module Middleman
         ignored
       end,
 
-      layout: proc do |file, _sitemap_app|
-        file[:relative_path].to_s.start_with?('layout.', 'layouts/')
+      layout: proc do |file, app|
+        file[:relative_path].to_s.start_with?('layout.', app.config[:layouts_dir] + '/')
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 
     define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| p =~ r } }, 'Whether some paths should not be removed during a clean build.'
 
+    define_setting :cli_options, {}, 'Options from the Command Line.'
+
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
     define_setting :watcher_latency, nil, 'The Listen watcher latency'
@@ -225,7 +235,8 @@ module Middleman
                                       :before, # Before Rack requests
                                       :before_render,
                                       :after_render,
-                                      :before_server
+                                      :before_server,
+                                      :reload
                                     ])
 
         @middleware = Set.new
@@ -255,6 +266,8 @@ module Middleman
       # Evaluate a passed block if given
       config_context.instance_exec(&block) if block_given?
 
+      apply_cli_options
+
       execute_callbacks(:before_sitemap)
 
       # Initialize the Sitemap
@@ -277,6 +290,8 @@ module Middleman
       # Run any `configure` blocks for the current mode.
       execute_callbacks([:configure, config[:mode]])
 
+      apply_cli_options
+
       # Post parsing, pre-extension callback
       execute_callbacks(:after_configuration_eval)
 
@@ -293,6 +308,17 @@ module Middleman
       execute_callbacks(:ready) unless config[:exit_before_ready]
     end
 
+    def apply_cli_options
+      config[:cli_options].each do |k, v|
+        setting = config.setting(k.to_sym)
+        next unless setting
+
+        v = setting.options[:import].call(v) if setting.options[:import]
+
+        config[k.to_sym] = v
+      end
+    end
+
     # Eval config
     def evaluate_configuration!
       # Check for and evaluate local configuration in `config.rb`

data/lib/middleman-core/builder.rb

@@ -97,7 +97,7 @@ module Middleman
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
         # Double-check for compass sprites
-        if @app.files.find_new_files!.length > 0
+        unless @app.files.find_new_files!.empty?
           logger.debug '== Checking for Compass sprites'
           @app.sitemap.ensure_resource_list_updated!
         end
@@ -117,7 +117,13 @@ module Middleman
                       .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
 
       if @glob
-        resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
+        resources = resources.select do |resource|
+          if defined?(::File::FNM_EXTGLOB)
+            File.fnmatch(@glob, resource.destination_path, ::File::FNM_EXTGLOB)
+          else
+            File.fnmatch(@glob, resource.destination_path)
+          end
+        end
       end
 
       output_resources(resources)

data/lib/middleman-core/config_context.rb

@@ -8,7 +8,7 @@ module Middleman
     attr_reader :app
 
     # Whitelist methods that can reach out.
-    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?
+    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?, :extensions
     def_delegator :"@app.extensions", :activate
 
     def initialize(app, template_context_class)
@@ -22,6 +22,10 @@ module Middleman
       app.subscribe_to_callbacks(&method(:execute_callbacks))
     end
 
+    def include(mod)
+      extend(mod)
+    end
+
     def helpers(*helper_modules, &block)
       helper_modules ||= []
 

data/lib/middleman-core/configuration.rb

@@ -40,7 +40,7 @@ module Middleman
 
       # Allow configuration settings to be read and written via methods
       def method_missing(method, *args)
-        if defines_setting?(method) && args.size == 0
+        if defines_setting?(method) && args.empty?
           self[method]
         elsif method.to_s =~ /^(\w+)=$/ && args.size == 1
           self[$1.to_sym] = args[0]

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

@@ -1,3 +1,4 @@
+require 'monitor'
 require 'middleman-core/core_extensions/collections/pagination'
 require 'middleman-core/core_extensions/collections/step_context'
 require 'middleman-core/core_extensions/collections/lazy_root'
@@ -41,6 +42,8 @@ module Middleman
           @values_by_name = {}
 
           @collector_roots = []
+
+          @lock = Monitor.new
         end
 
         def before_configuration
@@ -81,27 +84,35 @@ module Middleman
 
         Contract ResourceList => ResourceList
         def manipulate_resource_list(resources)
-          @collector_roots.each do |pair|
-            dataset = pair[:block].call(app, resources)
-            pair[:root].realize!(dataset)
-          end
+          @lock.synchronize do
+            @collector_roots.each do |pair|
+              dataset = pair[:block].call(app, resources)
+              pair[:root].realize!(dataset)
+            end
 
-          ctx = StepContext.new
-          leaves = @leaves.dup
+            ctx = StepContext.new(app)
+            StepContext.current = ctx
 
-          @collectors_by_name.each do |k, v|
-            @values_by_name[k] = v.value(ctx)
-            leaves.delete v
-          end
+            leaves = @leaves.dup
 
-          # Execute code paths
-          leaves.each do |v|
-            v.value(ctx)
-          end
+            @collectors_by_name.each do |k, v|
+              @values_by_name[k] = v.value(ctx)
+              leaves.delete v
+            end
+
+            # Execute code paths
+            leaves.each do |v|
+              v.value(ctx)
+            end
+
+            # Inject descriptors
+            results = ctx.descriptors.reduce(resources) do |sum, d|
+              d.execute_descriptor(app, sum)
+            end
+
+            StepContext.current = nil
 
-          # Inject descriptors
-          ctx.descriptors.reduce(resources) do |sum, d|
-            d.execute_descriptor(app, sum)
+            results
           end
         end
       end

data/lib/middleman-core/core_extensions/collections/step_context.rb

@@ -2,23 +2,30 @@ module Middleman
   module CoreExtensions
     module Collections
       class StepContext
-        def self.add_to_context(name, &func)
-          send(:define_method, :"_internal_#{name}", &func)
+        class << self
+          attr_accessor :current
+
+          def add_to_context(name, &func)
+            send(:define_method, :"_internal_#{name}", &func)
+          end
         end
 
         attr_reader :descriptors
 
-        def initialize
+        def initialize(app)
+          @app = app
           @descriptors = []
         end
 
         def method_missing(name, *args, &block)
           internal = :"_internal_#{name}"
 
-          return super unless respond_to?(internal)
-
-          send(internal, *args, &block).tap do |r|
-            @descriptors << r if r.respond_to?(:execute_descriptor)
+          if respond_to?(internal)
+            send(internal, *args, &block).tap do |r|
+              @descriptors << r if r.respond_to?(:execute_descriptor)
+            end
+          else
+            @app.config_context.send(name, *args, &block)
           end
         end
       end

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

@@ -67,7 +67,7 @@ module Middleman
         # @param [Symbol] name Name of the data, used for namespacing
         # @param [Hash] content The content for this data
         # @return [Hash]
-        Contract Symbol, Hash => Hash
+        Contract Symbol, Or[Hash, Array] => Hash
         def store(name=nil, content=nil)
           @local_sources[name.to_s] = content unless name.nil? || content.nil?
           @local_sources
@@ -88,6 +88,8 @@ module Middleman
         def update_files(updated_files, removed_files)
           updated_files.each(&method(:touch_file))
           removed_files.each(&method(:remove_file))
+
+          @app.sitemap.rebuild_resource_list!(:touched_data_file)
         end
 
         # Update the internal cache for a given file path
@@ -148,7 +150,7 @@ module Middleman
         #
         # @param [String, Symbol] path The name of the data namespace
         # @return [Hash, nil]
-        Contract Or[String, Symbol] => Maybe[Hash]
+        Contract Or[String, Symbol] => Maybe[Or[Array, IsA['Middleman::Util::EnhancedHash']]]
         def data_for_path(path)
           response = if store.key?(path.to_s)
             store[path.to_s]

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

@@ -1,4 +1,5 @@
 require 'padrino-helpers'
+require 'middleman-core/contracts'
 
 # Don't fail on invalid locale, that's not what our current
 # users expect.

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

@@ -73,18 +73,20 @@ module Middleman::CoreExtensions
 
       return [{}, nil] unless file
 
-      return @cache[file[:full_path]] if @cache.key?(file[:full_path])
+      file_path = file[:full_path].to_s
 
-      @cache[file[:full_path]] = ::Middleman::Util::Data.parse(
-        file,
-        app.config[:frontmatter_delims]
-      )
+      @cache[file_path] ||= begin
+        ::Middleman::Util::Data.parse(
+          file,
+          app.config[:frontmatter_delims]
+        )
+      end
     end
 
     Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any
     def clear_data(updated_files, removed_files)
       (updated_files + removed_files).each do |file|
-        @cache.delete(file[:full_path])
+        @cache.delete(file[:full_path].to_s)
       end
     end
   end