rdf 1.1.17.1 → 1.99.0

data/lib/rdf/query/pattern.rb

@@ -6,10 +6,14 @@ module RDF; class Query
     # @private
     # @since 0.2.2
     def self.from(pattern, options = {})
+      if options.has_key?(:context)
+        warn "[DEPRECATION] the :contexts option to Pattern.from is deprecated in RDF.rb 2.0, use :graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+        options[:graph_name] ||= options.delete(:context)
+      end
       case pattern
         when Pattern then pattern
         when Array, Statement
-          self.new(pattern[0], pattern[1], pattern[2], options.merge(:context => pattern[3]))
+          self.new(pattern[0], pattern[1], pattern[2], options.merge(graph_name: pattern[3]))
         when Hash    then self.new(options.merge(pattern))
         else raise ArgumentError, "expected RDF::Query::Pattern, RDF::Statement, Hash, or Array, but got #{pattern.inspect}"
       end
@@ -23,6 +27,9 @@ module RDF; class Query
     #   @option options [Variable, Term, Symbol, nil]     :object    (nil)
     #   @option options [Variable, Resource, Symbol, nil, false] :context   (nil)
     #     A context of nil matches any context, a context of false, matches only the default context.
+    #     The :context option is deprecated in RDF.rb 2.0. Use :graph_name instead.
+    #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
     #   @option options [Boolean]            :optional  (false)
     #
     # @overload initialize(subject, predicate, object, options = {})
@@ -32,20 +39,27 @@ module RDF; class Query
     #   @param  [Hash{Symbol => Object}]          options
     #   @option options [Variable, Resource, Symbol, nil, false] :context   (nil)
     #     A context of nil matches any context, a context of false, matches only the default context.
+    #     The :context option is deprecated in RDF.rb 2.0. Use :graph_name instead.
+    #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
     #   @option options [Boolean]                 :optional  (false)
     #
     # @note {Statement} treats symbols as interned {Node} instances, in a {Pattern}, they are treated as {Variable}.
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
+      if options.has_key?(:context)
+        warn "[DEPRECATION] the :contexts option to Pattern#initialize is deprecated in RDF.rb 2.0, use :graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+        options[:graph_name] ||= options.delete(:context)
+      end
       super
     end
 
     ##
     # @private
     def initialize!
-      @context   = Variable.new(@context)   if @context.is_a?(Symbol)
-      @subject   = Variable.new(@subject)   if @subject.is_a?(Symbol)
-      @predicate = Variable.new(@predicate) if @predicate.is_a?(Symbol)
-      @object    = Variable.new(@object)    if @object.is_a?(Symbol)
+      @graph_name = Variable.new(@graph_name) if @graph_name.is_a?(Symbol)
+      @subject    = Variable.new(@subject)    if @subject.is_a?(Symbol)
+      @predicate  = Variable.new(@predicate)  if @predicate.is_a?(Symbol)
+      @object     = Variable.new(@object)     if @object.is_a?(Symbol)
       super
     end
 
@@ -67,7 +81,7 @@ module RDF; class Query
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
     def blank?
-      subject.nil? && predicate.nil? && object.nil? && context.nil?
+      subject.nil? && predicate.nil? && object.nil? && graph_name.nil?
     end
 
     ##
@@ -79,7 +93,7 @@ module RDF; class Query
       subject.is_a?(Variable) ||
         predicate.is_a?(Variable) ||
         object.is_a?(Variable) ||
-        context.is_a?(Variable)
+        graph_name.is_a?(Variable)
     end
     alias_method :variables?, :has_variables?
 
@@ -88,7 +102,7 @@ module RDF; class Query
     #
     # @example
     #   Pattern.new(:s, :p, :o).optional?                     #=> false
-    #   Pattern.new(:s, :p, :o, :optional => true).optional?  #=> true
+    #   Pattern.new(:s, :p, :o, optional: true).optional?  #=> true
     #
     # @return [Boolean] `true` or `false`
     # @since  0.3.0
@@ -104,7 +118,7 @@ module RDF; class Query
       (has_subject?   ? (subject.resource? || subject.variable?) && subject.valid? : true) && 
       (has_predicate? ? (predicate.uri? || predicate.variable?) && predicate.valid? : true) &&
       (has_object?    ? (object.term? || object.variable?) && object.valid? : true) &&
-      (has_context?   ? (context.resource? || context.variable?) && context.valid? : true )
+      (has_graph?     ? (graph_name.resource? || graph_name.variable?) && graph_name.valid? : true )
     rescue NoMethodError
       false
     end
@@ -117,7 +131,7 @@ module RDF; class Query
     # If the optional `bindings` are given, variables will be substituted with their values
     # when executing the query.
     #
-    # To match triples only in the default context, set context to `false`.
+    # To match triples only in the default graph, set graph_name to `false`.
     #
     # @example
     #   Pattern.new(:s, :p, :o).execute(RDF::Repository.load('etc/doap.nt'))
@@ -130,16 +144,16 @@ module RDF; class Query
     #   each matching statement
     # @yieldparam [RDF::Statement] statement
     #   an RDF statement matching this pattern
-    # @return [Enumerator]
+    # @return [Enumerable<RDF::Query::Pattern>]
     #   an enumerator yielding matching statements
     # @see    RDF::Queryable#query
     # @since  0.3.0
     def execute(queryable, bindings = {}, &block)
       query = {
-        :subject   => subject.is_a?(Variable)   && bindings[subject.to_sym]   ? bindings[subject.to_sym]   : subject,
-        :predicate => predicate.is_a?(Variable) && bindings[predicate.to_sym] ? bindings[predicate.to_sym] : predicate,
-        :object    => object.is_a?(Variable)    && bindings[object.to_sym]    ? bindings[object.to_sym]    : object,
-        :context   => context.is_a?(Variable)   && bindings[context.to_sym]   ? bindings[context.to_sym]   : context,
+        subject:    subject.is_a?(Variable)     && bindings[subject.to_sym]     ? bindings[subject.to_sym]    : subject,
+        predicate:  predicate.is_a?(Variable)   && bindings[predicate.to_sym]   ? bindings[predicate.to_sym]  : predicate,
+        object:     object.is_a?(Variable)      && bindings[object.to_sym]      ? bindings[object.to_sym]     : object,
+        graph_name: graph_name.is_a?(Variable)  && bindings[graph_name.to_sym]  ? bindings[graph_name.to_sym] : graph_name,
       }.delete_if{|k,v| v.nil?}
 
       # Do all the variable terms refer to distinct variables?
@@ -185,10 +199,10 @@ module RDF; class Query
     # @since  0.3.0
     def solution(statement)
       RDF::Query::Solution.new do |solution|
-        solution[subject.to_sym]   = statement.subject   if subject.is_a?(Variable)
-        solution[predicate.to_sym] = statement.predicate if predicate.is_a?(Variable)
-        solution[object.to_sym]    = statement.object    if object.is_a?(Variable)
-        solution[context.to_sym]   = statement.context   if context.is_a?(Variable)
+        solution[subject.to_sym]    = statement.subject    if subject.is_a?(Variable)
+        solution[predicate.to_sym]  = statement.predicate  if predicate.is_a?(Variable)
+        solution[object.to_sym]     = statement.object     if object.is_a?(Variable)
+        solution[graph_name.to_sym] = statement.graph_name if graph_name.is_a?(Variable)
       end
     end
 
@@ -204,10 +218,10 @@ module RDF; class Query
     # @since  0.3.0
     def variable_terms(name = nil)
       terms = []
-      terms << :subject   if subject.is_a?(Variable)   && (!name || name.eql?(subject.name))
-      terms << :predicate if predicate.is_a?(Variable) && (!name || name.eql?(predicate.name))
-      terms << :object    if object.is_a?(Variable)    && (!name || name.eql?(object.name))
-      terms << :context   if context.is_a?(Variable)   && (!name || name.eql?(context.name))
+      terms << :subject    if subject.is_a?(Variable)    && (!name || name.eql?(subject.name))
+      terms << :predicate  if predicate.is_a?(Variable)  && (!name || name.eql?(predicate.name))
+      terms << :object     if object.is_a?(Variable)     && (!name || name.eql?(object.name))
+      terms << :graph_name if graph_name.is_a?(Variable) && (!name || name.eql?(graph_name.name))
       terms
     end
 
@@ -223,7 +237,7 @@ module RDF; class Query
       count += 1 if subject.is_a?(Variable)
       count += 1 if predicate.is_a?(Variable)
       count += 1 if object.is_a?(Variable)
