jekyll-rdf 3.1.1.pre.develop.662 → 3.1.1.pre.develop.666

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a8e220c1bee1d1864a1298ffdb90d01dc62debb8c9880988ec3e1e91c504198
-  data.tar.gz: 40cf2a3febffcf61127399f6c515c157dc6a332c95b7c444a41dae61fcb33048
+  metadata.gz: dd5d94bda7311923c6a1491a1309418dd8ce1c7b6b0fa920bafb74fb17f6e317
+  data.tar.gz: 5fefd52c10fe8bdd0961d77ca97ca4396d43bd6515845aecf818a4196a1de7d9
 SHA512:
-  metadata.gz: 802cba10ceeeff5ba7d42857c1889a4884d85d44655936fade7220f0b464cb97488f6618487b8375d6b3ee3fbfa5ca631d37bc5476c02ac350effb79a9300955
-  data.tar.gz: 1e2c8eec79ac47fc1b2651abc585539e17e5736568c8a7f28deaf51e256fd2efbc564b50cba044e0e650fab87db425818f0d0bd36ef9130e148836af3182d11a
+  metadata.gz: aa6eeee2bd5afa89f3f17b9e8a5d14cd783620a25f908ff30bc270e70c8bb872f49beb1619dd4279cf6ce2ecf135e51bd3a90291100a2999fa541a339edde59e
+  data.tar.gz: d1776b56eeadce1a2d600f620248e21268a89347906c77ede8febf67b6668355022ff908a213cbe0b0a3882e94a6dd330a28ed73fad6a17142a935bef10f1055

data/lib/jekyll-rdf.rb

@@ -51,15 +51,14 @@ require 'jekyll/helper/rdf_general_helper'
 require 'jekyll/helper/rdf_class_extraction'
 require 'jekyll/helper/rdf_page_helper'
 require 'jekyll/helper/rdf_generator_helper'
+require 'jekyll/helper/rdf_filter_helper'
 require 'jekyll/hooks/rdf_page_pointer'
-require 'jekyll/filters/rdf_resolve_prefix'
 require 'jekyll/filters/rdf_sparql_query'
 require 'jekyll/filters/rdf_property'
 require 'jekyll/filters/rdf_collection'
 require 'jekyll/filters/rdf_container'
 require 'jekyll/filters/rdf_get'
 require 'jekyll/filters/rdf_debug_message'
-require 'jekyll/filters/rdf_page_to_resource'
 
 
 Liquid::Template.register_filter(Jekyll::JekyllRdf::Filter)

data/lib/jekyll/helper/rdf_filter_helper.rb

@@ -0,0 +1,94 @@
+##
+# 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
+  module JekyllRdf
+    module Helper
+      module FilterHelper
+        private
+        def rdf_page_to_resource(input)
+          return Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if rdf_substitude_nil?(input)
+          return input['rdf'] if rdf_page_to_resource?(input)
+          return input
+        end
+
+        def rdf_page_to_resource?(input)
+          return input.class <= Hash && input.key?("template") && input.key?("url") && input.key?("path") &&!input["rdf"].nil?
+        end
+
+        def rdf_substitude_nil?(input)
+          return (!Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].nil?)&&input.nil?
+        end
+
+        def valid_resource?(input)
+          return (input.class <= String || input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
+        end
+
+        def to_string_wrap(input)
+          if(input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
+            return input.term.to_ntriples
+          elsif(input.class <= String)
+            return rdf_resolve_prefix(input)
+          else
+            return false
+          end
+        end
+      end
+
+      module PrefixSolver
+        private
+        def rdf_resolve_prefix(predicate)
+          if(predicate[0] == "<" && predicate[-1] == ">")
+            # iri
+            return predicate
+          end
+          # qname
+          arr = predicate.split(":", 2)
+          if((arr[1].include? (":")) || (arr[1][0..1].eql?("//")))
+            raise UnMarkedUri.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
+          end
+          if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?)
+            if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]].nil?)
+              return "<#{arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]])}>"
+            else
+              raise NoPrefixMapped.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'], arr[0]) #TODO .data['template'] is only defined on RdfPages
+            end
+          else
+            raise NoPrefixesDefined.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
+          end
+        end
+      end
+    end
+  end
+end
+
+module Jekyll
+  module JekyllRdf
+    module Filter
+      include Jekyll::JekyllRdf::Helper::FilterHelper
+      include Jekyll::JekyllRdf::Helper::PrefixSolver
+    end
+  end
+end

data/lib/jekyll/rdf_main_generator.rb

@@ -33,7 +33,7 @@ module Jekyll
     safe true
     priority :highest
     include Jekyll::JekyllRdf::Helper::RdfGeneratorHelper
-    include Jekyll::JekyllRdf::ResolvePrefixes
+    include Jekyll::JekyllRdf::Helper::PrefixSolver
 
     ##
     # #generate performs the enrichment of a Jekyll::Site with rdf triples

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.develop.662
+  version: 3.1.1.pre.develop.666
 platform: ruby
 authors:
 - Elias Saalmann
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -219,11 +219,10 @@ files:
 - lib/jekyll/filters/rdf_container.rb
 - lib/jekyll/filters/rdf_debug_message.rb
 - lib/jekyll/filters/rdf_get.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
 - lib/jekyll/helper/rdf_class_extraction.rb
+- lib/jekyll/helper/rdf_filter_helper.rb
 - lib/jekyll/helper/rdf_general_helper.rb
 - lib/jekyll/helper/rdf_generator_helper.rb
 - lib/jekyll/helper/rdf_page_helper.rb

data/lib/jekyll/filters/rdf_page_to_resource.rb

@@ -1,34 +0,0 @@
-module Jekyll
-  module JekyllRdf
-    module Filter
-      private
-      def rdf_page_to_resource(input)
-        return Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if rdf_substitude_nil?(input)
-        return input['rdf'] if rdf_page_to_resource?(input)
-        return input
-      end
-
-      def rdf_page_to_resource?(input)
-        return input.class <= Hash && input.key?("template") && input.key?("url") && input.key?("path") &&!input["rdf"].nil?
-      end
-
-      def rdf_substitude_nil?(input)
-        return (!Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].nil?)&&input.nil?
-      end
-
-      def valid_resource?(input)
-        return (input.class <= String || input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
-      end
-
-      def to_string_wrap(input)
-        if(input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
-          return input.term.to_ntriples
-        elsif(input.class <= String)
-          return rdf_resolve_prefix(input)
-        else
-          return false
-        end
-      end
-    end
-  end
-end

data/lib/jekyll/filters/rdf_resolve_prefix.rb

@@ -1,60 +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
-  module JekyllRdf
-    module ResolvePrefixes
-      private
-      def rdf_resolve_prefix(predicate)
-        if(predicate[0] == "<" && predicate[-1] == ">")
-          # iri
-          return predicate
-        end
-        # qname
-        arr = predicate.split(":", 2)
-        if((arr[1].include? (":")) || (arr[1][0..1].eql?("//")))
-          raise UnMarkedUri.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
-        end
-        if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?)
-          if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]].nil?)
-            return "<#{arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]])}>"
-          else
-            raise NoPrefixMapped.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'], arr[0]) #TODO .data['template'] is only defined on RdfPages
-          end
-        else
-          raise NoPrefixesDefined.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
-        end
-      end
-    end
-  end
-end
-
-module Jekyll
-  module JekyllRdf
-    module Filter
-      include Jekyll::JekyllRdf::ResolvePrefixes
-    end
-  end
-end