rdf 1.99.1 → 2.0.0.beta1

data/lib/rdf/model/literal.rb

@@ -148,6 +148,7 @@ module RDF
     #
     # @param  [Object] value
     # @option options [Symbol]  :language (nil)
+    #   Language is downcased to ensure proper matching
     # @option options [String]  :lexical (nil)
     #   Supplied lexical representation of this literal,
     #   otherwise it comes from transforming `value` to a string form
@@ -166,7 +167,7 @@ module RDF
       @string   = value if !defined?(@string) && value.is_a?(String)
       @string   = @string.encode(Encoding::UTF_8) if @string
       @object   = @string if @string && @object.is_a?(String)
-      @language = options[:language].to_s.to_sym if options[:language]
+      @language = options[:language].to_s.downcase.to_sym if options[:language]
       @datatype = RDF::URI(options[:datatype]) if options[:datatype]
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
       @datatype ||= @language ? RDF.langString : RDF::XSD.string
@@ -195,14 +196,6 @@ module RDF
       true
     end
 
-    ##
-    # Returns `false`.
-    #
-    # @return [Boolean] `true` or `false`
-    def anonymous?
-      false
-    end
-
     ##
     # Term compatibility according to SPARQL
     #
@@ -275,7 +268,7 @@ module RDF
         (self.class.eql?(other.class) &&
          self.value_hash == other.value_hash &&
          self.value.eql?(other.value) &&
-         self.language.to_s.downcase.eql?(other.language.to_s.downcase) &&
+         self.language.to_s.eql?(other.language.to_s) &&
          self.datatype.eql?(other.datatype))
     end
 
@@ -296,7 +289,7 @@ module RDF
         case
         when self.eql?(other)
           true
-        when self.has_language? && self.language.to_s.downcase == other.language.to_s.downcase
+        when self.has_language? && self.language.to_s == other.language.to_s
           # Literals with languages can compare if languages are identical
           self.value_hash == other.value_hash && self.value == other.value
         when self.simple? && other.simple?
@@ -412,19 +405,27 @@ module RDF
     # @return [RDF::Literal] `self`
     # @since  0.3.0
     def canonicalize!
-      @language = @language.to_s.downcase.to_sym if @language
       self
     end
 
     ##
-    # Returns the base representation of this URI.
+    # Escape a literal using ECHAR escapes.
+    #
+    #    ECHAR ::= '\' [tbnrf"'\]
     #
-    # @return [Sring]
-    def to_base
-      text = %("#{escape(value)}")
-      text << "@#{language}" if has_language?
-      text << "^^#{datatype.to_base}" if has_datatype?
-      text
+    # @note N-Triples only requires '\"\n\r' to be escaped.
+    #
+    # @param  [String] string
+    # @return [String]
+    # @see {RDF::Term#escape}
+    def escape(string)
+      string.gsub('\\', '\\\\').
+             gsub("\t", '\\t').
+             gsub("\b", '\\b').
+             gsub("\n", '\\n').
+             gsub("\r", '\\r').
+             gsub("\f", '\\f').
+             gsub('"', '\\"')
     end
 
     ##

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

@@ -18,7 +18,6 @@ module RDF; class Literal
     # @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)
@@ -66,6 +65,21 @@ module RDF; class Literal
       self
     end
 
+    ##
+    # Returns `true` if this literal is equal to `other`.
+    #
+    # @param  [Object] other
+    # @return [Boolean] `true` or `false`
+    # @since  0.3.0
+    def ==(other)
+      if valid? && infinite? && other.respond_to?(:infinite?) && other.infinite?
+        infinite? == other.infinite?
+        # JRuby INF comparisons differ from MRI
+      else
+        super
+      end
+    end
+
     ##
     # Compares this literal to `other` for sorting purposes.
     #
@@ -75,9 +89,11 @@ module RDF; class Literal
     def <=>(other)
       case other
         when ::Numeric
-          to_d <=> other
-        when RDF::Literal::Decimal, RDF::Literal::Double
-          to_d <=> other.to_d
+          to_f <=> other
+        when RDF::Literal::Decimal
+          to_f <=> other.to_d
+        when RDF::Literal::Double
+          to_f <=> other.to_f
         else super
       end
     end

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

