rdf 0.2.1 → 0.2.2

data/CONTRIBUTORS

@@ -1,3 +1,4 @@
+* Fumihiro Kato <fumi@fumi.me>
 * Gregg Kellogg <gregg@kellogg-assoc.com>
 * Hellekin O. Wolf <hellekin@cepheide.org>
 * John Fieber <jrf@ursamaris.org>

data/README

@@ -124,6 +124,7 @@ Documentation
 
 ### RDF Vocabularies
 
+* {RDF}        - Resource Description Framework (RDF)
 * {RDF::CC}    - Creative Commons (CC)
 * {RDF::CERT}  - W3 Authentication Certificate (CERT)
 * {RDF::DC}    - Dublin Core (DC)
@@ -180,6 +181,11 @@ Resources
 * <http://raa.ruby-lang.org/project/rdf/>
 * <http://www.ohloh.net/p/rdf>
 
+Mailing List
+------------
+
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
 Authors
 -------
 
@@ -189,6 +195,7 @@ Authors
 Contributors
 ------------
 
+* [Fumihiro Kato](mailto:fumi@fumi.me) - <http://fumi.me/>
 * [Gregg Kellogg](mailto:gregg@kellogg-assoc.com) - <http://kellogg-assoc.com/>
 * [Hellekin O. Wolf](mailto:hellekin@cepheide.org) - <http://hellekin.cepheide.org/>
 * [John Fieber](mailto:jrf@ursamaris.org) - <http://github.com/jfieber>

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/etc/doap.nt

@@ -27,6 +27,8 @@
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid1 .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid2 .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid3 .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid4 .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid5 .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#homepage> <http://rdf.rubyforge.org/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#license> <http://creativecommons.org/licenses/publicdomain/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#maintainer> <http://ar.to/#self> .
@@ -37,11 +39,17 @@
 <http://rubygems.org/gems/rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://usefulinc.com/ns/doap#Project> .
 <http://rubygems.org/gems/rdf> <http://xmlns.com/foaf/0.1/maker> <http://ar.to/#self> .
 _:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-_:genid1 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "c69f3255ff0639543cc5edfd8116eac8df16fab8" .
-_:genid1 <http://xmlns.com/foaf/0.1/name> "Hellekin O. Wolf" .
+_:genid1 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "d31fdd6af7a279a89bf09fdc9f7c44d9d08bb930" .
+_:genid1 <http://xmlns.com/foaf/0.1/name> "Fumihiro Kato" .
 _:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-_:genid2 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "f7653fc1ac0e82ebb32f092389bd5fc728eaae12" .
-_:genid2 <http://xmlns.com/foaf/0.1/name> "John Fieber" .
+_:genid2 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "35bc44e6d0070e5ad50ccbe0d24403c96af2b9bd" .
+_:genid2 <http://xmlns.com/foaf/0.1/name> "Gregg Kellogg" .
 _:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-_:genid3 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "bedbbf2451e5beb38d59687c0460032aff92cd3c" .
-_:genid3 <http://xmlns.com/foaf/0.1/name> "Pius Uzamere" .
+_:genid3 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "c69f3255ff0639543cc5edfd8116eac8df16fab8" .
+_:genid3 <http://xmlns.com/foaf/0.1/name> "Hellekin O. Wolf" .
+_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:genid4 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "f7653fc1ac0e82ebb32f092389bd5fc728eaae12" .
+_:genid4 <http://xmlns.com/foaf/0.1/name> "John Fieber" .
+_:genid5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:genid5 <http://xmlns.com/foaf/0.1/mbox_sha1sum> "bedbbf2451e5beb38d59687c0460032aff92cd3c" .
+_:genid5 <http://xmlns.com/foaf/0.1/name> "Pius Uzamere" .

data/lib/rdf/mixin/queryable.rb

@@ -32,12 +32,7 @@ module RDF
         when Query
           pattern.execute(self, &block)
         else
-          pattern = case pattern
-            when Query::Pattern, Statement then pattern
-            when Array then Query::Pattern.new(*pattern)
-            when Hash  then Query::Pattern.new(pattern)
-            else raise ArgumentError.new("expected RDF::Query, RDF::Query::Pattern, Array, or Hash, but got #{pattern.inspect}")
-          end
+          pattern = Query::Pattern.from(pattern)
 
           if block_given?
             query_pattern(pattern, &block)

data/lib/rdf/mixin/writable.rb

@@ -126,14 +126,9 @@ module RDF
     #
     # @param  [RDF::Statement, Hash, Array, #to_a] statement
     # @return [RDF::Statement]
+    # @deprecated
     def create_statement(statement)
-      # TODO: move this to RDF::Statement.construct or the like.
-      case statement
-        when Statement then statement
-        when Hash      then Statement.new(statement)
-        when Array     then Statement.new(*statement)
-        else raise ArgumentError.new # FIXME
-      end
+      Statement.from(statement)
     end
 
     protected :insert_statements

data/lib/rdf/model/graph.rb

@@ -195,11 +195,17 @@ module RDF
     end
 
     ##
-    # Inserts the given RDF statement into the graph.
-    #
-    # @param  [RDF::Statement] statement
-    # @return [void]
-    # @see    RDF::Mutable#insert
+    # @private
+    # @see RDF::Queryable#query
+    def query_pattern(pattern, &block)
+      pattern = pattern.dup
+      pattern.context = context
+      @data.query(pattern, &block)
+    end
+
+    ##
+    # @private
+    # @see RDF::Mutable#insert
     def insert_statement(statement)
       statement = statement.dup
       statement.context = context
@@ -207,11 +213,8 @@ module RDF
     end
 
     ##
-    # Deletes the given RDF statement from the graph.
-    #
-    # @param  [RDF::Statement] statement
-    # @return [void]
-    # @see    RDF::Mutable#delete
+    # @private
+    # @see RDF::Mutable#delete
     def delete_statement(statement)
       statement = statement.dup
       statement.context = context
@@ -219,14 +222,13 @@ module RDF
     end
 
     ##
-    # Deletes all RDF statements from this graph.
-    #
-    # @return [void]
-    # @see    RDF::Mutable#clear
+    # @private
+    # @see RDF::Mutable#clear
     def clear_statements
       @data.delete(:context => context)
     end
 
+    protected :query_pattern
     protected :insert_statement
     protected :delete_statement
     protected :clear_statements

data/lib/rdf/model/literal.rb

@@ -113,7 +113,7 @@ module RDF
     # @option options [URI]    :datatype (nil)
     def initialize(value, options = {})
       @object   = value
-      @string   = options[:lexical] if options.has_key?(:lexical)
+      @string   = options[:lexical] if options[:lexical]
       @language = options[:language].to_s.to_sym if options[:language]
       @datatype = RDF::URI(options[:datatype]) if options[:datatype]
     end

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

@@ -14,7 +14,7 @@ module RDF; class Literal
     # @param  [Boolean] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -12,7 +12,7 @@ module RDF; class Literal
     # @param  [Date] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -12,7 +12,7 @@ module RDF; class Literal
     # @param  [DateTime] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -12,7 +12,7 @@ module RDF; class Literal
     # @param  [BigDecimal] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -12,7 +12,7 @@ module RDF; class Literal
     # @param  [Float, #to_f] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -12,7 +12,7 @@ module RDF; class Literal
     # @param  [Integer, #to_i] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

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

@@ -16,7 +16,7 @@ module RDF; class Literal
     # @param  [Time] value
     # @option options [String] :lexical (nil)
     def initialize(value, options = {})
-      @datatype = options[:datatype] || DATATYPE
+      @datatype = RDF::URI(options[:datatype] || DATATYPE)
       @string   = options[:lexical] if options.has_key?(:lexical)
       @string   = value if !defined?(@string) && value.is_a?(String)
       @object   = case

