rdf 0.1.1 → 0.1.2

data/README

@@ -1,5 +1,5 @@
-RDF.rb: RDF for Ruby
-====================
+RDF.rb: Linked Data for Ruby
+============================
 
 This is a pure-Ruby library for working with [Resource Description Framework
 (RDF)][RDF] data.
@@ -147,8 +147,8 @@ See Also
 * [RDFcache](http://rdfcache.rubyforge.org/)
 * [Trinity](http://trinity.datagraph.org/)
 
-Author
-------
+Authors
+-------
 
 * [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
 * [Ben Lavender](mailto:blavender@gmail.com) - <http://bhuga.net/>

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rdf.rb

@@ -1,3 +1,4 @@
+require 'open-uri'
 require 'rdf/version'
 
 module RDF

data/lib/rdf/mixin/mutable.rb

@@ -39,6 +39,7 @@ module RDF
       count = 0
       Reader.open(filename, options) do |reader|
         reader.each_statement do |statement|
+          statement.context = options[:context] if options[:context]
           insert_statement(statement)
           count += 1
         end

data/lib/rdf/mixin/queryable.rb

@@ -13,10 +13,14 @@ module RDF
     ##
     # Queries `self` for RDF statements matching the given pattern.
     #
-    # @param  [Query, Statement, Array(Value)] pattern
+    # @example
+    #     queryable.query([nil, RDF::DOAP.developer, nil])
+    #     queryable.query(:predicate => RDF::DOAP.developer)
+    #
+    # @param  [Query, Statement, Array(Value), Hash] pattern
     # @yield  [statement]
     # @yieldparam [Statement]
-    # @return [Array<Statement>, nil]
+    # @return [Array<Statement>]
     def query(pattern, &block)
       raise TypeError.new("#{self} is not readable") if respond_to?(:readable) && !readable?
 
@@ -25,6 +29,8 @@ module RDF
           pattern.execute(self, &block)
         when Array
           query(Statement.new(*pattern), &block)
+        when Hash
+          query(Statement.new(pattern), &block)
         when Statement
           if block_given?
             find_all { |statement| pattern === statement }.each(&block)
@@ -32,7 +38,7 @@ module RDF
             find_all { |statement| pattern === statement }.extend(RDF::Enumerable, RDF::Queryable)
           end
         else
-          raise ArgumentError.new("expected RDF::Query or RDF::Pattern, got #{pattern.inspect}")
+          raise ArgumentError.new("expected RDF::Query, RDF::Pattern, Array or Hash, but got #{pattern.inspect}")
       end
     end
   end

data/lib/rdf/model/resource.rb

@@ -4,7 +4,20 @@ module RDF
   #
   # @abstract
   class Resource < Value
-    # Prevent instantiation of this class.
-    private_class_method :new
+    ##
+    # Instantiates an {RDF::Node} or an {RDF::URI}, depending on the given
+    # argument.
+    #
+    # @return [RDF::Resource]
+    def self.new(*args, &block)
+      if self == Resource
+        case arg = args.shift
+          when /^_:(.*)$/ then Node.new($1, *args, &block)
+          else URI.new(arg, *args, &block)
+        end
+      else
+        super
+      end
+    end
   end
 end

data/lib/rdf/model/statement.rb

@@ -49,9 +49,10 @@ module RDF
     #   @param  [Hash{Symbol => Object}] options
     #   @option options [Resource]       :context   (nil)
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
+      options = options.dup unless options.empty?
       case subject
         when Hash
-          options    = subject
+          options    = subject.dup
           subject    = options.delete(:subject)
           predicate  = options.delete(:predicate)
           object     = options.delete(:object)
@@ -143,7 +144,7 @@ module RDF
     # @param  [Statement] other
     # @return [Boolean]
     def eql?(other)
-      other.is_a?(Statement) && self == other
+      other.is_a?(Statement) && self == other && self.context == other.context
     end
 
     ##
@@ -157,6 +158,7 @@ module RDF
     # @param  [Statement] other
     # @return [Boolean]
     def ===(other)
+      return false if has_context?   && context   != other.context
       return false if has_subject?   && subject   != other.subject
       return false if has_predicate? && predicate != other.predicate
       return false if has_object?    && object    != other.object
@@ -228,7 +230,10 @@ module RDF
           when RDF::URI     then "<#{object}>"
           else object.inspect
         end
-        buffer << " ."
+        buffer << case context
+          when nil then " ."
+          else " <#{context}> ."
+        end
         buffer.string
       end
     end

data/lib/rdf/ntriples/format.rb

@@ -2,7 +2,7 @@ module RDF::NTriples
   ##
   # N-Triples format specification.
   #
-  # @example Obtaining an RDF/NTriples format class
+  # @example Obtaining an NTriples format class
   #   RDF::Format.for(:ntriples)     #=> RDF::NTriples::Format
   #   RDF::Format.for("etc/doap.nt")
   #   RDF::Format.for(:file_name      => "etc/doap.nt")

data/lib/rdf/ntriples/reader.rb

@@ -2,7 +2,7 @@ module RDF::NTriples
   ##
   # N-Triples parser.
   #
-  # @example Obtaining an RDF/NTriples reader class
+  # @example Obtaining an NTriples reader class
   #   RDF::Reader.for(:ntriples)     #=> RDF::NTriples::Reader
   #   RDF::Reader.for("etc/doap.nt")
   #   RDF::Reader.for(:file_name      => "etc/doap.nt")

data/lib/rdf/reader.rb

@@ -104,7 +104,7 @@ module RDF
     # @yieldparam [Reader]
     # @raise  [FormatError] if no reader available for the specified format
     def self.open(filename, options = {}, &block)
-      File.open(filename, 'rb') do |file|
+      Kernel.open(filename, 'rb') do |file|
         if reader = self.for(options[:format] || filename)
           reader.new(file, options, &block)
         else

data/lib/rdf/repository.rb

@@ -89,9 +89,9 @@ module RDF
     # @yield  [repository]
     # @yieldparam [Repository] repository
     def initialize(options = {}, &block)
-      @uri     = options.delete(:uri)
-      @title   = options.delete(:title)
-      @options = options
+      @options = options.dup
+      @uri     = @options.delete(:uri)
+      @title   = @options.delete(:title)
 
       # Provide a default in-memory implementation:
       if self.class.equal?(RDF::Repository)

data/lib/rdf/version.rb

@@ -2,15 +2,15 @@ module RDF
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')
-    STRING << "-#{EXTRA}" if EXTRA
+    STRING << ".#{EXTRA}" if EXTRA
 
     ##
     # @return [String]
-    def self.to_s()   STRING end
+    def self.to_s() STRING end
 
     ##
     # @return [String]

data/lib/rdf/writer.rb

@@ -97,11 +97,13 @@ module RDF
     end
 
     def self.dump(data, io = nil, options = {})
+      io = File.open(io, 'w') if io.is_a?(String)
       if io
         new(io) do |writer|
           data.each_statement do |statement|
             writer << statement
           end
+          writer.flush
         end
       else
         buffer do |writer|
@@ -258,6 +260,16 @@ module RDF
       raise NotImplementedError # override in subclasses
     end
 
+    ##
+    # Flushes the underlying output buffer.
+    #
+    # @return [void]
+    def flush
+      @output.flush if @output.respond_to?(:flush)
+    end
+
+    alias_method :flush!, :flush
+
     protected
 
       def puts(*args)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 +01:00
+date: 2010-03-27 00:00:00 +01:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency