rdf-trix 1.1.0.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147cdb2e02fe4edfcd27d30489737d24a515c5dc
-  data.tar.gz: d0afbd93a45315a1e631bfd911591dc90284b7c5
+  metadata.gz: da8741a141629c95c4a59c8bc20199b72e2e76dd
+  data.tar.gz: 6b042b85dacae9bc0b0b11e80678113ca274b504
 SHA512:
-  metadata.gz: 1d78b6f700492b541bf56a115a6336179e5341be90b719199a1bb402278793038f458b012c6ba16970b6680d1c5caf7af5e9de68bdd5f980632c68863b521a49
-  data.tar.gz: 6bf0255b66b73755b8e0f30395afa3b6983edd3c0005f27bb2e43e9bcd1a3d133d6216488c9c7a9840c001ad5cfbd0ccedbe11cecb366743371e8d2be433a8a6
+  metadata.gz: af098f72570473df003bd2596d5c6ed4bf396c3bfac325d80c0b69592ae6b38115a086a0b2b4e31447ef9bbb97d4d4afef975b3abf37b38f3cea704dbe163630
+  data.tar.gz: 24213449a5a9883db54aade7ec03a3cfe78de923b8a84c6765d3000b26edd8f22edbe19c0b682854ec5cbcd0daefe2f2e3ea1299935ed6518e6f89ede71d3300

data/VERSION

@@ -1 +1 @@
-1.1.0.1
+1.99.0

data/lib/rdf/trix/reader/libxml.rb

@@ -23,8 +23,8 @@ module RDF::TriX
       def initialize_xml(options = {})
         require 'libxml' unless defined?(::LibXML)
         @xml = case @input
-          when File   then ::LibXML::XML::Document.file(@input.path)
-          when IO     then ::LibXML::XML::Document.io(@input)
+          when File         then ::LibXML::XML::Document.file(@input.path)
+          when IO, StringIO then ::LibXML::XML::Document.io(@input)
           else ::LibXML::XML::Document.string(@input.to_s)
         end
       end
@@ -35,7 +35,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.find('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -59,7 +59,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.children.select { |node| node.element? && node.name.to_s == 'uri' }.first.content.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -67,7 +67,7 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        context = read_graph(graph_element)
         graph_element.find('./trix:triple', OPTIONS).each do |triple_element|
           triple = triple_element.children.select { |node| node.element? }[0..2]
           triple = triple.map { |element| parse_element(element.name, element.attributes, element.content) }

data/lib/rdf/trix/reader/nokogiri.rb

@@ -31,7 +31,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -55,7 +55,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.children.select { |node| node.element? && node.name.to_s == 'uri' }.first.content.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -63,7 +63,7 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        context = read_graph(graph_element)
         graph_element.xpath('./trix:triple', OPTIONS).each do |triple_element|
           triple = triple_element.children.select { |node| node.element? }[0..2]
           triple = triple.map { |element| parse_element(element.name, element, element.content) }

data/lib/rdf/trix/reader/rexml.rb

@@ -31,7 +31,7 @@ module RDF::TriX
       def each_graph(&block)
         if block_given?
           @xml.elements.each('TriX/graph') do |graph_element|
-            graph = RDF::Graph.new(read_context(graph_element))
+            graph = RDF::Graph.new(read_graph(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
@@ -55,7 +55,7 @@ module RDF::TriX
 
       ##
       # @private
-      def read_context(graph_element)
+      def read_graph(graph_element)
         name = graph_element.elements.select { |element| element.name.to_s == 'uri' }.first.text.strip rescue nil
         name ? RDF::URI.intern(name) : nil
       end
@@ -63,7 +63,7 @@ module RDF::TriX
       ##
       # @private
       def read_statements(graph_element, &block)
-        context = read_context(graph_element)
+        context = read_graph(graph_element)
         graph_element.elements.each('triple') do |triple_element|
           triple = triple_element.elements.to_a[0..2]
           triple = triple.map { |element| parse_element(element.name, element.attributes, element.text) }

data/lib/rdf/trix/writer.rb

@@ -53,10 +53,10 @@ module RDF::TriX
     attr_reader :implementation
 
     ##
-    # Returns the current named graph context, if any.
+    # Returns the current graph_name, if any.
     #
     # @return [RDF::Resource]
-    attr_reader :context
+    attr_reader :graph_name
 
     ##
     # Initializes the TriX writer instance.
@@ -71,7 +71,7 @@ module RDF::TriX
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void] ignored
     def initialize(output = $stdout, options = {}, &block)
-      @context = nil
+      @graph_name = nil
       @nesting = 0
 
       @library = case options[:library]
@@ -109,7 +109,7 @@ module RDF::TriX
     end
 
     ##
-    # Defines a named graph context.
+    # Defines a named graph.
     #
     # @param  [RDF::Resource] name
     # @yield  [writer]
@@ -117,7 +117,7 @@ module RDF::TriX
     # @return [void]
     def graph(name = nil, &block)
       @nesting += 1
-      @graph = create_graph(@context = name)
+      @graph = create_graph(@graph_name = name)
       if block_given?
         case block.arity
           when 1 then block.call(self)
@@ -148,23 +148,14 @@ module RDF::TriX
       (@graph || @trix) << create_comment(text)
     end
 
-    ##
-    # @private
-    # @see    RDF::Writer#write_graph
-    # @since  0.2.0
-    def write_graph(graph)
-      @graph = create_graph(@context = graph.context)
-      graph.each_triple { |*triple| write_triple(*triple) }
-    end
-
     ##
     # Generates the TriX representation of an RDF statement.
     #
     # @param  [RDF::Statement] statement
     # @return [void]
     def write_statement(statement)
-      unless nested? || statement.context.to_s == @context.to_s
-        @graph = create_graph(@context = statement.context)
+      unless nested? || statement.graph_name.to_s == @graph_name.to_s
+        @graph = create_graph(@graph_name = statement.graph_name)
       end
       write_triple(*statement.to_triple)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trix
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.99.0
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 description: RDF.rb extension for parsing/serializing TriX data.
 email: public-rdf-ruby@w3.org
 executables: []