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

data/lib/jekyll/drops/rdf_resource_class.rb

@@ -24,61 +24,63 @@
 #
 
 module Jekyll #:nodoc:
-  module Drops #:nodoc:
+  module JekyllRdf #:nodoc:
+    module Drops #:nodoc:
 
-    ##
-    # Represents an RDF resource class to the Liquid template engine
-    #
-    class RdfResourceClass < RdfResource
-      @subClasses = []
-      @lock = -1
-      @subClassHierarchyValue = 0
-      attr_accessor :lock
-      attr_accessor :template
-      attr_accessor :alternativeTemplates
-      attr_accessor :subClasses
-      attr_accessor :subClassHierarchyValue
-      attr_reader :sparql
-
-      def initialize(term, sparql)
-        super(term)
+      ##
+      # Represents an RDF resource class to the Liquid template engine
+      #
+      class RdfResourceClass < RdfResource
         @subClasses = []
         @lock = -1
         @subClassHierarchyValue = 0
-        @alternativeTemplates = []
-        @sparql = sparql
-      end
+        attr_accessor :lock
+        attr_accessor :template
+        attr_accessor :alternativeTemplates
+        attr_accessor :subClasses
+        attr_accessor :subClassHierarchyValue
+        attr_reader :sparql
 
-      def multiple_templates?
-        !@alternativeTemplates.empty?
-      end
+        def initialize(term, sparql)
+          super(term)
+          @subClasses = []
+          @lock = -1
+          @subClassHierarchyValue = 0
+          @alternativeTemplates = []
+          @sparql = sparql
+        end
 
-      def find_direct_subclasses
-        query = "SELECT ?s WHERE{ ?s <http://www.w3.org/2000/01/rdf-schema#subClassOf> #{@term.to_ntriples}}"
-        selection = @sparql.query(query).map{ |solution| solution.s.to_s}
-        return selection
-      end
+        def multiple_templates?
+          !@alternativeTemplates.empty?
+        end
 
-      def add_subclass(resource)
-        @subClasses << resource
-      end
+        def find_direct_subclasses
+          query = "SELECT ?s WHERE{ ?s <http://www.w3.org/2000/01/rdf-schema#subClassOf> #{@term.to_ntriples}}"
+          selection = @sparql.query(query).map{ |solution| solution.s.to_s}
+          return selection
+        end
 
-      def propagate_template(template, lock)
-        if(@lock>lock||@lock==-1)
-          @lock=lock
-          @template=template
-          @alternativeTemplates.clear()
-          subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
-        elsif(@lock==lock)
-          @alternativeTemplates.push(template)
-          subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
+        def add_subclass(resource)
+          @subClasses << resource
+        end
+
+        def propagate_template(template, lock)
+          if(@lock>lock||@lock==-1)
+            @lock=lock
+            @template=template
+            @alternativeTemplates.clear()
+            subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
+          elsif(@lock==lock)
+            @alternativeTemplates.push(template)
+            subClasses.each{|sub| sub.propagate_template(template ,lock+1)}
+          end
         end
-      end
 
-      def traverse_hierarchy_value(predecessorHierarchyValue)
-        if(@subClassHierarchyValue + 1 >= predecessorHierarchyValue)  #avoid loops
-          @subClassHierarchyValue += 1
-          subClasses.each{|sub| sub.traverse_hierarchy_value(@subClassHierarchyValue)}
+        def traverse_hierarchy_value(predecessorHierarchyValue)
+          if(@subClassHierarchyValue + 1 >= predecessorHierarchyValue)  #avoid loops
+            @subClassHierarchyValue += 1
+            subClasses.each{|sub| sub.traverse_hierarchy_value(@subClassHierarchyValue)}
+          end
         end
       end
     end

data/lib/jekyll/drops/rdf_statement.rb

@@ -24,43 +24,45 @@
 #
 
 module Jekyll
-  module Drops
-
-    ##
-    # Represents an RDF statement to the Liquid template engine
-    #
-    class RdfStatement < Liquid::Drop
+  module JekyllRdf
+    module Drops
 
       ##