data/lib/rdf/model/statement.rb

@@ -21,6 +21,18 @@ module RDF
   class Statement
     include RDF::Value
 
+    ##
+    # @private
+    # @since 0.2.2
+    def self.from(statement)
+      case statement
+        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}")
+      end
+    end
+
     # @return [Object]
     attr_accessor :id
 

data/lib/rdf/ntriples.rb

@@ -49,6 +49,8 @@ module RDF
     #
     # @param  [String] data
     # @return [RDF::Value]
+    # @see    RDF::NTriples::Reader.unserialize
+    # @since  0.1.5
     def self.unserialize(data)
       Reader.unserialize(data)
     end
@@ -59,9 +61,29 @@ module RDF
     #
     # @param  [RDF::Value] value
     # @return [String]
+    # @see    RDF::NTriples::Writer.serialize
+    # @since  0.1.5
     def self.serialize(value)
       Writer.serialize(value)
     end
+
+    ##
+    # @param  [String] string
+    # @return [String]
+    # @see    RDF::NTriples::Reader.unescape
+    # @since  0.2.2
+    def self.unescape(string)
+      Reader.unescape(string)
+    end
+
+    ##
+    # @param  [String] string
+    # @return [String]
+    # @see    RDF::NTriples::Writer.escape
+    # @since  0.2.2
+    def self.escape(string)
+      Writer.escape(string)
+    end
   end
 
   ##

data/lib/rdf/query/pattern.rb

@@ -1,7 +1,20 @@
-class RDF::Query
+module RDF; class Query
   ##
   # An RDF query pattern.
   class Pattern < RDF::Statement
+    ##
+    # @private
+    # @since 0.2.2
+    def self.from(pattern)
+      case pattern
+        when Pattern   then pattern
+        when Statement then self.new(pattern.to_hash)
+        when Hash      then self.new(pattern)
+        when Array     then self.new(*pattern)
+        else raise ArgumentError.new("expected RDF::Query::Pattern, RDF::Statement, Hash, or Array, but got #{pattern.inspect}")
+      end
+    end
+
     # @return [Hash{Symbol => Object}]
     attr_reader :options
 
@@ -11,6 +24,7 @@ class RDF::Query
     #   @option options [Variable, Resource] :subject   (nil)
     #   @option options [Variable, URI]      :predicate (nil)
     #   @option options [Variable, Value]    :object    (nil)
+    #   @option options [Variable, Resource] :context   (nil)
     #   @option options [Boolean]            :optional  (false)
     #
     # @overload initialize(subject, predicate, object, options = {})
@@ -18,6 +32,7 @@ class RDF::Query
     #   @param  [Variable, URI]              predicate
     #   @param  [Variable, Value]            object
     #   @param  [Hash{Symbol => Object}]     options
+    #   @option options [Variable, Resource] :context   (nil)
     #   @option options [Boolean]            :optional  (false)
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       super
@@ -146,5 +161,5 @@ class RDF::Query
         buffer.string
       end
     end
-  end
-end
+  end # class Pattern
+end; end # module RDF class Query

data/lib/rdf/reader.rb

@@ -158,6 +158,13 @@ module RDF
       end
     end
 
+    ##
+    # @return [void]
+    # @since  0.2.2
+    def close
+      @input.close unless @input.closed?
+    end
+
     protected
 
       ##

data/lib/rdf/repository.rb

@@ -234,6 +234,25 @@ module RDF
 
     protected
 
