middleman-core 4.6.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897f4aa3b3c7d0997c53c95fa7a30a1256238c1fa3d4ccfffd1f661d0cd46b56
-  data.tar.gz: ebc14bc55856a7320ef23c8b18f8622e1e95ffcad50dc486c3bf9fd0c85ee3dc
+  metadata.gz: 18aa55b6b39272e66799328b2c97c8a2dbae9878a0b1f8bd8d0547d7846e5206
+  data.tar.gz: 60c9da280ebfb8c0372149d1cb392deabbcb6b7d2592bc94f99499b5d4e359ab
 SHA512:
-  metadata.gz: 3257e06583706dd55db1a6dce91b0d6ab261490f61f85d2a56a1cbbe3034015b6714c433aeb793ab2e5655198ebd004cca4fa28ab42da35b6aab31685dee98fa
-  data.tar.gz: 161b00a558e1acb824ec210b2110eb59e2fc7d1c00d33f8a824b976545d9fbc0564d35d12e16645f614816653cc6ee4e31fd23dfad86348cd828d6a1bec39880
+  metadata.gz: 969f0a01818b6f73168f5a37ee69a2be4c341de90868c1b4e650a50b1583fd3e9348e4611932755b0460a183c72034dcb6800f0c49def99a9a292555e3a679e7
+  data.tar.gz: 6678950440c02694dde817a015113c8e4063ec8decce0c4d0015cc63f65739c91203b0c2f0cdcd83326ffeeb558b8c7acae909463836601ce01d8f151126bb0f

data/features/image_srcset_paths.feature

@@ -4,4 +4,4 @@ Feature: Support srcset property as params for image_tag helper
   Scenario: Rendering an image with the feature enabled
     Given the Server is running at "image-srcset-paths-app"
     When I go to "/image-srcset-paths.html"
-    Then I should see '//example.com/remote-image.jpg 2x, /images/blank_3x.jpg 3x'
+    Then I should see '/images/blank.jpg, //example.com/remote-image.jpg 2x, /images/blank_3x.jpg 3x'

data/features/markdown_redcarpet.feature

@@ -165,3 +165,15 @@ Feature: Markdown (Redcarpet) support
     Then I should see 'width="1"'
     And I should see 'height="1"'
     And I should see 'src="/images/blank.gif"'
+
+  Scenario: Redcarpet using a custom renderer
+    Given the Server is running at "markdown-app"
+    And a custom renderer with name "LinksInBold"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, renderer: LinksInBold
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/link.html"
+    Then I should see '<a href="http://example.net/">**This link**</a> <a href="links.html">links</a>'

data/fixtures/custom-renderers/links_in_bold.rb

@@ -0,0 +1,7 @@
+require 'middleman-core/renderers/redcarpet'
+
+class LinksInBold < Middleman::Renderers::MiddlemanRedcarpetHTML
+  def link(link, title, content)
+    scope.link_to("**#{content}**", link, { title: title })
+  end
+end

data/fixtures/image-srcset-paths-app/image-srcset-paths.html.erb

@@ -1 +1 @@
-<%= image_tag 'blank.jpg', srcset: '//example.com/remote-image.jpg 2x, blank_3x.jpg 3x, http://example.com/remoteimage.jpg 4x' %>
+<%= image_tag 'blank.jpg', srcset: 'blank.jpg, //example.com/remote-image.jpg 2x, blank_3x.jpg 3x, http://example.com/remoteimage.jpg 4x' %>

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

@@ -274,19 +274,24 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       params.symbolize_keys!
 
       if params.key?(:srcset)
-        images_sources = params[:srcset].split(',').map do |src_def|
-          if src_def.include?('//')
-            src_def
+        images_sources = params[:srcset].split(",").map do |src_def|
+          if src_def.include?("//")
+            src_def.strip
           else