-      # The subject RdfTerm of this RDF statement
+      # Represents an RDF statement to the Liquid template engine
       #
-      attr_reader :subject
+      class RdfStatement < Liquid::Drop
 
-      ##
-      # The predicate RdfTerm of this RDF statement
-      #
-      attr_reader :predicate
+        ##
+        # The subject RdfTerm of this RDF statement
+        #
+        attr_reader :subject
 
-      ##
-      # The object RdfTerm of this RDF statement
-      #
-      attr_reader :object
+        ##
+        # The predicate RdfTerm of this RDF statement
+        #
+        attr_reader :predicate
 
-      ##
-      # Create a new Jekyll::Drops::RdfStatement
-      #
-      # * +statement+ - The statement to be represented
-      # * +sparql+ - The SPARQL::Client which contains the +statement+
-      # * +site+ - The Jekyll::Site to be enriched
-      def initialize(statement, site)
-        @subject ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.subject, site, true)
-        @predicate ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.predicate, site, true)
-        @object ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.object, site, true)
-      end
+        ##
+        # The object RdfTerm of this RDF statement
+        #
+        attr_reader :object
+
+        ##
+        # Create a new Jekyll::Drops::RdfStatement
+        #
+        # * +statement+ - The statement to be represented
+        # * +sparql+ - The SPARQL::Client which contains the +statement+
+        # * +site+ - The Jekyll::Site to be enriched
+        def initialize(statement, site)
+          @subject ||= Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(statement.subject, site, true)
+          @predicate ||= Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(statement.predicate, site, true)
+          @object ||= Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(statement.object, site, true)
+        end
 
-      def inspect
-        obj_id = ('%x' % (self.object_id << 1)).to_s
-        return "#<RdfStatement:0x#{"0"*(14 - obj_id.length)}#{obj_id} @subject=#{subject.inspect} @predicate=#{predicate.inspect} @object=#{object.inspect}>"
+        def inspect
+          obj_id = ('%x' % (self.object_id << 1)).to_s
+          return "#<RdfStatement:0x#{"0"*(14 - obj_id.length)}#{obj_id} @subject=#{subject.inspect} @predicate=#{predicate.inspect} @object=#{object.inspect}>"
+        end
       end
     end
   end

data/lib/jekyll/drops/rdf_term.rb

@@ -24,83 +24,86 @@
 #
 
 module Jekyll
-  module Drops
-
-    ##
-    # Represents an RDF term to the Liquid template engine
-    #
-    class RdfTerm < Liquid::Drop
+  module JekyllRdf
+    module Drops
 
       ##
-      # The represented RDF term
+      # Represents an RDF term to the Liquid template engine
       #
-      attr_reader :term
+      class RdfTerm < Liquid::Drop
 
-      ##
-      # Create a new Jekyll::Drops::RdfTerm
-      #
-      # * +term+ - The term to be represented
-      #
-      def initialize(term)
-        @term  ||= term
-      end
+        ##
+        # The represented RDF term
+        #
+        attr_reader :term
 
-      ##
-      # Function stub with no functionality. Its purpose is to keep RdfResource compatible.
-      #
-      def add_necessities (site, page)
-        return self
-      end
+        ##
+        # Create a new Jekyll::JekyllRdf::Drops::RdfTerm
+        #
+        # * +term+ - The term to be represented
+        #
+        def initialize(term)
+          @term  ||= term
+        end
 
-      ##
-      # Function stub with no functionality. Its purpose is to keep RdfResource compatible.
-      #
-      def ready?
-        return true;
-      end
+        ##
+        # Function stub with no functionality. Its purpose is to keep RdfResource compatible.
+        #
+        def add_necessities (site, page)
+          return self
+        end
 
-      ##
-      # Convert this RdfTerm into a string
-      # This should be:
-      # - for resources: the IRI
-      # - for literals: the literal representation e.g. "Hallo"@de or "123"^^<http://www.w3.org/2001/XMLSchema#integer>
-      #
-      def to_s
-        term.to_s
-      end
+        ##
+        # Function stub with no functionality. Its purpose is to keep RdfResource compatible.
+        #
+        def ready?
+          return true;
+        end
 
