jekyll-rdf 2.1.0.alpha.pre.171 → 2.1.0.alpha.pre.186

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf67f6f007e203e27966536bdded0e5c552acbda
-  data.tar.gz: 192c1276717719dea8f449d58113a7e05606c731
+  metadata.gz: 05c71bb1e8c3429261cc2f0751ce88548d7c3163
+  data.tar.gz: 02fef96d8ea857b7ee5363a53bfa814c0a36ae9f
 SHA512:
-  metadata.gz: fe5f7f9cc3881a868dae0a8db88afe0df263d6b0def386921459685e59aa9bd2eecb4375a5015a90b66b4969e99cfdbc2fe87fa636f1003238f1485b2f2a939a
-  data.tar.gz: 2917ae2a2b7852e676e484d0b1c353684296186e9e6c5443551ff99d4e2fcd414369d25a8e1451120dc8ac51227de16880d92d7bb3094780772f2d1838f7d5e7
+  metadata.gz: deb188f104ce4f767c84c65eea1d3a6485a7785356e67cf6ca5350f4e603e9b9685ba65555e0e23e47eaf87be902698524f37dd2b1dd39eed0995670083bbf82
+  data.tar.gz: 3dbaa044e5d3a5ebaf43b194cf483e031fd467038a5e25162fa6103975a4ac8e21801f68665ba2c58f724d09b80baa653b96d03d8ca0d3b271ad48aa31b01b38

data/lib/jekyll/drops/rdf_resource.rb

@@ -64,7 +64,7 @@ module Jekyll #:nodoc:
         end
       end
 
-      def addNecessities(site, page)
+      def add_necessities(site, page)
         if(site.is_a?(Jekyll::Site))
           @site ||= site
         end
@@ -113,8 +113,8 @@ module Jekyll #:nodoc:
         @filename ||= generate_file_name(domain_name, baseurl)
       end
 
-      def directClasses
-        @directClasses ||= begin
+      def direct_classes
+        @direct_classes ||= begin
           classes=[]
           selection = statements_as(:subject).select{ |s| s.predicate.term.to_s=="http://www.w3.org/1999/02/22-rdf-syntax-ns#type" }
           unless selection.empty?
@@ -148,30 +148,30 @@ module Jekyll #:nodoc:
       #
       def statements_as(role)
         if(!term.to_s[0..1].eql? "_:")
-          inputURI = "<#{term.to_s}>"
+          input_uri = "<#{term.to_s}>"
         elsif(:predicate.eql? role)
           return []
         else
-          inputURI = term.to_s
+          input_uri = term.to_s
         end
 
         case role
           when :subject
-            query = "SELECT ?p ?o ?dt ?lit ?lang WHERE{ #{inputURI} ?p ?o BIND(datatype(?o) AS ?dt) BIND(isLiteral(?o) AS ?lit) BIND(lang(?o) AS ?lang)}"
+            query = "SELECT ?p ?o ?dt ?lit ?lang WHERE{ #{input_uri} ?p ?o BIND(datatype(?o) AS ?dt) BIND(isLiteral(?o) AS ?lit) BIND(lang(?o) AS ?lang)}"
             sparql.query(query).map do |solution|
-              check = checkSolution(solution)
-              createStatement(term.to_s, solution.p, solution.o, solution.lit, check[:lang], check[:dataType])
+              check = check_solution(solution)
+              create_statement(term.to_s, solution.p, solution.o, solution.lit, check[:lang], check[:data_type])
             end
           when :predicate
-            query = "SELECT ?s ?o ?dt ?lit ?lang WHERE{ ?s #{inputURI} ?o BIND(datatype(?o) AS ?dt) BIND(isLiteral(?o) AS ?lit) BIND(lang(?o) AS ?lang)}"
+            query = "SELECT ?s ?o ?dt ?lit ?lang WHERE{ ?s #{input_uri} ?o BIND(datatype(?o) AS ?dt) BIND(isLiteral(?o) AS ?lit) BIND(lang(?o) AS ?lang)}"
             sparql.query(query).map do |solution|
-              check = checkSolution(solution)
-              createStatement(solution.s, term.to_s, solution.o, solution.lit, check[:lang], check[:dataType])
+              check = check_solution(solution)
+              create_statement(solution.s, term.to_s, solution.o, solution.lit, check[:lang], check[:data_type])
             end
           when :object
-            query = "SELECT ?s ?p WHERE{ ?s ?p #{inputURI}}"
+            query = "SELECT ?s ?p WHERE{ ?s ?p #{input_uri}}"
             sparql.query(query).map do |solution|
-              createStatement( solution.s, solution.p, term.to_s)
+              create_statement( solution.s, solution.p, term.to_s)
             end
           else
             Jekyll.logger.error "Not existing role found in #{term.to_s}"
@@ -181,25 +181,25 @@ module Jekyll #:nodoc:
 
       #checks if a query solution contains a language or type tag and returns those in a hash
       private
-      def checkSolution(solution)
-        result = {:lang => nil, :dataType => nil}
+      def check_solution(solution)
+        result = {:lang => nil, :data_type => nil}
         if((solution.bound?(:lang)) && (!solution.lang.to_s.eql?("")))
           result[:lang] = solution.lang.to_s.to_sym
         end
         if(solution.bound? :dt)
-          result[:dataType] = solution.dt
+          result[:data_type] = solution.dt
         end
         return result
       end
 
       private
-      def createStatement(subjectString, predicateString, objectString, isLit = nil, lang = nil, dataType = nil)
-        subject = RDF::URI(subjectString)
-        predicate = RDF::URI(predicateString)
-        if(!isLit.nil?&&isLit.true?)
-          object = RDF::Literal(objectString, language: lang, datatype: RDF::URI(dataType))
+      def create_statement(subject_string, predicate_string, object_string, is_lit = nil, lang = nil, data_type = nil)
+        subject = RDF::URI(subject_string)
+        predicate = RDF::URI(predicate_string)
+        if(!is_lit.nil?&&is_lit.true?)
+          object = RDF::Literal(object_string, language: lang, datatype: RDF::URI(data_type))
         else
-          object = RDF::URI(objectString)
+          object = RDF::URI(object_string)
         end
         return RdfStatement.new(RDF::Statement( subject, predicate, object), @sparql, @site)
       end

data/lib/jekyll/drops/rdf_resource_class.rb

@@ -47,11 +47,11 @@ module Jekyll #:nodoc:
         @alternativeTemplates = []
       end
 
-      def multipleTemplates?
+      def multiple_templates?
         !@alternativeTemplates.empty?
       end
 
-      def findDirectSubClasses
+      def find_direct_subclasses
         if(!@term.to_s[0..1].eql? "_:")
           term_uri = "<#{@term.to_s}>"
         else
@@ -62,26 +62,26 @@ module Jekyll #:nodoc:
         return selection
       end
 
-      def addSubClass(resource)
+      def add_subclass(resource)
         @subClasses << resource
       end
 
-      def propagateTemplate(template, lock)
+      def propagate_template(template, lock)
         if(@lock>lock||@lock==-1)
           @lock=lock
           @template=template
           @alternativeTemplates.clear()
-          subClasses.each{|sub| sub.propagateTemplate(template ,lock+1)}
+          subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
         elsif(@lock==lock)
           @alternativeTemplates.push(template)
-          subClasses.each{|sub| sub.propagateTemplate(template ,lock+1)}
+          subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
         end
       end
 
-      def traverseHierarchyValue(predecessorHierarchyValue)
+      def traverse_hierarchy_value(predecessorHierarchyValue)
         if(@subClassHierarchyValue + 1 >= predecessorHierarchyValue)  #avoid loops
           @subClassHierarchyValue += 1
-          subClasses.each{|sub| sub.traverseHierarchyValue(@subClassHierarchyValue)}
+          subClasses.each{|sub| sub.traverse_hierarchy_value(@subClassHierarchyValue)}
         end
       end
     end

data/lib/jekyll/drops/rdf_term.rb

@@ -55,7 +55,7 @@ module Jekyll
       ##
       # Funktion stub with no funktionality. Its purpose is to keep RdfResource compatible.
       #
-      def addNecessities (site, page)
+      def add_necessities (site, page)
         return self
       end
 

