Make uri mapping neat #99

Simaris · 2017-07-31T15:39:58Z

Fix #94, #78, #82
it does not throw the error described at the end of #94

coveralls · 2017-07-31T15:45:38Z

Coverage decreased (-0.4%) to 99.572% when pulling 4e31ca4 on Simaris:make_URI_mapping_neat into 600cf61 on white-gecko:develop.

coveralls · 2017-07-31T17:19:15Z

Coverage remained the same at 100.0% when pulling 6c20443 on Simaris:make_URI_mapping_neat into 600cf61 on white-gecko:develop.

white-gecko · 2017-08-01T11:39:56Z

lib/jekyll/drops/rdf_resource.rb

+            # opaque jekyll produces static pages, so we do not dereferencing
+            # query queries do not address resources
+            # file_name << "#/#{uri[:fragment]}" unless uri[:fragment].nil? fragments are not evaluated by browsers, only by clients
+          rescue Addressable::URI::InvalidURIError => x #unclean coding: blanknodes are recognized through errors


Please remove this comment, if this is not true anymore

white-gecko · 2017-08-01T11:40:27Z

lib/jekyll/drops/rdf_resource.rb

-              file_name += '/'
-            end
-          rescue URI::InvalidURIError => x #unclean coding: blanknodes are recognized through errors
+            #key_field = [:scheme, :userinfo, :host, :port, :registry, :path, :opaque, :query, :fragment]


Please make a more verbose note, that these are the parameters of uri

coveralls · 2017-08-01T20:17:28Z

Coverage remained the same at 100.0% when pulling bc32cc8 on Simaris:make_URI_mapping_neat into 273336b on white-gecko:develop.

coveralls · 2017-08-18T11:42:49Z

Coverage remained the same at 100.0% when pulling d7c16bd on Simaris:make_URI_mapping_neat into 3e62c08 on white-gecko:develop.

white-gecko

Please also add dedicated tests for the new behavior please use the example given in https://github.com/white-gecko/jekyll-rdf/issues/94 for this.

coveralls · 2017-09-06T15:57:22Z

Coverage decreased (-0.4%) to 99.61% when pulling 14652dd on Simaris:make_URI_mapping_neat into 3e0c41f on white-gecko:develop.

coveralls · 2017-09-07T18:10:30Z

Coverage decreased (-0.3%) to 99.653% when pulling 088b02d on Simaris:make_URI_mapping_neat into 6da9634 on white-gecko:develop.

white-gecko · 2017-09-08T09:38:53Z

lib/jekyll/drops/rdf_resource.rb

            file_name = "invalids/#{term.to_s}"
            Jekyll.logger.error("Invalid resource found: #{term.to_s} is not a proper uri")
            Jekyll.logger.error("URI parser exited with message: #{x.message}")
          end
        end
+        # windows compatibility
        file_name = file_name.gsub('_','_u')
        file_name = file_name.gsub('//','/') # needs a better regex to include /// ////...
        file_name = file_name.gsub(':','_D')


I think this should have been removed

Please also check if the // -> / replacement is still needed.

white-gecko · 2017-09-08T10:03:02Z

test/test_rdf_page_data.rb

+      assert_equal "/b/x", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/b/x"), sparql, @site).page_url
+      assert_equal "/b/y/index.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/b/y/"), sparql, @site).render_path
+      assert_equal "/b/y/", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/b/y/"), sparql, @site).page_url
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a.html"), sparql, @site).render_path


This line should be duplicated for page_url = "/a.html"

because the .html is already contained in the URI

white-gecko · 2017-09-08T10:05:30Z

test/test_rdf_page_data.rb

+
+    should "let fragment-identifier default to super resource" do
+      assert_equal "/c.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/c#alpha"), sparql, @site).render_path
+      assert_equal "/c.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/c#beta"), sparql, @site).render_path


What is the page_url here?

I think the page_url should be "/c#alpha" resp. "/c#beta"

considering #94 we should only have another value for page_url if our subresource does not have a super resource.
The problem is that, checking if a superresource exist might be to complex for what we want to achieve

white-gecko · 2017-09-08T10:10:26Z

test/test_rdf_page_data.rb

