deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rubcop found some new offenses

Browse source
This commit is contained in:
Dennis Günnewig 2015-01-08 14:55:03 +01:00
parent 747ca86212
commit 79dbfa0238
6 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/extensions.rb
View file

@ -23,7 +23,7 @@ module Middleman
# If we've already got a matching extension that passed the # If we've already got a matching extension that passed the
# version check, bail out. # version check, bail out.
return if registered.key?(name.to_sym) && 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? registered[name.to_sym] = if block_given?
block block

2
middleman-core/lib/middleman-core/renderers/kramdown.rb
View file

@ -31,7 +31,7 @@ module Middleman
mail_addr = el.attr['href'].sub(/\Amailto:/, '') mail_addr = el.attr['href'].sub(/\Amailto:/, '')
href = obfuscate('mailto') << ':' << obfuscate(mail_addr) href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
content = obfuscate(content) if content == mail_addr content = obfuscate(content) if content == mail_addr
return %Q(<a href="#{href}">#{content}</a>) return %(<a href="#{href}">#{content}</a>)
end end
attr = el.attr.dup attr = el.attr.dup

4
middleman-core/lib/middleman-core/renderers/redcarpet.rb
View file

@ -61,7 +61,7 @@ module Middleman
middleman_app.image_tag(link, title: title, alt: alt_text) middleman_app.image_tag(link, title: title, alt: alt_text)
else else
link_string = link.dup 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})" "![#{alt_text}](#{link_string})"
end end
end end
@ -74,7 +74,7 @@ module Middleman
middleman_app.link_to(content, link, attributes) middleman_app.link_to(content, link, attributes)
else else
link_string = link.dup 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})" "[#{content}](#{link_string})"
end end
end end

6
middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
View file

@ -21,9 +21,9 @@ module Middleman
# @return [Boolean] # @return [Boolean]
def ignored? def ignored?
@app.ignore_manager.ignored?(path) || @app.ignore_manager.ignored?(path) ||
(!proxy? && (!proxy? &&
@app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", '')) @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ''))
) )
end end
end end

1
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -36,7 +36,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
# The helpers # The helpers
helpers do helpers do
# Make all block content html_safe # Make all block content html_safe
# rubocop:disable Semicolon # rubocop:disable Semicolon
def content_tag(name, content=nil, options=nil, &block) def content_tag(name, content=nil, options=nil, &block)

8
middleman-core/lib/middleman-more/core_extensions/i18n.rb
View file

@ -226,12 +226,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
if lang_suffix if lang_suffix
super(suffixed_partial_name, maybe_static) || super(suffixed_partial_name, maybe_static) ||
super(File.join(locals_dir, suffixed_partial_name), maybe_static) || super(File.join(locals_dir, suffixed_partial_name), maybe_static) ||
super(partials_path, try_static) || super(partials_path, try_static) ||
super super
else else
super(partials_path, try_static) || super(partials_path, try_static) ||
super super
end end
end end
end end