Merge pull request #1416 from dg-ratiodata/feature/fix_offenses

Fix rubocop offenses
This commit is contained in:
Eliott Appleford 2015-02-19 00:50:46 +00:00
commit a977f8bf20
10 changed files with 24 additions and 20 deletions

View file

@ -50,3 +50,7 @@ FormatString:
Enabled: false Enabled: false
CaseIndentation: CaseIndentation:
IndentWhenRelativeTo: end IndentWhenRelativeTo: end
Metrics/AbcSize:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false

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

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

View file

@ -53,7 +53,7 @@ module Middleman
proxy_resource proxy_resource
end end
# rubocop:disable AccessorMethodName # rubocop:disable Style/AccessorMethodName
def get_source_file def get_source_file
if proxy? if proxy?
proxied_to_resource.source_file proxied_to_resource.source_file
@ -61,18 +61,17 @@ module Middleman
super super
end end
end end
# rubocop:enable Style/AccessorMethodName
def content_type def content_type
mime_type = super mime_type = super
return mime_type if mime_type return mime_type if mime_type
if proxy? return proxied_to_resource.content_type if proxy?
proxied_to_resource.content_type
else
nil nil
end end
end end
end
module InstanceMethods module InstanceMethods
def proxy_manager def proxy_manager

View file

@ -66,9 +66,11 @@ module Middleman
super(store, path) super(store, path)
end end
# rubocop:disable Style/AccessorMethodName
def get_source_file def get_source_file
nil nil
end end
# rubocop:enable Style/AccessorMethodName
def template? def template?
true true

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)