rdf-n3 0.3.3.1 → 0.3.4

data/History.md

@@ -1,3 +1,10 @@
+0.3.4
+-----
+* Reader accepts 1.0E1 in addition to 1.0e1 (case-insensitive match on exponent).
+* Writer was not outputting xsd prefix if it was only used in a literal datatype.
+* Use bare representations of xsd:integer, xsd:boolean, xsd:double, and xsd:decimal.
+* Implement literal canonicalization (on option) in writer.
+
 0.3.3.1
 -------
 * Fixed bug in writer when given a base URI.

data/VERSION

@@ -1 +1 @@
-0.3.3.1
+0.3.4

data/lib/rdf/n3/reader/meta.rb

@@ -635,6 +635,6 @@ module RDF::N3::Meta
     :"http://www.w3.org/2000/10/swap/grammar/n3#string" => Regexp.compile("(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")"),
 
     # Hack to replace integer|double|decimal with numericliteral
-    :"http://www.w3.org/2000/10/swap/grammar/n3#numericliteral" => Regexp.compile(%(^[-+]?[0-9]+(\\.[0-9]+)?(e[-+]?[0-9]+)?))
+    :"http://www.w3.org/2000/10/swap/grammar/n3#numericliteral" => Regexp.compile(%(^[-+]?[0-9]+(\\.[0-9]+)?([eE][-+]?[0-9]+)?))
   }
 end

data/lib/rdf/n3/writer.rb

@@ -166,18 +166,21 @@ module RDF::N3
         return nil
       end
 
+      add_debug "get_qname(#{resource})"
       qname = case
       when @uri_to_qname.has_key?(uri)
         return @uri_to_qname[uri]
       when u = @uri_to_prefix.keys.detect {|u| uri.index(u.to_s) == 0}
         # Use a defined prefix
         prefix = @uri_to_prefix[u]
-        prefix(prefix, u)  # Define for output
+        prefix(prefix, u) unless u.to_s.empty? # Define for output
+        add_debug "get_qname: add prefix #{prefix.inspect} => #{u}"
         uri.sub(u.to_s, "#{prefix}:")
       when @options[:standard_prefixes] && vocab = RDF::Vocabulary.detect {|v| uri.index(v.to_uri.to_s) == 0}
         prefix = vocab.__name__.to_s.split('::').last.downcase
         @uri_to_prefix[vocab.to_uri.to_s] = prefix
         prefix(prefix, vocab.to_uri) # Define for output
+        add_debug "get_qname: add standard prefix #{prefix.inspect} => #{vocab.to_uri}"
         uri.sub(vocab.to_uri.to_s, "#{prefix}:")
       else
         nil
@@ -232,14 +235,22 @@ module RDF::N3
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_literal(literal, options = {})
+      literal = literal.dup.canonicalize! if @options[:canonicalize]
       case literal
-        when RDF::Literal
+      when RDF::Literal
+        case literal.datatype
+        when RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.decimal
+          literal.to_s
+        when RDF::XSD.double
+          literal.to_s.sub('E', 'e')  # Favor lower case exponent
+        else
           text = quoted(literal.value)
           text << "@#{literal.language}" if literal.has_language?
           text << "^^#{format_uri(literal.datatype)}" if literal.has_datatype?
           text
-        else
-          quoted(literal.to_s)
+        end
+      else
+        quoted(literal.to_s)
       end
     end
     
@@ -270,7 +281,7 @@ module RDF::N3
     def start_document
       @started = true
       
-      @output.write("#{indent}@base <#{@base_uri}> .\n") if @base_uri
+      @output.write("#{indent}@base <#{@base_uri}> .\n") unless @base_uri.to_s.empty?
       
       add_debug("start_document: #{prefixes.inspect}")
       prefixes.keys.sort_by(&:to_s).each do |prefix|
@@ -353,6 +364,7 @@ module RDF::N3
       get_qname(statement.subject)
       get_qname(statement.predicate)
       get_qname(statement.object)
+      get_qname(statement.object.datatype) if statement.object.literal? && statement.object.datatype
 
       @references[statement.predicate] = ref_count(statement.predicate) + 1
     end

