rdf 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2751c96a0ba8f1a51fe00c0b58f3ce4a7f11391c
-  data.tar.gz: 47e64925efb02489826099373e75215d81c06f59
+  metadata.gz: 27bb98ac53c34487b7b019cec8348e4d1c1b0248
+  data.tar.gz: 02531a71cfeae374e921994416c23be579147b25
 SHA512:
-  metadata.gz: e4b2cab8b9e984b9b9c2895a3c283523f039e31fc95cb75d7dee81f63baf6a419c45153f8143f61b9f34c11ea9b0e47cdb82f887ce8bfea58f47ff7d273c0696
-  data.tar.gz: '09b142a596e81f4a38e345fde610d0f9ff7b22060540ede70045213693e2e2fc43ec15d7014595bced01e6e8ff86767b215f71be7241f3a37c4728df2b231fda'
+  metadata.gz: d50dc7d520c49ec465bbc83c6d0a0df1348a921e77b0c1df19ab6286a14598a5a11bf1ff5460a753f851411df6d2e743bbc092e3b93cef2ed7784e09b96db46e
+  data.tar.gz: 44d24ae43fc15dcfff3421c8a86e3a8cc6a4878f74b18077e30791d2284ccf99ce6a2556febce3dc94c0d1c5a220812da235e17f6c7ae27648195c1f630709e9

data/README.md

