iq_rdf 0.1.4 → 0.1.5

data/lib/iq_rdf/literal.rb

@@ -16,7 +16,7 @@ module IqRdf
   class Literal
 
     def initialize(obj, lang = nil, datatype = nil)
-      raise "#{datatype.inspect} is not an URI" if datatype && !datatype.is_a?(::URI)
+      raise "#{datatype.inspect} is not an URI" unless datatype.nil? || datatype.is_a?(::URI) || datatype.is_a?(IqRdf::Uri)
       @obj = obj
       @datatype = datatype
       @lang = lang
@@ -36,15 +36,26 @@ module IqRdf
 
     def to_s(parent_lang = nil)
       lang = @lang || parent_lang # Use the Literals lang when given
+      lang = (lang && lang != :none) ? "@#{lang}" : ""
       quote = @obj.to_s.include?("\n") ? '"""' : '"'
-      "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}" <<
-          ((lang && lang != :none) ? "@#{lang}" : "") <<
-          (@datatype ? "^^<#{@datatype.to_s}>" : "")
+      datatype = if @datatype.is_a?(::URI)
+        "^^<#{@datatype.to_s}>"
+      elsif @datatype.is_a?(IqRdf::Uri)
+        "^^#{@datatype.to_s}"
+      else
+        ""
+      end
+
+      "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}#{lang}#{datatype}"
     end
 
     def build_xml(xml, &block)
       opts = {}
-      opts["rdf:datatype"] = @datatype.to_s if @datatype
+      if @datatype.is_a?(::URI)
+        opts["rdf:datatype"] = @datatype.to_s
+      elsif @datatype.is_a?(IqRdf::Uri)
+        opts["rdf:datatype"] = @datatype.full_uri
+      end
       opts["xml:lang"] = @lang if @lang
       block.call(@obj.to_s, opts)
     end

data/lib/iq_rdf/version.rb

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

data/test/turtle_test.rb

@@ -137,6 +137,7 @@ rdf
       t.married(false)
       t.weight(65.8)
       t.complex(IqRdf::Literal.new("A very complex type", :none, URI.parse("http://this.com/is#complex")))
+      t.complex2(IqRdf::Literal.new("Shorter form", :none, IqRdf::myDatatype))
       t.quotes("\"I'm \\quoted\"")
       t.line_breaks("I'm written\nover two lines")
       t.some_literal(IqRdf::Literal.new("text", :de))
@@ -155,6 +156,7 @@ rdf
            :married false;
            :weight 65.8;
            :complex "A very complex type"^^<http://this.com/is#complex>;
+           :complex2 "Shorter form"^^:myDatatype;
            :quotes "\\"I'm \\\\quoted\\""@de;
            :line_breaks """I'm written
 over two lines"""@de;

data/test/xml_test.rb

@@ -179,6 +179,7 @@ skos:testnode :test32 [
         t.married(false)
         t.weight(65.8)
         t.complex(IqRdf::Literal.new("A very complex type", :none, URI.parse("http://this.com/is#complex")))
+        t.complex2(IqRdf::Literal.new("Shorter form", :none, IqRdf::myDatatype))
         t.quotes("\"I'm \\quoted\"")
         t.line_breaks("I'm written\nover two lines")
         t.some_literal(IqRdf::Literal.new("text", :de))
@@ -195,6 +196,7 @@ skos:testnode :test32 [
     <married rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">false</married>
     <weight rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">65.8</weight>
     <complex rdf:datatype="http://this.com/is#complex" xml:lang="none">A very complex type</complex>
+    <complex2 rdf:datatype="http://www.test.de/myDatatype" xml:lang="none">Shorter form</complex2>
     <quotes>"I'm \\quoted"</quotes>
     <line_breaks>I'm written
 over two lines</line_breaks>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iq_rdf
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Till Schulte-Coerne