rdf 0.0.9 → 0.1.0

data/lib/rdf/model/uri.rb

@@ -17,12 +17,12 @@ module RDF
   #
   # @see http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
   # @see http://addressable.rubyforge.org/
-  class URI < Node
+  class URI < Resource
     ##
     # Creates a new `RDF::URI` instance based on the given `uri` string.
     #
-    # This is just an alias for {RDF::URI.new} for compatibity with
-    # {Addressable::URI].
+    # This is just an alias for {#initialize RDF::URI.new} for compatibity
+    # with `Addressable::URI.parse`.
     #
     # @param  [String] uri
     # @return [URI]
@@ -63,6 +63,20 @@ module RDF
       false
     end
 
+    ##
+    # Joins several URIs together.
+    #
+    # @param  [Array<String, URI, #to_str>] uris
+    # @return [URI]
+    def join(*uris)
+      result = @uri
+      uris.each do |uri|
+        result.path += '/' unless result.path[-1] == ?/ # '/'
+        result = result.join(uri)
+      end
+      self.class.new(result)
+    end
+
     ##
     # Returns `true` if this URI's path component is equal to `/`.
     #
@@ -200,7 +214,11 @@ module RDF
     # @private
     def method_missing(symbol, *args, &block)
       if @uri.respond_to?(symbol)
-        @uri.send(symbol, *args, &block)
+        case result = @uri.send(symbol, *args, &block)
+          when Addressable::URI
+            self.class.new(result)
+          else result
+        end
       else
         super
       end

data/lib/rdf/ntriples/reader.rb

@@ -14,8 +14,8 @@ module RDF::NTriples
     format RDF::NTriples::Format
 
     ##
-    # @return [Array, nil]
-    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
+    # @return [Array]
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
     def read_triple
       loop do
         readline.strip! # EOFError thrown on end of input
@@ -66,7 +66,7 @@ module RDF::NTriples
         elsif datatype = match(/^(\^\^)/)
           RDF::Literal.new(literal, :datatype => read_uriref || fail_object)
         else
-          literal # plain string literal
+          RDF::Literal.new(literal) # plain string literal
         end
       end
     end

data/lib/rdf/ntriples/writer.rb

@@ -7,6 +7,8 @@ module RDF::NTriples
     format RDF::NTriples::Format
 
     ##
+    # Outputs an N-Triples comment line.
+    #
     # @param  [String] text
     # @return [void]
     def write_comment(text)
@@ -14,32 +16,40 @@ module RDF::NTriples
     end
 
     ##
-    # @param  [Resource] subject
-    # @param  [URI]      predicate
-    # @param  [Value]    object
+    # Outputs the N-Triples representation of a triple.
+    #
+    # @param  [RDF::Resource] subject
+    # @param  [RDF::URI]      predicate
+    # @param  [RDF::Value]    object
     # @return [void]
     def write_triple(subject, predicate, object)
       puts "%s %s %s ." % [subject, predicate, object].map { |value| format_value(value) }
     end
 
     ##
-    # @param  [URI]                    value
+    # Returns the N-Triples representation of a blank node.
+    #
+    # @param  [RDF::Node] value
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
-    def format_uri(value, options = {})
-      "<%s>" % uri_for(value)
+    def format_node(value, options = {})
+      "_:%s" % node.id
     end
 
     ##
-    # @param  [Node]                   value
+    # Returns the N-Triples representation of a URI reference.
+    #
+    # @param  [RDF::URI] value
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
-    def format_node(value, options = {})
-      "_:%s" % node.id
+    def format_uri(value, options = {})
+      "<%s>" % uri_for(value)
     end
 
     ##
-    # @param  [Literal, String, #to_s] value
+    # Returns the N-Triples representation of a literal.
+    #
+    # @param  [RDF::Literal, String, #to_s] value
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_literal(value, options = {})

data/lib/rdf/reader.rb

@@ -8,9 +8,9 @@ module RDF
   # @example Obtaining an RDF reader class
   #   RDF::Reader.for(:ntriples)     #=> RDF::NTriples::Reader
   #   RDF::Reader.for("spec/data/test.nt")
-  #   RDF::Reader.for(:file_name => "spec/data/test.nt")
+  #   RDF::Reader.for(:file_name      => "spec/data/test.nt")
   #   RDF::Reader.for(:file_extension => "nt")
-  #   RDF::Reader.for(:content_type => "text/plain")
+  #   RDF::Reader.for(:content_type   => "text/plain")
   #
   # @example Instantiating an RDF reader class
   #   RDF::Reader.for(:ntriples).new($stdin) { |reader| ... }
@@ -114,9 +114,9 @@ module RDF
     end
 
     ##
-    # @param  [IO, String] input
+    # @param  [IO, File, String] input
     # @yield  [reader]
-    # @yieldparam [Reader]
+    # @yieldparam [Reader] reader
     def initialize(input = $stdin, options = {}, &block)
       @options = options
       @nodes   = {}

data/lib/rdf/repository.rb

@@ -129,17 +129,6 @@ module RDF
         false
       end
 
-      ##
-      # Enumerates each RDF statement in this repository.
-      #
-      # @yield  [statement]
-      # @yieldparam [Statement]
-      # @return [Enumerator]
-      # @see    RDF::Enumerable#each_statement
-      def each(&block)
-        @data.each(&block)
-      end
-
       ##
       # Returns `true` if this repository contains no RDF statements.
       #
@@ -169,16 +158,27 @@ module RDF
       end
 
       ##
-      # Inserts an RDF statement into the underlying storage.
+      # Enumerates each RDF statement in this repository.
+      #
+      # @yield  [statement]
+      # @yieldparam [Statement] statement
+      # @return [Enumerator]
+      # @see    RDF::Enumerable#each_statement
+      def each(&block)
+        @data.each(&block)
+      end
+
+      ##
+      # Inserts the given RDF statement into the underlying storage.
       #
       # @param  [RDF::Statement] statement
       # @return [void]
       def insert_statement(statement)
-        @data.push(statement) unless @data.include?(statement)
+        @data.push(statement.dup) unless @data.include?(statement)
       end
 
       ##
-      # Deletes an RDF statement from the underlying storage.
+      # Deletes the given RDF statement from the underlying storage.
       #
       # @param  [RDF::Statement] statement
       # @return [void]
@@ -189,7 +189,7 @@ module RDF
       ##
       # Deletes all RDF statements from this repository.
       #
-      # @return [Repository]
+      # @return [void]
       # @see    RDF::Mutable#clear
       def clear_statements
         @data.clear

data/lib/rdf/version.rb

@@ -1,8 +1,8 @@
 module RDF
   module VERSION
     MAJOR = 0
-    MINOR = 0
-    TINY  = 9
+    MINOR = 1
+    TINY  = 0
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')
@@ -15,5 +15,9 @@ module RDF
     ##
     # @return [String]
     def self.to_str() STRING end
+
+    ##
+    # @return [Array(Integer, Integer, Integer)]
+    def self.to_a() [MAJOR, MINOR, TINY] end
   end
 end

data/lib/rdf/vocab.rb

@@ -8,6 +8,7 @@ module RDF
   #
   # * {RDF::CC}    - Creative Commons (CC)
   # * {RDF::DC}    - Dublin Core (DC)
+  # * {RDF::DC11}  - Dublin Core 1.1 (DC11) _deprecated_
   # * {RDF::DOAP}  - Description of a Project (DOAP)
   # * {RDF::EXIF}  - Exchangeable Image File Format (EXIF)
   # * {RDF::FOAF}  - Friend of a Friend (FOAF)
@@ -23,6 +24,7 @@ module RDF
   #
   # @example Using pre-defined RDF vocabularies
   #   include RDF
+  #
   #   DC.title      #=> RDF::URI("http://purl.org/dc/terms/title")
   #   FOAF.knows    #=> RDF::URI("http://xmlns.com/foaf/0.1/knows")
   #   RDFS.seeAlso  #=> RDF::URI("http://www.w3.org/2000/01/rdf-schema#seeAlso")
@@ -52,7 +54,7 @@ module RDF
         # This is needed since all vocabulary classes are defined using
         # Ruby's autoloading facility, meaning that `@@subclasses` will
         # be empty until each subclass has been touched or require'd.
