iq_rdf 0.1.13 → 0.1.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8d1e7f78d4501e4926a949b23e9eac85ee22541fdc98445ceecf8125e1b43f6c
+  data.tar.gz: 23fcf45f8d9848b40d655f686fc656981e68d7bb6affc0551ab497c5a0e48e1f
+SHA512:
+  metadata.gz: 65cbaee04cc22cf60b667cadc6a107ceca63f2947830b2ac3eff4045754cd8f5fa5f3021e7202a8c5d9aee96d85c6122f781f5e2cf053c12a202e2d3436ae3a3
+  data.tar.gz: fcfec08a7092d8aeec7c737a52a093493da4a8a9e1f12fb12cbf31b97f56c93d0b4e25ae4fb99b718b79c041c43dfe8d01c042aeb33552dcfec319b5e6fd438f

data/README.md

@@ -1,4 +1,7 @@
-# IqRdf - RDF Renderering for Ruby and Rails [![build status](https://secure.travis-ci.org/innoq/iq_rdf.png)](http://travis-ci.org/innoq/iq_rdf)
+# IqRdf - RDF Renderering for Ruby and Rails
+
+![CI](https://github.com/innoq/iq_rdf/workflows/CI/badge.svg)
+
 IqRdf is a RDF renderer for Ruby and Rails. You can use it in any Ruby
 environment to render Trurtle-, N-Triple- (not implemented yet) or XML-RDF.
 

data/iq_rdf.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
   s.add_dependency "builder"
   s.add_dependency "activesupport"
 
+  s.add_development_dependency "minitest"
+
   s.files = %w(LICENSE README.md Rakefile iq_rdf.gemspec) + Dir.glob("{lib,rails,test}/**/*")
   s.test_files = Dir.glob("{test}/**/*")
   s.executables = Dir.glob("{bin}/**/*")

data/lib/iq_rdf/document.rb

@@ -73,7 +73,9 @@ module IqRdf
           sublist::rdf.build_predicate("type", IqRdf::Rdf::build_uri("List")) # _:b* a rdf:List
           sublist::rdf.first(current_element) # _:b* rdf:first <...>
           last = i + 1 == total
-          unless last
+          if last
+            sublist::rdf.rest(IqRdf::Rdf::build_uri("nil"))
+          else
             new_sublist = IqRdf::BlankNode.new
             sublist::rdf.rest(new_sublist) # _:b* rdf:rest _:b*
           end

data/lib/iq_rdf/predicate.rb

@@ -23,11 +23,19 @@ module IqRdf
     end
 
     def build_xml(xml)
-      raise "XML Output won't work with full URIs as predicates yet" unless namespace.token # There is a dummy_empty_namespace without token => postfix is a full uri!
       nodes.each do |node|
         node.build_xml(xml) do |*args|
           block = args.pop if args.last.is_a?(Proc)
-          params = namespace.token == :default ? [self.uri_postfix.to_s] : [namespace.token.to_s, self.uri_postfix.to_sym]
+          params = if namespace.token.nil? # Full uri
+            nameStartChar = "[A-Z]|_|[a-z]|[\u{00C0}-\u{00D6}]|[\u{00D8}-\u{00F6}]|[\u{00F8}-\u{02FF}]|[\u{0370}-\u{037D}]|[\u{037F}-\u{1FFF}]|[\u{200C}-\u{200D}]|[\u{2070}-\u{218F}]|[\u{2C00}-\u{2FEF}]|[\u{3001}-\u{D7FF}]|[\u{F900}-\u{FDCF}]|[\u{FDF0}-\u{FFFD}]|[\u{10000}-\u{EFFFF}]"
+            name = Regexp.new("^(.*?)((#{nameStartChar})(#{nameStartChar}|-|[0-9]|\u{00B7}|[\u{0300}-\u{036F}]|[\u{203F}-\u{2040}])*)$")
+            unless matches = name.match(self.uri_postfix.to_s)
+              raise "Coudln't extract namespace and postfix from URI '#{self.uri_postfix}'"
+            end
+            ["ns0", matches[2].to_sym, {"xmlns:ns0" => matches[1]}]
+          else
+            namespace.token == :default ? [self.uri_postfix.to_s] : [namespace.token.to_s, self.uri_postfix.to_sym]
+          end
           params += args
           params << {"xml:lang" => xml_lang} if xml_lang
           if block

data/lib/iq_rdf/rails/iq_rdf.rb

@@ -12,21 +12,23 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-def IqRdf.rails_template(template)
+def IqRdf.rails_template(template, source = nil)
+  source ||= template.source
+
   <<-EOV
   document = IqRdf::Document.new()
-  #{template.source}
+  #{source}
   if params[:format].to_s == "ttl"
-    controller.response.headers["Content-Type"] ||= 'text/turtle'
+    controller.response.headers["Content-Type"] ||= 'text/turtle;charset=utf-8'
     document.to_turtle
   elsif  params[:format].to_s == "nt"
-    controller.response.headers["Content-Type"] ||= 'text/plain'
+    controller.response.headers["Content-Type"] ||= 'text/plain;charset=utf-8'
     document.to_ntriples
   elsif params[:format].to_s == "rdf"
-    controller.response.headers["Content-Type"] ||= 'application/xml+rdf'
+    controller.response.headers["Content-Type"] ||= 'application/xml+rdf;charset=utf-8'
     document.to_xml
   else # Default => turtle
-    controller.response.headers["Content-Type"] ||= 'text/turtle'
+    controller.response.headers["Content-Type"] ||= 'text/turtle;charset=utf-8'
     document.to_turtle
   end
   EOV
@@ -34,7 +36,16 @@ end
 
 module ActionView
 
-  if Rails.version >= "3"
+  if Rails.version >= "6"
+    class Template::Handlers::IqRdf
+      # see https://github.com/rails/rails/commit/28f88e0074f473f58c2d3fd54cb3daff81027c12
+      def self.call(template, source)
+        IqRdf.rails_template(template, source)
+      end
+    end
+    ActionView::Template.register_template_handler('iqrdf', ActionView::Template::Handlers::IqRdf)
+
+  elsif Rails.version >= "3"
 
     class Template::Handlers::IqRdf
       def self.call(template)
@@ -54,6 +65,6 @@ module ActionView
     ActionView::Template.register_template_handler('iqrdf', ActionView::TemplateHandlers::IqRdf)
 
   end
- 
+
 
 end

data/lib/iq_rdf/version.rb

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

data/test/iq_rdf_test.rb

@@ -16,16 +16,16 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'test_helper'
 
-class IqRdfTest < Test::Unit::TestCase
+class IqRdfTest < Minitest::Test
 
   def test_namespace_definitions
-    assert_raise(URI::InvalidURIError) { IqRdf::Document.new(12345) }
+    assert_raises(URI::InvalidURIError) { IqRdf::Document.new(12345) }
 
     document = IqRdf::Document.new("http://default-namespace.com/")
 
-    assert_raise(ArgumentError) { document.namespaces :nohash }
-    assert_raise(ArgumentError) { document.namespaces "wrong" => "http://www.innoq.com/" }
-    assert_raise(URI::InvalidURIError) { document.namespaces :correct => 12 }
+    assert_raises(ArgumentError) { document.namespaces :nohash }
+    assert_raises(ArgumentError) { document.namespaces "wrong" => "http://www.innoq.com/" }
+    assert_raises(URI::InvalidURIError) { document.namespaces :correct => 12 }
 
     document.namespaces :innoq => "http://www.innoq.com/"
     document.namespaces :uba => "http://www.uba.de/"
@@ -52,7 +52,7 @@ class IqRdfTest < Test::Unit::TestCase
   def test_disallow_nested_definitions
     IqRdf::Document.new('http://www.umweltprobenbank.de/').namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
 
-    assert_raise(ArgumentError) {IqRdf::testemann.Foaf::knows(IqRdf::testefrau.Foaf::knows(IqRdf::someone_else)) }
+    assert_raises(ArgumentError) {IqRdf::testemann.Foaf::knows(IqRdf::testefrau.Foaf::knows(IqRdf::someone_else)) }
   end
 
 end

data/test/ntriples_test.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-#   
+#
 #   Copyright 2011 innoQ Deutschland GmbH
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'test_helper'
 
-class NTriplesTest < Test::Unit::TestCase
+class NTriplesTest < Minitest::Test
 
   def test_basics
     document = IqRdf::Document.new('http://example.org/')
@@ -109,6 +109,7 @@ _:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://test.de/goodbye>
 _:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b4 .
 _:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#List> .
 _:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "bla" .
+_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 <http://test.de/testemann> <http://test.de/testIt> _:b2 .
     rdf
   end

data/test/test_helper.rb

@@ -13,8 +13,9 @@
 #   limitations under the License.
 
 require 'rubygems'
-require 'test/unit'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
 
 require 'iq_rdf'
+
+require 'minitest/autorun'

data/test/turtle_test.rb

@@ -16,7 +16,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'test_helper'
 
-class TurtleTest < Test::Unit::TestCase
+class TurtleTest < Minitest::Test
 
   def test_basic_turtle_output
     document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
@@ -42,7 +42,7 @@ rdf
   def test_full_uri_subject_turtle_output
     document = IqRdf::Document.new('http://www.test.de/')
 
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       IqRdf::build_full_uri_subject("bla")
     end
 

data/test/xml_test.rb

@@ -16,7 +16,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'test_helper'
 
-class XmlTest < Test::Unit::TestCase
+class XmlTest < Minitest::Test
 
   def test_basic_xml_output
     document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
@@ -40,7 +40,7 @@ rdf
   def test_full_uri_subject_xml_output
     document = IqRdf::Document.new('http://www.test.de/')
 
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       IqRdf::build_full_uri_subject("bla")
     end
 
@@ -54,40 +54,40 @@ rdf
     <sometest>testvalue</sometest>
   </rdf:Description>
 rdf
-    end
+  end
 
-    def test_complex_features
-      document = IqRdf::Document.new('http://www.umweltprobenbank.de/', :lang => :de)
+  def test_complex_features
+    document = IqRdf::Document.new('http://www.umweltprobenbank.de/', :lang => :de)
 
-      document.namespaces :skos => 'http://www.w3.org/2008/05/skos#', :foaf => 'http://xmlns.com/foaf/0.1/', :upb => 'http://www.upb.de/'
+    document.namespaces :skos => 'http://www.w3.org/2008/05/skos#', :foaf => 'http://xmlns.com/foaf/0.1/', :upb => 'http://www.upb.de/'
 
-      document << IqRdf::testemann.myCustomNote("This is an example", :lang => :en) # :testemann :myCustomNote "This is an example"@en.
+    document << IqRdf::testemann.myCustomNote("This is an example", :lang => :en) # :testemann :myCustomNote "This is an example"@en.
 
-      document << IqRdf::testemann(IqRdf::Foaf::build_uri("Person")).Foaf::name("Heinz Peter Testemann", :lang => :none) # :testemann a foaf:Person; foaf:name "Heinz Peter Testemann" .
-      document << IqRdf::testemann.Foaf::knows(IqRdf::testefrau) # :testemann foaf:knows :testefrau .
-      document << IqRdf::testemann.Foaf::nick("Crash test dummy") # :testemann foaf:nick "Crash test dummy"@de .
+    document << IqRdf::testemann(IqRdf::Foaf::build_uri("Person")).Foaf::name("Heinz Peter Testemann", :lang => :none) # :testemann a foaf:Person; foaf:name "Heinz Peter Testemann" .
+    document << IqRdf::testemann.Foaf::knows(IqRdf::testefrau) # :testemann foaf:knows :testefrau .
+    document << IqRdf::testemann.Foaf::nick("Crash test dummy") # :testemann foaf:nick "Crash test dummy"@de .
 
-      document << IqRdf::testemann.testIt([IqRdf::hello, "bla"]) # :testIt (:hallo :goodbye "bla"@de), "blubb"@de;  # XML: rdf:list
+    document << IqRdf::testemann.testIt([IqRdf::hello, "bla"]) # :testIt (:hallo :goodbye "bla"@de), "blubb"@de;  # XML: rdf:list
 
-      ["u1023", "xkfkrl"].each do |id|
-        document << IqRdf::Upb::build_uri(id, IqRdf::Skos::build_uri(:Concept)) do |doc| # upb:#{id} a skos:Concept;
-          doc.Skos::prefLabel("Test", :lang => :en) # skos:prefLabel "Test"@en;
-          doc.Skos::related(IqRdf::Rdf.anotherThing) # skos:related test:another_thing;
+    ["u1023", "xkfkrl"].each do |id|
+      document << IqRdf::Upb::build_uri(id, IqRdf::Skos::build_uri(:Concept)) do |doc| # upb:#{id} a skos:Concept;
+        doc.Skos::prefLabel("Test", :lang => :en) # skos:prefLabel "Test"@en;
+        doc.Skos::related(IqRdf::Rdf.anotherThing) # skos:related test:another_thing;
 
-          doc.test1("bla") # :test1 "bla"@de;
-          doc.testIt(:hello, :goodbye, "bla") # :testIt :hallo, :goodbye, "bla"@de;
-          doc.anotherTest(URI.parse("http://www.test.de/foo")) # :anotherTest <http://www.test.de/foo>;
+        doc.test1("bla") # :test1 "bla"@de;
+        doc.testIt(:hello, :goodbye, "bla") # :testIt :hallo, :goodbye, "bla"@de;
+        doc.anotherTest(URI.parse("http://www.test.de/foo")) # :anotherTest <http://www.test.de/foo>;
 
-        end # .
-      end
-      document << IqRdf::Skos::testnode.test32 do |blank_node| # Blank nodes # skos:testnode :test32 [
-        blank_node.title("dies ist ein test") # :title "dies ist ein test"@de;
-        blank_node.sub do |subnode| # sub [
-          subnode.title("blubb") # title "blubb"
-        end # ]
+      end # .
+    end
+    document << IqRdf::Skos::testnode.test32 do |blank_node| # Blank nodes # skos:testnode :test32 [
+      blank_node.title("dies ist ein test") # :title "dies ist ein test"@de;
+      blank_node.sub do |subnode| # sub [
+        subnode.title("blubb") # title "blubb"
       end # ]
+    end # ]
 
-      assert_match(<<rdf, document.to_xml)
+    assert_match(<<rdf, document.to_xml)
   <rdf:Description rdf:about="http://www.umweltprobenbank.de/testemann">
     <myCustomNote xml:lang="en">This is an example</myCustomNote>
   </rdf:Description>
@@ -156,27 +156,27 @@ skos:testnode :test32 [
     ]
 ].
 =end
