rdf 1.1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c8571664914321e0f474aee4a4f81b0e303bf4
-  data.tar.gz: 1dcccdce4b1396acab2adcb0d65d8d650e6a89c5
+  metadata.gz: 103746563b943a055874ff834ecb5dfc5f2799af
+  data.tar.gz: 2041f3080c55e3d276912dd02572642f796687c7
 SHA512:
-  metadata.gz: 26f678c74a88cb7aaf3ad2b964005f5362937b8b130ca5200dd8860b125d02aef3a49cb275fe318600ac7bcffb8a1ee45d53fc7b6901a735aa4d592ca6fa60f5
-  data.tar.gz: cdf1ad2fbf9cf7f61aaac9e6e684768ef81fdcf0960697e9105b10218713878dd514bc63f1de8be1ade63e7107448219def7fd2309188d3123d48359f05e4506
+  metadata.gz: c144b4120b8762714fd9aed3a832378238bf3fcb70067f3a5d236ad9e2e3ed3343ef12a9841ff8774d9b3e23fddf924ce49168cecdf5fae8e40e73fcc9634365
+  data.tar.gz: 76a75cb6ea42718f3eac37080c7aebf46ab5d256330d7650a61f38b5464175e70a06307bad4db100f56258f8188c3ce369d877df43bfc99e528c08a1e7eacfe8

data/VERSION

@@ -1 +1 @@
-1.1.0.1
+1.1.1

data/lib/rdf/nquads.rb

@@ -83,7 +83,7 @@ module RDF
               object    = read_uriref || read_node || read_literal || fail_object
               context    = read_uriref || read_node
               if validate? && !read_eos
-                raise RDF::ReaderError, "expected end of statement in line #{lineno}: #{current_line.inspect}"
+                raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected end of statement (found: #{current_line.inspect})")
               end
               return [subject, predicate, object, {:context => context}]
             end

data/lib/rdf/ntriples/reader.rb

@@ -212,7 +212,8 @@ module RDF::NTriples
             object    = read_uriref || read_node || read_literal || fail_object
 
             if validate? && !read_eos
-              raise RDF::ReaderError, "expected end of statement in line #{lineno}: #{current_line.inspect}"
+              raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected end of statement (found: #{current_line.inspect})",
+                                         lineno: lineno)
             end
             return [subject, predicate, object]
           end
@@ -238,12 +239,11 @@ module RDF::NTriples
         uri_str = self.class.unescape(uri_str)
         uri = RDF::URI.send(intern? && options[:intern] ? :intern : :new, uri_str)
         uri.validate!     if validate?
-        raise RDF::ReaderError, "uri not absolute" if validate? && !uri.absolute?
         uri.canonicalize! if canonicalize?
         uri
       end
     rescue ArgumentError => e
-      raise RDF::ReaderError, "invalid URI"
+      raise RDF::ReaderError.new("ERROR [line #{lineno}] Invalid URI (found: \"<#{uri_str}>\")", lineno: lineno, token: "<#{uri_str}>")
     end
 
     ##

data/lib/rdf/reader.rb

@@ -398,7 +398,8 @@ module RDF
     # @return [void]
     # @raise  [RDF::ReaderError]
     def fail_subject
-      raise RDF::ReaderError, "expected subject in line #{lineno}: #{current_line.inspect}"
+      raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected subject (found: #{current_line.inspect})",
+                                 lineno: lineno)
     end
 
     ##
@@ -407,7 +408,8 @@ module RDF
     # @return [void]
     # @raise  [RDF::ReaderError]
     def fail_predicate
-      raise RDF::ReaderError, "expected predicate in line #{lineno}: #{current_line.inspect}"
+      raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected predicate (found: #{current_line.inspect})",
+                                 lineno: lineno)
     end
 
     ##
@@ -416,7 +418,8 @@ module RDF
     # @return [void]
     # @raise  [RDF::ReaderError]
     def fail_object
-      raise RDF::ReaderError, "expected object in line #{lineno}: #{current_line.inspect}"
+      raise RDF::ReaderError.new("ERROR [line #{lineno}] Expected object (found: #{current_line.inspect})",
+                                 lineno: lineno)
     end
 
     ##
@@ -526,5 +529,29 @@ module RDF
   ##
   # The base class for RDF parsing errors.
   class ReaderError < IOError
+    ##
+    # The invalid token which triggered the error.
+    #
+    # @return [String]
+    attr_reader :token
+
+    ##
+    # The line number where the error occurred.
+    #
+    # @return [Integer]
+    attr_reader :lineno
+
+    ##
+    # Initializes a new lexer error instance.
+    #
+    # @param  [String, #to_s]          message
+    # @param  [Hash{Symbol => Object}] options
+    # @option options [String]         :token  (nil)
+    # @option options [Integer]        :lineno (nil)
+    def initialize(message, options = {})
+      @token      = options[:token]
+      @lineno     = options[:lineno] || (@token.lineno if @token.respond_to?(:lineno))
+      super(message.to_s)
+    end
   end # ReaderError
 end # RDF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec