Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit ffa8bc3

Browse files
committed
follow sphinx convention
1 parent b164cb2 commit ffa8bc3

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

sphinx_search/extension.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from sphinx.util.fileutil import copy_asset
44

55

6-
CUSTOM_ASSETS_FILES = {
7-
'MINIFIED': [
6+
ASSETS_FILES = {
7+
'minified': [
88
os.path.join('js', 'rtd_sphinx_search.min.js'),
99
os.path.join('css', 'rtd_sphinx_search.min.css'),
1010
],
11-
'UN_MINIFIED': [
11+
'un-minified': [
1212
os.path.join('js', 'rtd_sphinx_search.js'),
1313
os.path.join('css', 'rtd_sphinx_search.css'),
1414
]
@@ -17,16 +17,22 @@
1717

1818
def copy_asset_files(app, exception):
1919
if exception is None: # build succeeded
20-
files = CUSTOM_ASSETS_FILES['MINIFIED'] + CUSTOM_ASSETS_FILES['UN_MINIFIED']
20+
files = ASSETS_FILES['minified'] + ASSETS_FILES['un-minified']
2121
for file in files:
2222
path = os.path.join(os.path.dirname(__file__), '_static', file)
2323
copy_asset(path, os.path.join(app.outdir, '_static', file.split('.')[-1]))
2424

2525

2626
def inject_static_files(app):
27-
"""Inject correct CSS and JS files based on the value of ``RTD_SPHINX_SEARCH_FILE_TYPE``."""
28-
file_type = app.config.RTD_SPHINX_SEARCH_FILE_TYPE
29-
files = CUSTOM_ASSETS_FILES[file_type]
27+
"""Inject correct CSS and JS files based on the value of ``RTD_SPHINX_SEARCH_FILE_TYPE``."""
28+
file_type = app.config.rtd_sphinx_search_file_type
29+
expected_file_type = ASSETS_FILES.keys()
30+
31+
assert (
32+
file_type in expected_file_type
33+
), f'"{file_type}" file type is not supported.'
34+
35+
files = ASSETS_FILES[file_type]
3036

3137
for file in files:
3238
if file.endswith('.js'):
@@ -37,7 +43,7 @@ def inject_static_files(app):
3743

3844
def setup(app):
3945

40-
app.add_config_value('RTD_SPHINX_SEARCH_FILE_TYPE', 'UN_MINIFIED', 'html')
46+
app.add_config_value('rtd_sphinx_search_file_type', 'un-minified', 'html')
4147

4248
app.connect('builder-inited', inject_static_files)
4349
app.connect('build-finished', copy_asset_files)

tests/test_extension.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77

88
from tests import TEST_DOCS_SRC
9-
from sphinx_search.extension import CUSTOM_ASSETS_FILES
9+
from sphinx_search.extension import ASSETS_FILES
1010

1111

1212
@pytest.mark.sphinx(srcdir=TEST_DOCS_SRC)
@@ -15,7 +15,7 @@ def test_static_files_exists(app, status, warning):
1515
app.build()
1616
path = app.outdir
1717

18-
static_files = CUSTOM_ASSETS_FILES['MINIFIED'] + CUSTOM_ASSETS_FILES['UN_MINIFIED']
18+
static_files = ASSETS_FILES['minified'] + ASSETS_FILES['un-minified']
1919

2020
for file in static_files:
2121
file_path = os.path.join(path, '_static', file)
@@ -27,7 +27,7 @@ def test_static_files_exists(app, status, warning):
2727
@pytest.mark.sphinx(
2828
srcdir=TEST_DOCS_SRC,
2929
confoverrides={
30-
'RTD_SPHINX_SEARCH_FILE_TYPE': 'MINIFIED'
30+
'rtd_sphinx_search_file_type': 'minified'
3131
}
3232
)
3333
def test_minified_static_files_injected_in_html(selenium, app, status, warning):
@@ -38,10 +38,10 @@ def test_minified_static_files_injected_in_html(selenium, app, status, warning):
3838
selenium.get(f'file://{path}')
3939
page_source = selenium.page_source
4040

41-
assert app.config.RTD_SPHINX_SEARCH_FILE_TYPE == 'MINIFIED'
41+
assert app.config.rtd_sphinx_search_file_type == 'minified'
4242

43-
file_type = app.config.RTD_SPHINX_SEARCH_FILE_TYPE
44-
files = CUSTOM_ASSETS_FILES[file_type]
43+
file_type = app.config.rtd_sphinx_search_file_type
44+
files = ASSETS_FILES[file_type]
4545

4646
for file in files:
4747
file_name = file.split('/')[-1]
@@ -53,7 +53,7 @@ def test_minified_static_files_injected_in_html(selenium, app, status, warning):
5353
@pytest.mark.sphinx(
5454
srcdir=TEST_DOCS_SRC,
5555
confoverrides={
56-
'RTD_SPHINX_SEARCH_FILE_TYPE': 'UN_MINIFIED'
56+
'rtd_sphinx_search_file_type': 'un-minified'
5757
}
5858
)
5959
def test_un_minified_static_files_injected_in_html(selenium, app, status, warning):
@@ -64,10 +64,10 @@ def test_un_minified_static_files_injected_in_html(selenium, app, status, warnin
6464
selenium.get(f'file://{path}')
6565
page_source = selenium.page_source
6666

67-
assert app.config.RTD_SPHINX_SEARCH_FILE_TYPE == 'UN_MINIFIED'
67+
assert app.config.rtd_sphinx_search_file_type == 'un-minified'
6868

69-
file_type = app.config.RTD_SPHINX_SEARCH_FILE_TYPE
70-
files = CUSTOM_ASSETS_FILES[file_type]
69+
file_type = app.config.rtd_sphinx_search_file_type
70+
files = ASSETS_FILES[file_type]
7171

7272
for file in files:
7373
file_name = file.split('/')[-1]

0 commit comments

Comments
 (0)