jekyll-rdf 3.0.0.pre.develop.343 → 3.0.0.pre.develop.344

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9255ac5d8912fd3200919a85fa010e84ea40ba9b8c47e8fcca1ad66788387ed
-  data.tar.gz: 5a8c256c0d62129f3ec4cafa6fca75abb207660a29ace1b8e60825d4aa22b8a0
+  metadata.gz: 8a5089e3880e712203acf2b3deb70a59ce6dad048b965acdd54f6be284bf1442
+  data.tar.gz: be20ab2f11afdea8c8c488af094dc4ce14f45f05233726a86099b4175f5c84d7
 SHA512:
-  metadata.gz: 4cd76f82301aa6628f57b5787b5f5b0ca1cdacf4ae5f3e1277e9526b80a0a05e5206e6d8e60311e48cc8f3738ce225981817695c42ae1aa09033eb0909f1359c
-  data.tar.gz: fca2156b0169d18b5e9ce248b145cc8deec6eb52357937d70ed6924f9f604ee491997badf2d52d73128376c1d5acb8e490a28464d556a70e7f4f5f2ed1bffd47
+  metadata.gz: 7b35b1fc8c403310accc71e77854fb126cc68e45ffbdf068360f615a863fc61fa16d3358c29084796e130fde58fb6fc44588af26211c68f5f9b92f97bb2c5dd7
+  data.tar.gz: 25014443680f96aad9f3d7f6294272f0e020930261eaa7885658e50b5b7a44b8e978967b9d60e775ab11525bde1f49e795c2faf79bd8f24f4e6953f399d2db4e

data/lib/jekyll-rdf.rb

@@ -52,6 +52,8 @@ require 'jekyll/filters/rdf_property'
 require 'jekyll/filters/rdf_collection'
 require 'jekyll/filters/rdf_container'
 require 'jekyll/filters/rdf_get'
+require 'jekyll/filters/rdf_message'
+require 'jekyll/filters/rdf_page_to_resource'
 
 Liquid::Template.register_filter(Jekyll::JekyllRdf::Filter)
 require 'jekyll/rdf_main_generator'

data/lib/jekyll/filters/rdf_collection.rb

@@ -28,7 +28,7 @@ module Jekyll
   module JekyllRdf
     module Filter
       def rdf_collection(input, predicate = nil)
-        input = Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if(input.nil? || input.class <= (Jekyll::RdfPageData))
+        input = rdf_page_to_resource(input)
         query = "SELECT ?f WHERE{ #{input.term.to_ntriples} " <<
           (predicate.nil? ? "" : " <#{rdf_resolve_prefix(predicate)}> ?coll . ?coll ") <<
           " <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest>* ?r. ?r <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?f}"

data/lib/jekyll/filters/rdf_container.rb

@@ -27,7 +27,7 @@ module Jekyll
   module JekyllRdf
     module Filter
       def rdf_container(input, type = nil)
-        input = Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if(input.nil? ||  input.class <= (Jekyll::RdfPageData))
+        input = rdf_page_to_resource(input)
         sparql_client = Jekyll::JekyllRdf::Helper::RdfHelper::sparql
         n_triples = input.term.to_ntriples
         if(!(valid_container?(n_triples, type)))

data/lib/jekyll/filters/rdf_get.rb

@@ -32,7 +32,7 @@ module Jekyll
     #
     module Filter
       def rdf_get(request_uri)
-        request_uri = "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term.to_s}>" if (request_uri.nil? || request_uri.class <= (Jekyll::RdfPageData))
+        request_uri = "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term.to_s}>" if (rdf_page_to_resource?(request_uri))
         request_uri = rdf_resolve_prefix(request_uri)
         ask_exist = "ASK WHERE {{<#{request_uri}> ?p ?o}UNION{?s <#{request_uri}> ?o}UNION{?s ?p <#{request_uri}>}} "
         return unless (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist).true?)

data/lib/jekyll/filters/rdf_message.rb

@@ -0,0 +1,25 @@
+module Jekyll
+
+  module JekyllRdf
+
+    ##
+    # Internal module to hold the medthod #rdf_message
+    #
+    module Filter
+      def rdf_message(message, logLevel = "info") #:nodoc:
+        case logLevel
+        when "info"
+          Jekyll.logger.info message
+        when "warn"
+          Jekyll.logger.warn message
+        when "error"
+          Jekyll.logger.error message
+        when "debug"
+          Jekyll.logger.debug message
+        else
+          Jekyll.logger.info "NoLevel: #{message}"
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/filters/rdf_page_to_resource.rb

@@ -0,0 +1,15 @@
+module Jekyll
+  module JekyllRdf
+    module Filter
+      private
+      def rdf_page_to_resource(input)
+        return Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if(rdf_page_to_resource?(input))
+        return input
+      end
+
+      def rdf_page_to_resource?(input)
+        return (input.nil? ||  input.class <= (Jekyll::RdfPageData) || (input.class <= Hash && input.respond_to?(:template) && input.respond_to?(:url) && input.respond_to?(:path) ))
+      end
+    end
+  end
+end

data/lib/jekyll/filters/rdf_property.rb

@@ -47,7 +47,7 @@ module Jekyll
 
       private
       def map_predicate(input, predicate, lang = nil, list = false, inverse = false)
-        input = Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if(input.nil? ||  input.class <= (Jekyll::RdfPageData))
+        input = rdf_page_to_resource(input)
         return input unless input.is_a?(Jekyll::JekyllRdf::Drops::RdfResource)
         predicate = rdf_resolve_prefix(predicate)
         result = filter_statements(input.term.to_ntriples, predicate, inverse, lang)

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -38,7 +38,7 @@ module Jekyll
       # * +query+ - the SPARQL query
       #
       def sparql_query(resource = nil, query)
-        if(resource.nil? || resource.class <= (Jekyll::RdfPageData))
+        if(rdf_page_to_resource?(resource))
           query.gsub!('?resourceUri', "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term}>")
         elsif(resource.class <= Array)
           resource.each_with_index do |uri, index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.343
+  version: 3.0.0.pre.develop.344
 platform: ruby
 authors:
 - Elias Saalmann
@@ -169,6 +169,8 @@ files:
 - lib/jekyll/filters/rdf_collection.rb
 - lib/jekyll/filters/rdf_container.rb
 - lib/jekyll/filters/rdf_get.rb
+- lib/jekyll/filters/rdf_message.rb
+- lib/jekyll/filters/rdf_page_to_resource.rb
 - lib/jekyll/filters/rdf_property.rb
 - lib/jekyll/filters/rdf_resolve_prefix.rb
 - lib/jekyll/filters/rdf_sparql_query.rb