-      count += 1 if context.is_a?(Variable)
+      count += 1 if graph_name.is_a?(Variable)
       count
     end
     alias_method :cardinality, :variable_count
@@ -237,10 +251,10 @@ module RDF; class Query
     # @return [Hash{Symbol => Variable}]
     def variables
       variables = {}
-      variables.merge!(subject.variables)   if subject.is_a?(Variable)
-      variables.merge!(predicate.variables) if predicate.is_a?(Variable)
-      variables.merge!(object.variables)    if object.is_a?(Variable)
-      variables.merge!(context.variables)   if context.is_a?(Variable)
+      variables.merge!(subject.variables)    if subject.is_a?(Variable)
+      variables.merge!(predicate.variables)  if predicate.is_a?(Variable)
+      variables.merge!(object.variables)     if object.is_a?(Variable)
+      variables.merge!(graph_name.variables) if graph_name.is_a?(Variable)
       variables
     end
 
@@ -280,10 +294,10 @@ module RDF; class Query
     # @return [Hash{Symbol => RDF::Term}]
     def bindings
       bindings = {}
-      bindings.merge!(subject.bindings)   if subject.is_a?(Variable)
-      bindings.merge!(predicate.bindings) if predicate.is_a?(Variable)
-      bindings.merge!(object.bindings)    if object.is_a?(Variable)
-      bindings.merge!(context.bindings)   if context.is_a?(Variable)
+      bindings.merge!(subject.bindings)    if subject.is_a?(Variable)
+      bindings.merge!(predicate.bindings)  if predicate.is_a?(Variable)
+      bindings.merge!(object.bindings)     if object.is_a?(Variable)
+      bindings.merge!(graph_name.bindings) if graph_name.is_a?(Variable)
       bindings
     end
 
@@ -329,10 +343,10 @@ module RDF; class Query
         buffer << [subject, predicate, object].map do |r|
           r.is_a?(RDF::Query::Variable) ? r.to_s : RDF::NTriples.serialize(r)
         end.join(" ")
-        buffer << case context
+        buffer << case graph_name
           when nil, false then " ."
-          when Variable then " #{context.to_s} ."
-          else " #{RDF::NTriples.serialize(context)} ."
+          when Variable then " #{graph_name.to_s} ."
+          else " #{RDF::NTriples.serialize(graph_name)} ."
         end
         buffer.string
       end

data/lib/rdf/query/solution.rb

@@ -18,7 +18,7 @@ class RDF::Query
   #   solution.mbox
   #
   # @example Retrieving all bindings in the solution as a `Hash`
-  #   solution.to_hash       #=> {:mbox => "jrhacker@example.org", ...}
+  #   solution.to_hash       #=> {mbox: "jrhacker@example.org", ...}
   #
   class Solution
     # Undefine all superfluous instance methods:

data/lib/rdf/query/solutions.rb

@@ -3,10 +3,10 @@ module RDF; class Query
   # An RDF basic graph pattern (BGP) query solution sequence.
   #
   # @example Filtering solutions using a hash
-  #   solutions.filter(:author  => RDF::URI("http://ar.to/#self"))
-  #   solutions.filter(:author  => "Gregg Kellogg")
-  #   solutions.filter(:author  => [RDF::URI("http://ar.to/#self"), "Gregg Kellogg"])
-  #   solutions.filter(:updated => RDF::Literal(Date.today))
+  #   solutions.filter(author:  RDF::URI("http://ar.to/#self"))
+  #   solutions.filter(author:  "Gregg Kellogg")
+  #   solutions.filter(author:  [RDF::URI("http://ar.to/#self"), "Gregg Kellogg"])
+  #   solutions.filter(updated: RDF::Literal(Date.today))
   #
   # @example Filtering solutions using a block
   #   solutions.filter { |solution| solution.author.literal? }

data/lib/rdf/query.rb

@@ -3,10 +3,10 @@ module RDF
   # An RDF basic graph pattern (BGP) query.
   #
   # Named queries either match against a specifically named
-  # contexts if the name is an RDF::Resource or bound RDF::Query::Variable.
+  # graph if the name is an RDF::Resource or bound RDF::Query::Variable.
   # Names that are against unbound variables match either default
-  # or named contexts.
-  # The name of `false` will only match against the default context.
+  # or named graphs.
+  # The name of `false` will only match against the default graph.
   #
   # Variable names cause the variable to be added to the solution set
   # elements.
