iq_rdf 0.1.13 → 0.1.14

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/version.rb

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

data/test/xml_test.rb

@@ -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_raise 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iq_rdf
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,18 +106,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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
@@ -130,3 +124,4 @@ test_files:
 - test/test_helper.rb
 - test/turtle_test.rb
 - test/xml_test.rb
+has_rdoc: