Skip to content

Commit 9f909f4

Browse files
authored
Reduce Ruby 2.7 deprecation warnings (#603)
1 parent 7eaa12e commit 9f909f4

File tree

8 files changed

+13
-7
lines changed

8 files changed

+13
-7
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ cache:
1010
yarn: true
1111
directories:
1212
- node_modules
13+
matrix:
14+
include:
15+
- rvm: 2.7
16+
env: TEST_SUITE=ruby JEKYLL_VERSION="~> 3.8"
17+
- rvm: 2.7
18+
env: TEST_SUITE=ruby JEKYLL_VERSION="~> 4.0"
1319
env:
1420
matrix:
1521
- TEST_SUITE=node

lib/jekyll-admin/apiable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def name
127127
end
128128

129129
def file_contents
130-
@file_contents ||= File.read(file_path, file_read_options) if file_exists?
130+
@file_contents ||= File.read(file_path, **file_read_options) if file_exists?
131131
end
132132

133133
def file_read_options

lib/jekyll-admin/server/collections.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def entries
7979
:splat => splats&.first,
8080
}
8181
# get the directories inside the requested directory
82-
directory = JekyllAdmin::Directory.new(directory_path, args)
82+
directory = JekyllAdmin::Directory.new(directory_path, **args)
8383
directories = directory.directories
8484
# merge directories with the documents at the same level
8585
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
@@ -38,7 +38,7 @@ def parsed_configuration
3838
def raw_configuration
3939
File.read(
4040
configuration_path,
41-
Jekyll::Utils.merged_file_read_opts(site, {})
41+
**Jekyll::Utils.merged_file_read_opts(site, {})
4242
)
4343
end
4444

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/drafts.rb

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

9292
# exclude root level directories which do not have drafts

lib/jekyll-admin/server/pages.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def entries
9292
:splat => params["splat"].first,
9393
}
9494
# get all directories inside the requested directory
95-
directory = JekyllAdmin::Directory.new(directory_path, args)
95+
directory = JekyllAdmin::Directory.new(directory_path, **args)
9696
directories = directory.directories
9797

9898
# exclude root level directories which do not have pages

lib/jekyll-admin/server/static_files.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def entries
6060
:splat => splat,
6161
}
6262
# get all directories inside the requested directory
63-
directory = JekyllAdmin::Directory.new(directory_path, args)
63+
directory = JekyllAdmin::Directory.new(directory_path, **args)
6464
directories = directory.directories
6565

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

0 commit comments

Comments
 (0)