middleman-blog 4.0.3 → 4.1.0

data/fixtures/custom-collections-sources-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources      = ':category/:year-:month-:day-:title.html'
   blog.permalink    = 'blog/:year-:month-:day-:title.html'

data/fixtures/custom-permalinks-app/config-directory-indexes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 activate :blog do |blog|
   blog.sources      = 'blog/:year-:month-:day-:title.html'

data/fixtures/custom-permalinks-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 activate :blog do |blog|
   blog.sources      = 'blog/:year-:month-:day-:title.html'

data/fixtures/filename-date-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Time.zone = 'Pacific Time (US & Canada)'
 
 activate :blog

data/fixtures/future-date-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Time.zone = 'Pacific Time (US & Canada)'
 
 activate :blog do |blog|

data/fixtures/indexes-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = ':year/:month/:day/:title.html'
 end

data/fixtures/lang-path-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :i18n
 
 activate :blog do |blog|

data/fixtures/language-app/config.rb

@@ -1,2 +1,4 @@
-activate :i18n
+# frozen_string_literal: true
+
+activate :i18n
 activate :blog

data/fixtures/layouts-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = ':year/:month/:day/:title.html'
 end

data/fixtures/paginate-app/config-directory-indexes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = 'blog/:year-:month-:day-:title.html'
   blog.permalink         = 'blog/:year-:month-:day-:title.html'

data/fixtures/paginate-app/config-paginate-off.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = 'blog/:year-:month-:day-:title.html'
   blog.permalink         = 'blog/:year-:month-:day-:title.html'

data/fixtures/paginate-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = 'blog/:year-:month-:day-:title.html'
   blog.permalink         = 'blog/:year-:month-:day-:title.html'

data/fixtures/paginate-multiblog-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.name              = 'blog_name_1'
   blog.prefix            = 'blog1'

data/fixtures/permalink-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = ':category/:year-:month-:day-:title.html'
   blog.permalink = ':category/:custom-:year-:month-:day-:title.html'

data/fixtures/preview-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = ':year/:month/:day/:title.html'
 end

data/fixtures/published-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.sources = 'blog/:year-:month-:day-:title.html'
 end

data/fixtures/summary-app/config.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 activate :blog

data/fixtures/tags-app/config-directory-indexes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 
 activate :blog do |blog|

data/fixtures/tags-app/config-filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 
 activate :blog do |blog|

data/fixtures/tags-app/config-no-tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 
 activate :blog do |blog|

data/fixtures/tags-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'
 
 activate :blog do |blog|

data/fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown

@@ -1,7 +1,7 @@
 --- 
 title: "Newer Article"
 date: 2011-01-01
-tags: foo, bar
+tags: foo, bar, 日本語
 ---
 
 Newer Article Content

data/fixtures/tags-app/source/blog/2011-01-02-another-article.html.markdown

@@ -4,6 +4,7 @@ date: 2011-01-02
 tags:
   - foo
   - 120
+  - 日本語
 ---
 
 Another Article Content

data/fixtures/tags-multiblog-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
   blog.name         = 'blog_name_1'
   blog.prefix       = 'blog1'

data/fixtures/time-zone-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :time_zone, 'Tokyo'
 
 activate :blog do |blog|

data/lib/middleman-blog/blog_article.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/time_with_zone'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'
@@ -14,9 +16,6 @@ module Middleman
     module BlogArticle
       extend Gem::Deprecate
 
-      ##
-      #
-      ##
       def self.extended(base)
         base.class.send(:attr_accessor, :blog_controller)
       end
@@ -204,10 +203,10 @@ module Middleman
 
         # First get the date from frontmatter
         @_date = if frontmatter_date.is_a? Time
-                   frontmatter_date.in_time_zone
-                 else
-                   Time.zone.parse(frontmatter_date.to_s)
-                 end
+          frontmatter_date.in_time_zone
+        else
+          Time.zone.parse(frontmatter_date.to_s)
+        end
 
         # Next figure out the date from the filename
         source_vars = blog_data.source_template.variables

data/lib/middleman-blog/blog_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 module Middleman
@@ -49,7 +51,7 @@ module Middleman
       # @return [Array<Middleman::Sitemap::Resource>]
       ##
       def articles
-        @_articles.select(&(options.filter || proc { |a| a })).sort_by(&:date).reverse
+        @_articles.select(&options.filter || proc { |a| a }).sort_by(&:date).reverse
       end
 
       ##
