rdf 1.0.10.2 → 1.1.0.p0

data/lib/rdf/query/solutions.rb

@@ -4,13 +4,13 @@ module RDF; class Query
   #
   # @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(:author  => "Arto Bendiken")
+  #   solutions.filter(:author  => [RDF::URI("http://ar.to/#self"), "Arto Bendiken"])
   #   solutions.filter(:updated => RDF::Literal(Date.today))
   #
   # @example Filtering solutions using a block
   #   solutions.filter { |solution| solution.author.literal? }
-  #   solutions.filter { |solution| solution.title.to_s =~ /^SPARQL/ }
+  #   solutions.filter { |solution| solution.title =~ /^SPARQL/ }
   #   solutions.filter { |solution| solution.price < 30.5 }
   #   solutions.filter { |solution| solution.bound?(:date) }
   #   solutions.filter { |solution| solution.age.datatype == RDF::XSD.integer }
@@ -93,11 +93,7 @@ module RDF; class Query
         self.reject! do |solution|
           solution = solution.is_a?(Solution) ? solution : Solution.new(solution)
           results = criteria.map do |name, value|
-            case value
-            when Array then value.any? {|v| solution[name] == v}
-            when Regexp then solution[name].to_s.match(value)
-            else solution[name] == value
-            end
+            solution[name] == value
           end
           !results.all?
         end
@@ -106,20 +102,6 @@ module RDF; class Query
     end
     alias_method :filter!, :filter
 
-    ##
-    # Difference between solution sets, from SPARQL 1.1.
-    #
-    # The `minus` operation on solutions returns those solutions which either have no compatible solution in `other`, or the solution domains are disjoint.
-    #
-    # @param [RDF::Query::Solutions] other
-    # @return [RDF::Query::Solutions] a new solution set
-    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
-    def minus(other)
-      self.dup.filter! do |soln|
-        !other.any? {|soln2| soln.compatible?(soln2) && !soln.disjoint?(soln2)}
-      end
-    end
-
     ##
     # Reorders this solution sequence by the given `variables`.
     #

data/lib/rdf/query/variable.rb

@@ -12,7 +12,7 @@ class RDF::Query
   #   var.name       #=> :g2166151240
   #
   # @example Unbound variables match any value
-  #   var === RDF::Literal(42)     #=> true
+  #   var === 42     #=> true
   #
   # @example Creating a bound variable
   #   var = RDF::Query::Variable.new(:y, 123)
@@ -20,12 +20,10 @@ class RDF::Query
   #   var.value      #=> 123
   #
   # @example Bound variables match only their actual value
-  #   var = RDF::Query::Variable.new(:y, 123)
   #   var === 42     #=> false
   #   var === 123    #=> true
   #
   # @example Getting the variable name
-  #   var = RDF::Query::Variable.new(:y, 123)
   #   var.named?     #=> true
   #   var.name       #=> :y
   #   var.to_sym     #=> :y

data/lib/rdf/reader.rb

@@ -168,7 +168,7 @@ module RDF
     # @param  [Hash{Symbol => Object}] options
     #   any additional options
     # @option options [Encoding] :encoding     (Encoding::UTF_8)
-    #   the encoding of the input stream (Ruby 1.9+)
+    #   the encoding of the input stream
     # @option options [Boolean]  :validate     (false)
     #   whether to validate the parsed statements and values
     # @option options [Boolean]  :canonicalize (false)
@@ -189,7 +189,6 @@ module RDF
       @options[:canonicalize] ||= false
       @options[:intern]       ||= true
       @options[:prefixes]     ||= Hash.new
-      @options[:base_uri]     ||= input.base_uri if input.respond_to?(:base_uri)
 
       @input = case input
         when String then StringIO.new(input)
@@ -363,13 +362,6 @@ module RDF
     end
     alias_method :close!, :close
 
-    ##
-    # Current line number being processed. For formats that can associate generated {Statement} with a particular line number from input, this value reflects that line number.
-    # @return [Integer]
-    def lineno
-      @input.lineno
-    end
-
   protected
 
     ##
@@ -422,8 +414,6 @@ module RDF
     ##
     # Returns the encoding of the input stream.
     #
-    # _Note: this method requires Ruby 1.9 or newer._
-    #
     # @return [Encoding]
     def encoding
       case @options[:encoding]
