jekyll-rdf 3.0.0.pre.develop.402 → 3.0.0.pre.develop.411

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa596e726fdcc001da9fe18a52cfaad90d006f77f5c24899d985a0107eb1833
-  data.tar.gz: 47aad3ab3fee69b78988214051ee331be915fff051a961a893678f45627d21e7
+  metadata.gz: 02974fe5e76067be8c148e41f3a6e928bff9db0b34a53b07af5ea0287ba0811e
+  data.tar.gz: 08da424a063e05237e71a17e3a3e1c21c02b537dcbdd53feac0f18f81bfef9e7
 SHA512:
-  metadata.gz: f4f6b3cfcb6942426db3780b9e3f38cd32a3ef361f4d1316ce5d5dfc2795515f665a862c427aeca324b4b546d14b56f363dad34aff4a59e240ef20584a3607ab
-  data.tar.gz: 919d6dab6c17ed897feec35608e8c73f1f12edbd51f0fb21da037d11df6262409795d282716fe229da32e54734f7478f010d2aacc62aeaa854176a9f9f199441
+  metadata.gz: f21af48d4506abcf25680822325b404329ffc04bf08b6520edfa3ef233daf0c58b40990e644d6bd0a8b8aa718b230c6274984f72e1cffe2981eaf0858ea022fe
+  data.tar.gz: 122d05330026a94b4a2b1e99be417ca558ce41c64451706f755569378a264a5e48d98633e303aba8d8ee6dea0c8a7c3ee215e273079669fc19b96427e702f05c

data/lib/jekyll/helper/rdf_page_helper.rb

@@ -10,10 +10,11 @@ module Jekyll
         # * +resource+ - the resource that will be mapped to a template
         # * +mapper+ - the mapper that provides the resource mappings
         def map_template(resource, mapper)
-          @template = mapper.map(resource)
+          @template = mapper.map(resource).gsub(".html", "") unless mapper.map(resource).nil? #gsub only for downward compatibility // remove gsub + unless on next version update
           if(@template.nil?)
             Jekyll.logger.warn("Resource #{resource} not rendered: No fitting template or default template found.")
             @complete = false
+            return
           end
         end
 
@@ -21,9 +22,16 @@ module Jekyll
         # loads the data from the yaml-frontmatter and extends page.data with three key value pairs:
         # -title -> contains the resource.iri
         # -rdf -> contains the resource itself
-        # -template -> contains the path to the currenly used template
+        # -template -> contains the path to the currently used template
         def load_data(site)
-          self.read_yaml(File.join(@base, '_layouts'), @template)
+          if(@site.layouts[@template].nil?)
+            Jekyll.logger.error "Template #{@template} was not loaded by Jekyll for #{self.name}.\n Skipping Page."
+            self.data = {}
+            @complete = false
+            return
+          end
+          @path = @site.layouts[@template].path
+          self.read_yaml(@site.layouts[@template].instance_variable_get(:@base_dir), @site.layouts[@template].name)
           self.data['title'] = @resource.iri
           self.data['rdf'] = @resource
           self.data['template'] = @template
@@ -40,7 +48,7 @@ module Jekyll
         # loads the prefix data passed in the layout yaml-frontmatter into page.data["rdf_prefixes"] and page.data["rdf_prefix_map"]
         def load_prefixes_yaml
           if !self.data["rdf_prefix_path"].nil?
-            load_prefixes(File.join(@base, self.data["rdf_prefix_path"].strip), self.data)
+            load_prefixes(File.join(@site.layouts[@template].instance_variable_get(:@base_dir), self.data["rdf_prefix_path"].strip), self.data)
           end
         end
       end

data/lib/jekyll/rdf_page_data.rb

@@ -53,12 +53,11 @@ module Jekyll
       end
       self.process(@name)
       map_template(resource, mapper)
-      if(!@complete)
-        return        #return if something went wrong
-      end
+      return unless @complete
       load_data(site)
-      load_prefixes_yaml()
       self.data['permalink'] = File.join(@dir, @name)    #overwrite permalinks to stop them from interfering with JekyllRdfs rendersystem
+      return unless @complete
+      load_prefixes_yaml()
       resource.page = self
       resource.site = site
       site.data['resources'] << resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.402
+  version: 3.0.0.pre.develop.411
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: jekyll-theme-jod
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 description: Generate static sites with Jekyll based on RDF data
 email: arndt@informatik.uni-leipzig.de
 executables: []