@@ -216,9 +218,6 @@ module Middleman
           .merge(extra)
       end
 
-      ##
-      #
-      ##
       def convert_to_article(resource)
         return resource if resource.is_a?(BlogArticle)
 
@@ -232,9 +231,6 @@ module Middleman
         resource
       end
 
-      ##
-      #
-      ##
       def template_path(template, article, extras = {})
         apply_uri_template template, permalink_options(article, extras)
       end

data/lib/middleman-blog/calendar_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 module Middleman
@@ -31,12 +33,12 @@ module Middleman
       # @return [String]
       def link(year, month = nil, day = nil)
         template = if day
-                     @day_link_template
-                   elsif month
-                     @month_link_template
-                   else
-                     @year_link_template
-                   end
+          @day_link_template
+        elsif month
+          @month_link_template
+        else
+          @year_link_template
+        end
 
         apply_uri_template template, date_to_params(Date.new(year, month || 1, day || 1))
       end

data/lib/middleman-blog/commands/article.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-core/cli'
 require 'date'
 require 'middleman-blog/uri_templates'
@@ -77,14 +79,14 @@ module Middleman
         end
 
         blog_inst = if options[:blog]
-                      app.extensions[:blog].find { |_key, instance| instance.options[:name] == options[:blog] }[ 1 ]
-                    else
-                      app.extensions[:blog].values.first
-                    end
+          app.extensions[:blog].find { |_key, instance| instance.options[:name] == options[:blog] }[ 1 ]
+        else
+          app.extensions[:blog].values.first
+        end
 
         unless blog_inst
           msg = 'Could not find an active blog instance'
-          msg << " named #{options[:blog]}" if options[:blog]
+          msg = "#{msg} named #{options[:blog]}" if options[:blog]
           throw msg
         end
 

data/lib/middleman-blog/commands/article.tt

@@ -1,7 +1,7 @@
 ---
 
-title: <%= @title %>
-date: <%= @date.strftime('%F %R %Z') %>
+title: "<%= %Q[#{@title}] %>"
+date: <%= @date.strftime('%F %R %z') %>
 tags: <%= @tags.join(",") %>
 
 ---

data/lib/middleman-blog/custom_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 module Middleman

data/lib/middleman-blog/extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/time/zones'
 require 'middleman-blog/blog_data'
 require 'middleman-blog/blog_article'
@@ -79,18 +81,18 @@ module Middleman
       end
 
       # If "prefix" option is specified, all other paths are relative to it.
-      if options.prefix
-        options.prefix = "/#{options.prefix}" unless options.prefix.start_with? '/'
-        options.permalink = File.join(options.prefix, options.permalink)
-        options.sources = File.join(options.prefix, options.sources)
-        options.taglink = File.join(options.prefix, options.taglink)
-        options.year_link = File.join(options.prefix, options.year_link)
-        options.month_link = File.join(options.prefix, options.month_link)
-        options.day_link = File.join(options.prefix, options.day_link)
-
-        options.custom_collections.each do |_key, opts|
-          opts[:link] = File.join(options.prefix, opts[:link])
-        end
+      return unless options.prefix
+
+      options.prefix = "/#{options.prefix}" unless options.prefix.start_with? '/'
+      options.permalink = File.join(options.prefix, options.permalink)
+      options.sources = File.join(options.prefix, options.sources)
+      options.taglink = File.join(options.prefix, options.taglink)
+      options.year_link = File.join(options.prefix, options.year_link)
+      options.month_link = File.join(options.prefix, options.month_link)
+      options.day_link = File.join(options.prefix, options.day_link)
+
+      options.custom_collections.each_value do |opts|
+        opts[:link] = File.join(options.prefix, opts[:link])
       end
     end
 
@@ -113,6 +115,8 @@ module Middleman
       @app.ignore(options.day_template) if options.day_template
       @app.ignore options.tag_template if options.tag_template
 
+      ActiveSupport.to_time_preserves_timezone = :zone
+
       # Make sure ActiveSupport's TimeZone stuff has something to work with,
       # allowing people to set their desired time zone via Time.zone or
       # set :time_zone

data/lib/middleman-blog/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Middleman
   module Blog
     # Blog-related helpers that are available to the Middleman application in +config.rb+ and in templates.
@@ -59,7 +61,7 @@ module Middleman
       # Determine whether the currently rendering template is a {BlogArticle}.
       # This can be useful in layouts and helpers.
       # @return [Boolean]
