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

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

@@ -35,7 +35,7 @@ module Middleman
       def convert_a(el, indent)
         content = inner(el, indent)
 
-        if el.attr['href'] =~ /\Amailto:/
+        if el.attr['href'].start_with?('mailto:')
           mail_addr = el.attr['href'].sub(/\Amailto:/, '')
           href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
           content = obfuscate(content) if content == mail_addr

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

@@ -4,12 +4,11 @@ module Middleman
   module Renderers
     # Sass renderer
     class Less < ::Middleman::Extension
+      define_setting :less, {}, 'LESS compiler options'
+
       def initialize(app, options={}, &block)
         super
 
-        # Default less options
-        app.config.define_setting :less, {}, 'LESS compiler options'
-
         # Tell Tilt to use it as well (for inline sass blocks)
         ::Tilt.register 'less', LocalLoadingLessTemplate
         ::Tilt.prefer(LocalLoadingLessTemplate)
@@ -27,7 +26,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/markdown.rb

@@ -2,14 +2,8 @@ module Middleman
   module Renderers
     # Markdown renderer
     class Markdown < ::Middleman::Extension
-      # Once registered
-      def initialize(app, options={}, &block)
-        super
-
-        # Set our preference for a markdown engine
-        app.config.define_setting :markdown_engine, :kramdown, 'Preferred markdown engine'
-        app.config.define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
-      end
+      define_setting :markdown_engine, :kramdown, 'Preferred markdown engine'
+      define_setting :markdown_engine_prefix, ::Tilt, 'The parent module for markdown template engines'
 
       # Once configuration is parsed
       def after_configuration

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

@@ -8,7 +8,7 @@ module Middleman
       # in the wrong direction
       ALIASES = {
         escape_html: :filter_html
-      }
+      }.freeze
 
       def initialize(*args, &block)
         super

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

@@ -4,6 +4,12 @@ module Middleman
   module Renderers
     # Sass renderer
     class Sass < ::Middleman::Extension
+      opts = { output_style: :nested }
+      opts[:line_comments] = false if ENV['TEST']
+      define_setting :sass, opts, 'Sass engine options'
+      define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
+      define_setting :sass_source_maps, nil, 'Whether to inline sourcemap into Sass'
+
       # Setup extension
       def initialize(app, options={}, &block)
         super
@@ -12,15 +18,6 @@ module Middleman
 
         app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
 
-        opts = { output_style: :nested }
-        opts[:line_comments] = false if ENV['TEST']
-
-        # Default sass options
-        app.config.define_setting :sass, opts, 'Sass engine options'
-
-        app.config.define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
-        app.config.define_setting :sass_source_maps, app.development?, 'Whether to inline sourcemap into Sass'
-
         # Tell Tilt to use it as well (for inline sass blocks)
         ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
         ::Tilt.prefer(SassPlusCSSFilenameTemplate)
@@ -75,7 +72,7 @@ module Middleman
           ctx = @context
 
           more_opts = {
-            load_paths: ::Sass.load_paths | ctx.config[:sass_assets_paths],
+            load_paths: ::Sass.load_paths | ctx.app.config[:sass_assets_paths],
             filename: eval_file,
             line: line,
             syntax: syntax,
@@ -85,7 +82,7 @@ module Middleman
             )
           }
 
-          if ctx.config[:sass_source_maps]
+          if ctx.app.config[:sass_source_maps] || (ctx.app.config[:sass_source_maps].nil? && ctx.app.development?)
             more_opts[:source_map_file] = '.'
             more_opts[:source_map_embed] = true
             more_opts[:source_map_contents] = true

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

@@ -4,11 +4,7 @@ require 'stylus/tilt'
 module Middleman
   module Renderers
     class Stylus < ::Middleman::Extension
-      def initialize(app, options={}, &block)
-        super
-
-        app.config.define_setting :styl, {}, 'Stylus config options'
-      end
+      define_setting :styl, {}, 'Stylus config options'
     end
   end
 end

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

