Merge pull request #139 from jekyll/pr/rubocop

Merge pull request 139
jekyll · Oct 6, 2016 · 8159197 · 8159197
2 parents 79d06e5 + 1b2c1d8
commit 8159197
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,7 +2,7 @@ inherit_gem:
  jekyll: .rubocop.yml
 
 AllCops:
- TargetRubyVersion: 1.9
+ TargetRubyVersion: 2.0
  Include:
  - lib/*.rb
 

diff --git a/lib/jekyll/feed_meta_tag.rb b/lib/jekyll/feed_meta_tag.rb
@@ -2,7 +2,7 @@ module Jekyll
  class FeedMetaTag < Liquid::Tag
  def render(context)
  @context = context
- attrs = attributes.map { |k, v| %(#{k}="#{v}") }.join(' ')
+ attrs = attributes.map { |k, v| %(#{k}="#{v}") }.join(" ")
  "<link #{attrs} />"
  end
 
@@ -14,9 +14,9 @@ def config
 
  def attributes
  {
- :type => 'application/atom+xml',
- :rel => 'alternate',
- :href => "#{url}/#{path}",
+ :type  => "application/atom+xml",
+ :rel  => "alternate",
+ :href  => "#{url}/#{path}",
  :title => title
  }.keep_if { |_, v| v }
  end

diff --git a/lib/jekyll/jekyll-feed.rb b/lib/jekyll/jekyll-feed.rb
@@ -54,7 +54,7 @@ def file_exists?(file_path)
  # Generates contents for a file
  def content_for_file(file_path, file_source_path)
  file = PageWithoutAFile.new(@site, File.dirname(__FILE__), "", file_path)
- file.content = File.read(file_source_path).gsub(/(?<!\")\s+([<{])/, '\1')
+ file.content = File.read(file_source_path).gsub(%r!(?<\!")\s+([<{])!, '\1')
  file.data["layout"] = nil
  file.data["sitemap"] = false
  file.output