@@ -475,6 +465,12 @@ module RDF
       super
     end
 
+    ##
+    # @return [Integer]
+    def lineno
+      @input.lineno
+    end
+
     ##
     # @private
     # @return [String] The most recently read line of the input
@@ -488,17 +484,7 @@ module RDF
       @line = @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
       @line = @line.to_s.chomp
-      begin
-        @line.encode!(encoding) if @line.respond_to?(:encode!)
-      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError, Encoding::ConverterNotFoundError
-        # It is likely the persisted line was not encoded on initial write
-        # (i.e. persisted via RDF <= 1.0.9 and read via RDF >= 1.0.10)
-        #
-        # Encoding::UndefinedConversionError is raised by MRI.
-        # Encoding::InvalidByteSequenceError is raised by jruby >= 1.7.5
-        # Encoding::ConverterNotFoundError is raised by jruby < 1.7.5
-        @line = RDF::NTriples::Reader.unescape(@line).encode(encoding)
-      end
+      @line.force_encoding(encoding)
       @line
     end
 

data/lib/rdf/repository.rb

@@ -77,7 +77,7 @@ module RDF
     # @return [void]
     def self.load(filenames, options = {}, &block)
       self.new(options) do |repository|
-        Array(filenames).each do |filename|
+        [filenames].flatten.each do |filename|
           repository.load(filename, options)
         end
 
@@ -96,10 +96,13 @@ module RDF
     # @param  [Hash{Symbol => Object}] options
     # @option options [URI, #to_s]    :uri (nil)
     # @option options [String, #to_s] :title (nil)
+    # @option options [Boolean] :with_context (true)
+    #   Indicates that the repository supports named graphs, otherwise,
+    #   only the default graph is supported.
     # @yield  [repository]
     # @yieldparam [Repository] repository
     def initialize(options = {}, &block)
-      @options = options.dup
+      @options = {:with_context => true}.merge(options)
       @uri     = @options.delete(:uri)
       @title   = @options.delete(:title)
 
@@ -141,6 +144,8 @@ module RDF
     #   end
     #
     # @param  [RDF::Resource] context
+    #   Context on which to run the transaction, use `false` for the default
+    #   context and `nil` the entire Repository
     # @yield  [tx]
     # @yieldparam  [RDF::Transaction] tx
     # @yieldreturn [void] ignored
@@ -176,7 +181,7 @@ module RDF
     # @return [RDF::Transaction]
     # @since  0.3.0
     def begin_transaction(context)
-      RDF::Transaction.new(:context => context)
+      RDF::Transaction.new(:graph => context)
     end
 
     ##
@@ -221,10 +226,11 @@ module RDF
 
       ##
       # @private
-      # @see RDF::Readable#supports?
+      # @see RDF::Enumerable#supports?
       def supports?(feature)
         case feature.to_sym
-          when :context   then true   # statement contexts / named graphs
+          # statement contexts / named graphs
+          when :context   then @options[:with_context]
           when :inference then false  # forward-chaining inference
           else false
         end
@@ -237,6 +243,13 @@ module RDF
         false
       end
 
+      ##
+      # @private
+      # @see RDF::Countable#empty?
+      def empty?
+        @data.empty?
+      end
+
       ##
       # @private
       # @see RDF::Countable#count
@@ -344,6 +357,7 @@ module RDF
       def insert_statement(statement)
         unless has_statement?(statement)
           s, p, o, c = statement.to_quad
+          c = DEFAULT_CONTEXT unless supports?(:context)
           c ||= DEFAULT_CONTEXT
           @data[c] ||= {}
           @data[c][s] ||= {}
@@ -358,6 +372,7 @@ module RDF
       def delete_statement(statement)
         if has_statement?(statement)
           s, p, o, c = statement.to_quad
+          c = DEFAULT_CONTEXT unless supports?(:context)
           c ||= DEFAULT_CONTEXT
           @data[c][s][p].delete(o)
           @data[c][s].delete(p) if @data[c][s][p].empty?
@@ -379,4 +394,7 @@ module RDF
       protected :clear_statements
     end # Implementation
   end # Repository
+
+  # RDF::Dataset is a synonym for RDF::Repository
+  Dataset = Repository
 end # RDF

data/lib/rdf/transaction.rb

