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

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

@@ -1,6 +1,10 @@
-module Sprockets
+module Middleman
   module Sass
     module Functions
+      def asset_path(_source, _options)
+        # current_resource
+      end
+
       # Using Middleman::Util#asset_path, return the full path
       # for the given +source+ as a Sass String. This supports keyword
       # arguments that mirror the +options+.
@@ -81,36 +85,30 @@ module Sprockets
         options[:custom][:middleman_context]
       end
 
+      # Returns a reference to Middleman's current resource.
+      def current_resource # :nodoc:
+        options[:custom][:current_resource]
+      end
+
       # Returns an options hash where the keys are symbolized
       # and the values are unwrapped Sass literals.
       def map_options(options={}) # :nodoc:
         ::Sass::Util.map_hash(options) do |key, value|
           [key.to_sym, value.respond_to?(:value) ? value.value : value]
         end
+
+        options[:current_resource] = current_resource
+
+        options
       end
     end
   end
 end
 
-module Sass::Script::Functions
-  include Sprockets::Sass::Functions
-
-  # Hack to ensure previous API declarations (by Compass or whatever)
-  # don't take precedence.
-  [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method|
-    defined?(@signatures) && @signatures.delete(method)
-  end
-
-  declare :asset_path,     [:source], var_kwargs: true
-  declare :asset_path,     [:source, :kind]
-  declare :asset_url,      [:source], var_kwargs: true
-  declare :asset_url,      [:source, :kind]
-  declare :image_path,     [:source], var_kwargs: true
-  declare :image_url,      [:source], var_kwargs: true
-  declare :image_url,      [:source, :only_path]
-  declare :image_url,      [:source, :only_path, :cache_buster]
-  declare :font_path,      [:source], var_kwargs: true
-  declare :font_url,       [:source], var_kwargs: true
-  declare :font_url,       [:source, :only_path]
-  declare :asset_data_uri, [:source]
+SASS_MODULE = if defined?(::SassC)
+  ::SassC
+else
+  ::Sass
 end
+
+SASS_MODULE::Script::Functions.send :include, ::Middleman::Sass::Functions

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

@@ -30,7 +30,11 @@ module Middleman
           elsif path.is_a? String
             path_clean = ::Middleman::Util.normalize_path(path)
             if path_clean.include?('*') # It's a glob
-              @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) }
+              if defined? File::FNM_EXTGLOB
+                @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p, File::FNM_EXTGLOB) }
+              else
+                @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) }
+              end
             else
               # Add a specific-path ignore unless that path is already covered
               return if ignored?(path_clean)

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