data/rdf-n3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-n3}
-  s.version = "0.3.3.1"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-07-10}
   s.description = %q{RDF::N3 is an Notation-3 and Turtle reader/writer for the RDF.rb library suite.}
   s.email = %q{gregg@kellogg-assoc.com}
   s.extra_rdoc_files = [
@@ -73,19 +73,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.0}
   s.summary = %q{N3/Turtle reader/writer for RDF.rb.}
-  s.test_files = [
-    "spec/cwm_spec.rb",
-    "spec/cwm_test.rb",
-    "spec/format_spec.rb",
-    "spec/matchers.rb",
-    "spec/reader_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/swap_spec.rb",
-    "spec/swap_test.rb",
-    "spec/turtle_spec.rb",
-    "spec/turtle_test.rb",
-    "spec/writer_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/reader_spec.rb

@@ -446,6 +446,7 @@ describe "RDF::N3::Reader" do
         %(:a :b 1.0e1)  => %(<http://a/b#a> <http://a/b#b> "1.0e1"^^<http://www.w3.org/2001/XMLSchema#double> .),
         %(:a :b 1.0e-1)  => %(<http://a/b#a> <http://a/b#b> "1.0e-1"^^<http://www.w3.org/2001/XMLSchema#double> .),
         %(:a :b 1.0e+1)  => %(<http://a/b#a> <http://a/b#b> "1.0e+1"^^<http://www.w3.org/2001/XMLSchema#double> .),
+        %(:a :b 1.0E1)  => %(<http://a/b#a> <http://a/b#b> "1.0e1"^^<http://www.w3.org/2001/XMLSchema#double> .),
       }.each_pair do |n3, nt|
         it "should create typed literal for '#{n3}'" do
           parse(n3, :base_uri => "http://a/b").should be_equivalent_graph(nt, :about => "http://a/b", :trace => @debug)

data/spec/writer_spec.rb

@@ -223,17 +223,130 @@ describe RDF::N3::Writer do
       #$verbose = false
     end
   end
-  
-  describe "strings" do
-    it "encodes embedded \"\"\"" do
-      n3 = %(:a :b """testing string parsing in N3.
-""" .)
-      serialize(n3, nil, [/testing string parsing in N3.\n/])
+
+  describe "literals" do
+    describe "plain" do
+      it "encodes embedded \"\"\"" do
+        n3 = %(:a :b """testing string parsing in N3.
+  """ .)
+        serialize(n3, nil, [/testing string parsing in N3.\n/])
+      end
+
+      it "encodes embedded \"" do
+        n3 = %(:a :b """string with " escaped quote marks""" .)
+        serialize(n3, nil, [/string with \\" escaped quote mark/])
+      end
+    end
+    
+    describe "with language" do
+      it "specifies language for literal with language" do
+        ttl = %q(:a :b "string"@en .)
+        serialize(ttl, nil, [%r("string"@en)])
+      end
+    end
+    
+    describe "xsd:anyURI" do
+      it "uses xsd namespace for datatype" do
+        ttl = %q(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b "http://foo/"^^xsd:anyURI .)
+        serialize(ttl, nil, [
+          %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+          %r("http://foo/"\^\^xsd:anyURI \.),
+        ])
+      end
+    end
+    
+    describe "xsd:boolean" do
+      [
+        [%q("true"^^xsd:boolean), /true ./],
+        [%q("TrUe"^^xsd:boolean), /true ./],
+        [%q("1"^^xsd:boolean), /true ./],
+        [%q(true), /true ./],
+        [%q("false"^^xsd:boolean), /false ./],
+        [%q("FaLsE"^^xsd:boolean), /false ./],
+        [%q("0"^^xsd:boolean), /false ./],
+        [%q(false), /false ./],
+      ].each do |(l,r)|
+        it "uses token for #{l.inspect}" do
+          ttl = %(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b #{l} .)
+          serialize(ttl, nil, [
+            %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+            r,
+          ], :canonicalize => true)
+        end
+      end
+    end
+    
+    describe "xsd:integer" do
+      [
+        [%q("1"^^xsd:integer), /1 ./],
+        [%q(1), /1 ./],
+        [%q("0"^^xsd:integer), /0 ./],
+        [%q(0), /0 ./],
+        [%q("10"^^xsd:integer), /10 ./],
+        [%q(10), /10 ./],
+      ].each do |(l,r)|
+        it "uses token for #{l.inspect}" do
+          ttl = %(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b #{l} .)
+          serialize(ttl, nil, [
+            %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+            r,
+          ], :canonicalize => true)
+        end
+      end
+    end
+
+    describe "xsd:int" do
+      [
+        [%q("1"^^xsd:int), /"1"\^\^xsd:int ./],
+        [%q("0"^^xsd:int), /"0"\^\^xsd:int ./],
+        [%q("10"^^xsd:int), /"10"\^\^xsd:int ./],
+      ].each do |(l,r)|
+        it "uses token for #{l.inspect}" do
+          ttl = %(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b #{l} .)
+          serialize(ttl, nil, [
+            %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+            r,
+          ], :canonicalize => true)
+        end
+      end
     end
 
-    it "encodes embedded \"" do
-      n3 = %(:a :b """string with " escaped quote marks""" .)
-      serialize(n3, nil, [/string with \\" escaped quote mark/])
+    describe "xsd:decimal" do
+      [
+        [%q("1.0"^^xsd:decimal), /1.0 ./],
+        [%q(1.0), /1.0 ./],
+        [%q("0.1"^^xsd:decimal), /0.1 ./],
+        [%q(0.1), /0.1 ./],
+        [%q("10.02"^^xsd:decimal), /10.02 ./],
+        [%q(10.02), /10.02 ./],
+      ].each do |(l,r)|
+        it "uses token for #{l.inspect}" do
+          ttl = %(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b #{l} .)
+          serialize(ttl, nil, [
+            %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+            r,
+          ], :canonicalize => true)
+        end
+      end
+    end
+    
+    describe "xsd:double" do
+      [
+        [%q("1.0e1"^^xsd:double), /1.0e1 ./],
+        [%q(1.0e1), /1.0e1 ./],
+        [%q("0.1e1"^^xsd:double), /1.0e0 ./],
+        [%q(0.1e1), /1.0e0 ./],
+        [%q("10.02e1"^^xsd:double), /1.002e2 ./],
+        [%q(10.02e1), /1.002e2 ./],
+      ].each do |(l,r)|
+        it "uses token for #{l.inspect}" do
+          ttl = %(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . :a :b #{l} .)
+          serialize(ttl, nil, [
+            %r(@prefix xsd: <http://www.w3.org/2001/XMLSchema#> \.),
+            r,
+          ], :canonicalize => true)
+        end
+      end
     end
   end
   
@@ -266,9 +379,10 @@ describe RDF::N3::Writer do
 
   # Serialize ntstr to a string and compare against regexps
   def serialize(ntstr, base = nil, regexps = [], options = {})
-    g = parse(ntstr, :base_uri => base)
+    prefixes = options[:prefixes] || {}
+    g = parse(ntstr, :base_uri => base, :prefixes => prefixes)
     @debug = []
-    result = RDF::N3::Writer.buffer(options.merge(:debug => @debug, :base_uri => base)) do |writer|
+    result = RDF::N3::Writer.buffer(options.merge(:debug => @debug, :base_uri => base, :prefixes => prefixes)) do |writer|
       writer << g
     end
     if $verbose

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-n3
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  - 1
-  version: 0.3.3.1
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -238,15 +237,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: N3/Turtle reader/writer for RDF.rb.
-test_files: 
-- spec/cwm_spec.rb
-- spec/cwm_test.rb
-- spec/format_spec.rb
-- spec/matchers.rb
-- spec/reader_spec.rb
-- spec/spec_helper.rb
-- spec/swap_spec.rb
-- spec/swap_test.rb
-- spec/turtle_spec.rb
-- spec/turtle_test.rb
-- spec/writer_spec.rb
+test_files: []
+