rdf-n3 1.0.0 → 1.0.2

data/{README.markdown → README.md}

@@ -1,6 +1,9 @@
 # RDF::N3 reader/writer
 Notation-3 reader/writer for [RDF.rb][RDF.rb] .
 
+[![Gem Version](https://badge.fury.io/rb/rdf-n3.png)](http://badge.fury.io/rb/rdf-n3)
+[![Build Status](https://travis-ci.org/ruby-rdf/rdf-n3.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-n3)
+
 ## Description
 RDF::N3 is an Notation-3 parser for Ruby using the [RDF.rb][RDF.rb]  library suite.
 
@@ -81,7 +84,7 @@ http://www.w3.org/2000/10/swap/grammar/n3.n3 (along with bnf-rules.n3) using cwm
 * Create equivalent to `--think` to iterate on solutions.
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.4)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
 
 ## Documentation
 Full documentation available on [RubyDoc.info](http://rubydoc.info/github/ruby-rdf/rdf-n3/frames)
@@ -144,11 +147,11 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * <http://github.com/ruby-rdf/rdf-n3>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF.rb]:     http://rdf.rubyforge.org/
-[RDF::Turtle] http://github.com/ruby-rdf/rdf-turtle/
-[N3]:         http://www.w3.org/DesignIssues/Notation3.html "Notation-3"
-[Turtle]:     http://www.w3.org/TeamSubmission/turtle/
-[N-Triples]:  http://www.w3.org/2001/sw/RDFCore/ntriples/
-[YARD]:       http://yardoc.org/
-[YARD-GS]:    http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:        http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[RDF.rb]:       http://ruby-rdf.github.com/rdf
+[RDF::Turtle]:  http://ruby-rdf.github.com/rdf-turtle/
+[N3]:           http://www.w3.org/DesignIssues/Notation3.html "Notation-3"
+[Turtle]:       http://www.w3.org/TR/turtle/
+[N-Triples]:    http://www.w3.org/TR/n-triples/
+[YARD]:         http://yardoc.org/
+[YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/lib/rdf/n3/reader.rb

@@ -59,8 +59,9 @@ module RDF::N3
 
         @branches = BRANCHES # Get from meta class
         @regexps = REGEXPS # Get from meta class
-        
-        @formulae = []      # Nodes used as Formluae context identifiers
+
+        @formulae = []      # Nodes used as Formluae graph names
+        @formulae_nodes = {}
         @variables = {}    # variable definitions along with defining formula
 
         if options[:base_uri]
@@ -114,17 +115,17 @@ module RDF::N3
     # Start of production
     def onStart(prod)
       handler = "#{prod}Start".to_sym
-      add_debug("#{handler}(#{respond_to?(handler)})", prod)
+      add_debug("#{handler}(#{respond_to?(handler, true)})", prod)
       @productions << prod
-      send(handler, prod) if respond_to?(handler)
+      send(handler, prod) if respond_to?(handler, true)
     end
 
     # End of production
     def onFinish
       prod = @productions.pop()
       handler = "#{prod}Finish".to_sym
-      add_debug("#{handler}(#{respond_to?(handler)})") {"#{prod}: #{@prod_data.last.inspect}"}
-      send(handler) if respond_to?(handler)
+      add_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}: #{@prod_data.last.inspect}"}
+      send(handler) if respond_to?(handler, true)
     end
 
     # Process of a token
@@ -132,8 +133,8 @@ module RDF::N3
       unless @productions.empty?
         parentProd = @productions.last
         handler = "#{parentProd}Token".to_sym
-        add_debug("#{handler}(#{respond_to?(handler)})") {"#{prod}, #{tok}: #{@prod_data.last.inspect}"}
-        send(handler, prod, tok) if respond_to?(handler)
+        add_debug("#{handler}(#{respond_to?(handler, true)})") {"#{prod}, #{tok}: #{@prod_data.last.inspect}"}
+        send(handler, prod, tok) if respond_to?(handler, true)
       else
         error("Token has no parent production")
       end
@@ -312,11 +313,12 @@ module RDF::N3
         symbol = process_anonnode(@prod_data.pop)
         add_prod_data(:symbol, symbol)
       when "{"
-        # A new formula, push on a graph as a formula context
-        context = RDF::Graph.new(RDF::Node.new)
-        @formulae << context
+        # A new formula, push on a node as a named graph
+        node = RDF::Node.new
+        @formulae << node
+        @formulae_nodes[node] = true
       when "}"
-        # Pop off the formula, and remove any variables defined in this context
+        # Pop off the formula, and remove any variables defined in this graph
         formula = @formulae.pop
         @variables.delete_if {|k, v| v[:formula] == formula}
         add_prod_data(:symbol, formula)
@@ -482,7 +484,7 @@ module RDF::N3
       verb = @prod_data.pop
       if verb[:expression]
         error("Literal may not be used as a predicate") if verb[:expression].is_a?(RDF::Literal)
-        error("Formula may not be used as a peredicate") if verb[:expression].is_a?(RDF::Graph)
+        error("Formula may not be used as a peredicate") if @formulae_nodes.has_key?(verb[:expression])
         add_prod_data(:verb, verb[:expression])
         add_prod_data(:invert, true) if verb[:invert]
       else
@@ -498,26 +500,26 @@ module RDF::N3
 
     def process_anonnode(anonnode)
       add_debug("process_anonnode") {anonnode.inspect}
-      bnode = RDF::Node.new
       
       if anonnode[:propertylist]
         properties = anonnode[:propertylist]
+        bnode = RDF::Node.new
         properties.each do |p|
           predicate = p[:verb]
           add_debug("process_anonnode(verb)") {predicate.inspect}
           objects = [p[:object]].flatten.compact
           objects.each { |object| add_triple("anonnode", bnode, predicate, object) }
         end
+        bnode
       elsif anonnode[:pathlist]
         objects = [anonnode[:pathlist]].flatten.compact
-        list = RDF::List.new(bnode, nil, objects)
+        list = RDF::List[*objects]
         list.each_statement do |statement|
           next if statement.predicate == RDF.type && statement.object == RDF.List
           add_triple("anonnode(list)", statement.subject, statement.predicate, statement.object)
         end
-        bnode = RDF.nil if list.empty?
+        list.subject
       end
-      bnode
     end
 
     # Process a path, such as:
@@ -613,7 +615,7 @@ module RDF::N3
 
     # Add debug event to debug array, if specified
     #
-    # @param [XML Node, any] node XML Node or string for showing context
+    # @param [any] node string for showing context
     # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(node, message = "")
@@ -625,19 +627,16 @@ module RDF::N3
 
     # add a statement, object can be literal or URI or bnode
     #
-    # @param [Nokogiri::XML::Node, any] node XML Node or string for showing context
+    # @param [any] node string for showing context
     # @param [URI, Node] subject the subject of the statement
     # @param [URI] predicate the predicate of the statement
     # @param [URI, Node, Literal] object the object of the statement
     # @return [Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_triple(node, subject, predicate, object)
-      context_opts = {:context => @formulae.last.context} if @formulae.last
+      context_opts = @formulae.last ? {:context => @formulae.last} : {}
       
-      # Replace graph with it's context
-      subject = subject.context if subject.graph?
-      object = object.context if object.graph?
-      statement = RDF::Statement.new(subject, predicate, object, context_opts || {})
+      statement = RDF::Statement.new(subject, predicate, object, context_opts)
       add_debug(node) {statement.to_s}
       @callback.call(statement)
     end

data/lib/rdf/n3/writer.rb

@@ -15,7 +15,6 @@ module RDF::N3
   #   RDF::Writer.for(:file_extension => "n3")
   #   RDF::Writer.for(:file_extension => "ttl")
   #   RDF::Writer.for(:content_type   => "text/n3")
-  #   RDF::Writer.for(:content_type   => "text/turtle")
   #
   # @example Serializing RDF graph into an Turtle file
   #   RDF::N3::Writer.open("etc/test.n3") do |writer|

metadata

@@ -1,169 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-n3
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Gregg
 - Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open-uri-cached
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+- !ruby/object:Gem::Dependency
+  name: open-uri-cached
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: spira
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 0
-        - 12
-        version: 0.0.12
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: json-ld
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdf-rdfxml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdf-turtle
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 description: RDF::N3 is an Notation-3 reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- README.markdown
+files:
+- README.md
 - History.markdown
 - AUTHORS
 - VERSION
@@ -178,41 +161,30 @@ files:
 - lib/rdf/n3/vocab.rb
 - lib/rdf/n3/writer.rb
 - lib/rdf/n3.rb
-homepage: http://github.com/ruby-rdf/rdf-n3
-licenses: 
+homepage: http://ruby-rdf.github.com/rdf-n3
+licenses:
 - Public Domain
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rdf-n3
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Notation3 reader/writer for RDF.rb.
 test_files: []
-
 has_rdoc: false