@@ -0,0 +1,108 @@
+require 'set'
+require 'middleman-core/contracts'
+
+module Middleman
+  module Sitemap
+    module Extensions
+      class Import < Extension
+        self.resource_list_manipulator_priority = 1
+
+        ImportFileDescriptor = Struct.new(:from, :to)
+        ImportPathDescriptor = Struct.new(:from, :renameProc)
+
+        # Expose `create_import_file` to config as `import_file`
+        expose_to_config import_file: :create_import_file
+
+        # Expose `create_import_path` to config as `import_path`
+        expose_to_config import_path: :create_import_path
+
+        def initialize(app, config={}, &block)
+          super
+
+          @import_file_configs = Set.new
+          @import_path_configs = Set.new
+        end
+
+        def after_configuration
+          ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(:import_file, &method(:create_import_file))
+          ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(:import_path, &method(:create_import_path))
+        end
+
+        # Import an external file into `source`
+        # @param [String] from The original path.
+        # @param [String] to The new path.
+        # @return [void]
+        Contract String, String => Any
+        def create_import_file(from, to)
+          @import_file_configs << create_anonymous_import_file(from, to)
+          @app.sitemap.rebuild_resource_list!(:added_import_file)
+        end
+
+        # Import an external file into `source`
+        # @param [String] from The original path.
+        # @param [String] to The new path.
+        # @return [ImportFileDescriptor]
+        Contract String, String => ImportFileDescriptor
+        def create_anonymous_import_file(from, to)
+          ImportFileDescriptor.new(
+            File.expand_path(from, @app.root),
+            ::Middleman::Util.normalize_path(to)
+          )
+        end
+
+        # Import an external glob into `source`
+        # @param [String] from The original path.
+        # @param [Proc] block Renaming method
+        # @return [void]
+        Contract String, Maybe[Proc] => Any
+        def create_import_path(from, &block)
+          rename_proc = block_given? ? block : proc { |path| path }
+          @import_path_configs << create_anonymous_import_path(from, rename_proc)
+          @app.sitemap.rebuild_resource_list!(:added_import_path)
+        end
+
+        # Import an external glob into `source`
+        # @param [String] from The original path.
+        # @param [Proc] block Renaming method
+        # @return [ImportPathDescriptor]
+        Contract String, Proc => ImportPathDescriptor
+        def create_anonymous_import_path(from, block)
+          ImportPathDescriptor.new(
+            from,
+            block
+          )
+        end
+
+        Contract IsA['Middleman::SourceFile'] => Bool
+        def ignored?(file)
+          @app.config[:ignored_sitemap_matchers].any? { |_, fn| fn.call(file, @app) }
+        end
+
+        # Update the main sitemap resource list
+        # @return Array<Middleman::Sitemap::Resource>
+        Contract ResourceList => ResourceList
+        def manipulate_resource_list(resources)
+          resources + @import_file_configs.map { |c|
+            ::Middleman::Sitemap::Resource.new(
+              @app.sitemap,
+              c[:to],
+              c[:from]
+            )
+          } + @import_path_configs.flat_map { |c|
+            ::Middleman::Util.glob_directory(File.join(c[:from], '**/*'))
+              .reject { |path| File.directory?(path) }
+              .map do |path|
+              target_path = Pathname(path).relative_path_from(Pathname(c[:from]).parent).to_s
+
+              ::Middleman::Sitemap::Resource.new(
+                @app.sitemap,
+                c[:renameProc].call(target_path, path),
+                path
+              )
+            end
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+require 'middleman-core/sitemap/resource'
+require 'middleman-core/core_extensions/collections/step_context'
+
+module Middleman
+  module Sitemap
+    module Extensions
+      # Manages the list of proxy configurations and manipulates the sitemap
+      # to include new resources based on those configurations
+      class MoveFile < Extension
+        MoveFileDescriptor = Struct.new(:from, :to)
+
+        self.resource_list_manipulator_priority = 101
+
+        # Expose `create_move_file` to config as `move_file`
+        expose_to_config move_file: :create_move_file
+
+        def initialize(app, config={}, &block)
+          super
+
+          @move_configs = Set.new
+        end
+
+        def after_configuration
+          ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(:move_file, &method(:create_move_file))
+        end
+
+        # Setup a move from one path to another
+        # @param [String] from The original path.
+        # @param [String] to The new path.
+        # @return [void]
+        Contract String, String => Any
+        def create_move_file(from, to)
+          @move_configs << create_anonymous_move(from, to)
+          @app.sitemap.rebuild_resource_list!(:added_move_file)
+        end
+
+        # Setup a move from one path to another
+        # @param [String] from The original path.
+        # @param [String] to The new path.
+        # @return [MoveFileDescriptor]
+        Contract String, String => MoveFileDescriptor
+        def create_anonymous_move(from, to)
+          MoveFileDescriptor.new(
+            ::Middleman::Util.normalize_path(from),
+            ::Middleman::Util.normalize_path(to)
+          )
+        end
+
+        # Update the main sitemap resource list
+        # @return Array<Middleman::Sitemap::Resource>
+        Contract ResourceList => ResourceList
+        def manipulate_resource_list(resources)
+          resources.each do |r|
+            matches = @move_configs.select do |c|
+              c.from == r.path || c.from == r.destination_path
+            end
+
+            if c = matches.last
+              r.destination_path = c.to
+            end
+          end
+
+          resources
+        end
+      end
+    end
+  end
+end

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

@@ -86,8 +86,8 @@ module Middleman
     end
 
     class Resource
-      def proxy_to(path)
-        throw "Resource#proxy_to has been removed. Use ProxyResource class instead."
+      def proxy_to(_path)
+        throw 'Resource#proxy_to has been removed. Use ProxyResource class instead.'
       end
     end
 
@@ -141,6 +141,11 @@ module Middleman
 
         target_resource.content_type
       end
+
+      def to_s
+        "#<#{self.class} path=#{@path} target=#{@target}>"
+      end
+      alias_method :inspect, :to_s
     end
   end
 end

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

@@ -74,6 +74,7 @@ module Middleman
             <<-END
               <html>
                 <head>
+                  <link rel="canonical" href="#{url}" />
                   <meta http-equiv=refresh content="0; url=#{url}" />
                   <meta name="robots" content="noindex,follow" />
                   <meta http-equiv="cache-control" content="no-cache" />

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

@@ -48,9 +48,7 @@ module Middleman
         @app         = @store.app
         @path        = path
 
-        if source && source.is_a?(String)
-          source = Pathname(source)
-        end
+        source = Pathname(source) if source && source.is_a?(String)
 
         if source && source.is_a?(Pathname)
           @file_descriptor = ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]))