+      ##
+      # @private
+      # @see RDF::Queryable#query
+      def query_pattern(pattern, &block)
+        @data.dup.each do |c, ss|
+          next if pattern.has_context? && pattern.context != c
+          ss.dup.each do |s, ps|
+            next if pattern.has_subject? && pattern.subject != s
+            ps.dup.each do |p, os|
+              next if pattern.has_predicate? && pattern.predicate != p
+              os.dup.each do |o|
+                next if pattern.has_object? && pattern.object != o
+                block.call(RDF::Statement.new(s, p, o, :context => c))
+              end
+            end
+          end
+        end
+      end
+
       ##
       # @private
       # @see RDF::Mutable#insert
@@ -267,6 +286,7 @@ module RDF
         @data.clear
       end
 
+      protected :query_pattern
       protected :insert_statement
       protected :delete_statement
       protected :clear_statements

data/lib/rdf/version.rb

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

data/lib/rdf/vocab.rb

@@ -6,6 +6,7 @@ module RDF
   #
   # The following vocabularies are pre-defined for your convenience:
   #
+  # * {RDF}        - Resource Description Framework (RDF)
   # * {RDF::CC}    - Creative Commons (CC)
   # * {RDF::CERT}  - W3 Authentication Certificate (CERT)
   # * {RDF::DC}    - Dublin Core (DC)
@@ -30,6 +31,7 @@ module RDF
   #
   #   DC.title      #=> RDF::URI("http://purl.org/dc/terms/title")
   #   FOAF.knows    #=> RDF::URI("http://xmlns.com/foaf/0.1/knows")
+  #   RDF.type      #=> RDF::URI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
   #   RDFS.seeAlso  #=> RDF::URI("http://www.w3.org/2000/01/rdf-schema#seeAlso")
   #   RSS.title     #=> RDF::URI("http://purl.org/rss/1.0/title")
   #   OWL.sameAs    #=> RDF::URI("http://www.w3.org/2002/07/owl#sameAs")

data/lib/rdf/writer.rb

@@ -146,6 +146,7 @@ module RDF
     ##
     # @param  [IO, File]               output
     # @param  [Hash{Symbol => Object}] options
+    # @option options [Hash] :prefixes ({})
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
@@ -162,6 +163,38 @@ module RDF
       end
     end
 
+    ##
+    # Returns the options for this writer.
+    #
+    # @return [Hash{Symbol => Object}]
+    attr_reader :options
+
+    ##
+    # Returns the URI prefixes currently defined for this writer.
+    #
+    # @return [Hash{Symbol => RDF::URI}]
+    def prefixes
+      options[:prefixes] ||= {}
+    end
+
+    ##
+    # Defines a named URI prefix for this writer.
+    #
+    # @overload prefix(name, uri)
+    #   @param  [Symbol, #to_s]   name
+    #   @param  [RDF::URI, #to_s] uri
+    #
+    # @overload prefix(name)
+    #   @param  [Symbol, #to_s]   name
+    #
+    # @return [void]
+    def prefix(name, uri = nil)
+      name = name.respond_to?(:to_sym) ? name.to_sym : name.to_s.to_sym
+      uri.nil? ? prefixes[name] : prefixes[name] = RDF::URI(uri)
+    end
+
+    alias_method :prefix!, :prefix
+
     ##
     # Flushes the underlying output buffer.
     #

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :development
   version_requirements: *id004
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.
@@ -141,7 +141,6 @@ files:
 - lib/rdf/vocab/geo.rb
 - lib/rdf/vocab/http.rb
 - lib/rdf/vocab/owl.rb
-- lib/rdf/vocab/rdf.rb
 - lib/rdf/vocab/rdfs.rb
 - lib/rdf/vocab/rsa.rb
 - lib/rdf/vocab/rss.rb

data/lib/rdf/vocab/rdf.rb

@@ -1,15 +0,0 @@
-module RDF
-  ##
-  # Resource Description Framework (RDF) vocabulary.
-  #
-  # @see http://www.w3.org/RDF/
-  class RDF < Vocabulary("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
-    property :first
-    property :object
-    property :predicate
-    property :rest
-    property :subject
-    property :type
-    property :value
-  end
-end