rdf-trix 0.2.0 → 0.3.0

data/README

@@ -19,7 +19,7 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.2.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
 * [REXML](http://ruby-doc.org/stdlib/libdoc/rexml/rdoc/) (>= 3.1.7),
   [LibXML-Ruby](http://rubygems.org/gems/libxml-ruby) (>= 1.1.4), or
   [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.4.2)
@@ -39,21 +39,31 @@ To get a local working copy of the development repository, do:
 
     % git clone git://github.com/bendiken/rdf-trix.git
 
-Alternatively, you can download the latest development version as a tarball
-as follows:
+Alternatively, download the latest development version as a tarball as
+follows:
 
     % wget http://github.com/bendiken/rdf-trix/tarball/master
 
+Mailing List
+------------
+
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
 Author
 ------
 
-* [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
+* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
+
+Contributors
+------------
+
+Refer to the accompanying {file:CREDITS} file.
 
 License
 -------
 
-`RDF::TriX` is free and unencumbered public domain software. For more
-information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
+This is free and unencumbered public domain software. For more information,
+see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 [RDF.rb]:   http://rdf.rubyforge.org/
 [TriX]:     http://www.w3.org/2004/03/trix/

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rdf/trix/format.rb

@@ -2,6 +2,9 @@ module RDF::TriX
   ##
   # TriX format specification.
   #
+  # @example Loading TriX format support
+  #   require 'rdf/trix'
+  #
   # @example Obtaining a TriX format class
   #   RDF::Format.for(:trix)         #=> RDF::TriX::Format
   #   RDF::Format.for("etc/doap.xml")
@@ -18,5 +21,5 @@ module RDF::TriX
     writer { RDF::TriX::Writer }
 
     XMLNS = 'http://www.w3.org/2004/03/trix/trix-1/'
-  end # class Format
-end # module RDF::TriX
+  end # Format
+end # RDF::TriX

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

@@ -33,28 +33,26 @@ module RDF::TriX
       # @private
       # @see RDF::Reader#each_graph
       def each_graph(&block)
-        unless block_given?
-          enum_for(:each_graph)
-        else
+        if block_given?
           @xml.find('//trix:graph', OPTIONS).each do |graph_element|
             graph = RDF::Graph.new(read_context(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
         end
+        enum_graph
       end
 
       ##
       # @private
       # @see RDF::Reader#each_statement
       def each_statement(&block)
-        unless block_given?
-          enum_for(:each_statement)
-        else
+        if block_given?
           @xml.find('//trix:graph', OPTIONS).each do |graph_element|
             read_statements(graph_element, &block)
           end
         end
+        enum_statement
       end
 
     protected
@@ -77,6 +75,6 @@ module RDF::TriX
           block.call(RDF::Statement.new(*triple))
         end
       end
-    end # module LibXML
-  end # class Reader
-end # module RDF::TriX
+    end # LibXML
+  end # Reader
+end # RDF::TriX

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

@@ -29,28 +29,26 @@ module RDF::TriX
       # @private
       # @see RDF::Reader#each_graph
       def each_graph(&block)
-        unless block_given?
-          enum_for(:each_graph)
-        else
+        if block_given?
           @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
             graph = RDF::Graph.new(read_context(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
         end
+        enum_graph
       end
 
       ##
       # @private
       # @see RDF::Reader#each_statement
       def each_statement(&block)
-        unless block_given?
-          enum_for(:each_statement)
-        else
+        if block_given?
           @xml.xpath('//trix:graph', OPTIONS).each do |graph_element|
             read_statements(graph_element, &block)
           end
         end
+        enum_statement
       end
 
     protected
@@ -73,6 +71,6 @@ module RDF::TriX
           block.call(RDF::Statement.new(*triple))
         end
       end
-    end # module Nokogiri
-  end # class Reader
-end # module RDF::TriX
+    end # Nokogiri
+  end # Reader
+end # RDF::TriX

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

@@ -29,28 +29,26 @@ module RDF::TriX
       # @private
       # @see RDF::Reader#each_graph
       def each_graph(&block)
-        unless block_given?
-          enum_for(:each_graph)
-        else
+        if block_given?
           @xml.elements.each('TriX/graph') do |graph_element|
             graph = RDF::Graph.new(read_context(graph_element))
             read_statements(graph_element) { |statement| graph << statement }
             block.call(graph)
           end
         end
+        enum_graph
       end
 
       ##
       # @private
       # @see RDF::Reader#each_statement
       def each_statement(&block)
-        unless block_given?
-          enum_for(:each_statement)
-        else
+        if block_given?
           @xml.elements.each('TriX/graph') do |graph_element|
             read_statements(graph_element, &block)
           end
         end
+        enum_statement
       end
 
     protected
@@ -73,6 +71,6 @@ module RDF::TriX
           block.call(RDF::Statement.new(*triple))
         end
       end
-    end # module REXML
-  end # class Reader
-end # module RDF::TriX
+    end # REXML
+  end # Reader
+end # RDF::TriX

data/lib/rdf/trix/reader.rb

@@ -12,6 +12,9 @@ module RDF::TriX
   # [LibXML]:   http://libxml.rubyforge.org/rdoc/
   # [Nokogiri]: http://nokogiri.org/
   #
+  # @example Loading TriX parsing support
+  #   require 'rdf/trix'
+  #
   # @example Obtaining a TriX reader class
   #   RDF::Reader.for(:trix)         #=> RDF::TriX::Reader
   #   RDF::Reader.for("etc/doap.xml")
@@ -56,11 +59,13 @@ module RDF::TriX
     ##
     # Initializes the TriX reader instance.
     #
-    # @param  [IO, File, String]       input
+    # @param  [IO, File, String] input
     # @param  [Hash{Symbol => Object}] options
-    # @option options [Symbol]         :library (:nokogiri, :libxml, or :rexml)
-    # @yield  [reader]
-    # @yieldparam [Reader] reader
+    #   any additional options (see `RDF::Reader#initialize`)
+    # @option options [Symbol] :library (:nokogiri, :libxml, or :rexml)
+    # @yield  [reader] `self`
+    # @yieldparam  [RDF::Reader] reader
+    # @yieldreturn [void] ignored
     def initialize(input = $stdin, options = {}, &block)
       super do
         @library = case options[:library]
@@ -92,7 +97,12 @@ module RDF::TriX
         self.extend(@implementation)
 
         initialize_xml(options)
-        block.call(self) if block_given?
+        if block_given?
+          case block.arity
+            when 0 then instance_eval(&block)
+            else block.call(self)
+          end
+        end
       end
     end
 
@@ -100,32 +110,30 @@ module RDF::TriX
     # @private
     # @see RDF::Reader#each_triple
     def each_triple(&block)
-      unless block_given?
-        enum_for(:each_triple)
-      else
+      if block_given?
         each_statement do |statement|
           block.call(*statement.to_triple)
         end
       end
+      enum_triple
     end
 
     ##
     # @private
     # @see RDF::Reader#each_quad
     def each_quad(&block)
-      unless block_given?
-        enum_for(:each_quad)
-      else
+      if block_given?
         each_statement do |statement|
           block.call(*statement.to_quad)
         end
       end
+      enum_quad
     end
 
     ##
     # Returns the RDF value of the given TriX element.
     #
-    # @param  [String]                 name
+    # @param  [String] name
     # @param  [Hash{String => Object}] attributes
     # @param  [String] content
     # @return [RDF::Value]
@@ -134,18 +142,28 @@ module RDF::TriX
         when :id
           RDF::Node.new(content.strip)
         when :uri
-          RDF::URI.new(content.strip)
+          uri = RDF::URI.new(content.strip) # TODO: interned URIs
+          uri.validate!     if validate?
+          uri.canonicalize! if canonicalize?
+          uri
         when :typedLiteral
-          RDF::Literal.new(content, :datatype => attributes['datatype'])
+          literal = RDF::Literal.new(content, :datatype => attributes['datatype'])
+          literal.validate!     if validate?
+          literal.canonicalize! if canonicalize?
+          literal
         when :plainLiteral
-          if lang = attributes['xml:lang'] || attributes['lang']
-            RDF::Literal.new(content, :language => lang)
-          else
-            RDF::Literal.new(content)
+          literal = case
+            when lang = attributes['xml:lang'] || attributes['lang']
+              RDF::Literal.new(content, :language => lang)
+            else
+              RDF::Literal.new(content)
           end
+          literal.validate!     if validate?
+          literal.canonicalize! if canonicalize?
+          literal
         else
-          # TODO: raise error
+          raise RDF::ReaderError, "expected element name to be 'id', 'uri', 'typedLiteral', or 'plainLiteral', but got #{name.inspect}"
       end
     end
-  end # class Reader
-end # module RDF::TriX
+  end # Reader
+end # RDF::TriX

data/lib/rdf/trix/version.rb

@@ -1,7 +1,7 @@
 module RDF module TriX
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
     EXTRA = nil
 

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

@@ -88,6 +88,6 @@ module RDF::TriX
         block.call(element) if block_given?
         element
       end
-    end # module Nokogiri
-  end # class Writer
-end # module RDF::TriX
+    end # Nokogiri
+  end # Writer
+end # RDF::TriX

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

@@ -88,6 +88,6 @@ module RDF::TriX
         block.call(element) if block_given?
         element
       end
-    end # module REXML
-  end # class Writer
-end # module RDF::TriX
+    end # REXML
+  end # Writer
+end # RDF::TriX

data/lib/rdf/trix/writer.rb

@@ -12,6 +12,9 @@ module RDF::TriX
   # [LibXML]:   http://libxml.rubyforge.org/rdoc/
   # [Nokogiri]: http://nokogiri.org/
   #
+  # @example Loading TriX serialization support
+  #   require 'rdf/trix'
+  #
   # @example Obtaining a TriX writer class
   #   RDF::Writer.for(:trix)         #=> RDF::TriX::Writer
   #   RDF::Writer.for("etc/test.xml")
@@ -58,13 +61,15 @@ module RDF::TriX
     ##
     # Initializes the TriX writer instance.
     #
-    # @param  [IO, File]               output
+    # @param  [IO, File] output
     # @param  [Hash{Symbol => Object}] options
+    #   any additional options (see `RDF::Writer#initialize`)
     # @option options [Symbol]         :library  (:nokogiri or :rexml)
     # @option options [String, #to_s]  :encoding ('utf-8')
     # @option options [Integer]        :indent   (2)
-    # @yield  [writer]
-    # @yieldparam [Writer] writer
+    # @yield  [writer] `self`
+    # @yieldparam  [RDF::Writer] writer
+    # @yieldreturn [void] ignored
     def initialize(output = $stdout, options = {}, &block)
       @context = nil
       @nesting = 0
@@ -219,7 +224,6 @@ module RDF::TriX
     # @param  [Hash{Symbol => Object}]      options
     # @return [Element]
     def format_literal(value, options = {})
-      value = RDF::Literal.new(value) unless value.is_a?(RDF::Literal) # FIXME: remove after RDF.rb 0.2.1
       case
         when value.has_datatype?
           create_element(:typedLiteral, value.value.to_s, 'datatype' => value.datatype.to_s)
@@ -229,8 +233,5 @@ module RDF::TriX
           create_element(:plainLiteral, value.value.to_s)
       end
     end
-
-    alias_method :insert_graph,     :write_graph     # FIXME: remove after RDF.rb 0.2.1
-    alias_method :insert_statement, :write_statement # FIXME: remove after RDF.rb 0.2.1
-  end # class Writer
-end # module RDF::TriX
+  end # Writer
+end # RDF::TriX

data/lib/rdf/trix.rb

@@ -1,4 +1,4 @@
-require 'rdf'
+require 'rdf' # @see http://rubygems.org/gems/rdf
 
 module RDF
   ##
@@ -32,5 +32,5 @@ module RDF
     autoload :Reader,  'rdf/trix/reader'
     autoload :Writer,  'rdf/trix/writer'
     autoload :VERSION, 'rdf/trix/version'
-  end # module TriX
-end # module RDF
+  end # TriX
+end # RDF

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +02:00
+date: 2010-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -82,9 +82,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
         - 6
-        version: 0.5.6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -95,10 +95,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: 2.1.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -110,9 +110,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   version_requirements: *id007
 description: RDF.rb plugin for parsing/serializing TriX data.
@@ -125,6 +125,7 @@ extra_rdoc_files: []
 
 files: 
 - AUTHORS
+- CREDITS
 - README
 - UNLICENSE
 - VERSION
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- REXML (>= 3.1.7), LibXML-Ruby (>= 1.1.4) or Nokogiri (>= 1.4.2)
+- REXML (>= 3.1.7), LibXML-Ruby (>= 1.1.4), or Nokogiri (>= 1.4.2)
 rubyforge_project: rdf
 rubygems_version: 1.3.6
 signing_key: