rdf 0.3.0.pre → 0.3.0

data/lib/rdf/model/literal.rb

@@ -40,6 +40,7 @@ module RDF
   # @see http://www.w3.org/TR/rdf-concepts/#section-Datatypes-intro
   class Literal
     autoload :Boolean,  'rdf/model/literal/boolean'
+    autoload :Numeric,  'rdf/model/literal/numeric'
     autoload :Integer,  'rdf/model/literal/integer'
     autoload :Double,   'rdf/model/literal/double'
     autoload :Decimal,  'rdf/model/literal/decimal'
@@ -49,7 +50,7 @@ module RDF
     autoload :Token,    'rdf/model/literal/token'
     autoload :XML,      'rdf/model/literal/xml'
 
-    include RDF::Value
+    include RDF::Term
 
     ##
     # @private
@@ -105,6 +106,10 @@ module RDF
       literal
     end
 
+    TRUE  = RDF::Literal.new(true).freeze
+    FALSE = RDF::Literal.new(false).freeze
+    ZERO  = RDF::Literal.new(0).freeze
+
     # @return [Symbol] The language tag (optional).
     attr_accessor :language
 
@@ -162,7 +167,7 @@ module RDF
     ##
     # Returns `true`.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     def literal?
       true
     end
@@ -170,7 +175,7 @@ module RDF
     ##
     # Returns `false`.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     def anonymous?
       false
     end
@@ -184,56 +189,69 @@ module RDF
     end
 
     ##
-    # @return [Boolean]
+    # Returns `true` if this literal is equal to `other`.
+    #
+    # @example
+    #   RDF::Literal(1).eql?(RDF::Literal(1.0))  #=> false
+    #
+    # @param  [Object] other
+    # @return [Boolean] `true` or `false`
     def eql?(other)
-      other.is_a?(Literal) && self == other
+      self.equal?(other) ||
+        (self.class.eql?(other.class) &&
+         self.datatype.eql?(other.datatype) &&
+         self == other)
     end
 
     ##
-    # @return [Boolean]
+    # Returns `true` if this literal is equivalent to `other`.
+    #
+    # @example
+    #   RDF::Literal(1) == RDF::Literal(1.0)     #=> true
+    #
+    # @param  [Object] other
+    # @return [Boolean] `true` or `false`
     def ==(other)
       case other
         when Literal
-          value.eql?(other.value) &&
-          language.eql?(other.language) &&
-          datatype.eql?(other.datatype)
+          self.value.eql?(other.value) &&
+          self.language.eql?(other.language) &&
+          self.datatype.eql?(other.datatype)
         when String
-          value.eql?(other) &&
-            language.nil? &&
-            datatype.nil?
+          self.plain? && self.value.eql?(other)
         else false
       end
     end
+    alias_method :===, :==
 
     ##
     # Returns `true` if this is a plain literal.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-plain-literal
     def plain?
       language.nil? && datatype.nil?
     end
+    alias_method :simple?, :plain?
 
     ##
     # Returns `true` if this is a language-tagged literal.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-plain-literal
     def has_language?
       !language.nil?
     end
-
     alias_method :language?, :has_language?
 
     ##
     # Returns `true` if this is a datatyped literal.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-typed-literal
     def has_datatype?
       !datatype.nil?
     end
-
     alias_method :datatype?,  :has_datatype?
     alias_method :typed?,     :has_datatype?
     alias_method :datatyped?, :has_datatype?
@@ -242,7 +260,7 @@ module RDF
     # Returns `true` if the value adheres to the defined grammar of the
     # datatype.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     # @since  0.2.1
     def valid?
       grammar = self.class.const_get(:GRAMMAR) rescue nil
@@ -253,7 +271,7 @@ module RDF
     # Returns `true` if the value does not adhere to the defined grammar of
     # the datatype.
     #
-    # @return [Boolean]
+    # @return [Boolean] `true` or `false`
     # @since  0.2.1
     def invalid?
       !valid?

data/lib/rdf/model/resource.rb

@@ -2,7 +2,7 @@ module RDF
   ##
   # An RDF resource.
   module Resource
-    include RDF::Value
+    include RDF::Term
 
     ##
     # Instantiates an {RDF::Node} or an {RDF::URI}, depending on the given
@@ -24,5 +24,5 @@ module RDF
     def resource?
       true
     end
-  end
-end
+  end # Resource
+end # RDF

data/lib/rdf/model/statement.rb

@@ -24,12 +24,13 @@ module RDF
     ##
     # @private
     # @since 0.2.2
-    def self.from(statement)
+    def self.from(statement, options = {})
       case statement