-      def ==(other_obj)
-        return self.eql? other_obj
-      end
+        ##
+        # Convert this RdfTerm into a string
+        # This should be:
+        # - for resources: the IRI
+        # - for literals: the literal representation e.g. "Hallo"@de or "123"^^<http://www.w3.org/2001/XMLSchema#integer>
+        #
+        def to_s
+          term.to_s
+        end
 
-      def eql? other_obj
-        return (self.to_s.eql? other_obj.to_s)&&((other_obj.class <= self.class)||(self.class <= other_obj.class)||(other_obj.class <= self.term.class))
-      end
+        def ==(other_obj)
+          return self.eql? other_obj
+        end
 
-      def ===(other_obj)
-        return self.to_s.eql? other_obj.to_s
-      end
-      ##
-      # Convert an RDF term into a new Jekyll::Drops::RdfTerm
-      #
-      # * +term+ - The term to be represented
-      # * +site+ - The Jekyll::Site to be enriched
-      #
-      def self.build_term_drop(term, site, covered)
-        case term
-        when RDF::URI, RDF::Node
-          return RdfResource.new(term, site, nil, covered)
-        when RDF::Literal
-          return RdfLiteral.new(term,)
-        else
-          return nil
+        def eql? other_obj
+          return (self.to_s.eql? other_obj.to_s)&&((other_obj.class <= self.class)||(self.class <= other_obj.class)||(other_obj.class <= self.term.class))
         end
-      end
 
-      def inspect
-        obj_id = ('%x' % (self.object_id << 1)).to_s
-        return "#<#{self.class.to_s.split("::")[-1]}:0x#{"0"*(14 - obj_id.length)}#{obj_id} @term=#{@term}>"
+        def ===(other_obj)
+          return self.to_s.eql? other_obj.to_s
+        end
+        ##
+        # Convert an RDF term into a new Jekyll::Drops::RdfTerm
+        #
+        # * +term+ - The term to be represented
+        # * +site+ - The Jekyll::Site to be enriched
+        #
+        def self.build_term_drop(term, site, covered)
+          case term
+          when RDF::URI, RDF::Node
+            return RdfResource.new(term, site, nil, covered)
+          when RDF::Literal
+            return RdfLiteral.new(term)
+          else
+            return nil
+          end
+        end
+
+        def inspect
+          obj_id = ('%x' % (self.object_id << 1)).to_s
+          return "#<#{self.class.to_s.split("::")[-1]}:0x#{"0"*(14 - obj_id.length)}#{obj_id} @term=#{@term}>"
+        end
       end
+
     end
   end
 end

data/lib/jekyll/filters/rdf_collection.rb

@@ -25,20 +25,19 @@
 #
 
 module Jekyll
-  module RdfCollection
-    include Jekyll::RdfPrefixResolver
-    def rdf_collection(input, predicate = nil)
-      input = Jekyll::RdfHelper::page.data['rdf'] if(input.nil? || input.class <= (Jekyll::RdfPageData))
-      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}"
-      results = []
-      Jekyll::RdfHelper::sparql.query(query).each{ |solution|
-        results.push Jekyll::Drops::RdfTerm.build_term_drop(solution.f, Jekyll::RdfHelper::site, true).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
-      }
-      return results
+  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))
+        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}"
+        results = []
+        Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(query).each{ |solution|
+          results.push Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(solution.f, Jekyll::JekyllRdf::Helper::RdfHelper::site, true).add_necessities(Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)
+        }
+        return results
+      end
     end
   end
 end
-
-Liquid::Template.register_filter(Jekyll::RdfCollection)

data/lib/jekyll/filters/rdf_container.rb

@@ -24,35 +24,35 @@
 #
 
 module Jekyll
