rdf 1.0.4 → 1.0.5

data/README

@@ -79,7 +79,7 @@ to use when loading a file. The specific format to use can be forced using, e.g.
 option where the specific format symbol is determined by the available readers. Both also use
 MimeType or file extension, where available.
 
-    require 'linkeddata'
+    require 'rdf/nquads'
     
     graph = RDF::Graph.load("http://ruby-rdf.github.com/rdf/etc/doap.nq", :format => :nquads)
 
@@ -113,7 +113,10 @@ appropriate writer to use.
 
 A specific sub-type of Writer can also be invoked directly:
 
-    graph.dump(:nquads)
+    require 'rdf/nquads'
+
+    repo = RDF::Repository.new << RDF::Statement.new(:hello, RDF::DC.title, "Hello, world!", :context => RDF::URI("context"))
+    File.open("hello.nq", "w") {|f| f << repo.dump(:nquads)}
 
 ## Reader/Writer convenience methods
 {RDF::Enumerable} implements `to_{format}` for each available instance of {RDF::Reader}.

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/rdf/mixin/mutable.rb

@@ -106,6 +106,9 @@ module RDF
 
     ##
     # Deletes RDF statements from `self`.
+    # If any statement contains a {Query::Variable}, it is
+    # considered to be a pattern, and used to query
+    # self to find matching statements to delete.
     #
     # @param  [Enumerable<RDF::Statement>] statements
     # @raise  [TypeError] if `self` is immutable
@@ -118,7 +121,7 @@ module RDF
           when value.respond_to?(:each_statement)
             delete_statements(value)
             nil
-          when (statement = Statement.from(value)).valid?
+          when (statement = Statement.from(value)).constant?
             statement
           else
             delete_statements(query(value))

data/lib/rdf/model/literal.rb

@@ -134,8 +134,14 @@ module RDF
 
     ##
     # @param  [Object] value
-    # @option options [Symbol] :language (nil)
-    # @option options [URI]    :datatype (nil)
+    # @option options [Symbol]  :language (nil)
+    # @option options [String]  :lexical (nil)
+    #   Supplied lexical representation of this literal,
+    #   otherwise it comes from transforming `value` to a string form
+    #   See {#to_s}.
+    # @option options [URI]     :datatype (nil)
+    # @option options [Boolean] :validate (false)
+    # @option options [Boolean] :canonicalize (false)
     def initialize(value, options = {})
       @object   = value
       @string   = options[:lexical] if options[:lexical]

data/lib/rdf/model/statement.rb

@@ -105,6 +105,18 @@ 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?

data/lib/rdf/model/term.rb

@@ -56,15 +56,6 @@ 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

@@ -138,6 +138,7 @@ 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
@@ -147,6 +148,8 @@ module RDF
         else
           @uri = Addressable::URI.parse(uri_or_options.to_s)
       end
+    rescue Addressable::URI::InvalidURIError => e
+      raise ArgumentError, e.message
     end
 
     ##
@@ -198,7 +201,7 @@ module RDF
     alias_method :size, :length
 
     ##
-    # Determine if the URI is avalid according to RFC3987
+    # Determine if the URI is a valid according to RFC3987
     #
     # Note, for Ruby versions < 1.9, this always returns true.
     #
@@ -207,7 +210,7 @@ module RDF
     def valid?
       # As Addressable::URI does not perform adequate validation, validate
       # relative to RFC3987
-      to_s.match(RDF::URI::IRI) || to_s.match(RDF::URI::IRELATIVE_REF) || false
+      to_s.match(RDF::URI::IRI) || false
     end
 
     ##
@@ -263,12 +266,15 @@ 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
 
     ##
@@ -294,6 +300,7 @@ 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>
@@ -353,8 +360,11 @@ 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
 
     ##

data/lib/rdf/model/value.rb

@@ -103,7 +103,7 @@ module RDF
     end
 
     ##
-    # Returns `true` if `self` is a {RDF::Query::Variable}.
+    # Returns `true` this value is a {RDF::Query::Variable}, or is contains a variable.
     #
     # @return [Boolean]
     # @since  0.1.7
@@ -111,6 +111,15 @@ 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?
     #

data/lib/rdf/ntriples/format.rb

@@ -15,6 +15,7 @@ module RDF::NTriples
   #   RDF::Format.for(:content_type   => "text/plain")
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Format < RDF::Format
     content_type     'application/n-triples', :extension => :nt, :alias => ['text/plain']
     content_encoding 'utf-8'