data/lib/jekyll/filters/rdf_collection.rb

@@ -41,7 +41,7 @@ module Jekyll
             if((!solution.r.to_s.eql? "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil") && (finalizedContainer.add? solution.r))
               nextSequence.push solution.r.to_s
             end
-            results.push Jekyll::Drops::RdfTerm.build_term_drop(solution.f, input.sparql, input.site).addNecessities(input.site, input.page)
+            results.push Jekyll::Drops::RdfTerm.build_term_drop(solution.f, input.sparql, input.site).add_necessities(input.site, input.page)
             if(nodeSequence.empty?)
               nodeSequence = nextSequence
               nextSequence = []

data/lib/jekyll/filters/rdf_container.rb

@@ -27,23 +27,23 @@ module Jekyll
   module RdfContainer
     include Jekyll::RdfPrefixResolver
     def rdf_container(input, type = nil)
-      sparqlClient = input.sparql
-      if(!(validContainer?(input, sparqlClient, type)))
+      sparql_client = input.sparql
+      if(!(valid_container?(input, sparql_client, type)))
         Jekyll.logger.error "<#{input.iri}> is not recognized as a container"
         return []
       end
       query = "SELECT ?p ?o WHERE{ <#{input.iri}> ?p ?o }"
-      solutions = sparqlClient.query(query).each_with_object([]) {|solution, array|
+      solutions = sparql_client.query(query).each_with_object([]) {|solution, array|
         if((solution.p.to_s[0..43].eql? "http://www.w3.org/1999/02/22-rdf-syntax-ns#_") && (solution.p.to_s[44..-1] !~ /\D/))
-          array << Jekyll::Drops::RdfTerm.build_term_drop(solution.o, input.sparql, input.site).addNecessities(input.site, input.page)
+          array << Jekyll::Drops::RdfTerm.build_term_drop(solution.o, input.sparql, input.site).add_necessities(input.site, input.page)
         end
       }
       return solutions
     end
-    def validContainer?(input, sparqlClient, type = nil)
-      askQuery1 = "ASK WHERE {VALUES ?o {<http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt>} <#{input.iri}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o}"
-      askQuery2 = "ASK WHERE {<#{input.iri}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o. ?o <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Container>}"
-      return (sparqlClient.query(askQuery1).true?) || (sparqlClient.query(askQuery2).true?)
+    def valid_container?(input, sparql_client, type = nil)
+      ask_query_1 = "ASK WHERE {VALUES ?o {<http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt>} <#{input.iri}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o}"
+      ask_query_2 = "ASK WHERE {<#{input.iri}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o. ?o <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Container>}"
+      return (sparql_client.query(ask_query_1).true?) || (sparql_client.query(ask_query_2).true?)
     end
   end
 end

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -46,7 +46,7 @@ module Jekyll
       begin
         result = input.sparql.query(query).map do |solution|
           hsh = solution.to_h
-          hsh.update(hsh){ |k,v| Jekyll::Drops::RdfTerm.build_term_drop(v, input.sparql, input.site).addNecessities(input.site, input.page)}
+          hsh.update(hsh){ |k,v| Jekyll::Drops::RdfTerm.build_term_drop(v, input.sparql, input.site).add_necessities(input.site, input.page)}
           hsh.collect{|k,v| [k.to_s, v]}.to_h
         end
         return result

data/lib/jekyll/rdf_class_extraction.rb

@@ -17,8 +17,8 @@ module Jekyll
 	      end
 
         @classResources.each{|key, value|
-          value.findDirectSubClasses.each{|s|
-            value.addSubClass(@classResources[s])
+          value.find_direct_subclasses.each{|s|
+            value.add_subclass(@classResources[s])
           }
         }
       end
@@ -26,8 +26,8 @@ module Jekyll
       def assign_class_templates(classes_to_templates)
         if(classes_to_templates.is_a?(Hash))
           classes_to_templates.each{|key, value|
-            @classResources[key].propagateTemplate(value,0)
-            @classResources[key].traverseHierarchyValue(0);
+            @classResources[key].propagate_template(value,0)
+            @classResources[key].traverse_hierarchy_value(0);
           }
         end
       end

data/lib/jekyll/rdf_generator_helper.rb

@@ -6,18 +6,18 @@ module Jekyll
           if(entry['./'].nil?)
             if(@config['render_orphaned_uris'])
               entry.each{|name, resource|
-                createPage(site, resource, mapper, @global_config)
+                create_page(site, resource, mapper, @global_config)
               }
             end
           else
             resource = entry.delete('./')
             resource.subResources = entry
-            createPage(site, resource, mapper, @global_config)
+            create_page(site, resource, mapper, @global_config)
           end
         }
 
         @blanknodes.each{|resource|
-          createPage(site, resource, mapper, @global_config)
+          create_page(site, resource, mapper, @global_config)
         }
       end
 
@@ -109,7 +109,7 @@ module Jekyll
         end.uniq
       end
 
-      def createPage(site, resource, mapper, global_config)
+      def create_page(site, resource, mapper, global_config)
         page = RdfPageData.new(site, site.source, resource, mapper, global_config)
         if(page.complete)
           site.pages << page

data/lib/jekyll/rdf_page_helper.rb

@@ -38,9 +38,9 @@ module Jekyll
       def load_prefixes
         if !self.data["rdf_prefix_path"].nil?
           begin
-            prefixFile=File.new(File.join(@base, 'rdf-data', self.data["rdf_prefix_path"].strip)).readlines
-            self.data["rdf_prefixes"] = prefixFile.join(" ")
-            self.data["rdf_prefix_map"] = Hash[ *(prefixFile.collect { |v|
+            prefix_file=File.new(File.join(@base, 'rdf-data', self.data["rdf_prefix_path"].strip)).readlines
+            self.data["rdf_prefixes"] = prefix_file.join(" ")
+            self.data["rdf_prefix_map"] = Hash[ *(prefix_file.collect { |v|
               arr = v.split(":",2)
               [arr[0][7..-1].strip, arr[1].strip[1..-2]]
             }.flatten)]

data/lib/jekyll/rdf_template_mapper.rb

@@ -68,10 +68,10 @@ module Jekyll
       tmpl = resources_to_templates ? resources_to_templates[resource.term.to_s] : nil
       lock = -1
       hier = -1
-      warnMultTempl = false
-      duplicateLevelTempl = []
+      warn_mult_templ = false
+      duplicate_level_templ = []
       if(tmpl.nil?)
-        resource.directClasses.each do |classUri|
+        resource.direct_classes.each do |classUri|
           classRes = classResources[classUri]
           if((classRes.lock <= lock || lock == -1) && !classRes.template.nil?)
             if(classRes.subClassHierarchyValue > hier)
@@ -79,20 +79,20 @@ module Jekyll
               lock = classRes.lock
               tmpl = classRes.template
               hier = classRes.subClassHierarchyValue
-              warnMultTempl = false
-              duplicateLevelTempl.clear.push(tmpl)
-              if(classRes.multipleTemplates?)
-                warnMultTempl = true
-                duplicateLevelTempl.concat(classRes.alternativeTemplates)
+              warn_mult_templ = false
+              duplicate_level_templ.clear.push(tmpl)
+              if(classRes.multiple_templates?)
+                warn_mult_templ = true
+                duplicate_level_templ.concat(classRes.alternativeTemplates)
               end
             elsif(classRes.subClassHierarchyValue == hier)
-              warnMultTempl = true
-              duplicateLevelTempl.push(classRes.template)
+              warn_mult_templ = true
+              duplicate_level_templ.push(classRes.template)
             end
           end unless classRes.nil?
         end
-        if(warnMultTempl)
-          Jekyll.logger.warn("Warning: multiple possible templates for #{resource.term.to_s}: #{duplicateLevelTempl.uniq.join(', ')}")
+        if(warn_mult_templ)
+          Jekyll.logger.warn("Warning: multiple possible templates for #{resource.term.to_s}: #{duplicate_level_templ.uniq.join(', ')}")
         end
       end
       return tmpl unless tmpl.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.pre.171
+  version: 2.1.0.alpha.pre.186
 platform: ruby
 authors:
 - Elias Saalmann
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Hypertext Publication System for Templated Resource Rendering