@@ -5,6 +5,10 @@ module RDF
   # Transactions consist of a sequence of RDF statements to delete from and
   # a sequence of RDF statements to insert into a given named graph.
   #
+  # Repository implementations may choose to sub-class this class
+  # to provide transactional support for repository updates, when
+  # accessed through {RDF::Repository#begin_transaction}.
+  #
   # @example Executing a transaction against a repository
   #   repository = ...
   #   RDF::Transaction.execute(repository) do |tx|
@@ -30,10 +34,14 @@ module RDF
     end
 
     ##
-    # RDF graph to modify when executed.
-    #
+    # Name of this graph, if it is part of an {RDF::Repository}
+    # @!attribute [rw] context
     # @return [RDF::Resource]
-    attr_reader :graph
+    # @since 1.1.0
+    attr_accessor :context
+
+    alias_method :graph, :context
+    alias_method :graph=, :context=
 
     ##
     # RDF statements to delete when executed.
@@ -57,14 +65,18 @@ module RDF
     # Initializes this transaction.
     #
     # @param  [Hash{Symbol => Object}]  options
+    # @option options [RDF::Resource]   :context  (nil)
+    #   Name of named graph to be affected if `inserts` or `deletes`
+    #   do not have a `context`.
     # @option options [RDF::Resource]   :graph  (nil)
+    #   Alias for `:context`.
     # @option options [RDF::Enumerable] :insert (RDF::Graph.new)
     # @option options [RDF::Enumerable] :delete (RDF::Graph.new)
     # @yield  [tx]
     # @yieldparam [RDF::Transaction] tx
     def initialize(options = {}, &block)
       @options = options.dup
-      @graph   = @options.delete(:graph)  || @options.delete(:context)
+      @context = @options.delete(:graph)  || @options.delete(:context)
       @inserts = @options.delete(:insert) || RDF::Graph.new
       @deletes = @options.delete(:delete) || RDF::Graph.new
       @inserts.extend(RDF::Enumerable) unless @inserts.kind_of?(RDF::Enumerable)
@@ -102,13 +114,13 @@ module RDF
 
       deletes.each_statement do |statement|
         statement = statement.dup
-        statement.context = graph
+        statement.context ||= graph
         repository.delete(statement)
       end
 
       inserts.each_statement do |statement|
         statement = statement.dup
-        statement.context = graph
+        statement.context ||= graph
         repository.insert(statement)
       end
 
@@ -134,6 +146,7 @@ module RDF
       warn(inspect)
     end
 
+    protected
     ##
     # Appends an RDF statement to the sequence to insert when executed.
     #
@@ -155,7 +168,5 @@ module RDF
     end
 
     undef_method :load, :update, :clear
-    protected :insert_statement
-    protected :delete_statement
   end # Transaction
 end # RDF

data/lib/rdf/util/aliasing.rb

@@ -42,19 +42,9 @@ module RDF; module Util
       def alias_method(new_name, old_name)
         new_name, old_name = new_name.to_sym, old_name.to_sym
 
-        class_eval(<<-EOF)
-          def #{new_name}(*args, &block)
-            #{old_name}(*args, &block)
-          end
-        EOF
-
-        # NOTE: the following eval-less (and hence slightly less evil)
-        # implementation only works on Ruby 1.8.7+ due to the |&block|
-        # syntax that was introduced in 1.9 and then backported to 1.8.7;
-        # it is a syntax error in earlier versions of Ruby:
-        #self.__send__(:define_method, new_name) do |*args, &block|
-        #  __send__(old_name, *args, &block)
-        #end
+        self.__send__(:define_method, new_name) do |*args, &block|
+          __send__(old_name, *args, &block)
+        end
 
         return self
       end

data/lib/rdf/util/cache.rb

@@ -56,7 +56,7 @@ module RDF; module Util
 
     ##
     # This implementation relies on `ObjectSpace#_id2ref` and performs
-    # optimally on Ruby 1.8.x and 1.9.x; however, it does not work on JRuby
+    # optimally on Ruby >= 1.9.x; however, it does not work on JRuby
     # by default since much `ObjectSpace` functionality on that platform is
     # disabled unless the `-X+O` startup option is given.
     #
@@ -89,8 +89,7 @@ module RDF; module Util
 
     ##
     # This implementation uses the `WeakRef` class from Ruby's standard