data/lib/rdf/ntriples/reader.rb

@@ -25,6 +25,7 @@ module RDF::NTriples
   #   end
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Reader < RDF::Reader
     format RDF::NTriples::Format
 
@@ -288,6 +289,8 @@ module RDF::NTriples
         uri.canonicalize! if canonicalize?
         uri
       end
+    rescue ArgumentError => e
+      raise RDF::ReaderError, "invalid URI"
     end
 
     ##

data/lib/rdf/ntriples/writer.rb

@@ -35,6 +35,7 @@ module RDF::NTriples
   #   end
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
+  # @see http://www.w3.org/TR/n-triples/
   class Writer < RDF::Writer
     format RDF::NTriples::Format
 
@@ -43,6 +44,10 @@ module RDF::NTriples
     ESCAPE_ASCII = /\A[\x00-\x7F]*\z/m.freeze
 
     ##
+    # Escape Literal and URI content. If encoding is ASCII, all unicode
+    # is escaped, otherwise only ASCII characters that must be escaped are
+    # escaped.
+    #
     # @param  [String] string
     # @param  [Encoding] encoding Ruby 1.9 only
     # @return [String]
@@ -53,7 +58,7 @@ module RDF::NTriples
           string
         when string.respond_to?(:ascii_only?) && string.ascii_only?
           StringIO.open do |buffer|
-            string.each_byte { |u| buffer << escape_ascii(u) }
+            string.each_byte { |u| buffer << escape_ascii(u, encoding) }
             buffer.string
           end
         when string.respond_to?(:each_char) && encoding && encoding != Encoding::ASCII
@@ -62,7 +67,7 @@ module RDF::NTriples
             string.each_char do |u|
               buffer << case u.ord
               when (0x00..0x7F)
-                escape_ascii(u)
+                escape_ascii(u, encoding)
               else
                 u
               end
@@ -70,11 +75,13 @@ module RDF::NTriples
             buffer.string
           end
         when string.respond_to?(:each_codepoint)
+          # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
             string.each_codepoint { |u| buffer << escape_unicode(u, encoding) }
             buffer.string
           end
         else # works in Ruby 1.8.x, too
+          # Encode ASCII && UTF-8 characters
           StringIO.open do |buffer|
             string.scan(/./mu) { |c| buffer << escape_unicode(u = c.unpack('U*').first, encoding) }
             buffer.string
@@ -85,7 +92,6 @@ module RDF::NTriples
 
     ##
     # Escape ascii and unicode characters.
-    # If encoding is UTF_8, only ascii characters are escaped.
     #
     # @param  [Integer, #ord] u
     # @param  [Encoding] encoding Ruby 1.9 only
@@ -94,7 +100,7 @@ module RDF::NTriples
     def self.escape_unicode(u, encoding)
       case (u = u.ord)
         when (0x00..0x7F)        # ASCII 7-bit
-          escape_ascii(u)
+          escape_ascii(u, encoding)
         when (0x80..0xFFFF)      # Unicode BMP
           escape_utf16(u)
         when (0x10000..0x10FFFF) # Unicode
@@ -105,15 +111,22 @@ module RDF::NTriples
     end
 
     ##
+    # Standard ASCII escape sequences. If encoding is ASCII, use Test-Cases
+    # sequences, otherwise, assume the test-cases escape sequences. Otherwise,
+    # the N-Triples recommendation includes `\b` and `\f` escape sequences.
+    #
     # @param  [Integer, #ord] u
     # @return [String]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    def self.escape_ascii(u)
+    # @see    http://www.w3.org/TR/n-triples/
+    def self.escape_ascii(u, encoding)
       case (u = u.ord)
-        when (0x00..0x08) then escape_utf16(u)
+        when (0x00..0x07) then escape_utf16(u)
+        when (0x08)       then (encoding.nil? || encoding == Encoding::ASCII ? escape_utf16(u) : "\\b")
         when (0x09)       then "\\t"
         when (0x0A)       then "\\n"
-        when (0x0B..0x0C) then escape_utf16(u)
+        when (0x0B)       then escape_utf16(u)
+        when (0x0C)       then (encoding.nil? || encoding == Encoding::ASCII ? escape_utf16(u) : "\\f")
         when (0x0D)       then "\\r"
         when (0x0E..0x1F) then escape_utf16(u)
         when (0x22)       then "\\\""

data/lib/rdf/query/pattern.rb

@@ -67,29 +67,6 @@ module RDF; class Query
       subject.nil? && predicate.nil? && object.nil? && context.nil?
     end
 
-    ##
-    # Returns `true` if this is a constant pattern, with all terms being
-    # either URIs, blank nodes, or literals.
-    #
-    # A constant pattern is structurally and functionally equivalent to an
-    # RDF statement.
-    #
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def constant?
-      !(variable?)
-    end
-
-    ##
-    # Returns `true` if this is a variable pattern, with any term being
-    # `nil` or a variable.
-    #
-    # @return [Boolean] `true` or `false`
-    # @since  0.3.0
-    def variable?
-      subject.nil? || predicate.nil? || object.nil? || context.nil? || has_variables?
-    end
-
     ##
     # Returns `true` if this pattern contains any variables.
     #

data/lib/rdf/reader.rb

@@ -189,6 +189,7 @@ module RDF
       @options[:canonicalize] ||= false
       @options[:intern]       ||= true
       @options[:prefixes]     ||= Hash.new
+      @options[:base_uri]     ||= input.base_uri if input.respond_to?(:base_uri)
 
       @input = case input
         when String then StringIO.new(input)
@@ -362,6 +363,13 @@ module RDF
     end
     alias_method :close!, :close
 
+    ##
+    # Current line number being processed. For formats that can associate generated {Statement} with a particular line number from input, this value reflects that line number.
+    # @return [Integer]
+    def lineno
+      @input.lineno
+    end
+
   protected
 
     ##
@@ -467,12 +475,6 @@ module RDF
       super
     end
 
-    ##
-    # @return [Integer]
-    def lineno
-      @input.lineno
-    end
-
     ##
     # @private
     # @return [String] The most recently read line of the input

data/lib/rdf/writer.rb

@@ -105,13 +105,18 @@ module RDF
     ##
     # @param  [RDF::Enumerable, #each] data
     #   the graph or repository to dump
-    # @param  [IO, File] io
+    # @param  [IO, File, String] io
     #   the output stream or file to write to
     # @param  [Hash{Symbol => Object}] options
     #   passed to {RDF::Writer#initialize} or {RDF::Writer.buffer}
     # @return [void]
     def self.dump(data, io = nil, options = {})
-      io = File.open(io, 'w') if io.is_a?(String)
+      if io.is_a?(String)
+        io = File.open(io, 'w')
+      elsif io.respond_to?(:external_encoding) && io.external_encoding
+        options = {:encoding => io.external_encoding}.merge(options)
+      end
+      io.set_encoding(options[:encoding]) if io.respond_to?(:set_encoding) && options[:encoding]
       method = data.respond_to?(:each_statement) ? :each_statement : :each
       if io
         new(io, options) do |writer|
@@ -138,9 +143,11 @@ module RDF
     # @return [String]
     # @raise [ArgumentError] if no block is provided
     def self.buffer(*args, &block)
+      options = args.last.is_a?(Hash) ? args.last : {}
       raise ArgumentError, "block expected" unless block_given?
 
       StringIO.open do |buffer|
+        buffer.set_encoding(options[:encoding]) if buffer.respond_to?(:set_encoding) && options[:encoding]
         self.new(buffer, *args) { |writer| block.call(writer) }
         buffer.string
       end
@@ -156,6 +163,7 @@ module RDF
     # @return [RDF::Writer]
     def self.open(filename, options = {}, &block)
       File.open(filename, 'wb') do |file|
+        file.set_encoding(options[:encoding]) if file.respond_to?(:set_encoding) && options[:encoding]
         format_options = options.dup
         format_options[:file_name] ||= filename
         self.for(options[:format] || format_options).new(file, options, &block)
@@ -439,7 +447,7 @@ module RDF
     ##
     # @return [void]
     def puts(*args)
-      @output.puts(*args)
+      @output.puts(*args.map {|s| s.respond_to?(:force_encoding) ? s.force_encoding(encoding) : s})
     end
 
     ##

metadata

@@ -1,75 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
+  prerelease:
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.12'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
-  (RDF) data.
+    none: false
+  prerelease: false
+  type: :development
+description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.
 email: public-rdf-ruby@w3.org
 executables:
 - rdf
@@ -84,8 +92,19 @@ files:
 - bin/rdf
 - etc/doap.nt
 - lib/df.rb
+- lib/rdf.rb
 - lib/rdf/cli.rb
 - lib/rdf/format.rb