+  end
+
+  def test_literals
+    document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
+    document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
+
+    document << IqRdf::testemann do |t|
+      t.Foaf::knows(:testefrau)
+      t.Foaf.nick("Testy")
+      t.Foaf.lastname("Testemann", :lang => :none)
+      t.age(32)
+      t.married(false)
+      t.weight(65.8)
+      t.complex(IqRdf::Literal.new("A very complex type", nil, URI.parse("http://this.com/is#complex")))
+      t.complex2(IqRdf::Literal.new("Shorter form", nil, IqRdf::myDatatype))
+      t.quotes("\"I'm \\quoted\"")
+      t.line_breaks("I'm written\nover two lines")
+      t.some_literal(IqRdf::Literal.new("text", :de))
     end
 
-    def test_literals
-      document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
-      document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
-
-      document << IqRdf::testemann do |t|
-        t.Foaf::knows(:testefrau)
-        t.Foaf.nick("Testy")
-        t.Foaf.lastname("Testemann", :lang => :none)
-        t.age(32)
-        t.married(false)
-        t.weight(65.8)
-        t.complex(IqRdf::Literal.new("A very complex type", nil, URI.parse("http://this.com/is#complex")))
-        t.complex2(IqRdf::Literal.new("Shorter form", nil, IqRdf::myDatatype))
-        t.quotes("\"I'm \\quoted\"")
-        t.line_breaks("I'm written\nover two lines")
-        t.some_literal(IqRdf::Literal.new("text", :de))
-      end
-
-      assert_match(<<rdf, document.to_xml)
+    assert_match(<<rdf, document.to_xml)
   <rdf:Description rdf:about="http://www.test.de/testemann">
     <foaf:knows rdf:resource="http://www.test.de/testefrau"/>
     <foaf:nick>Testy</foaf:nick>