-  module RdfContainer
-    include Jekyll::RdfPrefixResolver
-    def rdf_container(input, type = nil)
-      input = Jekyll::RdfHelper::page.data['rdf'] if(input.nil? ||  input.class <= (Jekyll::RdfPageData))
-      sparql_client = Jekyll::RdfHelper::sparql
-      n_triples = input.term.to_ntriples
-      if(!(valid_container?(n_triples, type)))
-        Jekyll.logger.error "#{n_triples} is not recognized as a container"
-        return []
-      end
-      query = "SELECT ?p ?o WHERE{ #{n_triples} ?p ?o #{query_additions()}"
-      solutions = sparql_client.query(query).each_with_object([]) {|solution, array|
-        if(/^http:\/\/www\.w3\.org\/1999\/02\/22-rdf-syntax-ns#_\d+$/.match(solution.p.to_s))
-          array << Jekyll::Drops::RdfTerm.build_term_drop(solution.o, Jekyll::RdfHelper::site, true).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+  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))
+        sparql_client = Jekyll::JekyllRdf::Helper::RdfHelper::sparql
+        n_triples = input.term.to_ntriples
+        if(!(valid_container?(n_triples, type)))
+          Jekyll.logger.error "#{n_triples} is not recognized as a container"
+          return []
         end
-      }
-      return solutions
-    end
+        query = "SELECT ?p ?o WHERE{ #{n_triples} ?p ?o #{query_additions()}"
+        solutions = sparql_client.query(query).each_with_object([]) {|solution, array|
+          if(/^http:\/\/www\.w3\.org\/1999\/02\/22-rdf-syntax-ns#_\d+$/.match(solution.p.to_s))
+            array << Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(solution.o, Jekyll::JekyllRdf::Helper::RdfHelper::site, true).add_necessities(Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)
+          end
+        }
+        return solutions
+      end
 
-    def query_additions()
-      return "BIND((<http://www.w3.org/2001/XMLSchema#integer>(SUBSTR(str(?p), 45))) AS ?order) } ORDER BY ASC(?order)"
-    end
+      private
+      def query_additions()
+        return "BIND((<http://www.w3.org/2001/XMLSchema#integer>(SUBSTR(str(?p), 45))) AS ?order) } ORDER BY ASC(?order)"
+      end
 
-    def valid_container?(n_triples, type = nil)
-      ask_query1 = "ASK WHERE {VALUES ?o {<http://www.w3.org/2000/01/rdf-schema#Container> <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>} #{n_triples} <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o}"
-      ask_query2 = "ASK WHERE {#{ n_triples } <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o. ?o <http://www.w3.org/2000/01/rdf-schema#subClassOf>* <http://www.w3.org/2000/01/rdf-schema#Container>}"
-      return (Jekyll::RdfHelper::sparql.query(ask_query1).true?) || (Jekyll::RdfHelper::sparql.query(ask_query2).true?)
+      def valid_container?(n_triples, type = nil)
+        ask_query1 = "ASK WHERE {VALUES ?o {<http://www.w3.org/2000/01/rdf-schema#Container> <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>} #{n_triples} <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o}"
+        ask_query2 = "ASK WHERE {#{ n_triples } <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o. ?o <http://www.w3.org/2000/01/rdf-schema#subClassOf>* <http://www.w3.org/2000/01/rdf-schema#Container>}"
+        return (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_query1).true?) || (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_query2).true?)
+      end
     end
   end
 end
-
-Liquid::Template.register_filter(Jekyll::RdfContainer)

data/lib/jekyll/filters/rdf_get.rb

@@ -25,19 +25,19 @@
 
 module Jekyll
 
-  ##
-  # Internal module to hold the medthod #rdf_get
-  #
-  module RdfGet
-    include Jekyll::RdfPrefixResolver
-    def rdf_get(request_uri)
-      request_uri = "<#{Jekyll::RdfHelper::page.data['rdf'].term.to_s}>" if (request_uri.nil? || request_uri.class <= (Jekyll::RdfPageData))
-      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::RdfHelper::sparql.query(ask_exist).true?)
-      Jekyll::Drops::RdfResource.new(RDF::URI(request_uri), Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+  module JekyllRdf
+
+    ##
+    # Internal module to hold the medthod #rdf_get
+    #
+    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 = 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?)
+        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)
+      end
     end
   end
 end
-
-Liquid::Template.register_filter(Jekyll::RdfGet)