+- lib/rdf/nquads.rb
+- lib/rdf/ntriples.rb
+- lib/rdf/query.rb
+- lib/rdf/reader.rb
+- lib/rdf/repository.rb
+- lib/rdf/transaction.rb
+- lib/rdf/util.rb
+- lib/rdf/version.rb
+- lib/rdf/vocab.rb
+- lib/rdf/writer.rb
 - lib/rdf/mixin/countable.rb
 - lib/rdf/mixin/durable.rb
 - lib/rdf/mixin/enumerable.rb
@@ -98,6 +117,13 @@ files:
 - lib/rdf/mixin/writable.rb
 - lib/rdf/model/graph.rb
 - lib/rdf/model/list.rb
+- lib/rdf/model/literal.rb
+- lib/rdf/model/node.rb
+- lib/rdf/model/resource.rb
+- lib/rdf/model/statement.rb
+- lib/rdf/model/term.rb
+- lib/rdf/model/uri.rb
+- lib/rdf/model/value.rb
 - lib/rdf/model/literal/boolean.rb
 - lib/rdf/model/literal/date.rb
 - lib/rdf/model/literal/datetime.rb
@@ -109,33 +135,18 @@ files:
 - lib/rdf/model/literal/time.rb
 - lib/rdf/model/literal/token.rb
 - lib/rdf/model/literal/xml.rb
-- lib/rdf/model/literal.rb
-- lib/rdf/model/node.rb
-- lib/rdf/model/resource.rb
-- lib/rdf/model/statement.rb
-- lib/rdf/model/term.rb
-- lib/rdf/model/uri.rb
-- lib/rdf/model/value.rb
-- lib/rdf/nquads.rb
 - lib/rdf/ntriples/format.rb
 - lib/rdf/ntriples/reader.rb
 - lib/rdf/ntriples/writer.rb
-- lib/rdf/ntriples.rb
 - lib/rdf/query/hash_pattern_normalizer.rb
 - lib/rdf/query/pattern.rb
 - lib/rdf/query/solution.rb
 - lib/rdf/query/solutions.rb
 - lib/rdf/query/variable.rb
-- lib/rdf/query.rb
-- lib/rdf/reader.rb
-- lib/rdf/repository.rb
-- lib/rdf/transaction.rb
 - lib/rdf/util/aliasing.rb
 - lib/rdf/util/cache.rb
 - lib/rdf/util/file.rb
 - lib/rdf/util/uuid.rb
-- lib/rdf/util.rb
-- lib/rdf/version.rb
 - lib/rdf/vocab/cc.rb
 - lib/rdf/vocab/cert.rb
 - lib/rdf/vocab/dc.rb
@@ -155,32 +166,31 @@ files:
 - lib/rdf/vocab/wot.rb
 - lib/rdf/vocab/xhtml.rb
 - lib/rdf/vocab/xsd.rb
-- lib/rdf/vocab.rb
-- lib/rdf/writer.rb
-- lib/rdf.rb
 homepage: http://ruby-rdf.github.com/
 licenses:
 - Public Domain
-metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.1
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.0.3
-signing_key: 
-specification_version: 4
+rubygems_version: 1.8.24
+signing_key:
+specification_version: 3
 summary: A Ruby library for working with Resource Description Framework (RDF) data.
 test_files: []
 has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjI3YmJmYTZkOGMwMTc2M2VkYTY4YWFiZGQ2YWRlN2E0NmQ5YzIxOQ==
-  data.tar.gz: !binary |-
-    NmU0NTA4ODAwNTNkNzJmMWQ1M2U3M2IyODFiNjJkYjRhM2ZiNjM2ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTM5MDM3NjEzMWZhZTYwMjg1MGZjOGY5OTY4ODMyNDIxNjZjOTJiYTdiZDhk
-    YzAyZGUyYzllYjU1ZWZkMjM4NzEzMWU4NzViNGI0ZGI4YWMzZWEyZWJlZTkz
-    MzRjOTgyMzE1ZWZjN2UyYTIwZGM5ZWI4ZDRjYjhmODg0MGY5ZGM=
-  data.tar.gz: !binary |-
-    ZTA3MDBiYzUyYTBlYjJlNTk1Njg5NDYwNzI5ZTY3MGIzNjU5NmEyMjlkZTVl
-    MzQ4MTFjMmQyZTE1NDgwODc0ZTk4YThlYzRmYjJmOTBhYjdlYzQxOGFiZTg1
-    Y2MxOTQ4NDBhNzg3YzNmYjIwNWIwNjUyYTNiYzE3MzEzZTAwMzI=