rdf 0.1.4 → 0.1.5

data/README

@@ -10,13 +10,15 @@ This is a pure-Ruby library for working with [Resource Description Framework
 Features
 --------
 
-* 100% pure Ruby with minimal dependencies and no bloat whatsoever.
+* 100% pure Ruby with minimal dependencies and no bloat.
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Provides a clean, well-designed RDF object model and related APIs.
 * Supports parsing and serializing N-Triples out of the box, with more
   serialization format support available through add-on plugins.
 * Plays nice with others: entirely contained in the `RDF` module, and does
   not modify any of Ruby's core classes or standard library.
+* Based entirely on Ruby's autoloading, meaning that you can generally make
+  use of any one part of the library without needing to load up the rest.
 * Compatible with Ruby 1.8.x, Ruby 1.9.x, and JRuby (tested with JRuby 1.4).
 
 Examples

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/rdf.rb

@@ -56,7 +56,63 @@ module RDF
   autoload :XSD,        'rdf/vocab/xsd'
 
   ##
-  # @return [String] uri
+  # Alias for `RDF::Resource.new`.
+  #
+  # @return [RDF::Resource]
+  def self.Resource(*args, &block)
+    Resource.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::Node.new`.
+  #
+  # @return [RDF::Node]
+  def self.Node(*args, &block)
+    Node.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::URI.new`.
+  #
+  # @overload URI(uri)
+  #   @param  [URI, String, #to_s]    uri
+  #
+  # @overload URI(options = {})
+  #   @param  [Hash{Symbol => Object} options
+  #
+  # @return [RDF::URI]
+  def self.URI(*args, &block)
+    URI.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::Literal.new`.
+  #
+  # @return [RDF::Literal]
+  def self.Literal(*args, &block)
+    Literal.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::Graph.new`.
+  #
+  # @return [RDF::Graph]
+  def self.Graph(*args, &block)
+    Graph.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::Statement.new`.
+  #
+  # @return [RDF::Statement]
+  def self.Statement(*args, &block)
+    Statement.new(*args, &block)
+  end
+
+  ##
+  # Alias for `RDF::Vocabulary.create`.
+  #
+  # @param  [String] uri
   # @return [Class]
   def self.Vocabulary(uri)
     Vocabulary.create(uri)

data/lib/rdf/model/resource.rb

@@ -19,5 +19,13 @@ module RDF
         super
       end
     end
+
+    ##
+    # Returns `true` to indicate that this value is a resource.
+    #
+    # @return [Boolean]
+    def resource?
+      true
+    end
   end
 end

data/lib/rdf/ntriples/reader.rb

@@ -28,26 +28,106 @@ module RDF::NTriples
   class Reader < RDF::Reader
     format RDF::NTriples::Format
 
+    # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
+    COMMENT               = /^#\s*(.*)$/.freeze
+    NODEID                = /^_:([A-Za-z][A-Za-z0-9]*)/.freeze
+    URIREF                = /^<([^>]+)>/.freeze
+    LITERAL_PLAIN         = /^"((?:\\"|[^"])*)"/.freeze
+    LITERAL_WITH_LANGUAGE = /^"((?:\\"|[^"])*)"@([a-z]+[\-a-z0-9]*)/.freeze
+    LITERAL_WITH_DATATYPE = /^"((?:\\"|[^"])*)"\^\^<([^>]+)>/.freeze
+    LANGUAGE_TAG          = /^@([a-z]+[\-a-z0-9]*)/.freeze
+    DATATYPE_URI          = /^\^\^<([^>]+)>/.freeze
+    LITERAL               = Regexp.union(LITERAL_WITH_LANGUAGE, LITERAL_WITH_DATATYPE, LITERAL_PLAIN).freeze
+    SUBJECT               = Regexp.union(URIREF, NODEID).freeze
+    PREDICATE             = Regexp.union(URIREF).freeze
+    OBJECT                = Regexp.union(URIREF, NODEID, LITERAL).freeze
+
     ##
     # Reconstructs an RDF value from its serialized N-Triples
     # representation.
     #
-    # @param  [String] data
+    # @param  [String] input
     # @return [RDF::Value]
-    def self.unserialize(data)
-      case data
+    def self.unserialize(input)
+      case input
         when nil then nil
-        else self.new(data).read_value
+        else self.new(input).read_value
       end
     end
 
+    ##
+    # @param  [String] input
+    # @return [RDF::Resource]
+    def self.parse_subject(input)
+      parse_uri(input) || parse_node(input)
+    end
+
+    ##
+    # @param  [String] input
+    # @return [RDF::URI]
+    def self.parse_predicate(input)
+      parse_uri(input)
+    end
+
+    ##
+    # @param  [String] input
+    # @return [RDF::Value]
+    def self.parse_object(input)
+      parse_uri(input) || parse_node(input) || parse_literal(input)
+    end
+
+    ##
+    # @param  [String] input
+    # @return [RDF::Node]
+    def self.parse_node(input)
+      if input =~ NODEID
+        RDF::Node.new($1)
+      end
+    end
+
+    ##
+    # @param  [String] input
+    # @return [RDF::URI]
+    def self.parse_uri(input)
+      if input =~ URIREF
+        RDF::URI.new($1)
+      end
+    end
+
+    ##
+    # @param  [String] input
+    # @return [RDF::Literal]
+    def self.parse_literal(input)
+      case input
+        when LITERAL_WITH_LANGUAGE
+          RDF::Literal.new(unescape($1), :language => $2)
+        when LITERAL_WITH_DATATYPE
+          RDF::Literal.new(unescape($1), :datatype => $2)
+        when LITERAL_PLAIN
+          RDF::Literal.new(unescape($1))
+      end
+    end
+
+    ##
+    # @param  [String] string
+    # @return [String]
+    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    def self.unescape(string)
+      ["\t", "\n", "\r", "\"", "\\"].each do |escape|
+        string.gsub!(escape.inspect[1...-1], escape)
+      end
+      string.gsub!(/\\u([0-9A-Fa-f]{4,4})/u) { [$1.hex].pack('U*') }
+      string.gsub!(/\\U([0-9A-Fa-f]{8,8})/u) { [$1.hex].pack('U*') }
+      string
+    end
+
     ##
     # @return [RDF::Value]
     def read_value
       begin
         read_statement
       rescue RDF::ReaderError => e
-        read_uriref || read_bnode || read_literal
+        read_uriref || read_node || read_literal
       end
     end
 
@@ -61,9 +141,9 @@ module RDF::NTriples
 
         begin
           unless blank? || read_comment
-            subject   = read_uriref || read_bnode || fail_subject
+            subject   = read_uriref || read_node || fail_subject
             predicate = read_uriref || fail_predicate
-            object    = read_uriref || read_bnode || read_literal || fail_object
+            object    = read_uriref || read_node || read_literal || fail_object
             return [subject, predicate, object]
           end
         rescue RDF::ReaderError => e
@@ -77,55 +157,42 @@ module RDF::NTriples
     # @return [Boolean]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (comment)
     def read_comment
-      match(/^#\s*(.*)$/)
+      match(COMMENT)
     end
 
     ##
-    # @return [URI]
+    # @return [RDF::URI]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (uriref)
     def read_uriref
-      if uri = match(/^<([^>]+)>/)
+      if uri = match(URIREF)
         RDF::URI.new(uri)
       end
     end
 
     ##
-    # @return [Node]
+    # @return [RDF::Node]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (nodeID)
-    def read_bnode
-      if node_id = match(/^_:([A-Za-z][A-Za-z0-9]*)/)
+    def read_node
+      if node_id = match(NODEID)
         @nodes[node_id] ||= RDF::Node.new(node_id)
       end
     end
 
     ##
-    # @return [Literal]
+    # @return [RDF::Literal]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (literal)
     def read_literal
-      if literal = match(/^"((?:\\"|[^"])*)"/)
-        literal = unescaped(literal)
+      if literal = match(LITERAL_PLAIN)
+        literal = self.class.unescape(literal)
 
-        if language = match(/^@([a-z]+[\-a-z0-9]*)/)
+        if language = match(LANGUAGE_TAG)
           RDF::Literal.new(literal, :language => language)
-        elsif datatype = match(/^(\^\^)/)
+        elsif datatype = match(/^(\^\^)/) # FIXME
           RDF::Literal.new(literal, :datatype => read_uriref || fail_object)
         else
           RDF::Literal.new(literal) # plain string literal
         end
       end
     end
-
-    ##
-    # @param  [String] string
-    # @return [String]
-    # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    def unescaped(string)
-      ["\t", "\n", "\r", "\"", "\\"].each do |escape|
-        string.gsub!(escape.inspect[1...-1], escape)
-      end
-      string.gsub!(/\\u([0-9A-Fa-f]{4,4})/u) { [$1.hex].pack('U*') }
-      string.gsub!(/\\U([0-9A-Fa-f]{8,8})/u) { [$1.hex].pack('U*') }
-      string
-    end
   end
 end

data/lib/rdf/version.rb

@@ -2,7 +2,7 @@ module RDF
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +02:00
+date: 2010-04-06 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,7 +117,6 @@ files:
 - lib/rdf/query.rb
 - lib/rdf/reader.rb
 - lib/rdf/repository.rb
-- lib/rdf/spec.rb
 - lib/rdf/version.rb
 - lib/rdf/vocab/cc.rb
 - lib/rdf/vocab/dc.rb

data/lib/rdf/spec.rb

@@ -1,49 +0,0 @@
-require 'rdf'
-
-module RDF
-  ##
-  # **`RDF::Spec`** provides RSpec extensions for RDF.rb.
-  #
-  # @example Requiring the `RDF::Spec` module
-  #   require 'rdf/spec'
-  #
-  # @example Including the matchers in `spec/spec_helper.rb`
-  #   require 'rdf/spec'
-  #   
-  #   Spec::Runner.configure do |config|
-  #     config.include(RDF::Spec::Matchers)
-  #   end
-  #
-  # @example Using the shared examples for `RDF::Enumerable`
-  #   require 'rdf/spec/enumerable'
-  #   
-  #   describe RDF::Enumerable do
-  #     before :each do
-  #       @statements = RDF::NTriples::Reader.new(File.open("etc/doap.nt")).to_a
-  #       @enumerable = @statements.dup.extend(RDF::Enumerable)
-  #     end
-  #     
-  #     it_should_behave_like RDF_Enumerable
-  #   end
-  #
-  # @example Using the shared examples for `RDF::Repository`
-  #   require 'rdf/spec/repository'
-  #   
-  #   describe RDF::Repository do
-  #     before :each do
-  #       @repository = RDF::Repository.new
-  #     end
-  #     
-  #     it_should_behave_like RDF_Repository
-  #   end
-  #
-  # @see http://rdf.rubyforge.org/
-  # @see http://rspec.info/
-  #
-  # @author [Arto Bendiken](http://ar.to/)
-  # @author [Ben Lavender](http://bhuga.net/)
-  module Spec
-    autoload :Matchers, 'rdf/spec/matchers'
-    autoload :VERSION,  'rdf/spec/version'
-  end # module Spec
-end # module RDF