rdf 1.0.10.2 → 1.1.0.p0

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

@@ -144,46 +144,6 @@ module RDF; class Literal
       end
     end
 
-    ##
-    # Returns the absolute value of `self`.
-    #
-    # @return [RDF::Literal]
-    # @raise  [NotImplementedError] unless implemented in subclass
-    def abs
-      raise NotImplementedError
-    end
-
-    ##
-    # Returns the number with no fractional part that is closest to the argument. If there are two such numbers, then the one that is closest to positive infinity is returned. An error is raised if arg is not a numeric value.
-    #
-    # @return [RDF::Literal]
-    # @raise  [NotImplementedError] unless implemented in subclass
-    def round
-      raise NotImplementedError
-    end
-
-    ##
-    # Returns the smallest integer greater than or equal to `self`.
-    #
-    # @example
-    #   RDF::Literal(1).ceil            #=> RDF::Literal(1)
-    #
-    # @return [RDF::Literal]
-    def ceil
-      self
-    end
-
-    ##
-    # Returns the largest integer less than or equal to `self`.
-    #
-    # @example
-    #   RDF::Literal(1).floor            #=> RDF::Literal(1)
-    #
-    # @return [RDF::Literal]
-    def floor
-      self
-    end
-
     ##
     # Returns the value as an integer.
     #

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

@@ -22,7 +22,7 @@ module RDF; class Literal
       @string   ||= value if value.is_a?(String)
       @object   = case
         when value.is_a?(::Time)         then value
-        when value.respond_to?(:to_time) then value.to_time rescue ::Time.parse(value.to_s)
+        when value.respond_to?(:to_time) then value.to_time
         else ::Time.parse(value.to_s)
       end rescue nil
     end
@@ -63,11 +63,12 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || if RUBY_VERSION >= '1.9' && RUBY_PLATFORM != 'java'
+      @string || if RUBY_PLATFORM != 'java'
         @object.strftime('%H:%M:%S%:z').
         sub(/\+00:00|UTC|GMT/, 'Z')
       else
-        # Ruby 1.8 doesn't do timezone's properly, use utc_offset
+        # FIXME: verify
+        # JRuby doesn't do timezone's properly, use utc_offset
         off = @object.utc_offset == 0 ? "Z" : ("%0.2d:00" % (@object.utc_offset/3600))
         @object.strftime("%H:%M:%S#{off}")
       end

data/lib/rdf/model/node.rb

@@ -132,9 +132,7 @@ module RDF
         # If other is a Literal, reverse test to consolodate complex type checking logic
         other == self
       else 
-        other.respond_to?(:node?) && other.node? &&
-          self.hash == other.hash &&
-          other.respond_to?(:id) && @id == other.id
+        other.respond_to?(:node?) && other.node? && other.respond_to?(:id) && @id == other.id
       end
     end
     alias_method :===, :==

data/lib/rdf/model/statement.rb

@@ -9,7 +9,6 @@ module RDF
   #   RDF::Statement.new(s, p, o)
   #
   # @example Creating an RDF statement with a context
-  #   uri = RDF::URI("http://example/")
   #   RDF::Statement.new(s, p, o, :context => uri)
   #
   # @example Creating an RDF statement from a `Hash`
@@ -59,7 +58,6 @@ module RDF
     #   @option options [RDF::Term]      :object    (nil)
     #   @option options [RDF::Resource]  :context   (nil)
     #     Note, in RDF 1.1, a context MUST be an IRI.
-    #   @return [RDF::Statement]
     #
     # @overload initialize(subject, predicate, object, options = {})
     #   @param  [RDF::Resource]          subject
@@ -67,7 +65,6 @@ module RDF
     #   @param  [RDF::Term]              object
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [RDF::Resource]  :context   (nil)
-    #   @return [RDF::Statement]
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       case subject
         when Hash
@@ -108,18 +105,6 @@ module RDF
       true
     end
 
-    ##
-    # Returns `true` if any element of the statement is not a
-    # URI, Node or Literal.
-    #
-    # @return [Boolean]
-    def variable?
-      !(has_subject?    && subject.resource? && 
-        has_predicate?  && predicate.resource? &&
-        has_object?     && (object.resource? || object.literal?) &&
-        (has_context?    ? context.resource? : true ))
-    end
-
     ##
     # @return [Boolean]
     def invalid?
@@ -129,10 +114,10 @@ module RDF
     ##
     # @return [Boolean]
     def valid?
-      has_subject?    && subject.resource? && subject.valid? && 
-      has_predicate?  && predicate.uri? && predicate.valid? &&
-      has_object?     && object.term? && object.valid? &&
-      (has_context? ? context.resource? && context.valid? : true )
+      has_subject?    && subject.valid? && 
+      has_predicate?  && predicate.valid? &&
+      has_object?     && object.valid? &&
+      (has_context?    ? context.valid? : true )
     end
 
     ##
@@ -184,11 +169,12 @@ module RDF
     end
 
     ##
-    # Returns `true` if any resource of this statement is a blank node.
+    # Returns `true` if the subject or object of this statement is a blank
+    # node.
     #
     # @return [Boolean]
     def has_blank_nodes?
-      to_quad.compact.any?(&:node?)
+      (has_object? && object.node?) || (has_subject? && subject.node?)
     end
 
     ##
@@ -258,32 +244,6 @@ module RDF
     alias_method :to_a,   :to_triple
     alias_method :to_ary, :to_triple
 
-    ##
-    # Canonicalizes each unfrozen term in the statement
-    #
-    # @return [RDF::Statement] `self`
-    # @since  1.0.8
-    # @raise [ArgumentError] if any element cannot be canonicalized.
-    def canonicalize!
-      self.subject.canonicalize!    if has_subject? && !self.subject.frozen?
-      self.predicate.canonicalize!  if has_predicate? && !self.predicate.frozen?
-      self.object.canonicalize!     if has_object? && !self.object.frozen?
-      self.context.canonicalize!    if has_context? && !self.context.frozen?
-      self.validate!
-      self
-    end
-
-    ##
-    # Returns a version of the statement with each position in canonical form
-    #
-    # @return [RDF::Statement] `self` or nil if statement cannot be canonicalized
-    # @since  1.0.8
-    def canonicalize
-      self.dup.canonicalize!
-    rescue ArgumentError
-      nil
-    end
-
     ##
     # Returns the terms of this statement as a `Hash`.
     #

data/lib/rdf/model/term.rb

@@ -56,6 +56,15 @@ module RDF
       super
     end
 
+    ##
+    # Returns `true` if this term is constant.
+    #
+    # @return [Boolean] `true` or `false`
+    # @see    #variable?
+    def constant?
+      !(variable?)
+    end
+
     ##
     # Returns a base representation of `self`.
     #

data/lib/rdf/model/uri.rb

@@ -33,18 +33,15 @@ module RDF
     CACHE_SIZE = -1 # unlimited by default
     
     # IRI components
-    if RUBY_VERSION >= '1.9'
-      UCSCHAR = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-        [\\u00A0-\\uD7FF]|[\\uF900-\\uFDCF]|[\\uFDF0-\\uFFEF]|
-        [\\u{10000}-\\u{1FFFD}]|[\\u{20000}-\\u{2FFFD}]|[\\u{30000}-\\u{3FFFD}]|
-        [\\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}]
-      EOS
-      IPRIVATE = Regexp.compile("[\\uE000-\\uF8FF]|[\\u{F0000}-\\u{FFFFD}]|[\\u100000-\\u10FFFD]").freeze
-    end
-
+    UCSCHAR = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
+      [\\u00A0-\\uD7FF]|[\\uF900-\\uFDCF]|[\\uFDF0-\\uFFEF]|
+      [\\u{10000}-\\u{1FFFD}]|[\\u{20000}-\\u{2FFFD}]|[\\u{30000}-\\u{3FFFD}]|
+      [\\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}]
+    EOS
+    IPRIVATE = Regexp.compile("[\\uE000-\\uF8FF]|[\\u{F0000}-\\u{FFFFD}]|[\\u100000-\\u10FFFD]").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
@@ -54,19 +51,11 @@ module RDF
     RESERVED = Regexp.compile("(?:#{GEN_DELIMS}|#{SUB_DELIMS})").freeze
     UNRESERVED = Regexp.compile("[A-Za-z0-9]|-|\\.|_|~").freeze
 
