iq_rdf 0.1.17 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1e7f78d4501e4926a949b23e9eac85ee22541fdc98445ceecf8125e1b43f6c
-  data.tar.gz: 23fcf45f8d9848b40d655f686fc656981e68d7bb6affc0551ab497c5a0e48e1f
+  metadata.gz: 21e26c36ccb3dfca97f5c1224df1b95dec59c9672d837d2c3f4259a02acbbb36
+  data.tar.gz: 7f235328b11b0b864f3a283a715f86d498e6babf4d2a7e28457146b296fac78b
 SHA512:
-  metadata.gz: 65cbaee04cc22cf60b667cadc6a107ceca63f2947830b2ac3eff4045754cd8f5fa5f3021e7202a8c5d9aee96d85c6122f781f5e2cf053c12a202e2d3436ae3a3
-  data.tar.gz: fcfec08a7092d8aeec7c737a52a093493da4a8a9e1f12fb12cbf31b97f56c93d0b4e25ae4fb99b718b79c041c43dfe8d01c042aeb33552dcfec319b5e6fd438f
+  metadata.gz: ae3b1524338f266611e3d8976a20ba7ca5b6e8646cbc31c1ced591543714547f89cdeddcab4899ab92eff0109d13d46141394146b16e6b148a03cedf6b2ac432
+  data.tar.gz: 24f87a96f0995040ed7b8473b7102bd1e6bf490462384b196db0bbc85d5904ce63ecab75c4556bd9c7a25118957e657ccf5919796ee8bdb2050959625b3e207c

data/lib/iq_rdf/blank_node.rb

@@ -26,14 +26,24 @@ module IqRdf
 
     end
 
-    def to_s(parent_lang = nil)
-      "[\n#{(nodes.map{|pred| "#{pred} #{pred.nodes.map{|o| o.to_s(pred.lang || parent_lang)}.join(", ")}"}.join(";\n")).gsub(/^/, "    ")}\n]"
+    def to_s(options = {})
+      base_indent = options[:indent] || ""
+      predicate_indent =  base_indent + "".ljust(4)
+
+      predicates = nodes.map { |p| format_predicate(p, indent: predicate_indent, lang: options[:lang]) }
+           .join(";\n")
+
+      "[\n#{predicates}\n#{base_indent} ]"
     end
 
     def build_predicate(*args, &block)
       IqRdf::PredicateNamespace.new(self, IqRdf::Default).build_predicate(*args, &block)
     end
 
+    def build_predicate_with_ns(namespace, *args, &block)
+      IqRdf::PredicateNamespace.new(self, namespace).build_predicate(*args, &block)
+    end
+
     def build_xml(xml, &block)
       block.call({}, lambda {
           attrs = {}
@@ -46,5 +56,15 @@ module IqRdf
         })
     end
 
+    private
+
+    def format_predicate(predicate, options = {})
+      subjects = predicate.nodes
+                          .map { |object| object.to_s(indent: options[:indent], lang: predicate.lang || options[:lang]) }
+                          .join(", ")
+
+      "#{options[:indent]} #{predicate} #{subjects}"
+    end
+
   end
 end

data/lib/iq_rdf/collection.rb

@@ -25,8 +25,8 @@ module IqRdf
       end
     end
 
-    def to_s(lang = nil)
-      "(#{@elements.map{|e| e.to_s(lang)}.join(" ")})"
+    def to_s(options = {})
+      "(#{@elements.map{|e| e.to_s(options)}.join(" ")})"
     end
 
     def build_xml(xml, elements = nil, &block)

data/lib/iq_rdf/document.rb

@@ -25,6 +25,7 @@ module IqRdf
       @document_language = options[:lang]
 
       @nodes = []
+      @config = {}
     end
 
     def namespaces(namespaces)
@@ -39,6 +40,10 @@ module IqRdf
       self
     end
 
+    def config(config = {})
+      @config = config
+    end
+
     def <<(node)
       return if node.nil?
       raise ArgumentError, "Node must be an IqRdf::Uri and a Subject!" unless node.is_a?(IqRdf::Uri) and node.is_subject?
@@ -143,17 +148,29 @@ module IqRdf
         s << "@prefix #{namespace.turtle_token}: <#{namespace.uri_prefix}>.\n"
       end
       s << "\n"
-      @nodes.each do |node|
-        pref = "#{node.to_s(@document_language)}"
-        if node.rdf_type
-          s << "#{pref} a #{node.rdf_type}"
-          pref = ";\n" + "".ljust(node.to_s(@document_language).length)
+      @nodes.each do |subject|
+        pref = subject.to_s(@document_language)
+        indent = "".ljust(pref.length)
+
+        # Render subject, if it is defined as a RDF-type.
+        if subject.rdf_type
+          s << "#{pref} a #{subject.rdf_type}"
+          pref = ";\n" + indent
         end