@@ -5,13 +5,14 @@ module Middleman
       class Ignores < ConfigExtension
         self.resource_list_manipulator_priority = 0
 
-        expose_to_config ignore: :create_ignore
+        expose_to_application :ignore
+        expose_to_config :ignore
 
         # Ignore a path or add an ignore callback
         # @param [String, Regexp] path Path glob expression, or path regex
         # @return [IgnoreDescriptor]
         Contract Maybe[Or[String, Regexp]], Maybe[Proc] => RespondTo[:execute_descriptor]
-        def create_ignore(path=nil, &block)
+        def ignore(path=nil, &block)
           @app.sitemap.invalidate_resources_not_ignored_cache!
           IgnoreDescriptor.new(path, block)
         end
@@ -22,9 +23,9 @@ module Middleman
               # Ignore based on the source path (without template extensions)
               if ignored?(r.path)
                 r.ignore!
-              else
+              elsif !r.is_a?(ProxyResource) && r.file_descriptor && ignored?(r.file_descriptor[:relative_path].to_s)
                 # This allows files to be ignored by their source file name (with template extensions)
-                r.ignore! if !r.is_a?(ProxyResource) && r.file_descriptor && ignored?(r.file_descriptor[:relative_path].to_s)
+                r.ignore!
               end
 
               r

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

@@ -7,11 +7,8 @@ module Middleman
       class Import < ConfigExtension
         self.resource_list_manipulator_priority = 1
 
-        # 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
+        # Expose methods
+        expose_to_config :import_file, :import_path
 
         ImportFileDescriptor = Struct.new(:from, :to) do
           def execute_descriptor(app, resources)
@@ -26,14 +23,14 @@ module Middleman
             resources + ::Middleman::Util.glob_directory(File.join(from, '**/*'))
                         .reject { |path| File.directory?(path) }
                         .map do |path|
-              target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
-
-              ::Middleman::Sitemap::Resource.new(
-                app.sitemap,
-                renameProc.call(target_path, path),
-                path
-              )
-            end
+                          target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
+
+                          ::Middleman::Sitemap::Resource.new(
+                            app.sitemap,
+                            renameProc.call(target_path, path),
+                            path
+                          )
+                        end
           end
         end
 
@@ -42,7 +39,7 @@ module Middleman
         # @param [String] to The new path.
         # @return [void]
         Contract String, String => ImportFileDescriptor
