rdf-n3 0.3.4 → 0.3.4.1

data/History.md

@@ -1,16 +1,17 @@
-0.3.4
------
+## 0.3.4.1
+* In Reader, if no base\_uri is used, make sure that @prefix : <#> is generated, not @prefix : <>.
+* In Writer, fix bug when trying to use `:standard\_prefixes` option.
+
+## 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
--------
+## 0.3.3.1
 * Fixed bug in writer when given a base URI.
 
-0.3.3
------
+## 0.3.3
 * Update dependencies to RDF.rb 0.3.3
 * Update specs to use open-uri-cached and Spira; no longer directly include W3C test cases.
 * Use Bundler when running specs.
@@ -18,29 +19,24 @@
 * Fixed stack overflow in regular expression when matching long multi-line literals.
 * Fixed bug (issue 14) where illegal QNames were generated in writer.
 
-0.3.2
------
+## 0.3.2
 * Skipped
-0.3.1.3
------
+
+## 0.3.1.3
 * Normalize language tags to lower case (only when canonicalizing). SPARQL specs expect the reader
   to not screw with the language case for equivalence tests.
 
-0.3.1.2
------
+## 0.3.1.2
 * Normalize language tags to lower case.
 
-0.3.1.1
------
+## 0.3.1.1
 * Assert formats for :ttl, :turtle, and :notation3 in addition to :n3
 
-0.3.1
------
+## 0.3.1
 * Add application/turtle, application/x-turtle, text/rdf+n3 and application/rdf+n3 as mime types
   matching this format, even though only text/turtle and text/n3 are valid.
 
-0.3.0
------
+## 0.3.0
 * New Predictive-Parser based N3 Reader, substantially faster than previous Treetop-based parser
 * RDF.rb 0.3.0 compatibility updates
   * Remove literal_normalization and qname_hacks, add back uri_hacks (until 0.3.0)
@@ -57,16 +53,14 @@
     * Add check to ensure that predicates are not literals, it's not legal in any RDF variant.
 * RSpec 2 compatibility
 
-0.2.3
------
+## 0.2.3
 * In Writer, set @base_uri not @base, as :base_uri is an attribute.
 * Relativize URLs without matching as regexp.
 * Allow mixed case literal languages.
 * Improve N3 Unicode support for Ruby 1.9
 * Improve Turtle/N3 Writer to use unescaped and qname'd values
 
-0.2.2
------
+## 0.2.2
 * Ruby 1.9.2 compatibility
 * Added script/tc to run test cases
 * Fixed RDF.to_s != RDF.to_uri.to_s in writer, it worke for every other vocabulary
@@ -76,16 +70,13 @@
 * URI normalization isn't required for N3, so removed.
 * Added Reader#rewind and #close as stubs because document is parsed on initialize and input is closed.
 
-0.2.1
------
+## 0.2.1
 * Compatible with RDF.rb 0.2.1
 
