rdf-trig 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rdf/trig/reader.rb

@@ -25,7 +25,7 @@ module RDF::TriG
     # Productions
     # [3g] graph defines the basic creation of context
     production(:graph) do |reader, phase, input, current, callback|
-      current[:context] = nil
+      callback.call(:context, "graph", nil)
     end
     
     # [4g] graphIri
@@ -35,45 +35,10 @@ module RDF::TriG
       # If input contains set_graph_iri, use the returned value to set @context
       if phase == :finish
         callback.call(:trace, "graphIri", lambda {"Set graph context to #{current[:resource]}"})
-        input[:context] = current[:resource]
+        callback.call(:context, "graphIri", current[:resource])
       end
     end
     
-    # [12] object ::= IRIref | blank | literal
-    production(:object) do |reader, phase, input, current, callback|
-      next unless phase == :finish
-      if input[:object_list]
-        # Part of an rdf:List collection
-        input[:object_list] << current[:resource]
-      else
-        callback.call(:trace, "object", lambda {"current: #{current.inspect}"})
-        callback.call(:statement, "object", input[:subject], input[:predicate], current[:resource], input[:context])
-      end
-    end
-
-    # [16] collection ::= "(" object* ")"
-    production(:collection) do |reader, phase, input, current, callback|
-      if phase == :start
-        current[:object_list] = []  # Tells the object production to collect and not generate statements
-      else
-        # Create an RDF list
-        bnode = reader.bnode
-        objects = current[:object_list]
-        list = RDF::List.new(bnode, nil, objects)
-        list.each_statement do |statement|
-          # Spec Confusion, referenced section "Collection" is missing from the spec.
-          # Anicdodal evidence indicates that some expect each node to be of type rdf:list,
-          # but existing Notation3 and Turtle tests (http://www.w3.org/2001/sw/DataAccess/df1/tests/manifest.ttl) do not.
-          next if statement.predicate == RDF.type && statement.object == RDF.List
-          callback.call(:statement, "collection", statement.subject, statement.predicate, statement.object, input[:context])
-        end
-        bnode = RDF.nil if list.empty?
-
-        # Return bnode as resource
-        input[:resource] = bnode
-      end
-    end
-
     ##
     # Iterates the given block for each RDF statement in the input.
     #
@@ -89,7 +54,11 @@ module RDF::TriG
       ) do |context, *data|
         loc = data.shift
         case context
+        when :context
+          @context = data[0]
         when :statement
+          data << @context if @context
+          debug("each_statement") {"data: #{data.inspect}, context: #{@context.inspect}"}
           add_statement(loc, RDF::Statement.from(data))
         when :trace
           debug(loc, *data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trig
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-05-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &2164497940 !ruby/object:Gem::Requirement
+  requirement: &70113874716740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164497940
+  version_requirements: *70113874716740
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &2164497480 !ruby/object:Gem::Requirement
+  requirement: &70113874716240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164497480
+  version_requirements: *70113874716240
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &2164497020 !ruby/object:Gem::Requirement
+  requirement: &70113874715740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *2164497020
+  version_requirements: *70113874715740
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &2164496560 !ruby/object:Gem::Requirement
+  requirement: &70113874715220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *2164496560
+  version_requirements: *70113874715220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164496100 !ruby/object:Gem::Requirement
+  requirement: &70113874714760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2164496100
+  version_requirements: *70113874714760
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
-  requirement: &2164495640 !ruby/object:Gem::Requirement
+  requirement: &70113874714260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +76,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2164495640
-- !ruby/object:Gem::Dependency
-  name: rdf-n3
-  requirement: &2164495180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :development
-  prerelease: false
-  version_requirements: *2164495180
+  version_requirements: *70113874714260
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &2164494720 !ruby/object:Gem::Requirement
+  requirement: &70113874713780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2164494720
+  version_requirements: *70113874713780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164494260 !ruby/object:Gem::Requirement
+  requirement: &70113874713280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164494260
+  version_requirements: *70113874713280
 description: RDF::TriG is an TriG reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -148,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-trig
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: TriG reader/writer for Ruby.