-    if RUBY_VERSION >= '1.9'
-      IUNRESERVED = Regexp.compile("[A-Za-z0-9]|-|\\.|_|~|#{UCSCHAR}").freeze
-    else
-      IUNRESERVED = Regexp.compile("[A-Za-z0-9]|-|\\.|_|~").freeze
-    end
+    IUNRESERVED = Regexp.compile("[A-Za-z0-9]|-|\\.|_|~|#{UCSCHAR}").freeze
 
     IPCHAR = Regexp.compile("(?:#{IUNRESERVED}|#{PCT_ENCODED}|#{SUB_DELIMS}|:|@)").freeze
 
-    if RUBY_VERSION >= '1.9'
-      IQUERY = Regexp.compile("(?:#{IPCHAR}|#{IPRIVATE}|/|\\?)*").freeze
-    else
-      IQUERY = Regexp.compile("(?:#{IPCHAR}|/|\\?)*").freeze
-    end
+    IQUERY = Regexp.compile("(?:#{IPCHAR}|#{IPRIVATE}|/|\\?)*").freeze
 
     IFRAGMENT = Regexp.compile("(?:#{IPCHAR}|/|\\?)*").freeze.freeze
 
@@ -90,14 +79,7 @@ module RDF
 
     IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
-
-    # List of schemes known not to be hierarchical
-    NON_HIER_SCHEMES = %w(
-      about acct bitcoin callto cid data fax geo gtalk h323 iax icon im jabber
-      jms magnet mailto maps news pres proxy session sip sips skype sms spotify stun stuns
-      tag tel turn turns tv urn javascript
-    ).freeze
-
+    
     ##
     # @return [RDF::Util::Cache]
     # @private
@@ -145,7 +127,6 @@ module RDF
     #
     # @overload URI.new(options = {})
     #   @param  [Hash{Symbol => Object}] options
-    # @raise [ArgumentError] on seriously invalid URI
     def initialize(uri_or_options)
       case uri_or_options
         when Hash
@@ -155,8 +136,6 @@ module RDF
         else
           @uri = Addressable::URI.parse(uri_or_options.to_s)
       end
-    rescue Addressable::URI::InvalidURIError => e
-      raise ArgumentError, e.message
     end
 
     ##
@@ -181,21 +160,6 @@ module RDF
       self.start_with?('urn:')
     end
 
-    ##
-    # Returns `true` if the URI scheme is hierarchical.
-    #
-    # @example
-    #   RDF::URI('http://example.org/').hier?                    #=> true
-    #   RDF::URI('urn:isbn:125235111').hier?                     #=> false
-    #
-    # @return [Boolean] `true` or `false`
-    # @see    http://en.wikipedia.org/wiki/URI_scheme
-    # @see    {NON_HIER_SCHEMES}
-    # @since  1.0.10
-    def hier?
-      !NON_HIER_SCHEMES.include?(scheme)
-    end
-
     ##
     # Returns `true` if this URI is a URL.
     #
@@ -223,16 +187,14 @@ module RDF
     alias_method :size, :length
 
     ##
-    # Determine if the URI is a valid according to RFC3987
-    #
-    # Note, for Ruby versions < 1.9, this always returns true.
+    # Determine if the URI is avalid according to RFC3987
     #
     # @return [Boolean] `true` or `false`
     # @since 0.3.9
     def valid?
       # As Addressable::URI does not perform adequate validation, validate
       # relative to RFC3987
-      to_s.match(RDF::URI::IRI) || false
+      to_s.match(RDF::URI::IRI) || to_s.match(RDF::URI::IRELATIVE_REF) || false
     end
 
     ##
@@ -246,6 +208,16 @@ module RDF
       self
     end
 
+    ##
+    # Returns a copy of this URI converted into its canonical lexical
+    # representation.
+    #
+    # @return [RDF::URI]
+    # @since  0.3.0
+    def canonicalize
+      self.dup.canonicalize!
+    end
+
     ##
     # Converts this URI into its canonical lexical representation.
     #