-        %w(cc dc doap exif foaf http owl rdfs rss sioc skos wot xhtml xsd).each do |prefix|
+        %w(cc dc dc11 doap exif foaf http owl rdfs rss sioc skos wot xhtml xsd).each do |prefix|
           require "rdf/vocab/#{prefix}"
         end
         @@subclasses.each(&block)

data/lib/rdf/vocab/dc11.rb

@@ -0,0 +1,23 @@
+module RDF
+  ##
+  # Dublin Core (DC) legacy vocabulary.
+  #
+  # @see http://dublincore.org/schemas/rdfs/
+  class DC11 < Vocabulary("http://purl.org/dc/elements/1.1/")
+    property :contributor
+    property :coverage
+    property :creator
+    property :date
+    property :description
+    property :format
+    property :identifier
+    property :language
+    property :publisher
+    property :relation
+    property :rights
+    property :source
+    property :subject
+    property :title
+    property :type
+  end
+end

data/lib/rdf/writer.rb

@@ -8,21 +8,21 @@ module RDF
   # @example Obtaining an RDF writer class
   #   RDF::Writer.for(:ntriples)     #=> RDF::NTriples::Writer
   #   RDF::Writer.for("spec/data/output.nt")
-  #   RDF::Writer.for(:file_name => "spec/data/output.nt")
+  #   RDF::Writer.for(:file_name      => "spec/data/output.nt")
   #   RDF::Writer.for(:file_extension => "nt")
-  #   RDF::Writer.for(:content_type => "text/plain")
+  #   RDF::Writer.for(:content_type   => "text/plain")
   #
   # @example Instantiating an RDF writer class
   #   RDF::Writer.for(:ntriples).new($stdout) { |writer| ... }
   #
-  # @example Serializing RDF statements to a file
+  # @example Serializing RDF statements into a file
   #   RDF::Writer.open("spec/data/output.nt") do |writer|
   #     graph.each_statement do |statement|
   #       writer << statement
   #     end
   #   end
   #
-  # @example Serializing RDF statements to a string
+  # @example Serializing RDF statements into a string
   #   RDF::Writer.for(:ntriples).buffer do |writer|
   #     graph.each_statement do |statement|
   #       writer << statement
@@ -96,6 +96,22 @@ module RDF
       alias_method :format_class, :format
     end
 
+    def self.dump(data, io = nil, options = {})
+      if io
+        new(io) do |writer|
+          data.each_statement do |statement|
+            writer << statement
+          end
+        end
+      else
+        buffer do |writer|
+          data.each_statement do |statement|
+            writer << statement
+          end
+        end
+      end
+    end
+
     def self.buffer(*args, &block)
       require 'stringio' unless defined?(StringIO)
 
@@ -204,7 +220,7 @@ module RDF
     # @return [String]
     def format_value(value, options = {})
       case value
-        when String       then format_literal(value, options)
+        when String       then format_literal(value, options) # FIXME
         when RDF::Literal then format_literal(value, options)
         when RDF::URI     then format_uri(value, options)
         when RDF::Node    then format_node(value, options)
@@ -279,8 +295,8 @@ module RDF
       # @param  [String] string
       # @return [String]
       def escaped(string)
-        string.gsub("\\", "\\\\").gsub("\t", "\\\t").
-          gsub("\n", "\\\n").gsub("\r", "\\\r").gsub("\"", "\\\"")
+        string.gsub('\\', '\\\\').gsub("\t", '\\t').
+          gsub("\n", '\\n').gsub("\r", '\\r').gsub('"', '\\"')
       end
 
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -10,9 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-03-10 00:00:00 +01:00
 default_executable: rdf
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rdf-spec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.9
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -31,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -85,12 +95,10 @@ files:
 - lib/rdf/query.rb
 - lib/rdf/reader.rb
 - lib/rdf/repository.rb
-- lib/rdf/spec/enumerable.rb
-- lib/rdf/spec/repository.rb
-- lib/rdf/spec.rb
 - lib/rdf/version.rb
 - lib/rdf/vocab/cc.rb
 - lib/rdf/vocab/dc.rb
+- lib/rdf/vocab/dc11.rb
 - lib/rdf/vocab/doap.rb
 - lib/rdf/vocab/exif.rb
 - lib/rdf/vocab/foaf.rb

data/lib/rdf/spec.rb

@@ -1,138 +0,0 @@
-require 'spec'
-
-module RDF
-  ##
-  # RDF extensions for RSpec.
-  #
-  # @see http://rspec.info/
-  module Spec
-    ##
-    # RDF matchers for RSpec.
-    #
-    # @see http://rspec.rubyforge.org/rspec/1.2.9/classes/Spec/Matchers.html
-    module Matchers
-      ##
-      # Defines a new RSpec matcher.
-      #
-      # @param  [Symbol] name
-      # @return [void]
-      def self.define(name, &declarations)
-        define_method name do |*expected|
-          ::Spec::Matchers::Matcher.new(name, *expected, &declarations)
-        end
-      end
-
-      define :be_a_statement do
-        match do |statement|
-          statement.should be_instance_of(RDF::Statement)
-          statement.subject.should be_a_kind_of(RDF::Resource)
-          statement.predicate.should be_a_kind_of(RDF::URI)
-          statement.object.should be_a_kind_of(RDF::Value) unless statement.object.is_a?(String) # FIXME
-          true
-        end
-      end
-
-      define :be_a_triple do
-        match do |triple|
-          triple.should be_instance_of(Array)
-          triple.size.should == 3
-          triple[0].should be_a_kind_of(RDF::Resource)
-          triple[1].should be_a_kind_of(RDF::URI)
-          triple[2].should be_a_kind_of(RDF::Value) unless triple[2].is_a?(String) # FIXME
-          true
-        end
-      end
-
-      define :be_a_quad do
-        match do |quad|
-          quad.should be_instance_of(Array)
-          quad.size.should == 4
-          quad[0].should be_a_kind_of(RDF::Resource)
-          quad[1].should be_a_kind_of(RDF::URI)
-          quad[2].should be_a_kind_of(RDF::Value) unless quad[2].is_a?(String) # FIXME
-          quad[3].should be_a_kind_of(RDF::Resource) unless quad[3].nil?
-          true
-        end
-      end
-
-      define :be_a_resource do
-        match do |value|
-          value.should be_a_kind_of(RDF::Resource)
-          true
-        end
-      end
-
-      define :be_a_uri do
-        match do |value|
-          value.should be_a_kind_of(RDF::URI)
-          true
-        end
-      end
-
-      define :be_a_value do
-        match do |value|
-          value.should be_a_kind_of(RDF::Value) unless value.is_a?(String) # FIXME
-          true
-        end
-      end
-
-      define :be_a_vocabulary do |base_uri|
-        match do |vocabulary|
-          vocabulary.should be_a_kind_of(Module)
-          vocabulary.should respond_to(:to_uri)
-          vocabulary.to_uri.to_s.should == base_uri
-          vocabulary.should respond_to(:[])
-          true
-        end
-      end
-
-      define :have_properties do |base_uri, properties|
-        match do |vocabulary|
-          properties.map(&:to_sym).each do |property|
-            vocabulary[property].should be_a_uri
-            vocabulary[property].to_s.should == "#{base_uri}#{property}"
-            #vocabulary.should respond_to(property) # FIXME
-            lambda { vocabulary.send(property) }.should_not raise_error
-            vocabulary.send(property).should be_a_uri
-            vocabulary.send(property.to_s).should be_a_uri
-            vocabulary.send(property).to_s.should == "#{base_uri}#{property}"
-          end
-          true
-        end
-      end
-
-      define :have_subclasses do |base_uri, klasses|
-        match do |vocabulary|
-          klasses.map(&:to_sym).each do |klass|
-            # TODO
-          end
-          true
-        end
-      end
-
-      define :be_a_repository do
-        match do |repository|
-          repository.should be_a_kind_of(RDF::Repository)
-          true
-        end
-      end
-
-      define :be_a_repository_of_size do |size|
-        match do |repository|
-          repository.should be_a_repository
-          repository.size == size
-        end
-      end
-
-      define :have_predicate do |predicate, count|
-        match do |queryable|
-          if count.nil?
-            queryable.has_predicate?(predicate)
-          else
-            queryable.query([nil, predicate, nil]).size == count
-          end
-        end
-      end
-    end # module Matchers
-  end # module Spec
-end # module RDF