-      def is_blog_article? # rubocop:disable Naming/PredicateName
+      def is_blog_article?
         !current_article.nil?
       end
 
@@ -67,7 +69,7 @@ module Middleman
       # @return [BlogArticle]
       def current_article
         article = current_resource
-        article if article&.is_a?(BlogArticle)
+        article if article.is_a?(BlogArticle)
       end
 
       # Get a path to the given tag page, based on the +taglink+ blog setting.

data/lib/middleman-blog/paginator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 module Middleman
@@ -149,7 +151,7 @@ module Middleman
         else
           page_url = apply_uri_template page_link, num: page_num
           index_re = %r{(^|/)#{Regexp.escape(@app.config[:index_file])}$}
-          if res.path =~ index_re
+          if res.path&.match?(index_re)
             res.path.sub(index_re, "\\1#{page_url}/#{@app.config[:index_file]}")
           else
             res.path.sub(%r{(^|/)([^/]*)\.([^/]*)$}, "\\1\\2/#{page_url}.\\3")

data/lib/middleman-blog/tag_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 module Middleman

data/lib/middleman-blog/truncate_html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'nokogiri'
 rescue LoadError
@@ -48,7 +50,7 @@ module NokogiriTruncator
   module TextNode
     def truncate(max_length, ellipsis)
       # Don't break in the middle of a word
-      trimmed_content = content.match(/(.{1,#{max_length}}[\w]*)/m).to_s
+      trimmed_content = content.match(/(.{1,#{max_length}}\w*)/m).to_s
       trimmed_content << ellipsis if trimmed_content.length < content.length
 
       Nokogiri::XML::Text.new(trimmed_content, parent)
@@ -63,7 +65,7 @@ module NokogiriTruncator
   end
 end
 
-Nokogiri::HTML::DocumentFragment.send(:include, NokogiriTruncator::NodeWithChildren)
-Nokogiri::XML::Element.send(:include, NokogiriTruncator::NodeWithChildren)
-Nokogiri::XML::Text.send(:include, NokogiriTruncator::TextNode)
-Nokogiri::XML::Comment.send(:include, NokogiriTruncator::CommentNode)
+Nokogiri::HTML::DocumentFragment.include NokogiriTruncator::NodeWithChildren
+Nokogiri::XML::Element.include NokogiriTruncator::NodeWithChildren
+Nokogiri::XML::Text.include NokogiriTruncator::TextNode
+Nokogiri::XML::Comment.include NokogiriTruncator::CommentNode

data/lib/middleman-blog/uri_templates.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'addressable/template'
+require 'active_support/all'
 require 'middleman-core/util'
 require 'active_support/inflector'
 require 'active_support/inflector/transliterate'
@@ -57,7 +60,7 @@ module Middleman
 
         # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
         parameterized_string = ::ActiveSupport::Inflector.transliterate(str.to_s).downcase
-        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
+        parameterized_string.gsub!(/[^a-z0-9\-_?]+/, sep)
 
         # Check for multibytes and sub back in
         parameterized_string.chars.to_a.each_with_index do |char, i|
@@ -73,10 +76,13 @@ module Middleman
 
         # Remove leading/trailing separator.
         parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
+
+        # Replace all _ with -
         parameterized_string.tr!('_', '-')
+
+        # Delete all ?
         parameterized_string.delete!('?')
 
-        # Replace all ?
         parameterized_string
       end
 

data/lib/middleman-blog/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Middleman
   module Blog
-    VERSION = '4.0.3'.freeze
+    VERSION = '4.1.0'
   end
 end

data/lib/middleman-blog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-core'
 require 'middleman-blog/version'
 

data/lib/middleman_extension.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'middleman-blog'

data/middleman-blog.gemspec

@@ -1,25 +1,18 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path( "../lib", __FILE__ )
-require "middleman-blog/version"
+require "./lib/middleman-blog/version"
 
 Gem::Specification.new do | s |
-
-  s.name                  = "middleman-blog"
-  s.version               = Middleman::Blog::VERSION
-  s.platform              = Gem::Platform::RUBY
-  s.authors               = [ "Thomas Reynolds", "Ben Hollis", "Ian Warner" ]
-  s.email                 = [ "me@tdreyno.com", "ben@benhollis.net", "ian.warner@drykiss.com" ]
-  s.homepage              = "https://github.com/middleman/middleman-blog"
-  s.summary               = %q{ Blog engine for Middleman }
-  s.description           = %q{ Blog engine for Middleman }
-  s.license               = "MIT"
-  s.files                 = `git ls-files -z`.split( "\0" )
-  s.test_files            = `git ls-files -z -- {fixtures,features}/*`.split( "\0" )
-  s.require_paths         = [ "lib" ]
-  s.required_ruby_version = '>= 2.3.0'
-
-  s.add_dependency( "middleman-core", [ ">= 4.0.0" ] )
-  s.add_dependency( "tzinfo",         [ ">= 0.3.0" ] )
-  s.add_dependency( "addressable",    [ "~> 2.3"   ] )
-
+  s.name          = "middleman-blog"
+  s.version       = Middleman::Blog::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = [ "Thomas Reynolds", "Ben Hollis", "Ian Warner" ]
+  s.email         = [ "me@tdreyno.com", "ben@benhollis.net", "ian.warner@drykiss.com" ]
+  s.homepage      = "https://github.com/middleman/middleman-blog"
+  s.summary       = %q{ Blog engine for Middleman }
+  s.description   = %q{ Blog engine for Middleman }
+  s.license       = "MIT"
+  s.files         = `git ls-files -z`.split( "\0" )
+  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split( "\0" )
+  s.add_dependency("middleman-core", ">= 4.0.0")
+  s.add_dependency("tzinfo", ">= 0.3.0")
+  s.add_dependency("addressable", "~> 2.3")
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
+SimpleCov.root(File.expand_path("#{File.dirname(__FILE__)}/.."))

data/spec/uri_templates_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleman-blog/uri_templates'
 
 describe 'Middleman::Blog::UriTemplates' do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Thomas Reynolds
 - Ben Hollis
 - Ian Warner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -64,15 +64,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ci.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
-- CONTRIBUTING.md
 - Gemfile
-- Gemfile-4.x
-- ISSUE_TEMPLATE.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -190,17 +189,6 @@ files:
 - fixtures/custom-permalinks-app/source/blog/2011-01-03-third-article.html.markdown
 - fixtures/custom-permalinks-app/source/index.html.erb
 - fixtures/custom-permalinks-app/source/layout.erb
-- fixtures/default-template-app/Gemfile
-- fixtures/default-template-app/config.rb
-- fixtures/default-template-app/source/2013-04-01-new-article.html.markdown
-- fixtures/default-template-app/source/about-me.html.erb
-- fixtures/default-template-app/source/archives.html.erb
-- fixtures/default-template-app/source/index.html.erb
-- fixtures/default-template-app/source/javascripts/_zepto.pjax.js
-- fixtures/default-template-app/source/javascripts/app.js
-- fixtures/default-template-app/source/javascripts/modernizr.js
-- fixtures/default-template-app/source/layouts/layout.erb
-- fixtures/default-template-app/source/stylesheets/app.css.scss
 - fixtures/filename-date-app/config.rb
 - fixtures/filename-date-app/source/2011-01-01-new-article.html.markdown
 - fixtures/filename-date-app/source/2011-01-03-filename-and-frontmatter.html.markdown
@@ -365,7 +353,7 @@ homepage: https://github.com/middleman/middleman-blog
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -373,15 +361,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Blog engine for Middleman
 test_files:
@@ -499,17 +487,6 @@ test_files:
 - fixtures/custom-permalinks-app/source/blog/2011-01-03-third-article.html.markdown
 - fixtures/custom-permalinks-app/source/index.html.erb
 - fixtures/custom-permalinks-app/source/layout.erb
-- fixtures/default-template-app/Gemfile
-- fixtures/default-template-app/config.rb
-- fixtures/default-template-app/source/2013-04-01-new-article.html.markdown
-- fixtures/default-template-app/source/about-me.html.erb
-- fixtures/default-template-app/source/archives.html.erb
-- fixtures/default-template-app/source/index.html.erb
-- fixtures/default-template-app/source/javascripts/_zepto.pjax.js
-- fixtures/default-template-app/source/javascripts/app.js
-- fixtures/default-template-app/source/javascripts/modernizr.js
-- fixtures/default-template-app/source/layouts/layout.erb
-- fixtures/default-template-app/source/stylesheets/app.css.scss
 - fixtures/filename-date-app/config.rb
 - fixtures/filename-date-app/source/2011-01-01-new-article.html.markdown
 - fixtures/filename-date-app/source/2011-01-03-filename-and-frontmatter.html.markdown