diff --git a/.rubocop.yml b/.rubocop.yml index d966a685..2a518da3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -49,4 +49,8 @@ RegexpLiteral: FormatString: Enabled: false CaseIndentation: - IndentWhenRelativeTo: end \ No newline at end of file + IndentWhenRelativeTo: end +Metrics/AbcSize: + Enabled: false +Metrics/PerceivedComplexity: + Enabled: false diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 4179fae0..c10daa64 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -64,7 +64,7 @@ module Middleman::CoreExtensions data = app.extensions[:frontmatter].data(source_file).first if proxy? - url_data = app.extensions[:frontmatter].data( File.join( app.source_dir, url ).chomp('/') ).first + url_data = app.extensions[:frontmatter].data(File.join(app.source_dir, url).chomp('/')).first data = data.deep_merge(url_data) end diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb index 6695773c..bef3d44d 100644 --- a/middleman-core/lib/middleman-core/extensions.rb +++ b/middleman-core/lib/middleman-core/extensions.rb @@ -23,7 +23,7 @@ module Middleman # If we've already got a matching extension that passed the # version check, bail out. return if registered.key?(name.to_sym) && - !registered[name.to_sym].is_a?(String) + !registered[name.to_sym].is_a?(String) registered[name.to_sym] = if block_given? block diff --git a/middleman-core/lib/middleman-core/renderers/kramdown.rb b/middleman-core/lib/middleman-core/renderers/kramdown.rb index 309e6034..3246a7d9 100644 --- a/middleman-core/lib/middleman-core/renderers/kramdown.rb +++ b/middleman-core/lib/middleman-core/renderers/kramdown.rb @@ -31,7 +31,7 @@ module Middleman mail_addr = el.attr['href'].sub(/\Amailto:/, '') href = obfuscate('mailto') << ':' << obfuscate(mail_addr) content = obfuscate(content) if content == mail_addr - return %Q(#{content}) + return %(#{content}) end attr = el.attr.dup diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb index a9e72221..623d9d54 100644 --- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb +++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb @@ -61,7 +61,7 @@ module Middleman middleman_app.image_tag(link, title: title, alt: alt_text) else link_string = link.dup - link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text + link_string << %("#{title}") if title && title.length > 0 && title != alt_text "![#{alt_text}](#{link_string})" end end @@ -74,7 +74,7 @@ module Middleman middleman_app.link_to(content, link, attributes) else link_string = link.dup - link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text + link_string << %("#{title}") if title && title.length > 0 && title != alt_text "[#{content}](#{link_string})" end end diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb index 290063f2..df803505 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb @@ -21,9 +21,9 @@ module Middleman # @return [Boolean] def ignored? @app.ignore_manager.ignored?(path) || - (!proxy? && - @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", '')) - ) + (!proxy? && + @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", '')) + ) end end diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 2ecec61a..8fb29cc8 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -53,7 +53,7 @@ module Middleman proxy_resource end - # rubocop:disable AccessorMethodName + # rubocop:disable Style/AccessorMethodName def get_source_file if proxy? proxied_to_resource.source_file @@ -61,16 +61,15 @@ module Middleman super end end + # rubocop:enable Style/AccessorMethodName def content_type mime_type = super return mime_type if mime_type - if proxy? - proxied_to_resource.content_type - else - nil - end + return proxied_to_resource.content_type if proxy? + + nil end end diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb index fe34ec39..980dbe96 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb @@ -66,9 +66,11 @@ module Middleman super(store, path) end + # rubocop:disable Style/AccessorMethodName def get_source_file nil end + # rubocop:enable Style/AccessorMethodName def template? true diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index c5af996b..56daaa28 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -36,7 +36,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension # The helpers helpers do - # Make all block content html_safe # rubocop:disable Semicolon def content_tag(name, content=nil, options=nil, &block) diff --git a/middleman-core/lib/middleman-more/core_extensions/i18n.rb b/middleman-core/lib/middleman-more/core_extensions/i18n.rb index 450edddd..a3d842ad 100644 --- a/middleman-core/lib/middleman-more/core_extensions/i18n.rb +++ b/middleman-core/lib/middleman-more/core_extensions/i18n.rb @@ -226,12 +226,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension if lang_suffix super(suffixed_partial_name, maybe_static) || - super(File.join(locals_dir, suffixed_partial_name), maybe_static) || - super(partials_path, try_static) || - super + super(File.join(locals_dir, suffixed_partial_name), maybe_static) || + super(partials_path, try_static) || + super else super(partials_path, try_static) || - super + super end end end