@@ -278,15 +250,12 @@ module RDF
     # @see RDF::URI#+
     # @param  [Array<String, RDF::URI, #to_s>] uris
     # @return [RDF::URI]
-    # @raise  [ArgumentError] if the resulting URI is invalid
     def join(*uris)
       result = @uri.dup
       uris.each do |uri|
         result = result.join(uri)
       end
       self.class.new(result)
-    rescue Addressable::URI::InvalidURIError => e
-      raise ArgumentError, e.message
     end
 
     ##
@@ -312,7 +281,6 @@ module RDF
     #
     # @param [Any] fragment A URI fragment to be appended to this URI
     # @return [RDF::URI]
-    # @raise  [ArgumentError] if the URI is invalid
     # @see RDF::URI#+
     # @see RDF::URI#join
     # @see <http://tools.ietf.org/html/rfc3986#section-5.2>
@@ -372,27 +340,20 @@ module RDF
     # @see RDF::URI#join
     # @param [Any] other
     # @return [RDF::URI]
-    # @raise [ArgumentError] on seriously invalid URI
     def +(other)
       RDF::URI.intern(self.to_s + other.to_s)
-    rescue Addressable::URI::InvalidURIError => e
-      raise ArgumentError, e.message
     end
 
     ##
-    # Returns `true` if this URI's scheme is not hierarchical,
-    # or its path component is equal to `/`.
-    # Protocols not using hierarchical components are always considered
-    # to be at the root.
+    # Returns `true` if this URI's path component is equal to `/`.
     #
     # @example
     #   RDF::URI('http://example.org/').root?                   #=> true
     #   RDF::URI('http://example.org/path/').root?              #=> false
-    #   RDF::URI('urn:isbn').root?                              #=> true
     #
     # @return [Boolean] `true` or `false`
     def root?
-      !self.hier?  || self.path == '/' || self.path.empty?
+      self.path == '/' || self.path.empty?
     end
 
     ##
@@ -414,7 +375,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if this URI is hierarchical and it's path component isn't equal to `/`.
+    # Returns `true` if this URI's path component isn't equal to `/`.
     #
     # @example
     #   RDF::URI('http://example.org/').has_parent?             #=> false
@@ -538,7 +499,7 @@ module RDF
     # @param  [RDF::URI] other
     # @return [Boolean] `true` or `false`
     def eql?(other)
-      other.is_a?(URI) && self.hash == other.hash && self == other
+      other.is_a?(URI) && self == other
     end
 
     ##
@@ -560,7 +521,6 @@ module RDF
         # If other is a Literal, reverse test to consolodate complex type checking logic
         other == self
       when String then to_s == other
-      when URI then hash == other.hash && to_s == other.to_s
       when URI, Addressable::URI then to_s == other.to_s
       else other.respond_to?(:to_uri) && to_s == other.to_uri.to_s
       end

data/lib/rdf/model/value.rb

@@ -103,7 +103,7 @@ module RDF
     end
 
     ##
-    # Returns `true` this value is a {RDF::Query::Variable}, or is contains a variable.
+    # Returns `true` if `self` is a {RDF::Query::Variable}.
     #
     # @return [Boolean]
     # @since  0.1.7
@@ -111,15 +111,6 @@ module RDF
       false
     end
 
-    ##
-    # Returns `true` if this value is constant.
-    #
-    # @return [Boolean] `true` or `false`
-    # @see    #variable?
-    def constant?
-      !(variable?)
-    end
-
     ##
     # Is this an anonymous value?
     #
@@ -156,27 +147,6 @@ module RDF
     end
     alias_method :validate, :validate!
 
-    ##
-    # Returns a copy of this value converted into its canonical
-    # representation.
-    #
-    # @return [RDF::Value]
-    # @since  1.0.8
-    def canonicalize
-      self.dup.canonicalize!
-    end
-
-    ##
-    # Converts this value into its canonical representation.
-    #
-    # Should be overridden by concrete classes.
-    #
-    # @return [RDF::Value] `self`
-    # @since  1.0.8
-    def canonicalize!
-      self
-    end
-
     ##
     # Returns an `RDF::Value` representation of `self`.
     #