jekyll-rdf 3.0.0.pre.develop.472 → 3.0.0.pre.develop.477

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1984a15f0479ec3957bec51c1d7a3740aced15093518ef240ce9626b119167
-  data.tar.gz: 43602d81de94c0f5a3b5c34f605abfddb5c1afd19fcab14358b0932d638b599e
+  metadata.gz: 22c82cefcb8478a7c0d7ca8d832307107929bd10cb8f7fa17ab50e225158ce13
+  data.tar.gz: 52fda858d0d0f8094c2610b2f898a5e958b5a6aec83a8dbc31c8b3cb177be035
 SHA512:
-  metadata.gz: dc5c7e3786f6b6c8bcfcc937b4be7b49ee5313d005529e469171155855609f4a4c7916f000f5f755fff2562efbd94856c0afaa314857ac8be53f2be9151467b6
-  data.tar.gz: d5e473c6bc7442bc246aa1e094b8daaff706446eab702e75e89de3b594f2fd9add2d930a022606bc0e6196dbff41f70df067bdc47c616e64276075a803d31879
+  metadata.gz: de941230987979e7e693ae1fb32ae1c9dbe196ccbfa4e9cb99346a82a3497537f27a8955730a00e6c555bfa5e0413d170490fa63ee1ce8785d885ade6f36b984
+  data.tar.gz: f5e6dcb5c3aeb6ab86b35745cb5adfdd0a6acba45089422de942f0578f18666b1f2452250da2e8fac5fcc894b992c0197e9ef8e5ea07f21a2116b8a8c547ab11

data/lib/jekyll-rdf.rb

@@ -58,5 +58,4 @@ require 'jekyll/filters/rdf_page_to_resource'
 
 Liquid::Template.register_filter(Jekyll::JekyllRdf::Filter)
 require 'jekyll/rdf_main_generator'
-require 'jekyll/rdf_page_data'
 require 'jekyll/rdf_template_mapper'

data/lib/jekyll/drops/rdf_resource.rb

@@ -38,7 +38,7 @@ module Jekyll #:nodoc:
         attr_accessor :site
 
         ##
-        # The Jekyll::RdfPageData of this Jekyll::JekyllRdf::Drops::RdfResource
+        # The Jekyll::Page of this Jekyll::JekyllRdf::Drops::RdfResource
         #
         attr_accessor :page
 

data/lib/jekyll/helper/rdf_generator_helper.rb

@@ -4,14 +4,15 @@ module Jekyll
       module RdfGeneratorHelper
         private
         def prepare_pages (site, mapper)
+          Jekyll::Page.prepend Jekyll::JekyllRdf::Helper::RdfPageHelper
           @pageResources.each{|uri, entry|
             resource = entry.delete('./')
             resource.subResources = entry
-            create_page(site, resource, mapper, @global_config)
+            create_page(site, resource, mapper)
           }
 
           @blanknodes.each{|resource|
-            create_page(site, resource, mapper, @global_config)
+            create_page(site, resource, mapper)
           }
         end
 
@@ -120,10 +121,24 @@ module Jekyll
           end.uniq
         end
 
-        def create_page(site, resource, mapper, global_config)
-          page = RdfPageData.new(site, site.source, resource, mapper, global_config)
+        def create_page(site, resource, mapper)
+          Jekyll::JekyllRdf::Helper::RdfPageHelper.prepare_resource resource, mapper
+          page = Jekyll::Page.new(site, site.source, resource.filedir, resource.filename)
+          page.re_init_as_rdf(resource, mapper)
           if(page.complete)
