Skip to content

Commit 838599d

Browse files
committed
Merge pull request #89 from WasabiFan/stringify-all-github-values
Merge pull request 89
2 parents 738a3a7 + 1497d38 commit 838599d

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

lib/jekyll-redirect-from/redirector.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ def redirect_prefix(site)
7474

7575
def config_github_url(site)
7676
github_config = site.config['github']
77-
github_config['url'] if github_config.is_a?(Hash)
77+
if github_config.is_a?(Hash) && github_config['url']
78+
github_config['url'].to_s
79+
end
7880
end
7981

8082
def config_baseurl(site)

spec/jekyll_redirect_from/redirector_spec.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
expect(redirector.redirect_url(@site, page_with_one)).to start_with("http://example.github.io/test")
8989
end
9090

91+
it "converts non-string values in site.github.url to strings" do
92+
@site.config['github'] = { "url" => TestStringContainer.new("http://example.github.io/test") }
93+
expect(redirector.redirect_url(@site, page_with_one)).to start_with("http://example.github.io/test")
94+
end
95+
9196
it "uses site.baseurl as the redirect prefix when site.github.url is not set" do
9297
@site.config['baseurl'] = "/fancy/prefix"
9398
expect(redirector.redirect_url(@site, page_with_one)).to start_with("/fancy/prefix")

spec/spec_helper.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,13 @@ def destination_sitemap
7979
File.read(File.join(@dest.to_s, 'sitemap.xml'))
8080
end
8181
end
82+
83+
class TestStringContainer
84+
def initialize(strValue)
85+
@val = strValue
86+
end
87+
88+
def to_s
89+
@val
90+
end
91+
end

0 commit comments

Comments
 (0)