@@ -11,7 +11,6 @@ This is a pure-Ruby library for working with [Resource Description Framework
 
 [![Gem Version](https://badge.fury.io/rb/rdf.png)](http://badge.fury.io/rb/rdf)
 [![Build Status](https://travis-ci.org/ruby-rdf/rdf.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf)
-[![Code Climate](https://codeclimate.com/github/ruby-rdf/rdf/badges/gpa.svg)](https://codeclimate.com/github/ruby-rdf/rdf)
 [![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf)
 [![Join the chat at https://gitter.im/ruby-rdf/rdf](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ruby-rdf/rdf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/rdf.rb

@@ -206,6 +206,20 @@ module RDF
     property.to_s =~ %r{_\d+} ? RDF::URI("#{to_uri}#{property}") : RDF::RDFV[property]
   end
 
+  ##
+  # Return an enumerator over {RDF::Statement} defined for this vocabulary.
+  # @return [RDF::Enumerable::Enumerator]
+  # @see    Object#enum_for
+  def self.enum_for(method = :each_statement, *args)
+    # Ensure that enumerators are, themselves, queryable
+    Enumerable::Enumerator.new do |yielder|
+      RDF::RDFV.send(method, *args) {|*y| yielder << (y.length > 1 ? y : y.first)}
+    end
+  end
+  class << self
+    alias_method :to_enum, :enum_for
+  end
+
   ##
   # respond to module or RDFV
   def self.respond_to?(method, include_all = false)

data/lib/rdf/cli.rb

@@ -439,7 +439,9 @@ module RDF
         # If files are empty, either use options[:execute]
         input = options[:evaluate] ? StringIO.new(options[:evaluate]) : $stdin
         input.set_encoding(options.fetch(:encoding, Encoding::UTF_8))
-        RDF::Reader.for(options[:format] || :ntriples).new(input, options) do |reader|
+        r = RDF::Reader.for(options[:format] || :ntriples)
+        (@readers ||= []) << r
+        r.new(input, options) do |reader|
           yield(reader)
         end
       else

data/lib/rdf/format.rb

@@ -207,6 +207,19 @@ module RDF
       reader_symbols.flat_map {|s| RDF::Format.for(s).content_type}.uniq
     end
 
+    ##
+    # Returns the set of content types with quality for available RDF::Reader subclasses.
+    #
+    # @example
+    #
+    #     accept_types = RDF::Format.accept_types
+    #     # => %w(text/html;q=0.5 text/turtle ...)
+    #
+    # @return [Array<String>]
+    def self.accept_types
+      reader_symbols.flat_map {|s| RDF::Format.for(s).accept_type}.uniq
+    end
+
     ##
     # Returns the set of format symbols for available RDF::Writer subclasses.
     #
@@ -400,6 +413,11 @@ module RDF
     #   extensions, that should be mapped to the given MIME type and handled
     #   by this class.
     #
+    #   Optionally, both `type`, `alias`, and `aliases`, may be parameterized
+    #   for expressing quality.
+    #
+    #       content_type "text/html;q=0.4"
+    #
     #   @param  [String]                 type
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [String]         :alias   (nil)
@@ -420,10 +438,14 @@ module RDF
         [@@content_type[self], @@content_types.map {
           |ct, cl| (cl.include?(self) && ct != @@content_type[self]) ?  ct : nil }].flatten.compact
       else
+        accept_type, type = type, type.split(';').first
         @@content_type[self] = type
         @@content_types[type] ||= []
         @@content_types[type] << self unless @@content_types[type].include?(self)
 
+        @@accept_types[accept_type] ||= []
+        @@accept_types[accept_type] << self unless @@accept_types[accept_type].include?(self)
+
         if extensions = (options[:extension] || options[:extensions])
           extensions = Array(extensions).map(&:to_sym)
           extensions.each do |ext|
@@ -433,13 +455,26 @@ module RDF
         end
         if aliases = (options[:alias] || options[:aliases])
           aliases = Array(aliases).each do |a|
-            @@content_types[a] ||= []
-            @@content_types[a] << self unless @@content_types[a].include?(self)
+            aa = a.split(';').first
+            @@accept_types[a] ||= []
+            @@accept_types[a] << self unless @@accept_types[a].include?(self)
+
+            @@content_types[aa] ||= []
+            @@content_types[aa] << self unless @@content_types[aa].include?(self)
           end
         end
       end
     end
 
+    ##
+    # Returns an array of values appropriate for an Accept header.
+    # Same as `self.content_type`, if no parameter is given when defined.
+    #
+    # @return [Array<String>]
+    def self.accept_type
+      @@accept_types.map {|t, formats| t if formats.include?(self)}.compact
+    end
+
     ##
     # Retrieves or defines file extensions for this RDF serialization format.
     #
@@ -488,6 +523,7 @@ module RDF
     @@content_type     = {} # @private
     @@content_types    = {} # @private
     @@content_encoding = {} # @private
+    @@accept_types     = {} # @private
     @@readers          = {} # @private
     @@writers          = {} # @private
     @@subclasses       = [] # @private

data/lib/rdf/mixin/enumerator.rb

@@ -7,14 +7,11 @@ module RDF
       include Queryable
       include Enumerable
 
-      def method_missing(method, *args)
-        self.to_a if method.to_sym == :to_ary
-      end
-
       # Make sure returned arrays are also queryable
       def to_a
         return super.to_a.extend(RDF::Queryable, RDF::Enumerable)
       end
+      alias_method :to_ary, :to_a
     end
   end
 

data/lib/rdf/model/dataset.rb

@@ -2,22 +2,83 @@ module RDF
   ##
   # An RDF Dataset
   #
-  # Datasets are immutable by default. {RDF::Repository} provides an interface 
+  # Datasets are immutable by default. {RDF::Repository} provides an interface
   # for mutable Datasets.
-  # 
+  #
+  # A Dataset functions as an a set of named RDF graphs with a default graph.
+  # It implements {RDF::Enumerable} and {RDF::Queryable} over the whole set;
+  # if no specific graph name is queried, enumerating and querying takes place
+  # over the intersection of all the graphs in the Dataset.
+  #
+  # The default graph is named with a constant `DEFAULT_GRAPH`.
+  #
+  # @example initializing an RDF::Dataset with existing data
+  #   statements = [RDF::Statement.new(RDF::URI(:s), RDF::URI(:p), :o)]
+  #   dataset    = RDF::Dataset.new(statements: statements)
+  #   dataset.count # => 1
+  #
   # @see https://www.w3.org/TR/rdf11-concepts/#section-dataset
   # @see https://www.w3.org/TR/rdf11-datasets/
   class Dataset
-    include RDF::Countable
     include RDF::Enumerable
     include RDF::Durable
     include RDF::Queryable
 
-    ISOLATION_LEVELS = [ :read_uncommitted, 
-                         :read_committed, 
-                         :repeatable_read, 
-                         :snapshot, 
-                         :serializable].freeze
+    DEFAULT_GRAPH = false
+
+    ISOLATION_LEVELS = [ :read_uncommitted,
+                         :read_committed,
+                         :repeatable_read,
+                         :snapshot,
+                         :serializable ].freeze
+
+    ##
+    # @param [RDF::Enumerable, Array<RDF::Statement>] statements  the initial 
+    #   contents of the dataset
+    # @yield [dataset] yields itself when a block is given
+    # @yieldparam [RDF::Dataset] dataset
+    def initialize(statements: [], **options, &block)
+      @statements = statements.map do |s| 
+        s = s.dup
+        s.graph_name ||= DEFAULT_GRAPH
+        s.freeze
+      end.freeze
+
+      if block_given?
+        case block.arity
+          when 1 then yield self
+          else instance_eval(&block)
+        end
+      end
+    end
+
+    ##
+    # @private
+    # @see RDF::Durable#durable?
+    def durable?
+      false
+    end
+
+    ##
+    # @private
+    # @see RDF::Enumerable#each_statement
+    def each_statement
+      if block_given?
+        @statements.each do |st| 
+          if st.graph_name.equal?(DEFAULT_GRAPH)
+            st = st.dup
+            st.graph_name = nil
+          end
+
+          yield st
+        end
+
+        self
+      end
+
+      enum_statement 
+    end
+    alias_method :each, :each_statement
 
     ##
     # Returns a developer-friendly representation of this object.
@@ -36,13 +97,42 @@ module RDF
       each_statement { |statement| statement.inspect! }
       nil
     end
-    
+
     ##
     # @return [Symbol] a representation of the isolation level for reads of this
-    #   Dataset. One of `:read_uncommitted`, `:read_committed`, `:repeatable_read`, 
+    #   Dataset. One of `:read_uncommitted`, `:read_committed`, `:repeatable_read`,
     #  `:snapshot`, or `:serializable`.
     def isolation_level
       :read_committed
     end
+
+    ##
+    # @private
+    # @see RDF::Enumerable#supports?
+    def supports?(feature)
+      return true if feature == :graph_name
+      super
+    end
+
+    protected
+    
+    ##
+    # Implements basic query pattern matching over the Dataset, with handling 
+    # for a default graph.
+    def query_pattern(pattern, options = {}, &block)
+      return super unless pattern.graph_name == DEFAULT_GRAPH
+
+      if block_given?
+        pattern = pattern.dup
+        pattern.graph_name = nil
+
+        each_statement do |statement|
+          yield statement if (statement.graph_name == DEFAULT_GRAPH ||
+                              statement.graph_name.nil?) && pattern === statement
+        end
+      else
+        enum_for(:query_pattern, pattern, options)
+      end
+    end
   end
 end

data/lib/rdf/model/literal.rb

@@ -408,6 +408,30 @@ module RDF
       self
     end
 
+    ##
+    # Returns the literal, first removing all whitespace on both ends of the value, and then changing remaining consecutive whitespace groups into one space each.
+    #
+    # Note that it handles both ASCII and Unicode whitespace.
+    #
+    # @see [String#squish](http://apidock.com/rails/String/squish)
+    # @return [RDF::Literal] a new literal based on `self`.
+    def squish(*other_string)
+      self.dup.squish!
+    end
+
+    ##
+    # Performs a destructive {#squish}.
+    #
+    # @see [String#squish!](http://apidock.com/rails/String/squish%21)
+    # @return self
+    def squish!
+      @string = value.
+        gsub(/\A[[:space:]]+/, '').
+        gsub(/[[:space:]]+\z/, '').
+        gsub(/[[:space:]]+/, ' ')
+      self
+    end
+
     ##
     # Escape a literal using ECHAR escapes.
     #

data/lib/rdf/model/literal/double.rb

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @since 0.2.1
   class Double < Numeric
     DATATYPE = RDF::XSD.double
-    GRAMMAR  = /^(?:NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?([eE][\+\-]?\d+)?))))$/.freeze
+    GRAMMAR  = /^(?:NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?(e[\+\-]?\d+)?))))$/i.freeze
 
     ##
     # @param  [Float, #to_f] value

data/lib/rdf/model/literal/integer.rb

@@ -23,9 +23,8 @@ module RDF; class Literal
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   ||= value if value.is_a?(String)
       @object   = case
-        when value.is_a?(::String)    then Integer(value) rescue nil
-        when value.is_a?(::Integer)   then value
         when value.respond_to?(:to_i) then value.to_i
+        when value.is_a?(::Integer)   then value
         else Integer(value.to_s) rescue nil
       end
     end

data/lib/rdf/model/statement.rb

@@ -67,6 +67,7 @@ module RDF
     #     if not a {Resource}, it is coerced to {Literal} or {Node} depending on if it is a symbol or something other than a {Term}.
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
+    #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
     #   @return [RDF::Statement]
     #
     # @overload initialize(subject, predicate, object, options = {})
@@ -78,6 +79,7 @@ module RDF
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
+    #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
     #   @return [RDF::Statement]
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       if subject.is_a?(Hash)
@@ -138,7 +140,7 @@ module RDF
       !(has_subject?    && subject.resource? &&
         has_predicate?  && predicate.resource? &&
         has_object?     && (object.resource? || object.literal?) &&
-        (has_graph?     ? graph_name.resource? : true ))
+        (has_graph?     ? graph_name.resource? : true))
     end
 
     ##
@@ -153,7 +155,7 @@ module RDF
       has_subject?    && subject.resource? && subject.valid? &&
       has_predicate?  && predicate.uri? && predicate.valid? &&
       has_object?     && object.term? && object.valid? &&
-      (has_graph?      ? graph_name.resource? && graph_name.valid? : true )
+      (has_graph?      ? (graph_name.resource? && graph_name.valid?) : true)
     end
 
     ##
@@ -171,7 +173,7 @@ module RDF
     ##
     # @return [Boolean]
     def inferred?
-      false
+      !!@options[:inferred]
     end
 
     ##
@@ -241,6 +243,12 @@ module RDF
       other.is_a?(Statement) && self == other && (self.graph_name || false) == (other.graph_name || false)
     end
 
+    ##
+    # Generates a Fixnum hash value as a quad.
+    def hash
+      @hash ||= to_quad.hash
+    end
+
     ##
     # Checks statement equality as a triple.
     #
@@ -345,6 +353,7 @@ module RDF
       self.object.canonicalize!     if has_object? && !self.object.frozen?
       self.graph_name.canonicalize! if has_graph? && !self.graph_name.frozen?
       self.validate!
+      @hash = nil
       self
     end
 

data/lib/rdf/model/uri.rb

@@ -42,7 +42,7 @@ module RDF
       [\\u{D0000}-\\u{DFFFD}]|[\\u{E1000}-\\u{EFFFD}]
     EOS
     IPRIVATE = Regexp.compile("[\\uE000-\\uF8FF]|[\\u{F0000}-\\u{FFFFD}]|[\\u100000-\\u10FFFD]").freeze
-    SCHEME = Regexp.compile("[A-za-z](?:[A-Za-z0-9+-\.])*").freeze
+    SCHEME = Regexp.compile("[A-Za-z](?:[A-Za-z0-9+-\.])*").freeze
     PORT = Regexp.compile("[0-9]*").freeze
     IP_literal = Regexp.compile("\\[[0-9A-Fa-f:\\.]*\\]").freeze  # Simplified, no IPvFuture
     PCT_ENCODED = Regexp.compile("%[0-9A-Fa-f][0-9A-Fa-f]").freeze
@@ -382,6 +382,7 @@ module RDF
         fragment: normalized_fragment
       }
       @value = nil
+      @hash = nil
       self
     end
     alias_method :normalize!, :canonicalize!
@@ -672,22 +673,6 @@ module RDF
       self
     end
 
-    ##
-    # Returns `true` if this URI starts with the given `string`.
-    #
-    # @example
-    #   RDF::URI('http://example.org/').start_with?('http')     #=> true
-    #   RDF::URI('http://example.org/').start_with?('ftp')      #=> false
-    #
-    # @param  [String, #to_s] string
-    # @return [Boolean] `true` or `false`
-    # @see    String#start_with?
-    # @since  0.3.0
-    def start_with?(string)
-      to_s.start_with?(string.to_s)
-    end
-    alias_method :starts_with?, :start_with?
-
     ##
     # Returns `true` if this URI ends with the given `string`.
     #

data/lib/rdf/model/value.rb

@@ -159,6 +159,23 @@ module RDF
     end
     alias_method :validate, :validate!
 
+    ##
+    # Returns `true` if this Value starts with the given `string`.
+    #
+    # @example
+    #   RDF::URI('http://example.org/').start_with?('http')     #=> true
+    #   RDF::Node('_:foo').start_with?('_:bar')                 #=> false
+    #   RDF::Litera('Apple').start_with?('Orange')              #=> false
+    #
+    # @param  [String, #to_s] string
+    # @return [Boolean] `true` or `false`
+    # @see    String#start_with?
+    # @since  0.3.0
+    def start_with?(string)
+      to_s.start_with?(string.to_s)
+    end
+    alias_method :starts_with?, :start_with?
+
     ##
     # Returns a copy of this value converted into its canonical
     # representation.

data/lib/rdf/nquads.rb

@@ -20,7 +20,7 @@ module RDF
     # @see http://www.w3.org/TR/n-quads/
     # @since  0.4.0
     class Format < RDF::Format
-      content_type     'application/n-quads', extension: :nq, alias: ['text/x-nquads']
+      content_type     'application/n-quads', extension: :nq, alias: 'text/x-nquads;q=0.2'
       content_encoding 'utf-8'
 
       reader { RDF::NQuads::Reader }

data/lib/rdf/ntriples/format.rb

@@ -16,7 +16,7 @@ module RDF::NTriples
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   # @see http://www.w3.org/TR/n-triples/
   class Format < RDF::Format
-    content_type     'application/n-triples', extension: :nt, alias: ['text/plain']
+    content_type     'application/n-triples', extension: :nt, alias: 'text/plain;q=0.2'
     content_encoding 'utf-8'
 
     reader { RDF::NTriples::Reader }

data/lib/rdf/query/pattern.rb

@@ -104,7 +104,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_graph?     ? (graph_name.resource? || graph_name.variable?) && graph_name.valid? : true )
+      (has_graph?     ? (graph_name.resource? || graph_name.variable?) && graph_name.valid? : true)
     rescue NoMethodError
       false
     end

data/lib/rdf/repository.rb

@@ -177,11 +177,12 @@ module RDF
     # @see RDF::Enumerable#supports?
     def supports?(feature)
       case feature.to_sym
-      when :graph_name   then @options[:with_graph_name]
-      when :inference    then false  # forward-chaining inference
-      when :validity     then @options.fetch(:with_validity, true)
-      when :atomic_write then false
-      when :snapshots    then false
+      when :graph_name       then @options[:with_graph_name]
+      when :inference        then false  # forward-chaining inference
+      when :validity         then @options.fetch(:with_validity, true)
+      when :literal_equality then true
+      when :atomic_write     then false
+      when :snapshots        then false
       else false
       end
     end
@@ -212,7 +213,7 @@ module RDF
     ##
     # @see RDF::Dataset#isolation_level
     def isolation_level
-      supports?(:snapshot) ? :repeatable_read : super
+      supports?(:snapshots) ? :repeatable_read : super
     end
 
     ##
@@ -259,11 +260,12 @@ module RDF
       # @see RDF::Enumerable#supports?
       def supports?(feature)
         case feature.to_sym
-        when :graph_name   then @options[:with_graph_name]
-        when :inference    then false  # forward-chaining inference
-        when :validity     then @options.fetch(:with_validity, true)
-        when :atomic_write then true
-        when :snapshots    then true
+        when :graph_name       then @options[:with_graph_name]
+        when :inference        then false  # forward-chaining inference
+        when :validity         then @options.fetch(:with_validity, true)
+        when :literal_equality then true
+        when :atomic_write     then true
+        when :snapshots        then true
         else false
         end
       end
@@ -281,13 +283,6 @@ module RDF
         count
       end
       
-      ##
-      # @private
-      # @see RDF::Durable#durable?
-      def durable?
-        false
-      end
-      
       ##
       # @private
       # @see RDF::Enumerable#has_graph?      
@@ -388,7 +383,7 @@ module RDF
 
           cs.each do |c, ss|
             next unless graph_name.nil? ||
-                        graph_name == false && !c ||
+                        graph_name == DEFAULT_GRAPH && !c ||
                         graph_name.eql?(c)
 
             ss = if subject.nil? || subject.is_a?(RDF::Query::Variable)
@@ -549,6 +544,14 @@ module RDF
           :serializable
         end
         
+        ##
+        # @note this is a simple object equality check.
+        # 
+        # @see RDF::Transaction#mutated?
+        def mutated?
+          !@snapshot.send(:data).equal?(repository.send(:data))
+        end
+        
         ##
         # Replaces repository data with the transaction's snapshot in a safely 
         # serializable fashion.
@@ -566,11 +569,9 @@ module RDF
           raise TransactionError, 'Cannot execute a rolled back transaction. ' \
                                   'Open a new one instead.' if @rolledback
 
-          # `Hamster::Hash#==` will use a cheap `#equal?` check first, but fall 
-          # back on a full Ruby Hash comparison if required.
           raise TransactionError, 'Error merging transaction. Repository' \
                                   'has changed during transaction time.' unless 
-            repository.send(:data) == @base_snapshot.send(:data)
+            repository.send(:data).equal? @base_snapshot.send(:data)
 
           repository.send(:data=, @snapshot.send(:data))
         end

data/lib/rdf/transaction.rb

@@ -156,6 +156,29 @@ module RDF
       :read_committed
     end
 
+    ##
+    # Indicates whether the transaction includes changes relative to the target 
+    # repository's state at transaction start time.
+    #
+    # The response is guaranteed to be `true` if executing the transaction 
+    # against the original repository state would cause a change. It may also
+    # return `true` in cases where the repository would not change (e.g. 
+    # because the transaction would insert statements already present). 
+    #
+    # @note `Transaction` implementers may choose to `NotImplementedError`
+    #   if the transaction implementation cannot be implemented efficiently.
+    #
+    # @return [Boolean] true if the transaction has mutated (insert/delete) 
+    #   since transaction start time
+    #
+    # @raise [NotImplementedError] if a mutation check is not implemented
+    def mutated?
+      return !changes.empty? if self.class == Transaction
+
+      raise NotImplementedError, 
+            '#mutated? is not implemented for #{self.class}'
+    end
+
     ##
     # Returns `true` if this is a read/write transaction, `false` otherwise.
     #

data/lib/rdf/util/file.rb

@@ -39,19 +39,7 @@ module RDF; module Util
       ##
       # @return [String] the value for an Accept header
       def self.default_accept_header
-        # Receive text/html and text/plain at a lower priority than other formats
-        reader_types = RDF::Format.reader_types.map do |t|
-          case t.to_s
-          when /text\/(?:plain|html)/
-            "#{t};q=0.5"
-          when /application\/xhtml\+xml/
-            "#{t};q=0.7"
-          else
-            t
-          end
-        end
-
-        (reader_types + %w(*/*;q=0.1)).join(", ")
+        (RDF::Format.accept_types + %w(*/*;q=0.1)).join(", ")
       end
       
       ##
@@ -109,7 +97,7 @@ module RDF; module Util
             # Document base is redirected location
             # Location may be relative
             base_uri = ::URI.join(base_uri, response.headers[:location].to_s).to_s
-            response.follow_redirection(request, res, &blk)
+            response.follow_redirection(&blk)
           else
             raise IOError, "<#{base_uri}>: #{response.code}"
           end

data/lib/rdf/vocab/owl.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
-# This file generated automatically using vocab-fetch from http://www.w3.org/2002/07/owl#
+# This file generated automatically using rdf vocabulary format from http://www.w3.org/2002/07/owl#
 require 'rdf'
 module RDF
   # @!parse
@@ -9,6 +9,35 @@ module RDF
   #   end
   class OWL < RDF::StrictVocabulary("http://www.w3.org/2002/07/owl#")
 
+    # Ontology definition
+    ontology :"http://www.w3.org/2002/07/owl",
+      comment: %(
+  This ontology partially describes the built-in classes and
+  properties that together form the basis of the RDF/XML syntax of OWL 2.
+  The content of this ontology is based on Tables 6.1 and 6.2
+  in Section 6.4 of the OWL 2 RDF-Based Semantics specification,
+  available at http://www.w3.org/TR/owl2-rdf-based-semantics/.
+  Please note that those tables do not include the different annotations
+  \(labels, comments and rdfs:isDefinedBy links\) used in this file.
+  Also note that the descriptions provided in this ontology do not
+  provide a complete and correct formal description of either the syntax
+  or the semantics of the introduced terms \(please see the OWL 2
+  recommendations for the complete and normative specifications\).
+  Furthermore, the information provided by this ontology may be
+  misleading if not used with care. This ontology SHOULD NOT be imported
+  into OWL ontologies. Importing this file into an OWL 2 DL ontology
+  will cause it to become an OWL 2 Full ontology and may have other,
+  unexpected, consequences.
+   ).freeze,
+      :"dc11:title" => %(The OWL 2 Schema vocabulary \(OWL 2\)).freeze,
+      :"http://www.w3.org/2003/g/data-view#namespaceTransformation" => %(http://dev.w3.org/cvsweb/2009/owl-grddl/owx2rdf.xsl).freeze,
+      :"owl:imports" => %(http://www.w3.org/2000/01/rdf-schema).freeze,
+      :"owl:versionIRI" => %(http://www.w3.org/2002/07/owl).freeze,
+      :"owl:versionInfo" => %($Date: 2009/11/15 10:54:12 $).freeze,
+      :"rdfs:isDefinedBy" => [%(http://www.w3.org/TR/owl2-mapping-to-rdf/).freeze, %(http://www.w3.org/TR/owl2-rdf-based-semantics/).freeze, %(http://www.w3.org/TR/owl2-syntax/).freeze],
+      :"rdfs:seeAlso" => [%(http://www.w3.org/TR/owl2-rdf-based-semantics/#table-axiomatic-classes).freeze, %(http://www.w3.org/TR/owl2-rdf-based-semantics/#table-axiomatic-properties).freeze],
+      type: "owl:Ontology".freeze
+
     # Class definitions
     term :AllDifferent,
       comment: %(The class of collections of pairwise different individuals.).freeze,

data/lib/rdf/vocab/rdfs.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
-# This file generated automatically using vocab-fetch from http://www.w3.org/2000/01/rdf-schema#
+# This file generated automatically using rdf vocabulary format from http://www.w3.org/2000/01/rdf-schema#
 require 'rdf'
 module RDF
   # @!parse
@@ -9,6 +9,12 @@ module RDF
   #   end
   class RDFS < RDF::StrictVocabulary("http://www.w3.org/2000/01/rdf-schema#")
 
+    # Ontology definition
+    ontology :"http://www.w3.org/2000/01/rdf-schema#",
+      :"dc11:title" => %(The RDF Schema vocabulary \(RDFS\)).freeze,
+      :"rdfs:seeAlso" => %(http://www.w3.org/2000/01/rdf-schema-more).freeze,
+      type: "owl:Ontology".freeze
+
     # Class definitions
     term :Class,
       comment: %(The class of classes.).freeze,
@@ -112,12 +118,5 @@ module RDF
       range: "rdf:Property".freeze,
       :"rdfs:isDefinedBy" => %(rdfs:).freeze,
       type: "rdf:Property".freeze
-
-    # Extra definitions
-    term :"",
-      :"dc11:title" => %(The RDF Schema vocabulary \(RDFS\)).freeze,
-      label: "".freeze,
-      :"rdfs:seeAlso" => %(http://www.w3.org/2000/01/rdf-schema-more).freeze,
-      type: "owl:Ontology".freeze
   end
 end

data/lib/rdf/vocab/rdfv.rb

@@ -1,14 +1,25 @@
 # -*- encoding: utf-8 -*-
-# This file generated automatically using vocab-fetch from http://www.w3.org/1999/02/22-rdf-syntax-ns#
+# frozen_string_literal: true
+# This file generated automatically using rdf vocabulary format from http://www.w3.org/1999/02/22-rdf-syntax-ns#
 require 'rdf'
 module RDF
-  class RDFV < StrictVocabulary("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
+  # @!parse
+  #   # Vocabulary for <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+  #   class RDFV < RDF::StrictVocabulary
+  #   end
+  class RDFV < RDF::StrictVocabulary("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
 
     class << self
       def name; "RDF"; end
       alias_method :__name__, :name
     end
 
+    # Ontology definition
+    ontology :"http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+      :"dc11:description" => %(This is the RDF Schema for the RDF vocabulary terms in the RDF Namespace, defined in RDF 1.1 Concepts.).freeze,
+      :"dc11:title" => %(The RDF Concepts Vocabulary \(RDF\)).freeze,
+      type: "owl:Ontology".freeze
+
     # Class definitions
     term :Alt,
       comment: %(The class of containers of alternatives.).freeze,
@@ -128,11 +139,7 @@ module RDF
       type: "rdfs:Datatype".freeze
 
     # Extra definitions
-    term :"",
-      :"dc11:description" => %(This is the RDF Schema for the RDF vocabulary terms in the RDF Namespace, defined in RDF 1.1 Concepts.).freeze,
-      :"dc11:title" => %(The RDF Concepts Vocabulary \(RDF\)).freeze,
-      type: "owl:Ontology".freeze
-    term :Description,
+   term :Description,
       comment: %(RDF/XML node element).freeze,
       label: "Description".freeze
     term :ID,

data/lib/rdf/vocab/writer.rb

@@ -40,7 +40,12 @@ module RDF
             datatype: String,
             on: ["--extra URIEncodedJSON"],
             description: "URI Encoded JSON representation of extra data"
-          ) {|arg| ::JSON.parse(::URI.decode(arg))},
+          ) do |arg|
+            ::JSON.parse(::URI.decode(arg)).inject({}) do |m1, (term, defs)|
+              d1 = defs.inject({}) {|m, (k,v)| m.merge(k.to_sym => v)}
+              m1.merge(term.to_sym => d1)
+            end
+          end,
         ]
       end
 
@@ -104,14 +109,21 @@ module RDF
 
         # Split nodes into Class/Property/Datatype/Other
         term_nodes = {
+          ontology: {},
           class: {},
           property: {},
           datatype: {},
           other: {}
         }
 
+        # Generate Ontology first
+        if vocab.ontology
+          term_nodes[:ontology][vocab.ontology.to_s] = vocab.ontology.attributes
+        end
+
         vocab.each.to_a.sort.each do |term|
           name = term.to_s[base_uri.length..-1].to_sym
+          next if name.to_s.empty?  # Ontology serialized separately
           kind = begin
             case term.type.to_s
             when /Class/    then :class
@@ -127,6 +139,7 @@ module RDF
         end
 
         {
+          ontology: "Ontology definition",
           class: "Class definitions",
           property: "Property definitions",
           datatype: "Datatype definitions",
@@ -145,7 +158,11 @@ module RDF
       ##
       # Turn a node definition into a property/term expression
       def from_node(name, attributes, term_type)
-        op = term_type == :property ? "property" : "term"
+        op = case term_type
+        when :property then "property"
+        when :ontology then "ontology"
+        else                "term"
+        end
 
         components = ["    #{op} #{name.to_sym.inspect}"]
         attributes.keys.sort_by(&:to_s).map(&:to_sym).each do |key|

data/lib/rdf/vocab/xsd.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
-# This file generated automatically using vocab-fetch from etc/xsd.ttl
+# This file generated automatically using rdf vocabulary format from http://www.w3.org/2001/XMLSchema#
 require 'rdf'
 module RDF
   # @!parse

data/lib/rdf/vocabulary.rb

@@ -120,6 +120,10 @@ module RDF
           Term.cache.delete(uri_str.to_sym)  # Clear any previous entry
           prop = Term.intern(uri_str, attributes: options)
           props[name.to_sym] = prop
+
+          # If name is empty, also treat it as the ontology
+          @ontology ||= prop if name.to_s.empty?
+
           # Define an accessor, except for problematic properties
           (class << self; self; end).send(:define_method, name) { prop } unless %w(property hash).include?(name.to_s)
           prop
@@ -130,6 +134,45 @@ module RDF
       alias_method :term, :property
       alias_method :__property__, :property
 
+      ##
+      # @overload ontology
+      #   Returns the ontology definition of the current vocabulary as a term.
+      #   @return [RDF::Vocabulary::Term]
+      #
+      # @overload ontology(name, options)
+      #   Defines the vocabulary ontology.
+      #
+      #   @param [String, #to_s] uri
+      #     The URI of the ontology.
+      #   @param [Hash{Symbol => Object}] options
+      #     Any other values are expected to be String which expands to a {URI} using built-in vocabulary prefixes. The value is a `String` or `Array<String>` which is interpreted according to the `range` of the associated property.
+      #   @option options [String, Array<String>] :label
+      #     Shortcut for `rdfs:label`, values are String interpreted as a {Literal}.
+      #   @option options [String, Array<String>] :comment
+      #     Shortcut for `rdfs:comment`, values are String interpreted as a {Literal}.
+      #   @option options [String, Array<String>] :type
+      #     Shortcut for `rdf:type`, values are String interpreted as a {URI}.
+      #   @return [RDF::Vocabulary::Term]
+      #
+      # @note If the ontology URI has the vocabulary namespace URI as a prefix, it may also be defined using {#property} or {#term}
+      def ontology(*args)
+        case args.length
+        when 0
+          @ontology
+        else
+          uri, options = args
+          options = {vocab: self}.merge(options || {})
+          Term.cache.delete(uri.to_s.to_sym)  # Clear any previous entry
+          @ontology = Term.intern(uri.to_s, attributes: options)
+
+          # If the URI is the same as the vocabulary namespace, also define it as a term
+          props[:""] ||= @ontology if self.to_s == uri.to_s
+
+          @ontology
+        end
+      end
+      alias_method :__ontology__, :ontology
+
       ##
       #  @return [Array<RDF::URI>] a list of properties in the current vocabulary
       def properties
@@ -150,7 +193,7 @@ module RDF
         elsif vocab = RDF::Vocabulary.each.detect {|v| v.__name__ && v.__prefix__ == prefix.to_sym}
           suffix.to_s.empty? ? vocab.to_uri : vocab[suffix]
         else
-          RDF::Vocabulary.find_term(pname) || RDF::URI(pname)
+          (RDF::Vocabulary.find_term(pname) rescue nil) || RDF::URI(pname)
         end
       end
 
@@ -177,8 +220,13 @@ module RDF
       def find_term(uri)
         uri = RDF::URI(uri)
         return uri if uri.is_a?(Vocabulary::Term)
-        vocab = RDF::Vocabulary.detect {|v| uri.start_with?(v.to_uri)}
-        vocab[uri.to_s[vocab.to_uri.to_s.length..-1]] if vocab
+        if vocab = find(uri)
+          if vocab.ontology == uri
+            vocab.ontology
+          else
+            vocab[uri.to_s[vocab.to_uri.to_s.length..-1].to_s]
+          end
+        end
       end
 
       ##
@@ -200,8 +248,11 @@ module RDF
       # @note the alias {__imports__} guards against `RDF::OWL.imports` returning a term, rather than an array of vocabularies
       # @return [Array<RDF::Vocabulary>]
       def imports
+        return [] unless self.ontology
         @imports ||= begin
-          Array(self[""].attributes[:"owl:imports"]).map {|pn|find(expand_pname(pn)) rescue nil}.compact
+          Array(self.ontology.attributes[:"owl:imports"]).map do |pn|
+            find(expand_pname(pn)) rescue nil
+          end.compact
         rescue KeyError
           []
         end
@@ -252,6 +303,9 @@ module RDF
         props.each do |name, subject|
           subject.each_statement(&block)
         end
+
+        # Also include the ontology, if it's not also a property
+        @ontology.each_statement(&block) if @ontology && @ontology != self
       end
 
       ##
@@ -267,23 +321,32 @@ module RDF
       #
       # @param [RDF::Enumerable] graph
       # @param [URI, #to_s] url
-      # @param [String] class_name
-      #   The class_name associated with the vocabulary, used for creating the class name of the vocabulary. This will create a new class named with a top-level constant based on `class_name`.
+      # @param [RDF::Vocabulary, String] class_name
+      #   The class_name associated with the vocabulary, used for creating the class name of the vocabulary. This will create a new class named with a top-level constant based on `class_name`. If given an existing vocabulary, it replaces the existing definitions for that vocabulary with those from the graph.
       # @param [Array<Symbol>, Hash{Symbol => Hash}] extra
       #   Extra terms to add to the vocabulary. In the first form, it is an array of symbols, for which terms are created. In the second, it is a Hash mapping symbols to property attributes, as described in {RDF::Vocabulary.property}.
       # @return [RDF::Vocabulary] the loaded vocabulary
       def from_graph(graph, url: nil, class_name: nil, extra: nil)
-        vocab = if class_name
+        vocab = case class_name
+        when RDF::Vocabulary
+          class_name.instance_variable_set(:@ontology, nil)
+          class_name.instance_variable_set(:@properties, nil)
+          class_name
+        when String
           Object.const_set(class_name, Class.new(self.create(url)))
         else
           Class.new(self.create(url))
         end
 
+        ont_url = url.to_s.sub(%r([/#]$), '')
         term_defs = {}
         graph.each do |statement|
-          next unless statement.subject.uri? && statement.subject.start_with?(url)
-          name = statement.subject.to_s[url.to_s.length..-1] 
+          next unless statement.subject.uri?
+          next unless statement.subject.start_with?(url) || statement.subject == ont_url
+          name = statement.subject.to_s[url.to_s.length..-1].to_s
           term = (term_defs[name.to_sym] ||= {})
+          term[:uri] = statement.subject if name.empty?
+
           key = case statement.predicate
           when RDF.type                                     then :type
           when RDF::RDFS.subClassOf                         then :subClassOf
@@ -318,7 +381,12 @@ module RDF
         end
 
         term_defs.each do |term, attributes|
-          vocab.__property__ term, attributes
+          if term == :""
+            uri = attributes.delete(:uri)
+            vocab.__ontology__ uri, attributes
+          else
+            vocab.__property__ term, attributes
+          end
         end
 
         vocab

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -60,6 +60,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +108,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -284,9 +298,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.
 test_files: []
-has_rdoc: false