rdf 1.1.17.1 → 1.99.0

data/lib/rdf/model/graph.rb

@@ -5,12 +5,12 @@ module RDF
   # An {RDF::Graph} contains a unique set of {RDF::Statement}. It is
   # based on an underlying data object, which may be specified when the
   # graph is initialized, and will default to a {RDF::Repository} without
-  # support for contexts otherwise.
+  # support for named graphs otherwise.
   #
   # Note that in RDF 1.1, graphs are not named, but are associated with
-  # a name in the context of a Dataset, as a pair of <name, graph>.
+  # a graph name in a Dataset, as a pair of <name, graph>.
   # This class allows a name to be associated with a graph when it is
-  # a projection of an underlying {RDF::Repository} supporting contexts.
+  # a projection of an underlying {RDF::Repository} supporting graph_names.
   #
   # @example Creating an empty unnamed graph
   #   graph = RDF::Graph.new
@@ -45,13 +45,23 @@ module RDF
 
     ##
     # Name of this graph, if it is part of an {RDF::Repository}
-    # @!attribute [rw] context
+    # @!attribute [rw] graph_name
     # @return [RDF::Resource]
-    # @since 1.1.0
-    attr_accessor :context
+    # @since 1.1.18
+    attr_accessor :graph_name
+
+    alias_method :name, :graph_name
 
-    alias_method :name, :context
-    alias_method :name=, :context=
+    ##
+    # Name of this graph, if it is part of an {RDF::Repository}
+    # @!attribute [rw] graph_name
+    # @return [RDF::Resource]
+    # @since 1.1.0
+    # @deprecated Use {#graph_name} instead.
+    def context
+      warn "[DEPRECATION] Graph#context is being replaced with Graph@graph_name in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
+	    graph_name
+    end
 
     ##
     # {RDF::Queryable} backing this graph.
@@ -61,7 +71,7 @@ module RDF
 
     ##
     # Creates a new `Graph` instance populated by the RDF data returned by
-    # dereferencing the given context URL.
+    # dereferencing the given graph_name Resource.
     #
     # @param  [String, #to_s]          url
     # @param  [Hash{Symbol => Object}] options
@@ -84,19 +94,19 @@ module RDF
     end
 
     ##
-    # @overload initialize(context, options)
-    #   @param  [RDF::Resource]          context
-    #     The context from the associated {RDF::Queryable} associated
+    # @overload initialize(graph_name, options)
+    #   @param  [RDF::Resource]          graph_name
+    #     The graph_name from the associated {RDF::Queryable} associated
     #     with this graph as provided with the `:data` option
     #     (only for {RDF::Queryable} instances supporting
-    #     named contexts).
+    #     named graphs).
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [RDF::Queryable] :data (RDF::Repository.new)
     #     Storage behind this graph.
-    #   @raise [ArgumentError] if a `data` does not support contexts.
+    #   @raise [ArgumentError] if a `data` does not support named graphs.
     #   @note
     #     Contexts are only useful when used as a projection
-    #     on a `:data` which supports contexts. Otherwise, there is no
+    #     on a `:data` which supports named graphs. Otherwise, there is no
     #     such thing as a named graph in RDF 1.1, a repository may have
     #     graphs which are named, but the name is not a property of the graph.
     # @overload initialize(options)
@@ -106,19 +116,19 @@ module RDF
     # @yield  [graph]
     # @yieldparam [Graph]
     def initialize(*args, &block)
-      context = args.shift unless args.first.is_a?(Hash)
+      graph_name = args.shift unless args.first.is_a?(Hash)
       options = args.first || {}
-      @context = case context
+      @graph_name = case graph_name
         when nil then nil
-        when RDF::Resource then context
-        else RDF::URI.new(context)
+        when RDF::Resource then graph_name
+        else RDF::URI.new(graph_name)
       end
 
       @options = options.dup
-      @data    = @options.delete(:data) || RDF::Repository.new(:with_context => false)
+      @data    = @options.delete(:data) || RDF::Repository.new(with_graph_name: false)
 
