Skip to content

Commit

Permalink
Fix regexp (#219)
Browse files Browse the repository at this point in the history 
* fix regex inside repository

* bump up version
  • Loading branch information
@Soichiro725
Soichiro725 authored Nov 9, 2022
1 parent 350d676 commit 2945e69
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lib/wovnrb/store.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def format_settings
when 'query'
@settings['url_pattern_reg'] = "((\\?.*&)|\\?)#{@settings['lang_param_name']}=(?<lang>[^&]+)(&|$)"
when 'subdomain'
@settings['url_pattern_reg'] = "^(?<lang>[^.]+)."
@settings['url_pattern_reg'] = '^(?<lang>[^.]+)\.'
end

@settings['test_mode'] = !(@settings['test_mode'] != true || @settings['test_mode'] != 'on')
Expand Down
2 changes: 1 addition & 1 deletion lib/wovnrb/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Wovnrb
VERSION = '3.7.0'.freeze
VERSION = '3.7.1'.freeze
end
6 changes: 3 additions & 3 deletions test/lib/api_translator_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_api_timeout_is_search_engine_user_higher_default
'custom_lang_aliases' => { 'ja' => 'Japanese' },
'default_lang' => 'en',
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).',
'url_pattern_reg' => '^(?<lang>[^.]+)\.',
'lang_param_name' => 'lang'
}
store = Wovnrb::Store.instance
Expand All @@ -89,7 +89,7 @@ def test_api_timeout_no_user_agent_use_normal_default
'custom_lang_aliases' => { 'ja' => 'Japanese' },
'default_lang' => 'en',
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).',
'url_pattern_reg' => '^(?<lang>[^.]+)\.',
'lang_param_name' => 'lang'
}
store = Wovnrb::Store.instance
Expand Down Expand Up @@ -136,7 +136,7 @@ def create_sut
'custom_lang_aliases' => { 'ja' => 'Japanese' },
'default_lang' => 'en',
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).',
'url_pattern_reg' => '^(?<lang>[^.]+)\.',
'lang_param_name' => 'lang'
}
store = Wovnrb::Store.instance
Expand Down
26 changes: 13 additions & 13 deletions test/lib/headers_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def utility_assert_pathname_with_trailing_slash_if_present(env_opt, setting_opt,
},
{
'env' => { 'REQUEST_URI' => 'http://ja.page.com/test/' },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).' },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' },
'name' => 'test_pathname_with_trailing_slash_if_present_with_subdomain_lang_when_trailing_slash_is_present',
'expected' => {
'pathname_with_trailing_slash_if_present' => '/test/'
Expand Down Expand Up @@ -234,7 +234,7 @@ def test_pathanme
REDIRECT_LOCATION_TESTS = [
{
'env' => { 'url' => 'http://wovn.io/contact', 'HTTP_X_FORWARDED_HOST' => 'wovn.io' },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).' },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' },
'name' => 'test_redirect_location_without_custom_lang_code',
'expected' => {
'redirect_location' => {
Expand All @@ -244,7 +244,7 @@ def test_pathanme
},
{
'env' => { 'url' => 'http://wovn.io/contact', 'HTTP_X_FORWARDED_HOST' => 'wovn.io' },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).', 'custom_lang_aliases' => { 'ja' => 'staging-ja' } },
'setting' => { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.', 'custom_lang_aliases' => { 'ja' => 'staging-ja' } },
'name' => 'test_redirect_location_with_custom_lang_code',
'expected' => {
'redirect_location' => {
Expand Down Expand Up @@ -297,7 +297,7 @@ def test_redirect_location
def test_request_out_with_wovn_target_lang_header_using_subdomain
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand Down Expand Up @@ -345,7 +345,7 @@ def test_request_out_with_wovn_target_lang_header_using_query
def test_request_out_with_use_proxy_false
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand All @@ -362,7 +362,7 @@ def test_request_out_with_use_proxy_false
def test_request_out_with_use_proxy_true
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).',
'url_pattern_reg' => '^(?<lang>[^.]+)\.',
'use_proxy' => true
})
store = Wovnrb.get_store(settings)
Expand All @@ -380,7 +380,7 @@ def test_request_out_with_use_proxy_true
def test_request_out_http_referer_subdomain
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand Down Expand Up @@ -413,7 +413,7 @@ def test_request_out_http_referer_subdomain_with_custom_lang_code
settings = Wovnrb.get_settings({
'custom_lang_aliases' => { 'ja' => 'staging-ja' },
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand Down Expand Up @@ -475,7 +475,7 @@ def test_out_http_referer_subdomain_with_custom_lang_code
settings = Wovnrb.get_settings({
'custom_lang_aliases' => { 'ja' => 'staging-ja' },
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand All @@ -494,7 +494,7 @@ def test_out_http_referer_subdomain_with_custom_lang_code
def test_out_original_lang_with_subdomain_url_pattern
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand Down Expand Up @@ -551,7 +551,7 @@ def test_out_original_lang_with_query_url_pattern
def test_out_with_wovn_target_lang_header_using_subdomain
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand Down Expand Up @@ -759,7 +759,7 @@ def test_lang_detection_path
def test_path_lang_sudomain_with_use_proxy_false
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
})
store = Wovnrb.get_store(settings)
env = Wovnrb.get_env({
Expand All @@ -774,7 +774,7 @@ def test_path_lang_sudomain_with_use_proxy_false
def test_path_lang_sudomain_with_use_proxy_true
settings = Wovnrb.get_settings({
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).',
'url_pattern_reg' => '^(?<lang>[^.]+)\.',
'use_proxy' => true
})
store = Wovnrb.get_store(settings)
Expand Down
2 changes: 1 addition & 1 deletion test/lib/store_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_settings_url_pattern_path
def test_settings_url_pattern_subdomain
s = Wovnrb::Store.instance
s.update_settings('url_pattern' => 'subdomain')
assert_equal('^(?<lang>[^.]+).', s.settings['url_pattern_reg'])
assert_equal('^(?<lang>[^.]+)\.', s.settings['url_pattern_reg'])
assert_equal('subdomain', s.settings['url_pattern'])
end

Expand Down
2 changes: 1 addition & 1 deletion test/lib/wovnrb_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def store_headers_factory(subdomain, original_lang)
'custom_lang_aliases' => {},
'default_lang' => original_lang,
'url_pattern' => 'subdomain',
'url_pattern_reg' => '^(?<lang>[^.]+).'
'url_pattern_reg' => '^(?<lang>[^.]+)\.'
}

store = Wovnrb::Store.instance
Expand Down

0 comments on commit 2945e69

Please sign in to comment.