@@ -20,7 +20,7 @@ module RDF
   #
   # @example Constructing a basic graph pattern query (2)
   #   query = RDF::Query.new({
-  #     :person => {
+  #     person: {
   #       RDF.type  => FOAF.Person,
   #       FOAF.name => :name,
   #       FOAF.mbox => :email,
@@ -40,7 +40,7 @@ module RDF
   #
   # @example Constructing and executing a query in one go (2)
   #   solutions = RDF::Query.execute(graph, {
-  #     :person => {
+  #     person: {
   #       RDF.type => FOAF.Person,
   #     }
   #   })
@@ -147,15 +147,17 @@ module RDF
     #   @param  [Hash{Symbol => Object}] options
     #     any additional keyword options
     #   @option options [RDF::Query::Solutions] :solutions (Solutions.new)
-    #   @option options [RDF::Resource, RDF::Query::Variable, false] :context (nil)
-    #     Default context for matching against queryable.
+    #   @option options [RDF::Resource, RDF::Query::Variable, false] :graph_name (nil)
+    #     Default graph name for matching against queryable.
     #     Named queries either match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
     #     Names that are against unbound variables match either default
     #     or named graphs.
-    #     The name of `false` will only match against the default context.
+    #     The name of `false` will only match against the default graph.
+    #   @option options [RDF::Resource, RDF::Query::Variable, false] :context (nil)
+    #     Alias for `:graph_name`. The :context option is deprecated in RDF.rb 2.0.
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :name (nil)
-    #     Alias for `:context`.
+    #     Alias for `:graph_name`.
     #   @yield  [query]
     #   @yieldparam  [RDF::Query] query
     #   @yieldreturn [void] ignored
@@ -166,24 +168,31 @@ module RDF
     #   @param  [Hash{Symbol => Object}] options
     #     any additional keyword options
     #   @option options [RDF::Query::Solutions] :solutions (Solutions.new)
-    #   @option options [RDF::Resource, RDF::Query::Variable, false] :context (nil)
-    #     Default context for matching against queryable.
+    #   @option options [RDF::Resource, RDF::Query::Variable, false] :graph_name (nil)
+    #     Default graph name for matching against queryable.
     #     Named queries either match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
     #     Names that are against unbound variables match either default
     #     or named graphs.
+    #     The name of `false` will only match against the default graph.
+    #   @option options [RDF::Resource, RDF::Query::Variable, false] :context (nil)
+    #     Alias for `:graph_name`. The :context option is deprecated in RDF.rb 2.0.
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :name (nil)
-    #     Alias for `:context`.
+    #     Alias for `:graph_name`.
     #   @yield  [query]
     #   @yieldparam  [RDF::Query] query
     #   @yieldreturn [void] ignored
     def initialize(*patterns, &block)
       @options  = patterns.last.is_a?(Hash) ? patterns.pop.dup : {}
+      if @options.has_key?(:context)
+        warn "[DEPRECATION] the :contexts option to Query#initialize is deprecated in RDF.rb 2.0, use :graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+        @options[:graph_name] ||= options.delete(:context)
+      end
       patterns << @options if patterns.empty?
       @variables = {}
       @solutions = Query::Solutions(@options.delete(:solutions))
-      context = @options.fetch(:context, @options.fetch(:name, nil))
-      @options.delete(:context)
+      graph_name = @options.fetch(:graph_name, @options.fetch(:name, nil))
+      @options.delete(:graph_name)
       @options.delete(:name)
 
       @patterns  = case patterns.first
@@ -192,7 +201,7 @@ module RDF
         else patterns
       end
 
-      self.context = context
+      self.graph_name = graph_name
 
       if block_given?
         case block.arity
@@ -245,7 +254,7 @@ module RDF
     #
     # @param  [Hash{Symbol => Object}] options
     #   any additional options for optimization
-    # @return [void] `self`
+    # @return [self]
     # @see    RDF::Query::Pattern#cost
     # @since  0.3.0
     def optimize!(options = {})
@@ -259,10 +268,10 @@ module RDF
     # Executes this query on the given `queryable` graph or repository.
     #
     # Named queries either match against a specifically named
-    # contexts if the name is an RDF::Resource or bound RDF::Query::Variable.
+    # graphs if the name is an RDF::Resource or bound RDF::Query::Variable.
     # Names that are against unbound variables match either detault