-      raise ArgumentError, "Can't apply context unless initialized with `data` supporting contexts" if
-        @context && !@data.supports?(:context)
+      raise ArgumentError, "Can't apply graph_name unless initialized with `data` supporting graph_names" if
+        @graph_name && !@data.supports?(:graph_name)
 
       if block_given?
         case block.arity
@@ -129,14 +139,14 @@ module RDF
     end
 
     ##
-    # (re)loads the graph from the specified location, or from the location associated with the graph context, if any
+    # (re)loads the graph from the specified location, or from the location associated with the graph name, if any
     # @return [void]
     # @see    RDF::Mutable#load
     def load!(*args)
       case
         when args.empty?
-          raise ArgumentError, "Can't reload graph with no context" unless context.is_a?(RDF::URI)
-          load(context.to_s, {:base_uri => context}.merge(@options))
+          raise ArgumentError, "Can't reload graph without a graph_name" unless graph_name.is_a?(RDF::URI)
+          load(graph_name.to_s, {base_uri: graph_name}.merge(@options))
         else super
       end
     end
@@ -164,7 +174,7 @@ module RDF
     # @return [Boolean]
     # @note The next release, graphs will not be named, this will return true
     def unnamed?
-      context.nil?
+      graph_name.nil?
     end
 
     ##
@@ -180,16 +190,26 @@ module RDF
     # Returns all unique RDF contexts for this graph.
     #
     # @return [Enumerator<RDF::Resource>]
+    # @deprecated Use {#graph_names} instead.
     def contexts(options = {})
+      warn "[DEPRECATION] Graph#contexts is being replaced with Graph#graph_names in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
       (named? ? [context] : []).to_enum.extend(RDF::Countable)
     end
 
+    ##
+    # Returns all unique RDF names for this graph.
+    #
+    # @return [Enumerator<RDF::Resource>]
+    def graph_names(options = {})
+      (named? ? [graph_name] : []).extend(RDF::Countable)
+    end
+
     ##
     # Returns the {RDF::Resource} representation of this graph.
     #
     # @return [RDF::Resource]
     def to_uri
-      context
+      graph_name
     end
 
     ##
@@ -197,16 +217,16 @@ module RDF
     #
     # @return [String]
     def to_s
-      named? ? context.to_s : "default"
+      named? ? graph_name.to_s : "default"
     end
 
     ##
-    # Returns `true` if this graph has an anonymous context, `false` otherwise.
+    # Returns `true` if this graph has an anonymous graph, `false` otherwise.
     #
     # @return [Boolean]
     # @note The next release, graphs will not be named, this will return true
     def anonymous?
-      context.nil? ? false : context.anonymous?
+      graph_name.nil? ? false : graph_name.anonymous?
     end
 
     ##
@@ -215,7 +235,7 @@ module RDF
     # @return [Integer]
     # @see    RDF::Enumerable#count
     def count
-      @data.query(:context => context || false).count
+      @data.query(graph_name: graph_name || false).count
     end
 
     ##
@@ -226,7 +246,7 @@ module RDF
     # @see    RDF::Enumerable#has_statement?
     def has_statement?(statement)
       statement = statement.dup
-      statement.context = context
+      statement.graph_name = graph_name
       @data.has_statement?(statement)
     end
 
@@ -239,7 +259,7 @@ module RDF
     # @see    RDF::Enumerable#each_statement
     def each(&block)
       if @data.respond_to?(:query)
-        @data.query(:context => context || false, &block)
+        @data.query(graph_name: graph_name || false, &block)
       elsif @data.respond_to?(:each)
         @data.each(&block)
       else
@@ -257,16 +277,16 @@ module RDF
     # @see http://rubygems.org/gems/rdf-isomorphic
     def ==(other)
       other.is_a?(RDF::Graph) &&
-      context == other.context &&
+      graph_name == other.graph_name &&
       statements.to_a == other.statements.to_a
     end
 
     ##
     # @private
-    # @see RDF::Queryable#query
-    def query_pattern(pattern, &block)
+    # @see RDF::Queryable#query_pattern
+    def query_pattern(pattern, options = {}, &block)
       pattern = pattern.dup
