Skip to content
Permalink
Browse files

Attain Ruby 3.0 compatibility (#7948)

Merge pull request 7948
  • Loading branch information
ashmaroli committed Jan 31, 2020
1 parent 5be7faa commit 389eb88c20aa205ad0c412d83b3e60fff577113b
Showing with 10 additions and 8 deletions.
  1. +2 −0 .rubocop.yml
  2. +1 −1 .travis.yml
  3. +1 −1 lib/jekyll/convertible.rb
  4. +5 −5 lib/jekyll/document.rb
  5. +1 −1 lib/jekyll/tags/include.rb
@@ -108,6 +108,8 @@ Style/Alias:
EnforcedStyle: prefer_alias_method
Style/AndOr:
Severity: error
Style/BracesAroundHashParameters:
Enabled: false
Style/ClassAndModuleChildren:
Exclude:
- test/**/*.rb
@@ -19,7 +19,7 @@ matrix:
- rvm: *ruby1
env: TEST_SUITE=profile-docs
name: "Profile Docs"
- rvm: *ruby1
- rvm: *ruby2
env: TEST_SUITE=memprof
name: "Profile Memory Allocation"
exclude:
@@ -39,7 +39,7 @@ def read_yaml(base, name, opts = {})

begin
self.content = File.read(@path || site.in_source_dir(base, name),
Utils.merged_file_read_opts(site, opts))
**Utils.merged_file_read_opts(site, opts))
if content =~ Document::YAML_FRONT_MATTER_REGEXP
self.content = $POSTMATCH
self.data = SafeYAML.load(Regexp.last_match(1))
@@ -298,7 +298,7 @@ def read(opts = {})
else
begin
merge_defaults
read_content(opts)
read_content(**opts)
read_post_data
rescue StandardError => e
handle_read_error(e)
@@ -429,14 +429,14 @@ def populate_categories
categories.flatten!
categories.uniq!

merge_data!("categories" => categories)
merge_data!({ "categories" => categories })
end

def populate_tags
tags = Utils.pluralized_array_from_hash(data, "tag", "tags")
tags.flatten!

merge_data!("tags" => tags)
merge_data!({ "tags" => tags })
end

private
@@ -462,8 +462,8 @@ def merge_defaults
merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
end

def read_content(opts)
self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
def read_content(**opts)
self.content = File.read(path, **Utils.merged_file_read_opts(site, opts))
if content =~ YAML_FRONT_MATTER_REGEXP
self.content = $POSTMATCH
data_file = SafeYAML.load(Regexp.last_match(1))
@@ -176,7 +176,7 @@ def realpath_prefixed_with?(path, dir)

# This method allows to modify the file content by inheriting from the class.
def read_file(file, context)
File.read(file, file_read_opts(context))
File.read(file, **file_read_opts(context))
end

private

0 comments on commit 389eb88

Please sign in to comment.
You can’t perform that action at this time.