@@ -192,8 +192,26 @@ over two lines</line_breaks>
     <some_literal xml:lang="de">text</some_literal>
   </rdf:Description>
 rdf
+  end
+
+  def test_full_uri_predicates
+    assert_raises RuntimeError do
+      document = IqRdf::Document.new('http://www.test.de/')
+      document << IqRdf::testemann.build_full_uri_predicate(URI.parse("http://www.test.org/12"), 42)
+      document.to_xml
     end
 
+    document = IqRdf::Document.new('http://www.test.de/')
+
+    document << IqRdf::testemann.build_full_uri_predicate(URI.parse("http://www.test.org/hoho"), 42)
+
+    assert_match(<<-rdf, document.to_xml)
+  <rdf:Description rdf:about="http://www.test.de/testemann">
+    <ns0:hoho xmlns:ns0="http://www.test.org/" rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">42</ns0:hoho>
+  </rdf:Description>
+    rdf
+  end
+
   def test_blank_nodes
     document = IqRdf::Document.new('http://www.test.de/')
 
@@ -204,7 +222,7 @@ rdf
         subnode.title("blubb") # title "blubb"
       end # ]
     end # ]
-    assert_match(<<rdf, document.to_xml)
+    assert_match(<<-rdf, document.to_xml)
   <rdf:Description rdf:about=\"http://www.test.de/testnode\">
     <test32>
       <rdf:Description>
@@ -218,7 +236,7 @@ rdf
       </rdf:Description>
     </test32>
   </rdf:Description>
-rdf
+    rdf
   end
 
-  end
+end

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: iq_rdf
 version: !ruby/object:Gem::Version
-  version: 0.1.13
-  prerelease: 
+  version: 0.1.17
 platform: ruby
 authors:
 - Till Schulte-Coerne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: IqRdf - A builder like rdf library for ruby and rails
@@ -72,14 +79,15 @@ files:
 - README.md
 - Rakefile
 - iq_rdf.gemspec
+- lib/iq_rdf.rb
 - lib/iq_rdf/blank_node.rb
 - lib/iq_rdf/collection.rb
 - lib/iq_rdf/document.rb
+- lib/iq_rdf/literal.rb
 - lib/iq_rdf/literal/boolean.rb
 - lib/iq_rdf/literal/numeric.rb
 - lib/iq_rdf/literal/string.rb
 - lib/iq_rdf/literal/uri.rb
-- lib/iq_rdf/literal.rb
 - lib/iq_rdf/namespace.rb
 - lib/iq_rdf/node.rb
 - lib/iq_rdf/predicate.rb
@@ -87,7 +95,6 @@ files:
 - lib/iq_rdf/rails/iq_rdf.rb
 - lib/iq_rdf/uri.rb
 - lib/iq_rdf/version.rb
-- lib/iq_rdf.rb
 - rails/init.rb
 - test/iq_rdf_test.rb
 - test/ntriples_test.rb
@@ -96,37 +103,29 @@ files:
 - test/xml_test.rb
 homepage: http://github.com/innoq/iq_rdf
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3899584830229943406
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3899584830229943406
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3.1
+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