-    # or named contexts.
-    # The name of `false` will only match against the default context.
+    # or named graphs.
+    # The name of `false` will only match against the default graph.
     #
     # If the query nas no patterns, it returns a single empty solution as
     # per SPARQL 1.1 _Empty Group Pattern_.
@@ -274,10 +283,12 @@ module RDF
     # @option options [Hash{Symbol => RDF::Term}] bindings
     #   optional variable bindings to use
     # @option options [RDF::Resource, RDF::Query::Variable, false] context (nil)
-    #   Specific context for matching against queryable;
-    #   overrides default context defined on query.
+    #   Alias for `:graph_name`. The :context option is deprecated in RDF.rb 2.0.
+    # @option options [RDF::Resource, RDF::Query::Variable, false] graph_name (nil)
+    #   Specific graph name for matching against queryable;
+    #   overrides default graph defined on query.
     # @option options [RDF::Resource, RDF::Query::Variable, false] name (nil)
-    #   Alias for `:context`.
+    #   Alias for `:graph_name`.
     # @option options [RDF::Query::Solutions] solutions
     #   optional initial solutions for chained queries
     # @yield  [solution]
@@ -291,6 +302,10 @@ module RDF
     def execute(queryable, options = {}, &block)
       validate!
       options = options.dup
+      if options.has_key?(:context)
+        warn "[DEPRECATION] the :contexts option to Query#execute is deprecated in RDF.rb 2.0, use :graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+        options[:graph_name] ||= options.delete(:context)
+      end
 
       # just so we can call #keys below without worrying
       options[:bindings] ||= {}
@@ -307,14 +322,14 @@ module RDF
       end
 
       patterns = @patterns
-      context = options.fetch(:context, options.fetch(:name, self.context))
+      graph_name = options.fetch(:graph_name, options.fetch(:name, self.graph_name))
 
-      # Add context to pattern, if necessary
-      unless context.nil?
+      # Add graph_name to pattern, if necessary
+      unless graph_name.nil?
         if patterns.empty?
-          patterns = [Pattern.new(nil, nil, nil, :context => context)]
+          patterns = [Pattern.new(nil, nil, nil, graph_name: graph_name)]
         else
-          apply_context(context)
+          apply_graph_name(graph_name)
         end
       end
 
@@ -402,39 +417,63 @@ module RDF
     # Is this query scoped to a named graph?
     # @return [Boolean]
     def named?
-      !!options[:context]
+      !!options[:graph_name]
     end
     
     # Is this query scoped to the default graph?
     # @return [Boolean]
     def default?
-      options[:context] == false
+      options[:graph_name] == false
     end
     
     # Is this query unscoped? This indicates that it can return results from
     # either a named graph or the default graph.
     # @return [Boolean]
     def unnamed?
-      options[:context].nil?
+      options[:graph_name].nil?
     end
-    
+
     # Scope the query to named graphs matching value
     # @param [RDF::IRI, RDF::Query::Variable] value
     # @return [RDF::IRI, RDF::Query::Variable]
+    # @deprecated Use {#graph_name=} instead.
     def context=(value)
-      options[:context] = value
+      warn "[DEPRECATION] Query#context= is deprecated in RDF.rb 2.0, use Query#graph_name= instead. Called from #{Gem.location_of_caller.join(':')}"
+      self.graph_name = value
     end
-    
+
+    # Scope the query to named graphs matching value
+    # @param [RDF::IRI, RDF::Query::Variable] value
+    # @return [RDF::IRI, RDF::Query::Variable]
+    def graph_name=(value)
+      options[:graph_name] = value
+    end
+
     # Scope of this query, if any
     # @return [RDF::IRI, RDF::Query::Variable]
+    # @deprecated Use {#graph_name} instead.
     def context
-      options[:context]
+      warn "[DEPRECATION] Query#context is deprecated in RDF.rb 2.0, use Query#graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+      graph_name
+    end
+
+    # Scope of this query, if any
+    # @return [RDF::IRI, RDF::Query::Variable]
+    def graph_name
+      options[:graph_name]
     end
 
     # Apply the context specified (or configured) to all patterns that have no context
     # @param [RDF::IRI, RDF::Query::Variable] context (self.context)
     def apply_context(context = options[:context])