-      pattern.context = context || false
+      pattern.graph_name = graph_name || false
       @data.query(pattern, &block)
     end
 
@@ -275,7 +295,7 @@ module RDF
     # @see RDF::Mutable#insert
     def insert_statement(statement)
       statement = statement.dup
-      statement.context = context
+      statement.graph_name = graph_name
       @data.insert(statement)
     end
 
@@ -284,7 +304,7 @@ module RDF
     # @see RDF::Mutable#delete
     def delete_statement(statement)
       statement = statement.dup
-      statement.context = context
+      statement.graph_name = graph_name
       @data.delete(statement)
     end
 
@@ -292,7 +312,7 @@ module RDF
     # @private
     # @see RDF::Mutable#clear
     def clear_statements
-      @data.delete(:context => context || false)
+      @data.delete(graph_name: graph_name || false)
     end
 
     protected :query_pattern

data/lib/rdf/model/list.rb

@@ -66,7 +66,7 @@ module RDF
     def initialize(subject = nil, graph = nil, values = nil, &block)
       @subject = subject || RDF.nil
       @graph   = graph   || RDF::Graph.new
-      is_empty = @graph.query(:subject => subject, :predicate => RDF.first).empty?
+      is_empty = @graph.query(subject: subject, predicate: RDF.first).empty?
 
       if subject && is_empty
         # An empty list with explicit subject and value initializers
@@ -113,7 +113,7 @@ module RDF
         list_nodes << li
         rest = nil
         firsts = rests = 0
-        @graph.query(:subject => li) do |st|
+        @graph.query(subject: li) do |st|
           return false unless st.subject.node?
           case st.predicate
           when RDF.first
@@ -454,7 +454,7 @@ module RDF
     # @return [Boolean]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000434
     def empty?
-      graph.query(:subject => subject, :predicate => RDF.first).empty?
+      graph.query(subject: subject, predicate: RDF.first).empty?
     end
 
     ##
@@ -574,7 +574,7 @@ module RDF
     #
     # @return [RDF::Term]
     def first
-      graph.first_object(:subject => first_subject, :predicate => RDF.first)
+      graph.first_object(subject: first_subject, predicate: RDF.first)
     end
 
     ##
@@ -685,7 +685,7 @@ module RDF
     # @return [RDF::Term]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000422
     def last
-      graph.first_object(:subject => last_subject, :predicate => RDF.first)
+      graph.first_object(subject: last_subject, predicate: RDF.first)
     end
 
     ##
@@ -729,7 +729,7 @@ module RDF
     #
     # @return [RDF::Resource]
     def rest_subject
-      graph.first_object(:subject => subject, :predicate => RDF.rest)
+      graph.first_object(subject: subject, predicate: RDF.rest)
     end
 
     ##
@@ -760,7 +760,7 @@ module RDF
       yield subject
 
       loop do
-        rest = graph.first_object(:subject => subject, :predicate => RDF.rest)
+        rest = graph.first_object(subject: subject, predicate: RDF.rest)
         break if rest.nil? || rest.eql?(RDF.nil)
         yield subject = rest
       end
@@ -780,7 +780,7 @@ module RDF
       return to_enum unless block_given?
 
       each_subject do |subject|
-        if value = graph.first_object(:subject => subject, :predicate => RDF.first)
+        if value = graph.first_object(subject: subject, predicate: RDF.first)
           yield value # FIXME
         end
       end
@@ -800,7 +800,7 @@ module RDF
       return enum_statement unless block_given?
 
       each_subject do |subject|
-        graph.query(:subject => subject, &block)
+        graph.query(subject: subject, &block)
       end
     end
     alias_method :to_rdf, :each_statement

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

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#boolean
   # @since 0.2.1
   class Boolean < Literal
-    DATATYPE = XSD.boolean
+    DATATYPE = RDF::XSD.boolean
     GRAMMAR  = /^(true|false|1|0)$/i.freeze
     TRUES    = %w(true  1).freeze
     FALSES   = %w(false 0).freeze

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

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#date
   # @since 0.2.1
   class Date < Literal