-    # library, and provides adequate performance on JRuby and on Ruby 1.9.x;
-    # however, it performs very suboptimally on Ruby 1.8.x.
+    # library, and provides adequate performance on JRuby and on Ruby 1.9.x.
     #
     # @see http://ruby-doc.org/ruby-1.9/classes/WeakRef.html
     class WeakRefCache < Cache

data/lib/rdf/util/file.rb

@@ -27,26 +27,16 @@ module RDF; module Util
     # @param  [Hash{Symbol => Object}] options
     #   options are ignored in this implementation. Applications are encouraged
     #   to override this implementation to provide more control over HTTP
-    #   headers and redirect following. If opening as a file,
-    #   options are passed to `Kernel.open`.
+    #   headers and redirect following.
     # @option options [Array, String] :headers
-    #   HTTP Request headers, passed to Kernel.open. (Ruby >= 1.9 only)
+    #   HTTP Request headers, passed to Kernel.open.
     # @return [IO] File stream
     # @yield [IO] File stream
-    # @note HTTP headers not passed to `Kernel.open` for Ruby versions < 1.9.
     def self.open_file(filename_or_url, options = {}, &block)
       filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
-      if RUBY_VERSION < "1.9"
-        Kernel.open(filename_or_url.to_s, &block)
-      elsif filename_or_url.to_s =~ /^#{RDF::URI::SCHEME}/
-        # Open as a URL
-        headers = options.fetch(:headers, {})
-        headers['Accept'] ||= (RDF::Format.reader_types + %w(*/*;q=0.1)).join(", ")
-        Kernel.open(filename_or_url.to_s, headers, &block)
-      else
-        # Open as a file, passing any options
-        Kernel.open(filename_or_url, "r", options, &block)
-      end
+      options[:headers] ||= {}
+      options[:headers]['Accept'] ||= (RDF::Format.reader_types + %w(*/*;q=0.1)).join(", ")
+      Kernel.open(filename_or_url.to_s, options[:headers], &block)
     end
   end # File
 end; end # RDF::Util

data/lib/rdf/vocab.rb

@@ -6,26 +6,25 @@ module RDF
   #
   # The following vocabularies are pre-defined for your convenience:
   #
-  # * {RDF}         - Resource Description Framework (RDF)
-  # * {RDF::CC}     - Creative Commons (CC)
-  # * {RDF::CERT}   - W3 Authentication Certificate (CERT)
-  # * {RDF::DC}     - Dublin Core (DC)
-  # * {RDF::DC11}   - Dublin Core 1.1 (DC11) _deprecated_
-  # * {RDF::DOAP}   - Description of a Project (DOAP)
-  # * {RDF::EXIF}   - Exchangeable Image File Format (EXIF)
-  # * {RDF::FOAF}   - Friend of a Friend (FOAF)
-  # * {RDF::GEO}    - WGS84 Geo Positioning (GEO)
-  # * {RDF::HTTP}   - Hypertext Transfer Protocol (HTTP)
-  # * {RDF::OWL}    - Web Ontology Language (OWL)
-  # * {RDF::RDFS}   - RDF Schema (RDFS)
-  # * {RDF::RSA}    - W3 RSA Keys (RSA)
-  # * {RDF::RSS}    - RDF Site Summary (RSS)
-  # * {RDF::SCHEMA} - Schema.org
-  # * {RDF::SIOC}   - Semantically-Interlinked Online Communities (SIOC)
-  # * {RDF::SKOS}   - Simple Knowledge Organization System (SKOS)
-  # * {RDF::WOT}    - Web of Trust (WOT)
-  # * {RDF::XHTML}  - Extensible HyperText Markup Language (XHTML)
-  # * {RDF::XSD}    - XML Schema (XSD)
+  # * {RDF}        - Resource Description Framework (RDF)
+  # * {RDF::CC}    - Creative Commons (CC)
+  # * {RDF::CERT}  - W3 Authentication Certificate (CERT)
+  # * {RDF::DC}    - Dublin Core (DC)
+  # * {RDF::DC11}  - Dublin Core 1.1 (DC11) _deprecated_
+  # * {RDF::DOAP}  - Description of a Project (DOAP)
+  # * {RDF::EXIF}  - Exchangeable Image File Format (EXIF)
+  # * {RDF::FOAF}  - Friend of a Friend (FOAF)
+  # * {RDF::GEO}   - WGS84 Geo Positioning (GEO)
+  # * {RDF::HTTP}  - Hypertext Transfer Protocol (HTTP)
+  # * {RDF::OWL}   - Web Ontology Language (OWL)
+  # * {RDF::RDFS}  - RDF Schema (RDFS)
+  # * {RDF::RSA}   - W3 RSA Keys (RSA)
+  # * {RDF::RSS}   - RDF Site Summary (RSS)
+  # * {RDF::SIOC}  - Semantically-Interlinked Online Communities (SIOC)
+  # * {RDF::SKOS}  - Simple Knowledge Organization System (SKOS)
+  # * {RDF::WOT}   - Web of Trust (WOT)
+  # * {RDF::XHTML} - Extensible HyperText Markup Language (XHTML)
+  # * {RDF::XSD}   - XML Schema (XSD)
   #
   # @example Using pre-defined RDF vocabularies
   #   include RDF