+        when Array, Query::Pattern
+          self.new(statement[0], statement[1], statement[2], options.merge(:context => statement[3] || nil))
         when Statement then statement
-        when Hash      then self.new(statement)
-        when Array     then self.new(*statement)
-        else raise ArgumentError.new("expected RDF::Statement, Hash, or Array, but got #{statement.inspect}")
+        when Hash      then self.new(options.merge(statement))
+        else raise ArgumentError, "expected RDF::Statement, Hash, or Array, but got #{statement.inspect}"
       end
     end
 
@@ -45,7 +46,7 @@ module RDF
     # @return [RDF::URI]
     attr_accessor :predicate
 
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     attr_accessor :object
 
     ##
@@ -53,13 +54,13 @@ module RDF
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [RDF::Resource]  :subject   (nil)
     #   @option options [RDF::URI]       :predicate (nil)
-    #   @option options [RDF::Value]     :object    (nil)
+    #   @option options [RDF::Term]      :object    (nil)
     #   @option options [RDF::Resource]  :context   (nil)
     #
     # @overload initialize(subject, predicate, object, options = {})
     #   @param  [RDF::Resource]          subject
     #   @param  [RDF::URI]               predicate
-    #   @param  [RDF::Value]             object
+    #   @param  [RDF::Term]              object
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [RDF::Resource]  :context   (nil)
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
@@ -76,7 +77,7 @@ module RDF
           @object    = object
       end
       @id      = @options.delete(:id) if @options.has_key?(:id)
-      @context = @options.delete(:context) || @options.delete(:graph)
+      @context = @options.delete(:context)
       initialize!
     end
 
@@ -89,7 +90,7 @@ module RDF
       @object    = case @object
         when nil    then nil
         when Symbol then Node.intern(@object)
-        when Value  then @object
+        when Term   then @object
         else Literal.new(@object)
       end
     end
@@ -190,7 +191,7 @@ module RDF
 
     ##
     # @param  [Integer] index
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def [](index)
       case index
         when 0 then self.subject
@@ -203,8 +204,8 @@ module RDF
 
     ##
     # @param  [Integer]    index
-    # @param  [RDF::Value] value
-    # @return [RDF::Value]
+    # @param  [RDF::Term] value
+    # @return [RDF::Term]
     def []=(index, value)
       case index
         when 0 then self.subject   = value
@@ -216,13 +217,13 @@ module RDF
     end
 
     ##
-    # @return [Array(RDF::Value)]
+    # @return [Array(RDF::Term)]
     def to_quad
       [subject, predicate, object, context]
     end
 
     ##
-    # @return [Array(RDF::Value)]
+    # @return [Array(RDF::Term)]
     def to_triple
       [subject, predicate, object]
     end
@@ -236,7 +237,7 @@ module RDF
     # @param  [Symbol] subject_key
     # @param  [Symbol] predicate_key
     # @param  [Symbol] object_key
-    # @return [Hash{Symbol => RDF::Value}]
+    # @return [Hash{Symbol => RDF::Term}]
     def to_hash(subject_key = :subject, predicate_key = :predicate, object_key = :object, context_key = :context)
       {subject_key => subject, predicate_key => predicate, object_key => object, context_key => context}
     end

data/lib/rdf/model/term.rb

@@ -0,0 +1,45 @@
+module RDF
+  ##
+  # An RDF term.
+  #
+  # Terms can be used as subjects, predicates, objects, and contexts of
+  # statements.
+  #
+  # @since 0.3.0
+  module Term
+    include RDF::Value
+    include Comparable
+
+    ##
+    # Compares `self` to `other` for sorting purposes.
+    #
+    # Subclasses should override this to provide a more meaningful
+    # implementation than the default which simply performs a string
+    # comparison based on `#to_s`.
+    #
+    # @abstract
+    # @param  [Object]  other
+    # @return [Integer] `-1`, `0`, or `1`
+    def <=>(other)
+      self.to_s <=> other.to_s
+    end
+
+    ##
+    # Returns `true` if this term is constant.
+    #
+    # @return [Boolean] `true` or `false`
+    # @see    #variable?
+    def constant?
+      !(variable?)
+    end
+
+    ##
+    # Returns `true` if this term is variable.
+    #
+    # @return [Boolean] `true` or `false`
+    # @see    #constant?
+    def variable?
+      false
+    end
+  end # Term
+end # RDF

data/lib/rdf/model/value.rb

@@ -26,8 +26,6 @@ module RDF
   # @see RDF::Statement
   # @see RDF::URI
   module Value