+
+  context "Jekyll::Drops::RdfResource.render_path"do
+    setup do
+      @config = Jekyll.configuration({'url' => "http://ex.org", 'baseurl' => "" })


Please duplicate this test for baseurl => "/", where the page_url for "http://ex.org/a" would be "a" and the render path would be "a.html"

maybe also do the same for baseurl => "/blog" with http://ex.org/blog/a …
for http://ex.org/a in this case the page_url would be "/rdfsites/http/ex.org/a" (or "/rdfsites/http/ex/org/a") and the render_path: "/rdfsites/http/ex.org/a.html"

coveralls · 2017-10-04T16:09:29Z

Coverage remained the same at 100.0% when pulling 368d73a on Simaris:make_URI_mapping_neat into 6da9634 on white-gecko:develop.

coveralls · 2017-10-04T18:54:53Z

Coverage remained the same at 100.0% when pulling 5969ee9 on Simaris:make_URI_mapping_neat into 6da9634 on white-gecko:develop.

coveralls · 2017-10-04T18:55:07Z

Coverage remained the same at 100.0% when pulling 8a9771e on Simaris:make_URI_mapping_neat into 6da9634 on white-gecko:develop.

coveralls · 2017-10-23T19:03:47Z

Coverage remained the same at 100.0% when pulling d260859 on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

coveralls · 2017-10-24T12:19:42Z

Coverage decreased (-4.3%) to 95.745% when pulling 93ce9aa on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

coveralls · 2017-10-24T12:26:48Z

Coverage decreased (-6.6%) to 93.393% when pulling eb63217 on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

coveralls · 2017-10-24T18:06:53Z

Coverage remained the same at 100.0% when pulling a700943 on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

white-gecko · 2017-10-24T11:44:26Z

test/test_rdf_page_data.rb

+      assert_equal "/b/y/", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/b/y/"), @site).page_url
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a.html"), @site).render_path
+	  assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a.html"), @site).page_url


white-gecko · 2017-10-24T11:44:33Z

test/test_rdf_page_data.rb

+    should "let fragment-identifier default to super resource" do
+      assert_equal "/c.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/c#alpha"), @site).render_path
+	  assert_equal "/c", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/c#alpha"), @site).page_url


The page_url here should be /c#alpha.

Please also have a look at: https://github.com/white-gecko/jekyll-rdf/issues/82#issuecomment-338967632

white-gecko · 2017-10-25T09:24:52Z

test/test_rdf_page_data.rb

-      assert_equal "/rdfsites/http/ex.org/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url
+      assert_equal "/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


If 'url' => "http://ex.org", 'baseurl' => "/blog" is configured the correct renderpath for "http://ex.org/bla/blog/a" should be "/rdfsites/http/ex.org/bla/blog/a.html" not "/bla/blog/a.html". My test were already testing the right things as we have discussed.

white-gecko · 2017-10-25T09:25:03Z

test/test_rdf_page_data.rb

-      assert_equal "rdfsites/http/ex.org/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url
+      assert_equal "/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


white-gecko · 2017-10-25T12:47:07Z

test/test_rdf_page_data.rb

+      assert_equal "/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


The last three lines are not correct.
If 'url' => "http://ex.org", 'baseurl' => "/blog" is configured the correct renderpath for "http://ex.org/bla/blog/a" should be "/rdfsites/http/ex.org/bla/blog/a.html" not "/bla/blog/a.html". My test were already testing the right things as we have discussed before.

You can also have a look at white-gecko@a700943#r146799188

white-gecko · 2017-10-25T12:47:33Z

test/test_rdf_page_data.rb

+      assert_equal "/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


The same problem as above.

My bad, thought we said baseurl and url have to be considered separately.

coveralls · 2017-10-29T14:15:57Z

Coverage remained the same at 100.0% when pulling 9b68f2f on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

Simaris · 2017-10-29T14:21:28Z

test/test_rdf_page_data.rb

+      assert_equal "rdfsites/http/ex.org/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "rdfsites/http/ex.org/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "rdfsites/http/ex.org/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


rdfsites never has a leading / because it describes the same position independent of url and baseurl

no, there has to be a leading / as well.