data/lib/rdf/writer.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module RDF
   ##
   # The base class for RDF serializers.
@@ -106,18 +105,13 @@ module RDF
     ##
     # @param  [RDF::Enumerable, #each] data
     #   the graph or repository to dump
-    # @param  [IO, File, String] io
+    # @param  [IO, File] io
     #   the output stream or file to write to
     # @param  [Hash{Symbol => Object}] options
     #   passed to {RDF::Writer#initialize} or {RDF::Writer.buffer}
     # @return [void]
     def self.dump(data, io = nil, options = {})
-      if io.is_a?(String)
-        io = File.open(io, 'w')
-      elsif io.respond_to?(:external_encoding) && io.external_encoding
-        options = {:encoding => io.external_encoding}.merge(options)
-      end
-      io.set_encoding(options[:encoding]) if io.respond_to?(:set_encoding) && options[:encoding]
+      io = File.open(io, 'w') if io.is_a?(String)
       method = data.respond_to?(:each_statement) ? :each_statement : :each
       if io
         new(io, options) do |writer|
@@ -144,11 +138,9 @@ module RDF
     # @return [String]
     # @raise [ArgumentError] if no block is provided
     def self.buffer(*args, &block)
-      options = args.last.is_a?(Hash) ? args.last : {}
       raise ArgumentError, "block expected" unless block_given?
 
       StringIO.open do |buffer|
-        buffer.set_encoding(options[:encoding]) if buffer.respond_to?(:set_encoding) && options[:encoding]
         self.new(buffer, *args) { |writer| block.call(writer) }
         buffer.string
       end
@@ -164,7 +156,6 @@ module RDF
     # @return [RDF::Writer]
     def self.open(filename, options = {}, &block)
       File.open(filename, 'wb') do |file|
-        file.set_encoding(options[:encoding]) if file.respond_to?(:set_encoding) && options[:encoding]
         format_options = options.dup
         format_options[:file_name] ||= filename
         self.for(options[:format] || format_options).new(file, options, &block)
@@ -196,12 +187,10 @@ module RDF
     # @param  [Hash{Symbol => Object}] options
     #   any additional options
     # @option options [Encoding, String, Symbol] :encoding
-    #   the encoding to use on the output stream (Ruby 1.9+).
+    #   the encoding to use on the output stream.
     #   Defaults to the format associated with `content_encoding`.
     # @option options [Boolean]  :canonicalize (false)
-    #   whether to canonicalize terms when serializing
-    # @option options [Boolean]  :validate (false)
-    #   whether to validate terms when serializing
+    #   whether to canonicalize literals 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)
@@ -296,11 +285,8 @@ module RDF
     ##
     # Returns the encoding of the output stream.
     #
-    # _Note: this method requires Ruby 1.9 or newer._
-    #
     # @return [Encoding]
     def encoding
-      return nil unless "".respond_to?(:encode)
       case @options[:encoding]
       when String, Symbol
         Encoding.find(@options[:encoding].to_s)
@@ -311,24 +297,6 @@ 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.
     #
@@ -382,21 +350,15 @@ 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
@@ -408,7 +370,6 @@ 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
@@ -475,7 +436,7 @@ module RDF
     ##
     # @return [void]
     def puts(*args)
-      @output.puts(*args.map {|s| s.respond_to?(:encode) ? s.encode(encoding) : s})
+      @output.puts(*args)
     end
 
     ##