-        def create_import_file(from, to)
+        def import_file(from, to)
           ImportFileDescriptor.new(
             File.expand_path(from, @app.root),
             ::Middleman::Util.normalize_path(to)
@@ -54,7 +51,7 @@ module Middleman
         # @param [Proc] block Renaming method
         # @return [void]
         Contract String, Maybe[Proc] => ImportPathDescriptor
-        def create_import_path(from, &block)
+        def import_path(from, &block)
           ImportPathDescriptor.new(
             from,
             block_given? ? block : proc { |path| path }

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

@@ -9,8 +9,8 @@ module Middleman
       class MoveFile < ConfigExtension
         self.resource_list_manipulator_priority = 101
 
-        # Expose `create_move_file` to config as `move_file`
-        expose_to_config move_file: :create_move_file
+        # Expose `move_file`
+        expose_to_config :move_file
 
         MoveFileDescriptor = Struct.new(:from, :to) do
           def execute_descriptor(_app, resources)
@@ -27,7 +27,7 @@ module Middleman
         # @param [String] to The new path.
         # @return [void]
         Contract String, String => MoveFileDescriptor
-        def create_move_file(from, to)
+        def move_file(from, to)
           MoveFileDescriptor.new(
             ::Middleman::Util.normalize_path(from),
             ::Middleman::Util.normalize_path(to)

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

@@ -9,8 +9,8 @@ module Middleman
       class Proxies < ConfigExtension
         self.resource_list_manipulator_priority = 0
 
-        # Expose `create_proxy` to config as `proxy`
-        expose_to_config proxy: :create_proxy
+        # Expose `proxy`
+        expose_to_config :proxy
 
         # Setup a proxy from a path to a target
         # @param [String] path The new, proxied path to create
@@ -22,7 +22,7 @@ module Middleman
         # @option opts [Hash] data Extra metadata to add to the page. This is the same as frontmatter, though frontmatter will take precedence over metadata defined here. Available via {Resource#data}.
         # @return [ProxyDescriptor]
         Contract String, String, Maybe[Hash] => RespondTo[:execute_descriptor]
-        def create_proxy(path, target, opts={})
+        def proxy(path, target, opts={})
           ProxyDescriptor.new(
             ::Middleman::Util.normalize_path(path),
             ::Middleman::Util.normalize_path(target),
@@ -113,7 +113,7 @@ module Middleman
       def to_s
         "#<#{self.class} path=#{@path} target=#{@target}>"
       end
-      alias_method :inspect, :to_s
+      alias inspect to_s
     end
   end
 end

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

@@ -6,43 +6,31 @@ module Middleman
     module Extensions
       # Manages the list of proxy configurations and manipulates the sitemap
       # to include new resources based on those configurations
-      class Redirects < Extension
+      class Redirects < ConfigExtension
         self.resource_list_manipulator_priority = 0
 
-        # Expose `create_redirect` to config as `redirect`
-        expose_to_config redirect: :create_redirect
+        # Expose `redirect`
+        expose_to_config :redirect
 
-        def initialize(app, config={}, &block)
-          super
+        RedirectDescriptor = Struct.new(:path, :to, :template) do
+          def execute_descriptor(app, resources)
+            r = RedirectResource.new(
+              app.sitemap,
+              path,
+              to
+            )
+            r.output = template if template
 
-          @redirects = {}
+            resources + [r]
+          end
         end
 
         # Setup a redirect from a path to a target
         # @param [String] path
         # @param [Hash] opts The :to value gives a target path
-        Contract String, ({ to: Or[String, IsA['Middleman::Sitemap::Resource']] }), Maybe[Proc] => Any
-        def create_redirect(path, opts={}, &block)
-          opts[:template] = block if block_given?
-
-          @redirects[path] = opts
-
-          @app.sitemap.rebuild_resource_list!(:added_redirect)
-        end
-
-        # Update the main sitemap resource list
-        # @return Array<Middleman::Sitemap::Resource>
-        Contract ResourceList => ResourceList
-        def manipulate_resource_list(resources)
-          resources + @redirects.map do |path, opts|
-            r = RedirectResource.new(
-              @app.sitemap,
-              path,
-              opts[:to]
-            )
-            r.output = opts[:template] if opts[:template]
-            r
-          end
+        Contract String, { to: Or[String, ::Middleman::Sitemap::Resource] }, Maybe[Proc] => RedirectDescriptor
+        def redirect(path, opts={}, &block)
+          RedirectDescriptor.new(path, opts[:to], block_given? ? block : nil)
         end
       end
 

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

@@ -3,53 +3,35 @@ require 'middleman-core/sitemap/resource'
 module Middleman
   module Sitemap
     module Extensions
-      class RequestEndpoints < Extension
+      class RequestEndpoints < ConfigExtension
         self.resource_list_manipulator_priority = 0
 
-        # Expose `create_endpoint` to config as `endpoint`
-        expose_to_config endpoint: :create_endpoint
+        # Expose `endpoint`
+        expose_to_config :endpoint
 
-        # Manages the list of proxy configurations and manipulates the sitemap
-        # to include new resources based on those configurations
-        def initialize(app, config={}, &block)
-          super
+        EndpointDescriptor = Struct.new(:path, :request_path, :block) do
+          def execute_descriptor(app, resources)
+            r = EndpointResource.new(
+              app.sitemap,
+              path,
+              request_path
+            )
+            r.output = block if block
 
-          @endpoints = {}
+            resources + [r]
+          end
         end
 
         # Setup a proxy from a path to a target
         # @param [String] path
         # @param [Hash] opts The :path value gives a request path if it
         # differs from the output path
-        Contract String, Or[({ path: String }), Proc] => Any
-        def create_endpoint(path, opts={}, &block)
-          endpoint = {
-            request_path: path
-          }
-
+        Contract String, Or[{ path: String }, Proc] => EndpointDescriptor
+        def endpoint(path, opts={}, &block)
           if block_given?
-            endpoint[:output] = block
+            EndpointDescriptor.new(path, path, block)
           else
-            endpoint[:request_path] = opts[:path] if opts.key?(:path)
-          end
-
-          @endpoints[path] = endpoint
-
-          @app.sitemap.rebuild_resource_list!(:added_endpoint)
-        end
-
-        # Update the main sitemap resource list
-        # @return Array<Middleman::Sitemap::Resource>
-        Contract ResourceList => ResourceList
-        def manipulate_resource_list(resources)
-          resources + @endpoints.map do |path, config|
-            r = EndpointResource.new(
-              @app.sitemap,
-              path,
-              config[:request_path]
-            )
-            r.output = config[:output] if config.key?(:output)
-            r
+            EndpointDescriptor.new(path, opts[:path] || path, nil)
           end
         end
       end

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

@@ -44,14 +44,14 @@ module Middleman
         def children
           return [] unless directory_index?
 
-          if eponymous_directory?
-            base_path = eponymous_directory_path
-            prefix    = %r{^#{base_path.sub("/", "\\/")}}
+          base_path = if eponymous_directory?
+            eponymous_directory_path
           else
-            base_path = path.sub("#{@app.config[:index_file]}", '')
-            prefix    = %r{^#{base_path.sub("/", "\\/")}}
+            path.sub(@app.config[:index_file].to_s, '')
           end
 
+          prefix = %r{^#{base_path.sub("/", "\\/")}}
+
           @store.resources.select do |sub_resource|
             if sub_resource.path == path || sub_resource.path !~ prefix
               false

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

@@ -29,9 +29,9 @@ module Middleman
       # The path to use when requesting this resource. Normally it's
       # the same as {#destination_path} but it can be overridden in subclasses.
       # @return [String]
-      alias_method :request_path, :destination_path
+      alias request_path destination_path
 
-      METADATA_HASH = ({ options: Maybe[Hash], locals: Maybe[Hash], page: Maybe[Hash] })
+      METADATA_HASH = { options: Maybe[Hash], locals: Maybe[Hash], page: Maybe[Hash] }.freeze
 
       # The metadata for this resource
       # @return [Hash]
@@ -53,10 +53,10 @@ module Middleman
 
         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]))
+        @file_descriptor = if source && source.is_a?(Pathname)
+          ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source]))
         else
-          @file_descriptor = source
+          source
         end
 
         @destination_path = @path
@@ -129,18 +129,18 @@ module Middleman
       def render(opts={}, locs={})
         return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template?
 
-        ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
-          md   = metadata
-          opts = md[:options].deep_merge(opts)
-          locs = md[:locals].deep_merge(locs)
-          locs[:current_path] ||= destination_path
+        # ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
+        md   = metadata
+        opts = md[:options].deep_merge(opts)
+        locs = md[:locals].deep_merge(locs)
+        locs[:current_path] ||= destination_path
 
-          # Certain output file types don't use layouts
-          opts[:layout] = false if !opts.key?(:layout) && ext != '.html'
+        # Certain output file types don't use layouts
+        opts[:layout] = false if !opts.key?(:layout) && ext != '.html'
 
-          renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
-          renderer.render(locs, opts)
-        end
+        renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
+        renderer.render(locs, opts)
+        # end
       end
 
       # A path without the directory index - so foo/index.html becomes
@@ -189,7 +189,7 @@ module Middleman
       def to_s
         "#<#{self.class} path=#{@path}>"
       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
     end
 
     class StringResource < Resource