Skip to content

Commit 41c8658

Browse files
committed
Address deprecation warnings from Ruby 2.7
1 parent 95bfcf5 commit 41c8658

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

lib/jekyll-admin/apiable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def mtime
8686
end
8787

8888
def file_contents
89-
@file_contents ||= File.read(file_path, file_read_options) if file_exists?
89+
@file_contents ||= File.read(file_path, **file_read_options) if file_exists?
9090
end
9191

9292
def file_read_options

lib/jekyll-admin/server/collection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def entries
7676
:splat => params["splat"].first,
7777
}
7878
# get the directories inside the requested directory
79-
directory = JekyllAdmin::Directory.new(directory_path, args)
79+
directory = JekyllAdmin::Directory.new(directory_path, **args)
8080
directories = directory.directories
8181
# merge directories with the documents at the same level
8282
directories.concat(directory_docs.sort_by(&:date).reverse)

lib/jekyll-admin/server/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def parsed_configuration
3737
def raw_configuration
3838
File.read(
3939
configuration_path,
40-
Jekyll::Utils.merged_file_read_opts(site, {})
40+
**Jekyll::Utils.merged_file_read_opts(site, {})
4141
)
4242
end
4343

lib/jekyll-admin/server/data.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def entries
5454
:splat => splats.first,
5555
}
5656
# get all directories inside the requested directory
57-
directory = JekyllAdmin::Directory.new(directory_path, args)
57+
directory = JekyllAdmin::Directory.new(directory_path, **args)
5858
directories = directory.directories
5959

6060
# exclude root level directories which do not have data files

lib/jekyll-admin/server/draft.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def entries
8383
:splat => params["splat"].first,
8484
}
8585
# get the directories inside the requested directory
86-
directory = JekyllAdmin::Directory.new(directory_path, args)
86+
directory = JekyllAdmin::Directory.new(directory_path, **args)
8787
directories = directory.directories
8888

8989
# exclude root level directories which do not have drafts

lib/jekyll-admin/server/page.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def entries
7676
:splat => params["splat"].first,
7777
}
7878
# get all directories inside the requested directory
79-
directory = JekyllAdmin::Directory.new(directory_path, args)
79+
directory = JekyllAdmin::Directory.new(directory_path, **args)
8080
directories = directory.directories
8181

8282
# exclude root level directories which do not have pages

lib/jekyll-admin/server/static_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def entries
5656
:splat => params["splat"].first,
5757
}
5858
# get all directories inside the requested directory
59-
directory = JekyllAdmin::Directory.new(directory_path, args)
59+
directory = JekyllAdmin::Directory.new(directory_path, **args)
6060
directories = directory.directories
6161

6262
# exclude root level directories which do not have static files

lib/jekyll-admin/server/template.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def dirs
7070
:content_type => "templates",
7171
:splat => splats.first,
7272
}
73-
Directory.new(directory_path, args).directories
73+
Directory.new(directory_path, **args).directories
7474
end
7575

7676
def template_directories
@@ -173,7 +173,7 @@ def ensure_requested_file
173173

174174
def file_contents(file = requested_file)
175175
@file_contents ||= File.read(
176-
file, Jekyll::Utils.merged_file_read_opts(site, {})
176+
file, **Jekyll::Utils.merged_file_read_opts(site, {})
177177
)
178178
end
179179

lib/jekyll-admin/server/theme.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def entries
8585
:content_type => "theme",
8686
:splat => splats.first,
8787
}
88-
Directory.new(directory_path, args).directories
88+
Directory.new(directory_path, **args).directories
8989
end
9090

9191
def subdir_entries
@@ -130,7 +130,7 @@ def exist_at_source?
130130
end
131131

132132
def raw_content
133-
File.read(file_path, Jekyll::Utils.merged_file_read_opts(site, {}))
133+
File.read(file_path, **Jekyll::Utils.merged_file_read_opts(site, {}))
134134
end
135135
end
136136
end

0 commit comments

Comments
 (0)