-            site.pages << page
+            changes = false
+            site.pages.map!{|old_page|
+              if (File.join(old_page.dir, old_page.name) == File.join(page.dir, page.name))
+                changes||=true
+                page.assimilate_page(old_page)
+                page
+              else
+                old_page
+              end
+            }
+            unless changes
+              site.pages << page
+            end
             resource.add_necessities(site, page)
             resource.subResources.each {|key, value|
               value.add_necessities(site, page)

data/lib/jekyll/helper/rdf_page_helper.rb

@@ -2,6 +2,54 @@ module Jekyll
   module JekyllRdf
     module Helper
       module RdfPageHelper
+        attr_reader :complete
+
+        def assimilate_page page
+          self.data.merge!(page.data)
+          setData()
+          if page.data['layout'].nil?
+            self.content.gsub!(/{{\s*content\s*}}/, page.content)
+          else
+            self.content = page.content
+          end
+          self
+        end
+
+        def re_init_as_rdf(resource, mapper)
+          @resource = resource
+          if(@base.nil?)
+            Jekyll.logger.warn "Resource #{resource} not rendered: no base url found."
+            @complete = false   #TODO: set a return here and adapt the test for displaying a warning for rendering a page without template
+          else
+            @complete = true
+          end
+          map_template(resource, mapper)
+          return unless @complete
+          load_data(@site)
+          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
+        end
+
+        def self.prepare_resource resource, mapper
+          @@template = mapper.map(resource)
+          @@template.gsub!(".html", "") unless @@template.nil? #gsub only for downward compatibility // remove gsub + unless on next version update
+        end
+
+        def read_yaml(base, name, opts = {})
+          @path = @site.layouts[Jekyll::JekyllRdf::Helper::RdfPageHelper.template(true)].path unless Jekyll::JekyllRdf::Helper::RdfPageHelper.template.nil?
+          super(base, name, opts)
+        end
+
+        def self.template read_out = false
+          template = @@template
+          @@template = nil if read_out
+          template
+        end
+
         private
         include Jekyll::JekyllRdf::Helper::RdfPrefixHelper
         ##
@@ -10,7 +58,8 @@ 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).gsub(".html", "") unless mapper.map(resource).nil? #gsub only for downward compatibility // remove gsub + unless on next version update
+          @template = mapper.map(resource)
+          @template.gsub!(".html", "") unless @template.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
@@ -30,11 +79,7 @@ module Jekyll
             @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
+          setData()
           if(!@resource.subResources.nil?)
             self.data['sub_rdf'] = @resource.subResources.values
             self.data['sub_rdf'].each { |res|
@@ -44,16 +89,21 @@ module Jekyll
           end
         end
 
+        def setData
+          self.data['rdf'] = @resource
+          self.data['template'] = @template
+        end
+
         ##
         # 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?
+          unless self.data["rdf_prefix_path"].nil?
             load_prefixes(File.join(@site.layouts[@template].instance_variable_get(:@base_dir), self.data["rdf_prefix_path"].strip), self.data)
           end
         end
+
       end
 
     end
   end
 end
-

data/lib/jekyll/helper/rdf_prefix_helper.rb

@@ -34,7 +34,7 @@ module Jekyll
         def load_prefixes(path, prefHolder)
           Jekyll::JekyllRdf::Helper::RdfHelper.load_prefixes(path, prefHolder)
         rescue Errno::ENOENT => ex
-          Jekyll.logger.error("--> context resource: #{@resource}  template: #{@template}") if self.class <= Jekyll::RdfPageData
+          Jekyll.logger.error("--> context resource: #{@resource}  template: #{@template}") unless self.data["rdf"].nil?
         end
       end
 

data/lib/jekyll/hooks/rdf_page_pointer.rb

@@ -24,7 +24,7 @@
 
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
-  if(page.class <= Jekyll::RdfPageData)
+  unless(page.data['rdf'].nil?)
     payload["content"] = ""
   end
   if(page.data["rdf_prefixes"].nil? && !page.data["rdf_prefix_path"].nil?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.472
+  version: 3.0.0.pre.develop.477
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-15 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -195,7 +195,6 @@ files:
 - lib/jekyll/helper/rdf_prefix_helper.rb
 - lib/jekyll/hooks/rdf_page_pointer.rb
 - lib/jekyll/rdf_main_generator.rb
-- lib/jekyll/rdf_page_data.rb
 - lib/jekyll/rdf_template_mapper.rb
 homepage: https://github.com/white-gecko/jekyll-rdf
 licenses:

data/lib/jekyll/rdf_page_data.rb

@@ -1,66 +0,0 @@
-##
-# MIT License
-#
-# Copyright (c) 2016 Elias Saalmann, Christian Frommert, Simon Jakobi,
-# Arne Jonas Präger, Maxi Bornmann, Georg Hackel, Eric Füg
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-module Jekyll
-
-  ##
-  # JekyllRdf::RdfPageData creates pages for each RDF resource using a given template
-  #
-  class RdfPageData < Jekyll::Page
-    include Jekyll::JekyllRdf::Helper::RdfPageHelper
-    attr_reader :complete
-
-    ##
-    # initialize initializes the page
-    # * +site+ - The Jekyll site we want to enrich with RDF data
-    # * +base+ - The base of the site
-    # * +resource+ - The RDF resource for which the page is rendered
-    # * +mapper+ - The layout-mapping
-    #
-    def initialize(site, base, resource, mapper, config)
-      @site = site
-      @base = base
-      @name = resource.filename
-      @dir = resource.filedir
-      @resource = resource
-      if(base.nil?)
-        Jekyll.logger.warn "Resource #{resource} not rendered: no base url found."
-        @complete = false   #TODO: set a return here and adapt the test for displaying a warning for rendering a page without template
-      else
-        @complete = true
-      end
-      self.process(@name)
-      map_template(resource, mapper)
-      return unless @complete
-      load_data(site)
-      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
-    end
-  end
-end