rdf 1.1.0.p3 → 1.1.0p4

data/lib/rdf/writer.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RDF
   ##
   # The base class for RDF serializers.
@@ -198,7 +199,9 @@ module RDF
     #   the encoding to use on the output stream.
     #   Defaults to the format associated with `content_encoding`.
     # @option options [Boolean]  :canonicalize (false)
-    #   whether to canonicalize literals when serializing
+    #   whether to canonicalize terms when serializing
+    # @option options [Boolean]  :validate (false)
+    #   whether to validate terms when serializing
     # @option options [Hash]     :prefixes     (Hash.new)
     #   the prefix mappings to use (not supported by all writers)
     # @option options [#to_s]    :base_uri     (nil)
@@ -305,6 +308,24 @@ module RDF
       end
     end
 
+    ##
+    # Returns `true` if statements and terms should be validated.
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  1.0.8
+    def validate?
+      @options[:validate]
+    end
+
+    ##
+    # Returns `true` if terms should be canonicalized.
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  1.0.8
+    def canonicalize?
+      @options[:canonicalize]
+    end
+
     ##
     # Flushes the underlying output buffer.
     #
@@ -358,15 +379,21 @@ module RDF
     ##
     # @param  [RDF::Statement] statement
     # @return [void] `self`
+    # @raise [RDF::WriterError] if validating and attempting to write an invalid {RDF::Statement} or if canonicalizing a statement which cannot be canonicalized.
     def write_statement(statement)
+      statement = statement.canonicalize! if canonicalize?
+      raise RDF::WriterError, "Statement #{statement.inspect} is invalid" if validate? && statement.invalid?
       write_triple(*statement.to_triple)
       self
+    rescue ArgumentError => e
+      raise WriterError, e.message
     end
     alias_method :insert_statement, :write_statement # support the RDF::Writable interface
 
     ##
     # @param  [Array<Array(RDF::Resource, RDF::URI, RDF::Term)>] triples
     # @return [void] `self`
+    # @raise [RDF::WriterError] if validating and attempting to write an invalid {RDF::Term}.
     def write_triples(*triples)
       triples.each { |triple| write_triple(*triple) }
       self
@@ -378,6 +405,7 @@ module RDF
     # @param  [RDF::Term]     object
     # @return [void] `self`
     # @raise  [NotImplementedError] unless implemented in subclass
+    # @raise [RDF::WriterError] if validating and attempting to write an invalid {RDF::Term}.
     # @abstract
     def write_triple(subject, predicate, object)
       raise NotImplementedError.new("#{self.class}#write_triple") # override in subclasses
@@ -444,7 +472,7 @@ module RDF
     ##
     # @return [void]
     def puts(*args)
-      @output.puts(*args.map {|s| s.force_encoding(encoding)})
+      @output.puts(*args.map {|s| s.encode!(encoding)})
     end
 
     ##

data/lib/rdf.rb

@@ -5,7 +5,6 @@ require 'bigdecimal'
 require 'date'
 require 'time'
 
-require 'rdf/version'
 require 'rdf/version'
 
 module RDF
@@ -136,8 +135,8 @@ module RDF
 
   ##
   # @return [URI]
-  def self.type
-    self[:type]
+  def self.value
+    self[:value]
   end
 
   ##
@@ -171,6 +170,31 @@ module RDF
     RDF::URI.intern("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
   end
 
+  # RDF Vocabulary terms
+  %w(
+    Alt
+    Bag
+    first
+    HTML
+    langString
+    List
+    nil
+    object
+    predicate
+    Property
+    rest
+    Seq
+    Statement
+    subject
+    type
+    value
+    XMLLiteral
+  ).each do |term|
+    term_uri = self[term.to_sym]
+    define_method(term) {term_uri}
+    module_function term.to_sym
+  end
+
   class << self
     # For compatibility with `RDF::Vocabulary.__name__`:
     alias_method :__name__, :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.p3
+  version: 1.1.0p4
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - lib/rdf/vocab/rdfs.rb
 - lib/rdf/vocab/rsa.rb
 - lib/rdf/vocab/rss.rb
+- lib/rdf/vocab/schema.rb
 - lib/rdf/vocab/sioc.rb
 - lib/rdf/vocab/skos.rb
 - lib/rdf/vocab/wot.rb
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.