-        node.nodes.each do |predicate|
-          s << "#{pref} #{predicate.to_s} #{predicate.nodes.map{|o| o.to_s(predicate.lang || node.lang || @document_language)}.join(", ")}"
-          pref = ";\n" + "".ljust(node.to_s(@document_language).length)
+
+        # Render all predicates and their associated objects
+        subject.nodes.each do |predicate|
+          objects = predicate.nodes.map { |object| object.to_s(indent: indent, lang: predicate.lang || subject.lang || @document_language) }
+                             .join(", ")
+
+          s << "#{pref} #{predicate.to_s} #{objects}"
+
+          pref = ";\n" + indent
         end
         s << ".\n"
+        if @config[:empty_line_between_triples]
+          s << "\n"
+        end
       end
       s
     end

data/lib/iq_rdf/literal/boolean.rb

@@ -6,7 +6,7 @@ module IqRdf
         super(!!b, nil, ::URI.parse("http://www.w3.org/2001/XMLSchema#boolean"))
       end
 
-      def to_s(parent_lang = nil)
+      def to_s(options = {})
         @obj.to_s
       end
 

data/lib/iq_rdf/literal/numeric.rb

@@ -7,7 +7,7 @@ module IqRdf
         super(num, nil, ::URI.parse(num.is_a?(Integer) ? "http://www.w3.org/2001/XMLSchema#integer" : "http://www.w3.org/2001/XMLSchema#decimal"))
       end
 
-      def to_s(parent_lang = nil)
+      def to_s(options = {})
         @obj.to_s
       end
 

data/lib/iq_rdf/literal/uri.rb

@@ -7,7 +7,7 @@ module IqRdf
         super(uri)
       end
 
-      def to_s(parent_lang = nil)
+      def to_s(options = {})
         "<#{@obj.to_s}>"
       end
 

data/lib/iq_rdf/literal.rb

@@ -34,8 +34,8 @@ module IqRdf
       end
     end
 
-    def to_s(parent_lang = nil)
-      lang = @lang || parent_lang # Use the Literals lang when given
+    def to_s(options = {})
+      lang = @lang || options[:lang] # Use the Literals lang when given
       lang = (lang && lang != :none) ? "@#{lang}" : ""
       quote = @obj.to_s.include?("\n") ? '"""' : '"'
       datatype = if @datatype.is_a?(::URI)

data/lib/iq_rdf/uri.rb

@@ -31,7 +31,7 @@ module IqRdf
       "#{self.namespace.uri_prefix.to_s}#{self.uri_postfix.to_s}"
     end
 
-    def to_s(parent_lang = nil)
+    def to_s(options = {})
       if namespace.token # There is a dummy_empty_namespace without token => postfix is a full uri!
         "#{namespace.turtle_token}:#{self.uri_postfix.to_s}"
       else
@@ -39,7 +39,7 @@ module IqRdf
       end
     end
 
-    def is_subject?()
+    def is_subject?
       if (nodes.size > 0) # walk through the nodes: a blank node is an object (but has nodes)
         nodes.each do |node|
           return true unless node.is_a?(BlankNode)
@@ -65,5 +65,31 @@ module IqRdf
       end
     end
 
+    # Method to add a blank node for the given predicate to the current subject
+    # In contrast to the "method_missing" implementation, this method allows one
+    # to choose a different namespace for the predicate.
+    #
+    # Usage:
+    # document << IqRdf::Eg.build_uri('test', IqRdf::Eg.build_uri('testType')) do |uri|
+    #   uri.add_blank_node(IqRdf::Eg, :component) do |blank_node|
+    #     blank_node.build_predicate_with_ns(IqRdf::Eg, :order, 1)
+    #   end
+    # end
+    #
+    # Resulting in the following turtle syntax:
+    # eg:test a eg:testType
+    #         eg:component [
+    #             eg:order 1
+    #         ]
+    def add_blank_node(namespace, postfix, &block)
+      predicate = IqRdf::Predicate.new(namespace, postfix, self)
+      blank_node = IqRdf::BlankNode.new
+
+      block.call(blank_node)
+
+      predicate << blank_node
+      self << predicate
+    end
+
   end
 end

data/lib/iq_rdf/version.rb

@@ -13,5 +13,5 @@
 #   limitations under the License.
 
 module IqRdf
-  VERSION = "0.1.17"
+  VERSION = "0.2.0"
 end

data/test/ntriples_test.rb

@@ -206,18 +206,18 @@ _:b2 <http://www.umweltprobenbank.de/title> "blubb"@de .
 over two lines"""@de .
 <http://www.test.de/testemann> <http://www.test.de/some_literal> "text"@de .
 rdf
-    end
-
-    def test_supress_if_empty_option
-      document = IqRdf::Document.new('http://www.test.de/')
-      document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
+  end
 
-      document << IqRdf::testemann.Foaf::knows(:suppress_if_empty => true)
-      document << IqRdf::testemann.Foaf::knows(nil, :suppress_if_empty => true)
-      document << IqRdf::testemann.Foaf::knows("", :suppress_if_empty => true)
-      document << IqRdf::testemann.Foaf::knows([], :suppress_if_empty => true)
+  def test_supress_if_empty_option
+    document = IqRdf::Document.new('http://www.test.de/')
+    document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
 
-      assert_equal("", document.to_ntriples.strip)
-    end
+    document << IqRdf::testemann.Foaf::knows(:suppress_if_empty => true)
+    document << IqRdf::testemann.Foaf::knows(nil, :suppress_if_empty => true)
+    document << IqRdf::testemann.Foaf::knows("", :suppress_if_empty => true)
+    document << IqRdf::testemann.Foaf::knows([], :suppress_if_empty => true)
 
+    assert_equal("", document.to_ntriples.strip)
   end
+
+end

data/test/turtle_test.rb

@@ -117,11 +117,11 @@ upb:xkfkrl a skos:Concept;
            :testIt (:hello :goodbye "bla"@de), "blubb"@de;
            :anotherTest <http://www.test.de/foo>.
 skos:testnode :test32 [
-    :title "dies ist ein test"@de;
-    :sub [
-        :title "blubb"@de
-    ]
-].
+                  :title "dies ist ein test"@de;
+                  :sub [
+                      :title "blubb"@de
+                  ]
+              ].
 rdf
   end
 
@@ -207,12 +207,58 @@ rdf
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 
 :testnode :test32 [
-    :title "dies ist ein test";
-    :test "Another test";
-    :sub [
-        :title "blubb"
-    ]
-].
+              :title "dies ist ein test";
+              :test "Another test";
+              :sub [
+                  :title "blubb"
+              ]
+          ].
+rdf
+  end
+
+  def test_blank_nodes_with_different_ns
+    document = IqRdf::Document.new('http://www.test.de/')
+    document.namespaces(qb: 'http://purl.org/linked-data/cube#')
+    document.namespaces(eg: 'http://www.example.com')
+
+    document << IqRdf::Eg.build_uri('dsd', IqRdf::Qb.build_uri('DataStructureDefinition')) do |ds|
+      ds.add_blank_node(IqRdf::Qb, :component) do |blank_node|
+        blank_node.build_predicate_with_ns(IqRdf::Qb, :dimension, IqRdf::Eg.build_uri('refArea'))
+        blank_node.build_predicate_with_ns(IqRdf::Qb, :order, 1)
+        blank_node.build_predicate_with_ns(IqRdf::Eg, :cost, 2.25)
+      end
+    end
+
+    assert_equal(<<rdf, document.to_turtle)
+@prefix : <http://www.test.de/>.
+@prefix eg: <http://www.example.com>.
+@prefix qb: <http://purl.org/linked-data/cube#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+
+eg:dsd a qb:DataStructureDefinition;
+       qb:component [
+           qb:dimension eg:refArea;
+           qb:order 1;
+           eg:cost 2.25
+       ].
+rdf
+  end
+
+  def test_config
+    document = IqRdf::Document.new('http://www.test.de/')
+    document.config(empty_line_between_triples: true)
+
+    document << IqRdf::testemann.myCustomNote("This is an example", :lang => :en)
+    document << IqRdf::testemann.myCustomNote("Zweites Beispiel", :lang => :de)
+
+    assert_equal(<<rdf, document.to_turtle)
+@prefix : <http://www.test.de/>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+
+:testemann :myCustomNote "This is an example"@en.
+
+:testemann :myCustomNote "Zweites Beispiel"@de.
+
 rdf
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iq_rdf
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.0
 platform: ruby
 authors:
 - Till Schulte-Coerne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,13 +119,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: IqRdf - A builder like rdf library for ruby and rails
 test_files:
-- test/xml_test.rb
-- test/turtle_test.rb
-- test/test_helper.rb
 - test/iq_rdf_test.rb
 - test/ntriples_test.rb
+- test/test_helper.rb
+- test/turtle_test.rb
+- test/xml_test.rb