@@ -14,6 +14,8 @@ module RDF; class Literal
       case other
         when ::Numeric
           to_d <=> other
+        when Double
+          to_f <=> other.to_f
         when Numeric
           to_d <=> other.to_d
         else super
@@ -72,9 +74,9 @@ module RDF; class Literal
     # @since  0.2.3
     # @see http://www.w3.org/TR/xpath-functions/#func-numeric-add
     def +(other)
-      if self.class == Double || other.class == Double
+      if self.class == Double || [Double, ::Float].include?(other.class)
         RDF::Literal::Double.new(to_f + other.to_f)
-      elsif self.class == Float || other.class == Float
+      elsif ((self.class == RDF::Literal::Float || other.class == RDF::Literal::Float) rescue false)
         RDF::Literal::Float.new(to_f + other.to_f)
       elsif self.class == Decimal || other.class == Decimal
         RDF::Literal::Decimal.new(to_d + (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
@@ -91,9 +93,9 @@ module RDF; class Literal
     # @since  0.2.3
     # @see http://www.w3.org/TR/xpath-functions/#func-numeric-subtract
     def -(other)
-      if self.class == Double || other.class == Double
+      if self.class == Double || [Double, ::Float].include?(other.class)
         RDF::Literal::Double.new(to_f - other.to_f)
-      elsif self.class == Float || other.class == Float
+      elsif ((self.class == RDF::Literal::Float || other.class == RDF::Literal::Float) rescue false)
         RDF::Literal::Float.new(to_f - other.to_f)
       elsif self.class == Decimal || other.class == Decimal
         RDF::Literal::Decimal.new(to_d - (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
@@ -110,9 +112,9 @@ module RDF; class Literal
     # @since  0.2.3
     # @see http://www.w3.org/TR/xpath-functions/#func-numeric-multiply
     def *(other)
-      if self.class == Double || other.class == Double
+      if self.class == Double || [Double, ::Float].include?(other.class)
         RDF::Literal::Double.new(to_f * other.to_f)
-      elsif self.class == Float || other.class == Float
+      elsif ((self.class == RDF::Literal::Float || other.class == RDF::Literal::Float) rescue false)
         RDF::Literal::Float.new(to_f * other.to_f)
       elsif self.class == Decimal || other.class == Decimal
         RDF::Literal::Decimal.new(to_d * (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
@@ -124,8 +126,8 @@ module RDF; class Literal
     ##
     # Returns the quotient of `self` divided by `other`.
     #
-    # As a special case, if the types of both $arg1 and $arg2 are xs:integer,
-    # then the return type is xs:decimal.
+    # As a special case, if the types of both $arg1 and $arg2 are xsd:integer,
+    # then the return type is xsd:decimal.
     #
     # @param  [Literal::Numeric, #to_i, #to_f, #to_d] other
     # @return [RDF::Literal::Numeric]
@@ -133,14 +135,12 @@ module RDF; class Literal
     # @since  0.2.3
     # @see http://www.w3.org/TR/xpath-functions/#func-numeric-divide
     def /(other)
-      if self.class == Double || other.class == Double
+      if self.class == Double || [Double, ::Float].include?(other.class)
         RDF::Literal::Double.new(to_f / other.to_f)
-      elsif self.class == Float || other.class == Float
+      elsif ((self.class == RDF::Literal::Float || other.class == RDF::Literal::Float) rescue false)
         RDF::Literal::Float.new(to_f / other.to_f)
-      elsif self.class == Decimal || other.class == Decimal
-        RDF::Literal::Decimal.new(to_d / (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
       else
-        RDF::Literal::Integer.new(to_i / other.to_i)
+        RDF::Literal::Decimal.new(to_d / (other.respond_to?(:to_d) ? other.to_d : BigDecimal(other.to_s)))
       end
     end
 
@@ -211,6 +211,8 @@ module RDF; class Literal
     # @return [BigDecimal]
     def to_d
       @object.respond_to?(:to_d) ? @object.to_d : BigDecimal(@object.to_s)
+    rescue FloatDomainError
+      ::Float::NAN
     end
 
     ##

data/lib/rdf/model/node.rb

@@ -30,18 +30,17 @@ module RDF
     ##
     # Returns a blank node with a random UUID-based identifier.
     #
-    # @param  [Hash{Symbol => Object}] options
-    # @option options [Regexp] :grammar (nil)
+    # @param [Regexp] grammar (nil)
     #   a grammar specification that the generated UUID must match
     # @return [RDF::Node]
-    def self.uuid(options = {})
+    def self.uuid(grammar: nil)
       case
-        when options[:grammar]
+        when grammar
           # The UUID is generated such that its initial part is guaranteed
           # to match the given `grammar`, e.g. `/^[A-Za-z][A-Za-z0-9]*/`.
           # Some RDF storage systems (e.g. AllegroGraph) require this.
           # @see http://github.com/bendiken/rdf/pull/43
-          uuid = RDF::Util::UUID.generate(options) until uuid =~ options[:grammar]
+          uuid = RDF::Util::UUID.generate(options) until uuid =~ grammar
         else
           uuid = RDF::Util::UUID.generate(options)
       end
@@ -121,7 +120,7 @@ module RDF
     end
 
     ##
-    # Determins if `self` is the same term as `other`.
+    # Determines if `self` is the same term as `other`.
     #
     # In this case, nodes must be the same object
     #
@@ -148,25 +147,25 @@ module RDF
       else
         other.respond_to?(:node?) && other.node? &&
           self.hash == other.to_term.hash &&
-          other.respond_to?(:id) && @id == other.id
+          other.respond_to?(:id) && @id == other.to_term.id
       end
     end
     alias_method :===, :==
 
-    ##
-    # Returns the base representation of this node.
-    #
-    # @return [Sring]
-    def to_base
-      to_s
-    end
-
     ##
     # Returns a representation of this node independent of any identifier used to initialize it
     #
     # @return [String]
     def to_unique_base
-      "_:g#{__id__.to_i.abs}"
+      original ? original.to_unique_base :  "_:g#{__id__.to_i.abs}"
+    end
+
+    ##
+    # Make this term identifier unique, if it is found to be shared with another node having the same identifier
+    # @return [self]
+    def make_unique!
+      @id = to_unique_base[2..-1]
+      self
     end
 
     ##

data/lib/rdf/model/statement.rb

@@ -48,28 +48,6 @@ module RDF
     # @return [RDF::Resource]
     attr_accessor :graph_name
 
-    ##
-    # 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] Statement#context is being replaced with Statement@graph_name in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
-      graph_name
-    end
-
-    ##
-    # 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=(value)
-      warn "[DEPRECATION] Statement#context= is being replaced with Statement@graph_name= in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
-      self.graph_name = value
-    end
-
     # @return [RDF::Resource]
     attr_accessor :subject
 
@@ -87,8 +65,6 @@ module RDF
     #   @option options [RDF::URI]       :predicate (nil)
     #   @option options [RDF::Resource]      :object    (nil)
     #     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]  :context   (nil)
-    #     Alias for :graph_name, :context is deprecated in RDF.rb.
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @return [RDF::Statement]
@@ -100,8 +76,6 @@ module RDF
     #   @param  [RDF::Resource]              object
     #     if not a {Resource}, it is coerced to {Literal} or {Node} depending on if it is a symbol or something other than a {Term}.
     #   @param  [Hash{Symbol => Object}] options
-    #   @option options [RDF::Term]  :context   (nil)
-    #     Alias for :graph_name, :context is deprecated in RDF.rb.
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @return [RDF::Statement]
@@ -117,10 +91,6 @@ module RDF
         @predicate = predicate
         @object    = object
       end
-      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
       @id          = @options.delete(:id) if @options.has_key?(:id)
       @graph_name  = @options.delete(:graph_name)
       initialize!
@@ -229,14 +199,6 @@ module RDF
     end
     alias_method :has_name?, :has_graph?
 
-    ##
-    # @return [Boolean]
-    # @deprecated Use {#has_graph?} instead.
-    def has_context?
-      warn "[DEPRECATION] Statement#has_context? is being replaced with Statement#has_grap in RDF.rb 2.0. Called from #{Gem.location_of_caller.join(':')}"
-     !!context
-    end
-
     ##
     # @return [Boolean]
     def has_subject?
@@ -386,11 +348,7 @@ module RDF
     # @return [RDF::Graph]
     # @see    http://www.w3.org/TR/rdf-primer/#reification
     def reified(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
-      RDF::Graph.new(options[:graph_name]) do |graph|
+      RDF::Graph.new(graph_name: options[:graph_name]) do |graph|
         subject = options[:subject] || RDF::Node.new(options[:id])
         graph << [subject, RDF.type,      RDF[:Statement]]
         graph << [subject, RDF.subject,   self.subject]

data/lib/rdf/model/term.rb

@@ -80,6 +80,14 @@ module RDF
       self
     end
 
+    ##
+    # Returns the base representation of this term.
+    #
+    # @return [Sring]
+    def to_base
+      RDF::NTriples.serialize(self)
+    end
+
     ##
     # Term compatibility according to SPARQL
     #
@@ -91,18 +99,12 @@ module RDF
 
     protected
     ##
-    # Escape a term using standard character escapes
+    # Escape a term using escapes. This should be implemented as appropriate for the given type of term.
     #
     # @param  [String] string
     # @return [String]
     def escape(string)
-      string.gsub('\\', '\\\\').
-             gsub("\b", '\\b').
-             gsub("\f", '\\f').
-             gsub("\t", '\\t').
-             gsub("\n", '\\n').
-             gsub("\r", '\\r').
-             gsub('"', '\\"')
+      raise NotImplementedError, "#{self.class}#escape"
     end
 
   end # Term

data/lib/rdf/model/uri.rb

@@ -10,7 +10,7 @@ module RDF
   #   uri = RDF::URI.new("http://rubygems.org/gems/rdf")
   #
   # @example Creating a URI reference (2)
-  #   uri = RDF::URI.new(scheme: 'http', host: 'rubygems.org', path: '/rdf')
+  #   uri = RDF::URI.new(scheme: 'http', host: 'rubygems.org', path: '/gems/rdf')
   #     #=> RDF::URI.new("http://rubygems.org/gems/rdf")
   #
   # @example Creating an interned URI reference
@@ -39,7 +39,7 @@ module RDF
       [\\u{40000}-\\u{4FFFD}]|[\\u{50000}-\\u{5FFFD}]|[\\u{60000}-\\u{6FFFD}]|
       [\\u{70000}-\\u{7FFFD}]|[\\u{80000}-\\u{8FFFD}]|[\\u{90000}-\\u{9FFFD}]|
       [\\u{A0000}-\\u{AFFFD}]|[\\u{B0000}-\\u{BFFFD}]|[\\u{C0000}-\\u{CFFFD}]|
-      [\\u{D0000}-\\u{DFFFD}]|[\\u{E0000}-\\u{EFFFD}]
+      [\\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
@@ -202,14 +202,9 @@ module RDF
     ##
     # @overload URI(uri, options = {})
     #   @param  [URI, String, #to_s]    uri
-    #   @param  [Hash{Symbol => Object}] options
-    #   @option options [Boolean] :validate (false)
-    #   @option options [Boolean] :canonicalize (false)
     #
     # @overload URI(options = {})
     #   @param  [Hash{Symbol => Object}] options
-    #   @option options [Boolean] :validate (false)
-    #   @option options [Boolean] :canonicalize (false)
     #   @option [String, #to_s] :scheme The scheme component.
     #   @option [String, #to_s] :user The user component.
     #   @option [String, #to_s] :password The password component.
@@ -224,33 +219,34 @@ module RDF
     #   @option [String, #to_s] :path The path component.
     #   @option [String, #to_s] :query The query component.
     #   @option [String, #to_s] :fragment The fragment component.
-    def initialize(*args)
-      options = args.last.is_a?(Hash) ? args.last : {}
+    #
+    #   @param [Boolean] validate (false)
+    #   @param [Boolean] canonicalize (false)
+    def initialize(*args, validate: false, canonicalize: false, **options)
       uri = args.first
-      case uri
-      when Hash
+      if uri
+        @value = uri.to_s
+        if @value.encoding != Encoding::UTF_8
+          @value = @value.dup if @value.frozen?
+          @value.force_encoding(Encoding::UTF_8)
+        end
+      else
         %w(
           scheme
           user password userinfo
           host port authority
           path query fragment
         ).map(&:to_sym).each do |meth|
-          if uri.has_key?(meth)
-            self.send("#{meth}=".to_sym, uri[meth])
+          if options.has_key?(meth)
+            self.send("#{meth}=".to_sym, options[meth])
           else
             self.send(meth)
           end
         end
-      else
-        @value = uri.to_s
-        if @value.encoding != Encoding::UTF_8
-          @value = @value.dup if @value.frozen?
-          @value.force_encoding(Encoding::UTF_8)
-        end
       end
 
-      validate!     if options[:validate]
-      canonicalize! if options[:canonicalize]
+      validate!     if validate
+      canonicalize! if canonicalize
     end
 
     ##
@@ -341,10 +337,11 @@ module RDF
     ##
     # Determine if the URI is a valid according to RFC3987
     #
+    # Note that RDF URIs syntactically can contain Unicode escapes, which are unencoded in the internal representation. To validate, %-encode specifically excluded characters from IRIREF
+    #
     # @return [Boolean] `true` or `false`
     # @since 0.3.9
     def valid?
-      # Validate relative to RFC3987
       to_s.match(RDF::URI::IRI) || false
     end
 
@@ -355,7 +352,7 @@ module RDF
     # @raise  [ArgumentError] if the URI is invalid
     # @since  0.3.0
     def validate!
-      raise ArgumentError, "#{to_s.inspect} is not a valid IRI" if invalid?
+      raise ArgumentError, "#{to_base.inspect} is not a valid IRI" if invalid?
       self
     end
 
@@ -475,7 +472,7 @@ module RDF
     # @example Building a HTTP URL
     #     RDF::URI.new('http://example.org') / 'jhacker' / 'foaf.ttl'
     #     #=> RDF::URI('http://example.org/jhacker/foaf.ttl')
-    # @example Building a HTTP URL
+    # @example Building a HTTP URL (absolute path components)
     #     RDF::URI.new('http://example.org/') / '/jhacker/' / '/foaf.ttl'
     #     #=> RDF::URI('http://example.org/jhacker/foaf.ttl')
     # @example Using an anchored base URI
@@ -790,14 +787,6 @@ module RDF
       self
     end
 
-    ##
-    # Returns the base representation of this URI.
-    #
-    # @return [Sring]
-    def to_base
-      "<#{escape(to_s)}>"
-    end
-
     ##
     # Returns the string representation of this URI.
     #
@@ -1216,16 +1205,22 @@ module RDF
     # Sets the query component for this URI from a Hash object.
     # An empty Hash or Array will result in an empty query string.
     #
-    # @example
+    # @example Hash with single and array values
     #   uri.query_values = {a: "a", b: ["c", "d", "e"]}
     #   uri.query
     #   # => "a=a&b=c&b=d&b=e"
+    #
+    # @example Array with Array values including repeated variables
     #   uri.query_values = [['a', 'a'], ['b', 'c'], ['b', 'd'], ['b', 'e']]
     #   uri.query
     #   # => "a=a&b=c&b=d&b=e"
+    #
+    # @example Array with Array values including multiple elements
     #   uri.query_values = [['a', 'a'], ['b', ['c', 'd', 'e']]]
     #   uri.query
     #   # => "a=a&b=c&b=d&b=e"
+    #
+    # @example Array with Array values having only one entry
     #   uri.query_values = [['flag'], ['key', 'value']]
     #   uri.query
     #   # => "flag&key=value"
@@ -1245,7 +1240,13 @@ module RDF
           if v.nil?
             k
           else
-            "#{k}=#{normalize_segment(v.to_s, UNRESERVED)}"
+            Array(v).map do |vv|
+              if vv === TrueClass
+                k
+              else
+                "#{k}=#{normalize_segment(vv.to_s, UNRESERVED)}"
+              end
+            end.join("&")
           end
         end
       when Hash