-            image_def, size_def = src_def.strip.split(/\s+/)
-            asset_path(:images, image_def) + ' ' + size_def
+            image_def, size_def = src_def.strip.split(/\s+/, 2)
+            image_path = asset_path(:images, image_def)
+            if size_def
+              "#{image_path} #{size_def}"
+            else
+              image_path
+            end
           end
         end
 
-        params[:srcset] = images_sources.join(', ')
+        params[:srcset] = images_sources.join(", ")
       end
 
-      params[:alt] ||= ''
+      params[:alt] ||= ""
 
       super(path, params)
     end

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

@@ -8,7 +8,7 @@ module Middleman
 
       def _prepare_output
         @context = @options[:context]
-        MiddlemanKramdownHTML.scope = @context || context
+        MiddlemanKramdownHTML.scope = @context
 
         @engine = Kramdown::Document.new(data, options)
         output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)

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

@@ -19,7 +19,12 @@ module Middleman
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
       def generate_renderer
-        return options.delete(:renderer) if options.key?(:renderer)
+        if options.key?(:renderer)
+          renderer = options.delete(:renderer)
+          renderer.scope = options[:context] if renderer.respond_to?(:scope=)
+
+          return renderer
+        end
 
         covert_options_to_aliases!
 

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

@@ -72,6 +72,13 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string|
   step %Q{a file named "source/#{name}" with:}, string
 end
 
+Given /^a custom renderer with name "([^\"]*)"$/ do |custom_renderer_name|
+  # Convert custom renderer class name from CamelCase to snake_case
+  custom_renderer_filename = custom_renderer_name.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '') + '.rb'
+  target = File.join(PROJECT_ROOT_PATH, 'fixtures', 'custom-renderers', custom_renderer_filename)
+  require target
+end
+
 When /^I go to "([^\"]*)"$/ do |url|
   visit(Addressable::URI.encode(url))
 end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.6.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.6.3'.freeze unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7.0'
 
   # Core
-  s.add_dependency('bundler', '~> 2.0')
+  s.add_dependency('bundler', '> 2.0')
   s.add_dependency('rack', '>= 3')
   s.add_dependency('rackup')
   s.add_dependency('tilt', ['~> 2.2'])
   s.add_dependency('erubi')
-  s.add_dependency('haml', ['>= 4.0.5'])
+  s.add_dependency('haml', ['>= 4.0.5', '< 7'])
   s.add_dependency('coffee-script', ['~> 2.2'])
   s.add_dependency('kramdown', ['~> 2.4'])
   s.add_dependency('fast_blank')
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
 
   # Helpers
   s.add_dependency('activesupport', ['>= 6.1'])
-  s.add_dependency('padrino-helpers', ['~> 0.15.0'])
+  s.add_dependency('padrino-helpers', '>= 0.15', '< 0.17')
   s.add_dependency("addressable", ["~> 2.4"])
   s.add_dependency('memoist', ['~> 0.14'])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,20 +10,20 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-07 00:00:00.000000000 Z
+date: 2026-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -89,6 +89,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,6 +99,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -226,16 +232,22 @@ dependencies:
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -726,6 +738,7 @@ files:
 - fixtures/custom-layout-app2/source/custom-layout-dir/index.html.erb
 - fixtures/custom-layout-app2/source/custom-layout.html.erb
 - fixtures/custom-layout-app2/source/layouts/custom.erb
+- fixtures/custom-renderers/links_in_bold.rb
 - fixtures/custom-src-app/config.rb
 - fixtures/custom-src-app/src/index.html
 - fixtures/custom-src-app/src/layouts/layout.html.erb
@@ -1948,6 +1961,7 @@ test_files:
 - fixtures/custom-layout-app2/source/custom-layout-dir/index.html.erb
 - fixtures/custom-layout-app2/source/custom-layout.html.erb
 - fixtures/custom-layout-app2/source/layouts/custom.erb
+- fixtures/custom-renderers/links_in_bold.rb
 - fixtures/custom-src-app/config.rb
 - fixtures/custom-src-app/src/index.html
 - fixtures/custom-src-app/src/layouts/layout.html.erb