coveralls · 2017-11-02T19:58:10Z

Coverage remained the same at 100.0% when pulling c72b3e2 on Simaris:make_URI_mapping_neat into 0770fae on white-gecko:develop.

white-gecko · 2017-11-03T13:03:11Z

test/test_rdf_template_mapper.rb

-          @classResources["http://xmlns.com/foaf/0.1/Person"].subClasses.any?{|class_res| class_res.to_s.eql? "http://pcai042.informatik.uni-leipzig.de/~dtp16/#AnotherSpecialPerson"}), "http://xmlns.com/foaf/0.1/Person should have http://pcai042.informatik.uni-leipzig.de/~dtp16/#SpecialPerson and http://pcai042.informatik.uni-leipzig.de/~dtp16/#AnotherSpecialPerson as subclass"
-      assert @classResources["http://pcai042.informatik.uni-leipzig.de/~dtp16/#AnotherSpecialPerson"].subClasses.any?{|class_res| class_res.to_s.eql? "http://pcai042.informatik.uni-leipzig.de/~dtp16/#SpecialPerson"},"http://pcai042.informatik.uni-leipzig.de/~dtp16/#AnotherSpecialPerson should have http://pcai042.informatik.uni-leipzig.de/~dtp16/#SpecialPerson as subclass"
+      assert (@classResources["http://xmlns.com/foaf/0.1/Person"].subClasses.any?{|class_res| class_res.to_s.eql? "http://pcai042.informatik.uni-leipzig.de/~dtp16#SpecialPerson"}&&
+      @classResources["http://xmlns.com/foaf/0.1/Person"].subClasses.any?{|class_res| class_res.to_s.eql? "http://pcai042.informatik.uni-leipzig.de/~dtp16#AnotherSpecialPerson"}), "http://xmlns.com/foaf/0.1/Person should have http://pcai042.informatik.uni-leipzig.de/~dtp16#SpecialPerson and http://pcai042.informatik.uni-leipzig.de/~dtp16#AnotherSpecialPerson as subclass"


is there an assert missing?

ok the previous line ends with &&

white-gecko · 2017-11-03T13:04:34Z

test/test_rdf_page_data.rb

+      assert_equal "rdfsites/http/ex.org/bla/blog/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/bla/blog/a"), @site).render_path
+      assert_equal "rdfsites/http/ex.org/a.html", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).render_path
+      assert_equal "rdfsites/http/ex.org/a", Jekyll::Drops::RdfResource.new(RDF::URI("http://ex.org/a"), @site).page_url


no, there has to be a leading / as well.

- Fix testcases for fragemnt identifier - Fix testcases for baseurl ending with slash - Add testcases for different baseurls (ending with slash and not) - Replace tabs by spaces

coveralls · 2017-11-03T17:21:20Z

Coverage remained the same at 100.0% when pulling 20c0327 on Simaris:make_URI_mapping_neat into 4da1758 on white-gecko:develop.

Simaris added this to the 3.0.0 milestone Jul 31, 2017

Simaris force-pushed the make_URI_mapping_neat branch from 4e31ca4 to 6c20443 Compare July 31, 2017 17:13

Simaris requested a review from white-gecko July 31, 2017 17:14

white-gecko requested changes Aug 1, 2017

View reviewed changes

Simaris force-pushed the make_URI_mapping_neat branch from 6c20443 to bc32cc8 Compare August 1, 2017 20:10

Simaris requested a review from white-gecko August 1, 2017 20:11

Simaris force-pushed the make_URI_mapping_neat branch from bc32cc8 to d7c16bd Compare August 18, 2017 11:38

white-gecko requested changes Aug 30, 2017

View reviewed changes

white-gecko assigned Simaris Aug 30, 2017

Simaris force-pushed the make_URI_mapping_neat branch from d7c16bd to 14652dd Compare September 6, 2017 15:52

Simaris requested a review from white-gecko September 6, 2017 15:54

Simaris force-pushed the make_URI_mapping_neat branch from 14652dd to 088b02d Compare September 7, 2017 17:54

white-gecko reviewed Sep 8, 2017

View reviewed changes