-0.0.3
------
+## 0.0.3
 * Replace require against rdf/rdfxml/patches/* with rdf/n3/patches/*
 
-0.0.2
------
+## 0.0.2
 * N3 parsing and Turtle serialization substantially complete.
   * A little more work needed on some tests and some lingering issues in RDF.rb to be resolved.
 * Added script/console and script/parse
@@ -94,6 +85,5 @@
 * rdf_escape Literals when serializing via to_s
 * Remove trailing "#" from URIs when normalizing.
 
-0.0.1
------
+## 0.0.1
 * First port from RdfContext version 0.5.4

data/README

@@ -1,15 +1,12 @@
-RDF::N3 reader/writer
-=====================
+# RDF::N3 reader/writer
 Notation-3 and Turtle reader/writer for [RDF.rb][RDF.rb] .
 
-Description
------------
+## Description
 RDF::N3 is an Notation-3 parser for Ruby using the [RDF.rb][RDF.rb]  library suite.
 
 Reader inspired from TimBL predictiveParser and Python librdf implementation.
 
-Features
---------
+## Features
 RDF::N3 parses [Notation-3][N3], [Turtle][Turtle] and [N-Triples][N-Triples] into statements or triples. It also serializes to Turtle.
 
 Install with `gem install rdf-n3`
@@ -137,8 +134,7 @@ Full documentation available on [RubyForge](http://rdf.rubyforge.org/n3)
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
-Feedback
---------
+## Feedback
 * <gregg@kellogg-assoc.com>
 * <http://rubygems.org/gem/rdf-n3>
 * <http://github.com/gkellogg/rdf-n3>

data/README.md

@@ -1,15 +1,12 @@
-RDF::N3 reader/writer
-=====================
+# RDF::N3 reader/writer
 Notation-3 and Turtle reader/writer for [RDF.rb][RDF.rb] .
 
-Description
------------
+## Description
 RDF::N3 is an Notation-3 parser for Ruby using the [RDF.rb][RDF.rb]  library suite.
 
 Reader inspired from TimBL predictiveParser and Python librdf implementation.
 
-Features
---------
+## Features
 RDF::N3 parses [Notation-3][N3], [Turtle][Turtle] and [N-Triples][N-Triples] into statements or triples. It also serializes to Turtle.
 
 Install with `gem install rdf-n3`
@@ -137,8 +134,7 @@ Full documentation available on [RubyForge](http://rdf.rubyforge.org/n3)
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
-Feedback
---------
+## Feedback
 * <gregg@kellogg-assoc.com>
 * <http://rubygems.org/gem/rdf-n3>
 * <http://github.com/gkellogg/rdf-n3>

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.4.1

data/example-files/recipe.ttl

@@ -0,0 +1,33 @@
+@prefix v: <http://rdf.data-vocabulary.org/#> .
+
+_:c14n0
+   <http://rdf.data-vocabulary.org/#description> "Crush lime juice, mint and sugar together in glass.";
+   <http://rdf.data-vocabulary.org/#step> "1"^^<http://www.w3.org/2001/XMLSchema#integer>.
+_:c14n1
+   <http://rdf.data-vocabulary.org/#description> "Fill glass to top with ice cubes.";
+   <http://rdf.data-vocabulary.org/#step> "2"^^<http://www.w3.org/2001/XMLSchema#integer>.
+_:c14n2
+   <http://rdf.data-vocabulary.org/#description> "Fill the rest of glass with club soda, stir.";
+   <http://rdf.data-vocabulary.org/#step> "4"^^<http://www.w3.org/2001/XMLSchema#integer>.
+_:c14n3
+   <http://rdf.data-vocabulary.org/#description> "Garnish with a lime wedge.";
+   <http://rdf.data-vocabulary.org/#step> "5"^^<http://www.w3.org/2001/XMLSchema#integer>.
+_:c14n4
+   <http://rdf.data-vocabulary.org/#description> "Pour white rum over ice.";
+   <http://rdf.data-vocabulary.org/#step> "3"^^<http://www.w3.org/2001/XMLSchema#integer>.
+_:c14n5
+   <http://rdf.data-vocabulary.org/#ingredients> 
+      "1 cup ice cubes",
+      "1 tablespoons white sugar",
+      "1/2 cup club soda",
+      "1/2 lime, juiced with pulp",
+      "12 fresh mint leaves",
+      "2 fluid ounces white rum";
+   <http://rdf.data-vocabulary.org/#instructions> 
+      _:c14n0,
+      _:c14n1,
+      _:c14n2,
+      _:c14n3,
+      _:c14n4;
+   <http://rdf.data-vocabulary.org/#name> "Mojito";
+   <http://rdf.data-vocabulary.org/#yield> "1 cocktail".

data/lib/rdf/n3/reader.rb

@@ -666,10 +666,10 @@ module RDF::N3
 
     def namespace(prefix, uri)
       uri = uri.to_s
-      if uri == "#"
-        uri = prefix(nil)
+      if uri == '#'
+        uri = prefix(nil).to_s + '#'
       end
-      add_debug("namesspace", "'#{prefix}' <#{uri}>")
+      add_debug("namespace", "'#{prefix}' <#{uri}>")
       prefix(prefix, uri(uri))
     end
 

data/lib/rdf/n3/writer.rb

@@ -166,7 +166,7 @@ module RDF::N3
         return nil
       end
 
-      add_debug "get_qname(#{resource})"
+      add_debug "get_qname(#{resource}), std? #{RDF::Vocabulary.each.to_a.detect {|v| uri.index(v.to_uri.to_s) == 0}}"
       qname = case
       when @uri_to_qname.has_key?(uri)
         return @uri_to_qname[uri]
@@ -176,7 +176,7 @@ module RDF::N3
         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}
+      when @options[:standard_prefixes] && vocab = RDF::Vocabulary.each.to_a.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

data/rdf-n3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-n3}
-  s.version = "0.3.4"
+  s.version = "0.3.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2011-07-10}
+  s.date = %q{2011-07-11}
   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 = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "example-files/dwbutler-mj.n3",
     "example-files/dwbutler-mj.ttl",
     "example-files/lee-reilly-list.rb",
+    "example-files/recipe.ttl",
     "example-files/sp2b.n3",
     "example.rb",
     "lib/rdf/n3.rb",

data/script/parse

@@ -46,7 +46,7 @@ def run(input, options)
     r = reader_class.new(input, :base_uri => options[:base_uri], :strict => true)
     g = RDF::Graph.new << r
     num = g.count
-    options[:output].puts g.dump(options[:output_format], :base_uri => options[:base_uri], :prefixes => r.prefixes)
+    options[:output].puts g.dump(options[:output_format], :base_uri => options[:base_uri], :prefixes => r.prefixes, :standard_prefixes => true)
   end
   puts
   secs = Time.new - start

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-n3
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 69
   prerelease: 
   segments: 
   - 0
   - 3
   - 4
-  version: 0.3.4
+  - 1
+  version: 0.3.4.1
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 -07:00
+date: 2011-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +170,7 @@ files:
 - example-files/dwbutler-mj.n3
 - example-files/dwbutler-mj.ttl
 - example-files/lee-reilly-list.rb
+- example-files/recipe.ttl
 - example-files/sp2b.n3
 - example.rb
 - lib/rdf/n3.rb