rdf 1.1.17.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15cede153e5e1329f30828a740b421e93e6a42c8
-  data.tar.gz: 8b818ec2b57e912e9df285bdef80cd485b2b9438
+  metadata.gz: 5459870c2250fc3eb1ce868c6707b2fd20664ee4
+  data.tar.gz: be34a5df00dff4f60336ad287e50cf2d480bf5a0
 SHA512:
-  metadata.gz: fe69708809e8dcccb9f5e43176b561fa66d54bf810be1d2471ed7c385cd3c82b6ddf0c029b09e85c1b72da6c7537c90a68efb37d6764cbb11484b0f8435d85bf
-  data.tar.gz: a0198a7412e0b565666ca318a520f6e343a7e9b01af55b8df34d6ff7b081dc3ae8c481b0c3dc39b09d8e349e23ee3de948bd6295d1263934ddf5eb0e644f402d
+  metadata.gz: ed6a295b07e4fce0204a18ba1fe9d544f1a49af2baae95c5dea6da944db6d2eeae0176b479f279ebfac0874b1bcbda27b52438c0dc2d147aabfe12549f9ef920
+  data.tar.gz: d20fcf6cd98b1928afbc149223b49f6dee9c35f6aa38e325808fdd69f2b1b546f22675ad7cec880871c8cd4a19157db691659bcd80b0847d3b51868dfb54cbd6

data/README

@@ -92,7 +92,7 @@ operations on RDF files using available readers and writers.
 ### Writing RDF data using the [N-Triples][] format
 
     require 'rdf/ntriples'
-    graph = RDF::Graph.new << [:hello, RDF::DC.title, "Hello, world!"]
+    graph = RDF::Graph.new << [:hello, RDF::RDFS.label, "Hello, world!"]
     graph.dump(:ntriples)
     
 or
@@ -114,13 +114,13 @@ or
 
 ### Reading RDF data in other formats
 {RDF::Reader.open} and {RDF::Repository.load} use a number of mechanisms to determine the appropriate reader
-to use when loading a file. The specific format to use can be forced using, e.g. `:format => :ntriples`
+to use when loading a file. The specific format to use can be forced using, e.g. `format: :ntriples`
 option where the specific format symbol is determined by the available readers. Both also use
 MimeType or file extension, where available.
 
     require 'rdf/nquads'
     
-    graph = RDF::Graph.load("http://ruby-rdf.github.com/rdf/etc/doap.nq", :format => :nquads)
+    graph = RDF::Graph.load("http://ruby-rdf.github.com/rdf/etc/doap.nq", format: :nquads)
 
 A specific sub-type of Reader can also be invoked directly:
 
@@ -144,9 +144,9 @@ appropriate writer to use.
 
     require 'linkeddata'
 
-    RDF::Writer.open("hello.nq", :format => :nquads) do |writer|
+    RDF::Writer.open("hello.nq", format: :nquads) do |writer|
       writer << RDF::Repository.new do |repo|
-        repo << RDF::Statement.new(:hello, RDF::DC.title, "Hello, world!", :context => RDF::URI("context"))
+        repo << RDF::Statement.new(:hello, RDF::RDFS.label, "Hello, world!", context: RDF::URI("context"))
       end
     end
 
@@ -154,14 +154,14 @@ A specific sub-type of Writer can also be invoked directly:
 
     require 'rdf/nquads'
 
-    repo = RDF::Repository.new << RDF::Statement.new(:hello, RDF::DC.title, "Hello, world!", :context => RDF::URI("context"))
+    repo = RDF::Repository.new << RDF::Statement.new(:hello, RDF::RDFS.label, "Hello, world!", context: RDF::URI("context"))
     File.open("hello.nq", "w") {|f| f << repo.dump(:nquads)}
 
 ## Reader/Writer convenience methods
 {RDF::Enumerable} implements `to_{format}` for each available instance of {RDF::Reader}.
 For example, if `rdf/turtle` is loaded, this allows the following:
 
-    graph = RDF::Graph.new << [:hello, RDF::DC.title, "Hello, world!"]
+    graph = RDF::Graph.new << [:hello, RDF::RDFS.label, "Hello, world!"]
     graph.to_ttl
 
 Similarly, {RDF::Mutable} implements `from_{format}` for each available instance
@@ -172,7 +172,7 @@ of {RDF::Writer}. For example:
 
 Note that no prefixes are loaded automatically, however they can be provided as arguments:
 