-      patterns.each {|pattern| pattern.context = context if pattern.context.nil?} unless context.nil?
+      warn "[DEPRECATION] Query#apply_context is deprecated in RDF.rb 2.0, use Query#apply_graph_name instead. Called from #{Gem.location_of_caller.join(':')}"
+      apply_graph_name(context)
+    end
+
+    # Apply the graph name specified (or configured) to all patterns that have no graph name
+    # @param [RDF::IRI, RDF::Query::Variable] graph_name (self.graph_name)
+    def apply_graph_name(graph_name = options[:graph_name])
+      patterns.each {|pattern| pattern.graph_name = graph_name if pattern.graph_name.nil?} unless graph_name.nil?
     end
 
     ##
@@ -442,15 +481,16 @@ module RDF
     #
     # @return [Boolean]
     def variable?
-      patterns.any?(&:variable?) || context && context.variable?
+      patterns.any?(&:variable?) || graph_name && graph_name.variable?
     end
 
     ##
     # Returns `true` if any pattern contains a blank node.
     #
     # @return [Boolean]
-    def has_blank_nodes?
-      patterns.any?(&:has_blank_nodes?) || context && context.node?
+    # @since 2.0
+    def node?
+      patterns.any?(&:node?) || graph_name && graph_name.node?
     end
 
     # Query has no patterns
@@ -458,6 +498,7 @@ module RDF
     def empty?
       patterns.empty?
     end
+    alias_method :has_blank_nodes?, :node?
 
     ##
     # Enumerates over each matching query solution.
@@ -477,7 +518,7 @@ module RDF
     # @yieldparam [::Query::Pattern] pattern
     # @return [Enumerator]
     def each_statement(&block)
-      apply_context
+      apply_graph_name
       patterns.each(&block)
     end
 
@@ -486,7 +527,7 @@ module RDF
     # @return [RDF::Query]
     def dup
       patterns = @patterns.map {|p| p.dup}
-      patterns << @options.merge(:solutions => @solutions.dup)
+      patterns << @options.merge(solutions: @solutions.dup)
       Query.new(*patterns)
     end
 

data/lib/rdf/reader.rb

@@ -11,9 +11,9 @@ module RDF
   # @example Obtaining an RDF reader class
   #   RDF::Reader.for(:ntriples)     #=> RDF::NTriples::Reader
   #   RDF::Reader.for("etc/doap.nt")
-  #   RDF::Reader.for(:file_name      => "etc/doap.nt")
-  #   RDF::Reader.for(:file_extension => "nt")
-  #   RDF::Reader.for(:content_type   => "text/plain")
+  #   RDF::Reader.for(file_name:      "etc/doap.nt")
+  #   RDF::Reader.for(file_extension: "nt")
+  #   RDF::Reader.for(content_type:   "application/n-triples")
   #
   # @example Instantiating an RDF reader class
   #   RDF::Reader.for(:ntriples).new($stdin) { |reader| ... }
@@ -87,7 +87,7 @@ module RDF
     #
     # @return [Class]
     def self.for(options = {}, &block)
-      options = options.merge(:has_reader => true) if options.is_a?(Hash)
+      options = options.merge(has_reader: true) if options.is_a?(Hash)
       if format = self.format || Format.for(options, &block)
         format.reader
       end
@@ -246,7 +246,7 @@ module RDF
     #
     # @example
     #   reader.prefixes = {
-    #     :dc => RDF::URI('http://purl.org/dc/terms/'),
+    #     dc: RDF::URI('http://purl.org/dc/terms/'),
     #   }
     #
     # @param  [Hash{Symbol => RDF::URI}] prefixes
@@ -298,6 +298,7 @@ module RDF
     #   @return [Enumerator]
     #
     # @return [void]
+    # @raise  [RDF::ReaderError] on invalid data
     # @see    RDF::Enumerable#each_statement
     def each_statement(&block)
       if block_given?
@@ -376,6 +377,22 @@ module RDF
       @input.lineno
     end
 
+    ##
+    # @return [Boolean]
+    #
+    # @note this parses the full input. 
+    #   Use `Reader.new(input, validate: true)` if you intend to capture the 
+    #   result.
+    #
+    # @see RDF::Value#validate! for Literal & URI validation relevant to 
+    #   error handling.
+    # @see Enumerable#valid?
+    def valid?
+      super 
+    rescue ArgumentError, RDF::ReaderError
+      false
+    end
+
   protected
 
     ##