File path went from name to dir #154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 similar comment
|
|
I added a fix for the problem above. |
white-gecko
previously approved these changes
Feb 8, 2018
|
Please check this and see how to make the fix of #155 still work. |
Simaris
force-pushed
the
147/set_proper_page.name_attribute
branch
from
8049a6a to
2d413d1
Compare
white-gecko
requested changes
Apr 9, 2018
lib/jekyll/drops/rdf_resource.rb
Outdated
| @@ -116,6 +116,12 @@ def filename(domain_name, baseurl) | |||
| @filename ||= generate_file_name(domain_name, baseurl) | |||
| end | |||
|
|
|||
| def filedir | |||
| return @filedir unless @filedir.nil? | |||
| generate_file_name(@site.config["url"], @site.config["baseurl"]) #TODO change to RdfHelper.... like page_url | |||
lib/jekyll/drops/rdf_resource.rb
Outdated
| @@ -116,6 +116,12 @@ def filename(domain_name, baseurl) | |||
| @filename ||= generate_file_name(domain_name, baseurl) | |||
There was a problem hiding this comment.
Please remove domain_name and baseurlparameters from filename method.
lib/jekyll/drops/rdf_resource.rb
Outdated
| @@ -116,6 +116,12 @@ def filename(domain_name, baseurl) | |||
| @filename ||= generate_file_name(domain_name, baseurl) | |||
| end | |||
|
|
|||
| def filedir | |||
| return @filedir unless @filedir.nil? | |||
| generate_file_name(@site.config["url"], @site.config["baseurl"]) #TODO change to RdfHelper.... like page_url | |||
white-gecko
changed the title
Simaris
force-pushed
the
147/set_proper_page.name_attribute
branch
from
2d413d1 to
4e15c97
Compare
Simaris
changed the title
white-gecko
reviewed
Apr 12, 2018
lib/jekyll/drops/rdf_resource.rb
Outdated
| domain_name = domain_name.to_s | ||
| baseurl = baseurl.to_s | ||
| domain_name = URI::split(Jekyll::JekyllRdf::Helper::RdfHelper::site.config["url"])[2].to_s | ||
| baseurl = Jekyll::JekyllRdf::Helper::RdfHelper::site.config["baseurl"].to_s |
There was a problem hiding this comment.
What does happen, of no baseurl is set in the config? i.e. if there is no config parameter for baseurl at all?
There was a problem hiding this comment.
then the value returned by config would be Nil. For that reason, we use the .to_s method to cast it to string.
Nil cast to String becomes "", which means it has no further effect.
Simaris
force-pushed
the
147/set_proper_page.name_attribute
branch
from
0137c87 to
8c194de
Compare
white-gecko
requested changes
Apr 17, 2018
Simaris
changed the title
|
made the fix but the also, I still need to test |
Simaris
force-pushed
the
147/set_proper_page.name_attribute
branch
2 times, most recently
from
993c212 to
ae22032
Compare
the methods page_url, render_path, filename and filedir will now yield correct results, no matter in what order they are used. filename param were removed.
Simaris
force-pushed
the
147/set_proper_page.name_attribute
branch
from
ae22032 to
734295c
Compare
Simaris
changed the title
white-gecko
approved these changes
May 3, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #147
above issue brought a design flaw to my attention, that there since the beginning
and causes us to endlessly redo resource.generate_file_name