Simaris force-pushed the make_URI_mapping_neat branch from 088b02d to 368d73a Compare October 4, 2017 16:06

Simaris force-pushed the make_URI_mapping_neat branch 2 times, most recently from 5969ee9 to 8a9771e Compare October 4, 2017 18:51

Simaris requested a review from white-gecko October 5, 2017 10:07

Simaris force-pushed the make_URI_mapping_neat branch from 8a9771e to d260859 Compare October 23, 2017 18:55

white-gecko requested changes Oct 25, 2017

View reviewed changes

Simaris force-pushed the make_URI_mapping_neat branch from a700943 to 9b68f2f Compare October 29, 2017 14:09

Simaris commented Oct 29, 2017

View reviewed changes

Simaris force-pushed the make_URI_mapping_neat branch from 9b68f2f to c72b3e2 Compare November 2, 2017 19:43

white-gecko requested changes Nov 3, 2017

View reviewed changes

Simaris force-pushed the make_URI_mapping_neat branch from c72b3e2 to eb25a72 Compare November 3, 2017 16:43

Simaris and others added 6 commits November 3, 2017 17:58

better file pathing

bb14519

fragments no longer get rendered to single pages

7f8c702

rebase commit from 9a3d34 to 0770fae

cf21816

Add new testcases for fragments and baseurl

042b998

- Fix testcases for fragemnt identifier - Fix testcases for baseurl ending with slash - Add testcases for different baseurls (ending with slash and not) - Replace tabs by spaces

Extend tests for some "rdfsites"-cases

66a8510

fragments are shown by page_url; leading / are not mandantory

20c0327

Simaris force-pushed the make_URI_mapping_neat branch from eb25a72 to 20c0327 Compare November 3, 2017 17:17

Simaris requested a review from white-gecko November 3, 2017 21:39

white-gecko approved these changes Nov 6, 2017

View reviewed changes

white-gecko merged commit 3af2a28 into AKSW:develop Nov 6, 2017

Simaris deleted the make_URI_mapping_neat branch November 17, 2017 15:17

white-gecko mentioned this pull request Dec 5, 2017

Redirect rules for encoded URI/IRI chars on filesystem #17

Closed

Make uri mapping neat #99

Make uri mapping neat #99

Conversation

Simaris commented Jul 31, 2017 • edited by white-gecko Loading

coveralls commented Jul 31, 2017 • edited Loading

coveralls commented Jul 31, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Aug 1, 2017 • edited Loading

coveralls commented Aug 18, 2017 • edited Loading

white-gecko left a comment

Choose a reason for hiding this comment

coveralls commented Sep 6, 2017 • edited Loading

coveralls commented Sep 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Oct 4, 2017 • edited Loading

coveralls commented Oct 4, 2017 • edited Loading

coveralls commented Oct 4, 2017 • edited Loading

coveralls commented Oct 23, 2017 • edited Loading

coveralls commented Oct 24, 2017 • edited Loading

coveralls commented Oct 24, 2017 • edited Loading

coveralls commented Oct 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Oct 29, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Nov 2, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Nov 3, 2017 • edited Loading

Simaris commented Jul 31, 2017 •

edited by white-gecko

Loading

coveralls commented Jul 31, 2017 •

edited

Loading

coveralls commented Jul 31, 2017 •

edited

Loading

coveralls commented Aug 1, 2017 •

edited

Loading

coveralls commented Aug 18, 2017 •

edited

Loading

coveralls commented Sep 6, 2017 •

edited

Loading

coveralls commented Sep 7, 2017 •

edited

Loading

coveralls commented Oct 4, 2017 •

edited

Loading

coveralls commented Oct 4, 2017 •

edited

Loading

coveralls commented Oct 4, 2017 •

edited

Loading

coveralls commented Oct 23, 2017 •

edited

Loading

coveralls commented Oct 24, 2017 •

edited

Loading

coveralls commented Oct 24, 2017 •

edited

Loading

coveralls commented Oct 24, 2017 •

edited

Loading

coveralls commented Oct 29, 2017 •

edited

Loading

coveralls commented Nov 2, 2017 •

edited

Loading

coveralls commented Nov 3, 2017 •

edited

Loading