-    include Comparable
-
     ##
     # Returns `true` if `self` is a graph.
     #
@@ -95,20 +93,6 @@ module RDF
       false
     end
 
-    ##
-    # Compares `self` to `other` for sorting purposes.
-    #
-    # Subclasses should override this to provide a more meaningful
-    # implementation than the default which simply performs a string
-    # comparison based on `#to_s`.
-    #
-    # @abstract
-    # @param  [Object]  other
-    # @return [Integer] `-1`, `0`, or `1`
-    def <=>(other)
-      self.to_s <=> other.to_s
-    end
-
     ##
     # Returns an `RDF::Value` representation of `self`.
     #
@@ -135,5 +119,5 @@ module RDF
     def inspect!
       warn(inspect)
     end
-  end
-end
+  end # Value
+end # RDF

data/lib/rdf/nquads.rb

@@ -1,7 +1,19 @@
 module RDF
   ##
   # **`RDF::NQuads`** provides support for the N-Quads serialization format.
+  #
+  # This has not yet been implemented as of RDF.rb 0.3.x.
   module NQuads
-    include NTriples # TODO
-  end
-end
+    class Format < NTriples::Format
+      # TODO
+    end # Format
+
+    class Reader < NTriples::Reader
+      # TODO
+    end # Reader
+
+    class Writer < NTriples::Writer
+      # TODO
+    end # Writer
+  end # NQuads
+end # RDF

data/lib/rdf/ntriples/reader.rb

@@ -30,7 +30,7 @@ module RDF::NTriples
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
     COMMENT               = /^#\s*(.*)$/.freeze
-    NODEID                = /^_:([A-Za-z][A-Za-z0-9]*)/.freeze
+    NODEID                = /^_:([A-Za-z][A-Za-z0-9\-_]*)/.freeze
     URIREF                = /^<([^>]+)>/.freeze
     LITERAL_PLAIN         = /^"((?:\\"|[^"])*)"/.freeze
     LITERAL_WITH_LANGUAGE = /^"((?:\\"|[^"])*)"@([a-z]+[\-A-Za-z0-9]*)/.freeze
@@ -56,7 +56,7 @@ module RDF::NTriples
     # representation.
     #
     # @param  [String] input
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def self.unserialize(input)
       case input
         when nil then nil
@@ -80,7 +80,7 @@ module RDF::NTriples
 
     ##
     # @param  [String] input
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def self.parse_object(input)
       parse_uri(input) || parse_node(input) || parse_literal(input)
     end
@@ -155,7 +155,7 @@ module RDF::NTriples
     end
 
     ##
-    # @return [RDF::Value]
+    # @return [RDF::Term]
     def read_value
       begin
         read_statement

data/lib/rdf/ntriples/writer.rb

@@ -117,14 +117,17 @@ module RDF::NTriples
     #
     # @param  [RDF::Value] value
     # @return [String]
+    # @raise  [ArgumentError] if `value` is not an `RDF::Statement` or `RDF::Term`
     def self.serialize(value)
       writer = self.new
       case value
         when nil then nil
         when RDF::Statement
           writer.format_statement(value) + "\n"
+        when RDF::Term
+          writer.format_term(value)
         else
-          writer.format_value(value)
+          raise ArgumentError, "expected an RDF::Statement or RDF::Term, but got #{value.inspect}"
       end
     end
 
@@ -142,7 +145,7 @@ module RDF::NTriples
     #
     # @param  [RDF::Resource] subject
     # @param  [RDF::URI]      predicate
-    # @param  [RDF::Value]    object
+    # @param  [RDF::Term]     object
     # @return [void]
     def write_triple(subject, predicate, object)
       puts format_triple(subject, predicate, object)
@@ -162,10 +165,10 @@ module RDF::NTriples
     #
     # @param  [RDF::Resource] subject
     # @param  [RDF::URI]      predicate
-    # @param  [RDF::Value]    object
+    # @param  [RDF::Term]     object
     # @return [String]
     def format_triple(subject, predicate, object)
-      "%s %s %s ." % [subject, predicate, object].map { |value| format_value(value) }
+      "%s %s %s ." % [subject, predicate, object].map { |value| format_term(value) }
     end
 
     ##

data/lib/rdf/ntriples.rb

@@ -84,7 +84,7 @@ module RDF
     def self.escape(string)
       Writer.escape(string)
     end
-  end
+  end # NTriples
 
   ##
   # Extensions for `RDF::Value`.
@@ -100,5 +100,5 @@ module RDF
     def to_ntriples
       RDF::NTriples.serialize(self)
     end
-  end
-end
+  end # Value
+end # RDF