@@ -135,9 +133,7 @@ module Middleman
           locs[:current_path] ||= destination_path
 
           # Certain output file types don't use layouts
-          unless opts.key?(:layout)
-            opts[:layout] = false if %w(.js .json .css .txt).include?(ext)
-          end
+          opts[:layout] = false if !opts.key?(:layout) && ext != '.html'
 
           renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
           renderer.render(locs, opts)
@@ -196,7 +192,7 @@ module Middleman
       end
 
       def to_s
-        "#<Middleman::Sitemap::Resource path=#{@path}>"
+        "#<#{self.class} path=#{@path}>"
       end
       alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
     end

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

@@ -15,6 +15,12 @@ Middleman::Extensions.register :sitemap_ondisk, auto_activate: :before_configura
   Middleman::Sitemap::Extensions::OnDisk
 end
 
+# Files on Disk (outside the project root)
+Middleman::Extensions.register :sitemap_import, auto_activate: :before_configuration do
+  require 'middleman-core/sitemap/extensions/import'
+  Middleman::Sitemap::Extensions::Import
+end
+
 # Endpoints
 Middleman::Extensions.register :sitemap_endpoint, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/request_endpoints'
@@ -33,6 +39,12 @@ Middleman::Extensions.register :sitemap_redirects, auto_activate: :before_config
   Middleman::Sitemap::Extensions::Redirects
 end
 
+# Move Files
+Middleman::Extensions.register :sitemap_move_files, auto_activate: :before_configuration do
+  require 'middleman-core/sitemap/extensions/move_file'
+  Middleman::Sitemap::Extensions::MoveFile
+end
+
 require 'middleman-core/contracts'
 
 module Middleman
@@ -63,7 +75,7 @@ module Middleman
         @resources = []
         @update_count = 0
 
-        @resource_list_manipulators = ::Hamster.vector
+        @resource_list_manipulators = ::Hamster::Vector.empty
         @needs_sitemap_rebuild = true
 
         @lock = Monitor.new
@@ -174,7 +186,7 @@ module Middleman
       Contract String => String
       def extensionless_path(file)
         path = file.dup
-        remove_templating_extensions(path)
+        ::Middleman::Util.remove_templating_extensions(path)
       end
 
       # Actually update the resource list, assuming anything has called
@@ -187,23 +199,24 @@ module Middleman
 
           @app.logger.debug '== Rebuilding resource list'
 
-          @resources = @resource_list_manipulators.reduce([]) do |result, m|
+          @resources = []
+
+          @resource_list_manipulators.each do |m|
             @app.logger.debug "== Running manipulator: #{m[:name]}"
-            newres = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, result)
+            @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
 
             # Reset lookup cache
             reset_lookup_cache!
 
             # Rebuild cache
-            newres.each do |resource|
+            @resources.each do |resource|
               @_lookup_by_path[resource.path] = resource
               @_lookup_by_destination_path[resource.destination_path] = resource
             end
 
-            newres
+            invalidate_resources_not_ignored_cache!
           end
 
-          invalidate_resources_not_ignored_cache!
           @update_count += 1
         end
       end
@@ -211,20 +224,10 @@ module Middleman
       private
 
       def reset_lookup_cache!
-        @lock.synchronize {
+        @lock.synchronize do
           @_lookup_by_path = {}
           @_lookup_by_destination_path = {}
-        }
-      end
-
-      # Removes the templating extensions, while keeping the others
-      # @param [String] path
-      # @return [String]
-      Contract String => String
-      def remove_templating_extensions(path)
-        # Strip templating extensions as long as Tilt knows them
-        path = path.sub(File.extname(path), '') while ::Tilt[path]
-        path
+        end
       end
 
       # Remove the locale token from the end of the path

data/lib/middleman-core/sources.rb