-    DATATYPE = XSD.date
+    DATATYPE = RDF::XSD.date
     GRAMMAR  = %r(\A(-?\d{4}-\d{2}-\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
     FORMAT   = '%Y-%m-%d'.freeze
 

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

@@ -5,9 +5,9 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#dateTime#boolean
   # @since 0.2.1
   class DateTime < Literal
-    DATATYPE = XSD.dateTime
+    DATATYPE = RDF::XSD.dateTime
     GRAMMAR  = %r(\A(-?\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%Y-%m-%dT%H:%M:%SZ'.freeze
+    FORMAT   = '%Y-%m-%dT%H:%M:%S%:z'.freeze
 
     ##
     # @param  [DateTime] value
@@ -32,9 +32,9 @@ module RDF; class Literal
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.strftime(FORMAT)
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
         else
-          @object.strftime(FORMAT[0..-2])
+          @object.strftime(FORMAT[0..-4])
         end
       end
       self
@@ -58,7 +58,7 @@ module RDF; class Literal
     # @return [RDF::Literal]
     def timezone
       if tz == 'Z'
-        RDF::Literal("PT0S", :datatype => RDF::XSD.dayTimeDuration)
+        RDF::Literal("PT0S", datatype: RDF::XSD.dayTimeDuration)
       elsif md = tz.to_s.match(/^([+-])?(\d+):(\d+)?$/)
         plus_minus, hour, min = md[1,3]
         plus_minus = nil unless plus_minus == "-"

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

@@ -11,7 +11,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#decimal
   # @since 0.2.1
   class Decimal < Numeric
-    DATATYPE = XSD.decimal
+    DATATYPE = RDF::XSD.decimal
     GRAMMAR  = /^[\+\-]?\d+(\.\d*)?$/.freeze
 
     ##

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

@@ -11,18 +11,20 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#double
   # @since 0.2.1
   class Double < Numeric
-    DATATYPE = XSD.double
+    DATATYPE = RDF::XSD.double
     GRAMMAR  = /^NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?([eE][\+\-]?\d+)?)))$/.freeze
 
     ##
     # @param  [Float, #to_f] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
+      #require 'byebug'; byebug
       @datatype = RDF::URI(options[:datatype] || self.class.const_get(:DATATYPE))
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(::String) then case value
+          when '+INF'  then 1/0.0
           when 'INF'  then 1/0.0
           when '-INF' then -1/0.0
           when 'NaN'  then 0/0.0

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

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#integer
   # @since 0.2.1
   class Integer < Decimal
-    DATATYPE = XSD.integer
+    DATATYPE = RDF::XSD.integer
     GRAMMAR  = /^[\+\-]?\d+$/.freeze
 
     ##

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

@@ -10,9 +10,9 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#time
   # @since 0.2.1
   class Time < Literal
-    DATATYPE = XSD.time
+    DATATYPE = RDF::XSD.time
     GRAMMAR  = %r(\A(\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
-    FORMAT   = '%H:%M:%SZ'.freeze
+    FORMAT   = '%H:%M:%S%:z'.freeze
 
     ##
     # @param  [Time] value
@@ -44,9 +44,9 @@ module RDF; class Literal
     def canonicalize!
       if self.valid?
         @string = if has_timezone?
-          @object.new_offset.strftime(FORMAT)
+          @object.new_offset.new_offset.strftime(FORMAT[0..-4] + 'Z')
         else
-          @object.strftime(FORMAT[0..-2])
+          @object.strftime(FORMAT[0..-4])
         end
       end
       self
@@ -92,7 +92,7 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || @object.strftime('%H:%M:%S%:z').sub("+00:00", 'Z')
+      @string || @object.strftime(FORMAT).sub("+00:00", 'Z')
     end
 
     ##

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

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#token
   # @since 0.2.3
   class Token < Literal
-    DATATYPE = XSD.token
+    DATATYPE = RDF::XSD.token
     GRAMMAR  = /\A[^\x0D\x0A\x09]+\z/i.freeze # FIXME
 
     ##

data/lib/rdf/model/literal.rb

@@ -24,17 +24,17 @@ module RDF
   #   value.plain?                                   #=> true`
   #
   # @example Creating a language-tagged literal (1)
-  #   value = RDF::Literal.new("Hello!", :language => :en)
+  #   value = RDF::Literal.new("Hello!", language: :en)
   #   value.has_language?                            #=> true
   #   value.language                                 #=> :en
   #
   # @example Creating a language-tagged literal (2)
-  #   RDF::Literal.new("Wazup?", :language => :"en-US")
-  #   RDF::Literal.new("Hej!",   :language => :sv)
-  #   RDF::Literal.new("¡Hola!", :language => :es)
+  #   RDF::Literal.new("Wazup?", language: :"en-US")
+  #   RDF::Literal.new("Hej!",   language: :sv)
+  #   RDF::Literal.new("¡Hola!", language: :es)
   #
   # @example Creating an explicitly datatyped literal
-  #   value = RDF::Literal.new("2009-12-31", :datatype => RDF::XSD.date)
+  #   value = RDF::Literal.new("2009-12-31", datatype: RDF::XSD.date)
   #   value.has_datatype?                            #=> true
   #   value.datatype                                 #=> RDF::XSD.date
   #
@@ -203,12 +203,46 @@ module RDF
       false
     end
 
+    ##
+    # Term compatibility according to SPARQL
+    #
+    # Compatibility of two arguments is defined as:
+    # * The arguments are simple literals or literals typed as xsd:string
+    # * The arguments are plain literals with identical language tags
+    # * The first argument is a plain literal with language tag and the second argument is a simple literal or literal typed as xsd:string
+    #
+    # @example
+    #     compatible?("abc"	"b")                         #=> true
+    #     compatible?("abc"	"b"^^xsd:string)             #=> true
+    #     compatible?("abc"^^xsd:string	"b")             #=> true
+    #     compatible?("abc"^^xsd:string	"b"^^xsd:string) #=> true
+    #     compatible?("abc"@en	"b")                     #=> true
+    #     compatible?("abc"@en	"b"^^xsd:string)         #=> true
+    #     compatible?("abc"@en	"b"@en)                  #=> true
+    #     compatible?("abc"@fr	"b"@ja)                  #=> false
+    #     compatible?("abc"	"b"@ja)                      #=> false
+    #     compatible?("abc"	"b"@en)                      #=> false
+    #     compatible?("abc"^^xsd:string	"b"@en)          #=> false
+    #
+    # @see http://www.w3.org/TR/sparql11-query/#func-arg-compatibility
+    # @since 2.0
+    def compatible?(other)
+      return false unless other.literal? && plain? && other.plain?
+
+      # * The arguments are simple literals or literals typed as xsd:string
+      # * The arguments are plain literals with identical language tags
+      # * The first argument is a plain literal with language tag and the second argument is a simple literal or literal typed as xsd:string
+      has_language? ?
+        (language == other.language || other.datatype == RDF::XSD.string) :
+        other.datatype == RDF::XSD.string
+    end
+
     ##
     # Returns a hash code for this literal.
     #
     # @return [Fixnum]
     def hash
-      @hash ||= to_s.hash
+      @hash ||= [to_s, datatype, language].hash
     end
 
 

data/lib/rdf/model/node.rb

@@ -16,7 +16,7 @@ module RDF
     # Defines the maximum number of interned Node references that can be held
     # cached in memory at any one time.
     #
-    # Note that caching interned nodes means that two different invocations using the same symbol will result in the same node, which may not be appropriate depending on the context from which it is used. RDF requires that bnodes with the same label are, in fact, different bnodes, unless they are used within the same document.
+    # @note caching interned nodes means that two different invocations using the same symbol will result in the same node, which may not be appropriate depending on the graph from which it is used. RDF requires that bnodes with the same label are, in fact, different bnodes, unless they are used within the same document.
     CACHE_SIZE = -1 # unlimited by default
 
     ##