diff --git a/.rubocop.yml b/.rubocop.yml index fb736c5e..4a0432c4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,6 +21,8 @@ AllCops: - script/**/* - vendor/**/* - tmp/**/* +Layout/EmptyLinesAroundAttributeAccessor: + Enabled: false Layout/HashAlignment: EnforcedHashRocketStyle: table Layout/IndentationWidth: @@ -165,6 +167,8 @@ Style/RescueModifier: Style/SafeNavigation: Exclude: - lib/jekyll/document.rb +Style/SlicingWithRange: + Enabled: false Style/SignalException: EnforcedStyle: only_raise Style/StringLiterals: diff --git a/Gemfile b/Gemfile index f0611ea2..ff48521d 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ group :test do gem "nokogiri", "~> 1.7" gem "rspec" gem "rspec-mocks" - gem "rubocop", "~> 0.82.0" + gem "rubocop", "~> 0.83.0" gem "rubocop-performance" gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__) gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__) diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb index a7ece193..272e7bbb 100644 --- a/lib/jekyll/entry_filter.rb +++ b/lib/jekyll/entry_filter.rb @@ -3,6 +3,7 @@ module Jekyll class EntryFilter attr_reader :site + SPECIAL_LEADING_CHAR_REGEX = %r!\A#{Regexp.union([".", "_", "#", "~"])}!o.freeze def initialize(site, base_directory = nil) diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb index 77c70097..6d182750 100644 --- a/lib/jekyll/readers/collection_reader.rb +++ b/lib/jekyll/readers/collection_reader.rb @@ -5,6 +5,7 @@ module Jekyll SPECIAL_COLLECTIONS = %w(posts data).freeze attr_reader :site, :content + def initialize(site) @site = site @content = {} diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index 8d5803cb..4fa873fc 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -3,6 +3,7 @@ module Jekyll class DataReader attr_reader :site, :content + def initialize(site) @site = site @content = {} diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb index 883ca724..981867b3 100644 --- a/lib/jekyll/readers/layout_reader.rb +++ b/lib/jekyll/readers/layout_reader.rb @@ -3,6 +3,7 @@ module Jekyll class LayoutReader attr_reader :site + def initialize(site) @site = site @layouts = {} diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb index af4b879d..e72f7676 100644 --- a/lib/jekyll/readers/page_reader.rb +++ b/lib/jekyll/readers/page_reader.rb @@ -3,6 +3,7 @@ module Jekyll class PageReader attr_reader :site, :dir, :unfiltered_content + def initialize(site, dir) @site = site @dir = dir diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb index 17b12321..f6de49ae 100644 --- a/lib/jekyll/readers/post_reader.rb +++ b/lib/jekyll/readers/post_reader.rb @@ -3,6 +3,7 @@ module Jekyll class PostReader attr_reader :site, :unfiltered_content + def initialize(site) @site = site end diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb index 97df05af..5c8a6775 100644 --- a/lib/jekyll/readers/static_file_reader.rb +++ b/lib/jekyll/readers/static_file_reader.rb @@ -3,6 +3,7 @@ module Jekyll class StaticFileReader attr_reader :site, :dir, :unfiltered_content + def initialize(site, dir) @site = site @dir = dir diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb index 8b62c9d3..b20a3a08 100644 --- a/lib/jekyll/readers/theme_assets_reader.rb +++ b/lib/jekyll/readers/theme_assets_reader.rb @@ -3,6 +3,7 @@ module Jekyll class ThemeAssetsReader attr_reader :site + def initialize(site) @site = site end diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index 3e5172f7..9c0b6ca3 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -4,6 +4,7 @@ module Jekyll class Theme extend Forwardable attr_reader :name + def_delegator :gemspec, :version, :version def initialize(name)