-    graph.from_ttl("[ a rdf:Resource]", :prefixes => {:rdf => RDF.to_uri})
+    graph.from_ttl("[ a rdf:Resource]", prefixes: {rdf: RDF.to_uri})
 
 ### Querying RDF data using basic graph patterns (BGPs)
 
@@ -180,7 +180,7 @@ Note that no prefixes are loaded automatically, however they can be provided as
     
     graph = RDF::Graph.load("http://ruby-rdf.github.com/rdf/etc/doap.nt")
     query = RDF::Query.new({
-      :person => {
+      person: {
         RDF.type  => FOAF.Person,
         FOAF.name => :name,
         FOAF.mbox => :email,

data/VERSION

@@ -1 +1 @@
-1.1.17.1
+1.99.0

data/lib/rdf/cli.rb

@@ -62,8 +62,8 @@ module RDF
         writer_class = RDF::Writer.for(opts[:output_format]) || RDF::NTriples::Writer
         out = opts[:output] || $stdout
         out.set_encoding(Encoding::UTF_8) if out.respond_to?(:set_encoding) && RUBY_PLATFORM == "java"
-        opts = opts.merge(:prefixes => {})
-        writer_opts = opts.merge(:standard_prefixes => true)
+        opts = opts.merge(prefixes: {})
+        writer_opts = opts.merge(standard_prefixes: true)
         self.parse(argv, opts) do |reader|
           writer_class.new(out, writer_opts) do |writer|
             writer << reader
@@ -91,14 +91,14 @@ module RDF
     def self.options(&block)
       options = OptionParser.new
       opts = options.options = {
-        :base_uri       => nil,
-        :canonicalize   => false,
-        :debug          => false,
-        :evaluate       => nil,
-        :format         => nil,
-        :output         => $stdout,
-        :output_format  => :ntriples,
-        :validate       => false,
+        base_uri:       nil,
+        canonicalize:   false,
+        debug:          false,
+        evaluate:       nil,
+        format:         nil,
+        output:         $stdout,
+        output_format:  :ntriples,
+        validate:       false,
       }
 
       # Command-specific options

data/lib/rdf/format.rb

@@ -11,19 +11,19 @@ module RDF
   # @example Getting a serialization format class
   #   RDF::Format.for(:ntriples)     #=> RDF::NTriples::Format
   #   RDF::Format.for("etc/doap.nt")
-  #   RDF::Format.for(:file_name => "etc/doap.nt")
-  #   RDF::Format.for(:file_extension => "nt")
-  #   RDF::Format.for(:content_type => "application/n-triples")
+  #   RDF::Format.for(file_name: "etc/doap.nt")
+  #   RDF::Format.for(file_extension: "nt")
+  #   RDF::Format.for(content_type: "application/n-triples")
   #
   # @example Obtaining serialization format MIME types
   #   RDF::Format.content_types      #=> {"application/n-triples" => [RDF::NTriples::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #   RDF::Format.file_extensions    #=> {:nt => [RDF::NTriples::Format]}
+  #   RDF::Format.file_extensions    #=> {nt: [RDF::NTriples::Format]}
   #
   # @example Defining a new RDF serialization format class
   #   class RDF::NTriples::Format < RDF::Format
-  #     content_type     'application/n-triples', :extension => :nt
+  #     content_type     'application/n-triples', extension: :nt
   #     content_encoding 'utf-8'
   #     
   #     reader RDF::NTriples::Reader
@@ -95,7 +95,7 @@ module RDF
       format = case options
         when String
           # Find a format based on the file name
-          self.for(:file_name => options) { yield if block_given? }
+          self.for(file_name: options) { yield if block_given? }
 
         when Hash
           case
@@ -112,7 +112,7 @@ module RDF
               content_types[mime_type] unless mime_type == 'text/plain' && (options[:sample] || block_given?)
             # Find a format based on the file name:
             when file_name = options[:file_name]
-              self.for(:file_extension => File.extname(file_name.to_s)[1..-1]) { yield if block_given? }
+              self.for(file_extension: File.extname(file_name.to_s)[1..-1]) { yield if block_given? }
             # Find a format based on the file extension:
             when file_ext  = options[:file_extension]
               file_extensions[file_ext.to_sym]
@@ -201,7 +201,7 @@ module RDF
     # @example
     #
     #     content_types = RDF::Format.reader_types
-    #     format = RDF::Format.for(:content_type => content_types.first)
+    #     format = RDF::Format.for(content_type: content_types.first)
     #
     # @return [Array<String>]
     def self.reader_types
@@ -227,7 +227,7 @@ module RDF
     # @example
     #
     #     content_types = RDF::Format.writer_types
-    #     format = RDF::Format.for(:content_type => content_types.first)
+    #     format = RDF::Format.for(content_type: content_types.first)
     #
     # @return [Array<String>]
     def self.writer_types

data/lib/rdf/mixin/enumerable.rb

@@ -14,13 +14,13 @@ module RDF
   # @example Checking whether a specific statement exists
   #   enumerable.has_statement?(RDF::Statement(subject, predicate, object))
   #   enumerable.has_triple?([subject, predicate, object])
-  #   enumerable.has_quad?([subject, predicate, object, context])
+  #   enumerable.has_quad?([subject, predicate, object, graph_name])
   #
   # @example Checking whether a specific value exists
   #   enumerable.has_subject?(RDF::URI("http://rubygems.org/gems/rdf"))
-  #   enumerable.has_predicate?(RDF::DC.creator)
-  #   enumerable.has_object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", :language => :en))
-  #   enumerable.has_context?(RDF::URI("http://ar.to/#self"))
+  #   enumerable.has_predicate?(RDF::RDFS.label)
+  #   enumerable.has_object?(RDF::Literal("A Ruby library for working with Resource Description Framework (RDF) data.", language: :en))
+  #   enumerable.has_graph?(RDF::URI("http://ar.to/#self"))
   #
   # @example Enumerating all statements
   #   enumerable.each_statement do |statement|
@@ -33,26 +33,25 @@ module RDF
   #   end
   #
   # @example Enumerating all statements in the form of quads
-  #   enumerable.each_quad do |subject, predicate, object, context|
-  #     puts [subject, predicate, object, context].inspect
+  #   enumerable.each_quad do |subject, predicate, object, graph_name|
+  #     puts [subject, predicate, object, graph_name].inspect
   #   end
   #
   # @example Enumerating all terms
   #   enumerable.each_subject   { |term| puts term.inspect }
   #   enumerable.each_predicate { |term| puts term.inspect }
   #   enumerable.each_object    { |term| puts term.inspect }
-  #   enumerable.each_context   { |term| puts term.inspect }
   #
   # @example Obtaining all statements
   #   enumerable.statements  #=> [RDF::Statement(subject1, predicate1, object1), ...]
   #   enumerable.triples     #=> [[subject1, predicate1, object1], ...]
-  #   enumerable.quads       #=> [[subject1, predicate1, object1, context1], ...]
+  #   enumerable.quads       #=> [[subject1, predicate1, object1, graph_name1], ...]
   #
   # @example Obtaining all unique values
-  #   enumerable.subjects    #=> [subject1, subject2, subject3, ...]
-  #   enumerable.predicates  #=> [predicate1, predicate2, predicate3, ...]
-  #   enumerable.objects     #=> [object1, object2, object3, ...]
-  #   enumerable.contexts    #=> [context1, context2, context3, ...]
+  #   enumerable.subjects(unique: true)    #=> [subject1, subject2, subject3, ...]
+  #   enumerable.predicates(unique: true)  #=> [predicate1, predicate2, predicate3, ...]
+  #   enumerable.objects(unique: true)     #=> [object1, object2, object3, ...]
+  #   enumerable.graph_names(unique: true) #=> [graph_name1, graph_name2, graph_name3, ...]
   #
   # @see RDF::Graph
   # @see RDF::Repository
@@ -66,7 +65,8 @@ module RDF
     # Returns `true` if this repository supports the given `feature`.
     #
     # Supported features include:
-    #   * `:context` supports statements with a context, allowing multiple contexts
+    #   * `:graph_name` supports statements with a graph_name, allowing multiple named graphs
+    #   * `:context` supports statements with a context, allowing multiple contexts (DEPRECATED, use graph_name. `context` will be removed in RDF.rb 2.0)
     #   * `:inference` supports RDFS inferrence of queryable contents.
     #   * `:validity` allows a concrete Enumerable implementation to indicate that it does or does not support valididty checking. By default implementations are assumed to support validity checking.
     #   * `:skolemize` supports [Skolemization](https://www.w3.org/wiki/BnodeSkolemization) of an `Enumerable`. Implementations supporting this feature must implement a `#skolemize` method, taking a base URI used for minting URIs for BNodes as stable identifiers and a `#deskolemize` method, also taking a base URI used for turning URIs having that prefix back into the same BNodes which were originally skolemized.
@@ -267,19 +267,18 @@ module RDF
     # The order in which quads are yielded is undefined.
     #
     # @overload each_quad
-    #   @yield  [subject, predicate, object, context]
+    #   @yield  [subject, predicate, object, graph_name]
     #     each quad
     #   @yieldparam [RDF::Resource] subject
     #   @yieldparam [RDF::URI]      predicate
     #   @yieldparam [RDF::Term]     object
-    #   @yieldparam [RDF::Resource] context
+    #   @yieldparam [RDF::Resource] graph_name
     #   @yieldreturn [void] ignored
     #   @return [void]
     #
     # @overload each_quad
-    #   @return [Enumerator]
+    #   @return [Enumerator<Array(RDF::Resource, RDF::URI, RDF::Term, RDF::Resource)>]
     #
-    # @return [void]
     # @see    #enum_quad
     def each_quad
       if block_given?
@@ -342,9 +341,7 @@ module RDF
     #   @return [void]
     #
     # @overload each_subject
-    #   @return [Enumerator]
-    #
-    # @return [void]
+    #   @return [Enumerator<RDF::Resource>]
     # @see    #enum_subject
     def each_subject
       if block_given?
@@ -363,7 +360,7 @@ module RDF
     ##
     # Returns an enumerator for {RDF::Enumerable#each_subject}.
     #
-    # @return [Enumerator]
+    # @return [Enumerator<RDF::Resource>]
     # @see    #each_subject
     def enum_subject
       enum_for(:each_subject)
@@ -375,7 +372,7 @@ module RDF
     #
     # @param  [Hash{Symbol => Boolean}] options
     # @option options [Boolean] :unique (true)
-    # @return [Enumerator<RDF::URI>]
+    # @return [Array<RDF::URI>]
     # @see    #each_predicate
     # @see    #enum_predicate
     def predicates(options = {})
@@ -410,9 +407,7 @@ module RDF
     #   @return [void]
     #
     # @overload each_predicate
-    #   @return [Enumerator]
-    #
-    # @return [void]
+    #   @return [Enumerator<RDF::URI>]
     # @see    #enum_predicate
     def each_predicate
       if block_given?
@@ -431,7 +426,7 @@ module RDF
     ##
     # Returns an enumerator for {RDF::Enumerable#each_predicate}.
     #
-    # @return [Enumerator]
+    # @return [Enumerator<RDF::URI>]
     # @see    #each_predicate
     def enum_predicate
       enum_for(:each_predicate)
@@ -478,9 +473,8 @@ module RDF
     #   @return [void]
     #
     # @overload each_object
-    #   @return [Enumerator]
+    #   @return [Enumerator<RDF::Term>]
     #
-    # @return [void]
     # @see    #enum_object
     def each_object # FIXME: deduplication
       if block_given?
@@ -499,7 +493,7 @@ module RDF
     ##
     # Returns an enumerator for {RDF::Enumerable#each_object}.
     #
-    # @return [Enumerator]
+    # @return [Enumerator<RDF::Term>]
     # @see    #each_object
     def enum_object
       enum_for(:each_object)
@@ -514,7 +508,9 @@ module RDF
     # @return [Enumerator<RDF::Resource>]
     # @see    #each_context
     # @see    #enum_context
+    # @deprecated use {#graph_names} instead.
     def contexts(options = {})
+      warn "[DEPRECATION] Enumerable#contexts is being replaced with Enumerable#graph_names in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
       if options[:unique] == false
         enum_statement.map(&:context).compact.to_enum # TODO: optimize
       else
@@ -522,14 +518,33 @@ module RDF
       end
     end
 
+    ##
+    # Returns all unique RDF graph names, other than the default graph.
+    #
+    # @param  [Hash{Symbol => Boolean}] options
+    # @option options [Boolean] :unique (true)
+    # @return [Array<RDF::Resource>]
+    # @see    #each_graph
+    # @see    #enum_graph
+    # @since 2.0
+    def graph_names(options = {})
+      if options[:unique] == false
+        enum_statement.map(&:graph_name).compact # TODO: optimize
+      else
+        enum_graph.map(&:graph_name).compact
+      end
+    end
+
     ##
     # Returns `true` if `self` contains the given RDF context.
     #
     # @param  [RDF::Resource, false] value
     #   Use value `false` to query for the default context
     # @return [Boolean]
+    # @deprecated Use {#has_graph?} instead.
     def has_context?(value)
-      enum_context.include?(value)
+      warn "[DEPRECATION] Enumerable#has_context? is being replaced with Enumerable#has_graph? in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
+      has_graph?(value)
     end
 
     ##
@@ -549,9 +564,10 @@ module RDF
     # @overload each_context
     #   @return [Enumerator]
     #
-    # @return [void]
     # @see    #enum_context
+    # @deprecated Use {#each_graph} instead.
     def each_context
+      warn "[DEPRECATION] Enumerable#each_context is being replaced with Enumerable#each_graph in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
       if block_given?
         values = {}
         each_statement do |statement|
@@ -570,11 +586,23 @@ module RDF
     #
     # @return [Enumerator]
     # @see    #each_context
+    # @deprecated Use {#enum_graph} instead.
     def enum_context
+      warn "[DEPRECATION] Enumerable#enum_context is being replaced with Enumerable#enum_graph in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
       enum_for(:each_context)
     end
     alias_method :enum_contexts, :enum_context
 
+    ##
+    # Returns `true` if `self` contains the given RDF graph_name.
+    #
+    # @param  [RDF::Resource, false] graph_name
+    #   Use value `false` to query for the default graph_name
+    # @return [Boolean]
+    def has_graph?(graph_name)
+      enum_statement.any? {|s| s.graph_name == graph_name}
+    end
+
     ##
     # Iterates the given block for each RDF graph in `self`.
     #
@@ -590,16 +618,16 @@ module RDF
     #   @return [void]
     #
     # @overload each_graph
-    #   @return [Enumerator]
+    #   @return [Enumerator<RDF::Graph>]
     #
-    # @return [void]
     # @see    #enum_graph
     # @since  0.1.9
     def each_graph
       if block_given?
-        yield RDF::Graph.new(nil, :data => self)
-        each_context do |context|
-          yield RDF::Graph.new(context, :data => self)
+        yield RDF::Graph.new(nil, data: self)
+        # FIXME: brute force, repositories should override behavior
+        enum_statement.map(&:graph_name).uniq.compact do |graph_name|
+          yield RDF::Graph.new(graph_name, data: self)
         end
       end
       enum_graph
@@ -608,7 +636,7 @@ module RDF
     ##
     # Returns an enumerator for {RDF::Enumerable#each_graph}.
     #
-    # @return [Enumerator]
+    # @return [Enumerator<RDF::Graph>]
     # @see    #each_graph
     # @since  0.1.9
     def enum_graph
@@ -691,7 +719,7 @@ module RDF
     def method_missing(meth, *args)
       writer = RDF::Writer.for(meth.to_s[3..-1].to_sym) if meth.to_s[0,3] == "to_"
       if writer
-        writer.buffer(:standard_prefixes => true) {|w| w << self}
+        writer.buffer(standard_prefixes: true) {|w| w << self}
       else
         super
       end

data/lib/rdf/mixin/mutable.rb

@@ -35,16 +35,22 @@ module RDF
     # @param  [Hash{Symbol => Object}] options
     #   Options from {RDF::Reader.open}
     # @option options [RDF::Resource] :context
-    #   Set set context of each loaded statement
+    #   Set set context of each loaded statement. This option is deprecated in RDF.rb 2.0.
+    # @option options [RDF::Resource] :graph_name
+    #   Set set graph name of each loaded statement
     # @return [void]
     def load(filename, options = {})
+      if options.has_key?(:context)
+        warn "[DEPRECATION] the :contexts option to Mutable#load 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
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      Reader.open(filename, {:base_uri => filename}.merge(options)) do |reader|
-        if options[:context]
+      Reader.open(filename, {base_uri: filename}.merge(options)) do |reader|
+        if options[:graph_name]
           statements = []
           reader.each_statement do |statement|
-            statement.context = options[:context]
+            statement.graph_name = options[:graph_name]
             statements << statement
           end
           insert_statements(statements)
@@ -147,7 +153,7 @@ module RDF
     def clear
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      if respond_to?(:clear_statements)
+      if respond_to?(:clear_statements, true)
         clear_statements
       else
         delete_statements(self)

data/lib/rdf/mixin/queryable.rb

@@ -19,8 +19,8 @@ module RDF
     # actual lower-level query pattern matching implementation.
     #
     # @example Querying for statements having a given predicate
-    #     queryable.query([nil, RDF::DOAP.developer, nil])
-    #     queryable.query(:predicate => RDF::DOAP.developer) do |statement|
+    #     queryable.query([nil, RDF::Vocab::DOAP.developer, nil])
+    #     queryable.query(predicate: RDF::Vocab::DOAP.developer) do |statement|
     #       puts statement.inspect
     #     end
     #