@@ -1,6 +1,5 @@
 require 'hamster'
 require 'middleman-core/contracts'
-require 'backports/2.0.0/enumerable/lazy'
 
 module Middleman
   # The standard "record" that contains information about a file on disk.
@@ -48,10 +47,10 @@ module Middleman
       @options = options
 
       # Set of procs wanting to be notified of changes
-      @on_change_callbacks = ::Hamster.vector
+      @on_change_callbacks = ::Hamster::Vector.empty
 
       # Global ignores
-      @ignores = ::Hamster.hash
+      @ignores = ::Hamster::Hash.empty
 
       # Whether we're "running", which means we're in a stable
       # watch state after all initialization and config.

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

@@ -1,23 +1,19 @@
 # Watcher Library
 require 'listen'
 require 'middleman-core/contracts'
-require 'middleman-core/contracts'
-require 'backports/2.0.0/enumerable/lazy'
 
 # Monkey patch Listen silencer so `only` works on directories too
 module Listen
   class Silencer
     # TODO: switch type and path places - and verify
-    def silenced?(relative_path, type)
+    def silenced?(relative_path, _type)
       path = relative_path.to_s
 
       # if only_patterns && type == :file
       #   return true unless only_patterns.any? { |pattern| path =~ pattern }
       # end
 
-      if only_patterns
-        return !only_patterns.any? { |pattern| path =~ pattern }
-      end
+      return !only_patterns.any? { |pattern| path =~ pattern } if only_patterns
 
       ignore_patterns.any? { |pattern| path =~ pattern }
     end
@@ -125,6 +121,8 @@ module Middleman
     # @return [Middleman::SourceFile, nil]
     Contract Or[String, Pathname], Maybe[Bool] => Maybe[IsA['Middleman::SourceFile']]
     def find(path, glob=false)
+      path = path.to_s.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
+
       p = Pathname(path)
 
       return nil if p.absolute? && !p.to_s.start_with?(@directory.to_s)
@@ -163,7 +161,7 @@ module Middleman
       @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))
 
       @listener.ignore(/^\.sass-cache/)
-      @listener.only(@only) unless @only.empty?
+      # @listener.only(@only) unless @only.empty?
 
       @listener.start
     end
@@ -184,14 +182,8 @@ module Middleman
     # @return [void]
     Contract Any
     def poll_once!
-      removed = @files.keys
-
-      updated = []
-
-      ::Middleman::Util.all_files_under(@directory.to_s).each do |filepath|
-        removed.delete(filepath)
-        updated << filepath
-      end
+      updated = ::Middleman::Util.all_files_under(@directory.to_s)
+      removed = @files.keys.reject { |p| updated.include?(p) }
 
       update(updated, removed)
 
@@ -234,14 +226,21 @@ module Middleman
     Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any
     def update(updated_paths, removed_paths)
       valid_updates = updated_paths
-                      .lazy
-                      .map(&method(:path_to_source_file))
+                      .map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type, @options.fetch(:destination_dir, false)) }
                       .select(&method(:valid?))
-                      .to_a
-                      .each do |f|
-                        add_file_to_cache(f)
-                        logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
-                      end
+
+      valid_updates.each do |f|
+        add_file_to_cache(f)
+        logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
+      end
+
+      related_updates = ::Middleman::Util.find_related_files(app, (updated_paths + removed_paths)).select(&method(:valid?))
+
+      related_updates.each do |f|
+        logger.debug "== Possible Change (#{f[:types].inspect}): #{f[:relative_path]}"
+      end
+
+      valid_updates |= related_updates
 
       valid_removes = removed_paths
                       .lazy
@@ -291,20 +290,5 @@ module Middleman
         @only.any? { |reg| reg.match(file[:relative_path].to_s) }
       end
     end
-
-    # Convert a path to a file resprentation.
-    #
-    # @param [Pathname] path The path.
-    # @return [Middleman::SourceFile]
-    Contract Pathname => IsA['Middleman::SourceFile']
-    def path_to_source_file(path)
-      types = Set.new([@type])
-
-      relative_path   = path.relative_path_from(@directory)
-      destination_dir = @options.fetch(:destination_dir, false)
-      relative_path   = File.join(destination_dir, relative_path) if destination_dir
-
-      ::Middleman::SourceFile.new(Pathname(relative_path), path, @directory, types)
-    end
   end
 end