rdf 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/rdf/nquads.rb

@@ -4,9 +4,24 @@ module RDF
   #
   # This has not yet been implemented as of RDF.rb 0.3.x.
   module NQuads
-    class Format < NTriples::Format
-      # TODO
-    end # Format
+    ##
+    # N-Quads format specification.
+    #
+    # @example Obtaining an NQuads format class
+    #   RDF::Format.for(:nquads)     #=> RDF::NQuads::Format
+    #   RDF::Format.for("etc/doap.nq")
+    #   RDF::Format.for(:file_name      => "etc/doap.nq")
+    #   RDF::Format.for(:file_extension => "nq")
+    #   RDF::Format.for(:content_type   => "text/x-nquads")
+    #
+    # @see http://sw.deri.org/2008/07/n-quads/#mediatype
+    class Format < RDF::Format
+      content_type     'text/x-nquads', :extension => :nq
+      content_encoding 'ascii'
+
+      reader { RDF::NQuads::Reader }
+      writer { RDF::NQuads::Writer }
+    end
 
     class Reader < NTriples::Reader
       # TODO

data/lib/rdf/reader.rb

@@ -118,11 +118,11 @@ module RDF
         format_options = options.dup
         format_options[:content_type] ||= file.content_type if file.respond_to?(:content_type)
         format_options[:file_name] ||= filename
-        reader = self.for(format_options)
+        reader = self.for(format_options[:format] || format_options)
         if reader
           reader.new(file, options, &block)
         else
-          raise FormatError, "unknown RDF format: #{options[:format] || {:file_name => filename, :content_type => content_type}.inspect}"
+          raise FormatError, "unknown RDF format: #{format_options.inspect}"
         end
       end
     end

data/lib/rdf/version.rb

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

data/lib/rdf/writer.rb

@@ -147,12 +147,14 @@ module RDF
     #
     # @param  [String, #to_s] filename
     # @param  [Hash{Symbol => Object}] options
-    #   any additional options (see {RDF::Writer#initialize})
+    #   any additional options (see {RDF::Writer#initialize and {RDF::Format.for}})
     # @option options [Symbol] :format (nil)
     # @return [RDF::Writer]
     def self.open(filename, options = {}, &block)
       File.open(filename, 'wb') do |file|
-        self.for(options[:format] || filename).new(file, options, &block)
+        format_options = options.dup
+        format_options[:file_name] ||= filename
+        self.for(options[:format] || format_options).new(file, options, &block)
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +25,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 2
-        version: "2.2"
+        - 4
+        version: 2.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -74,8 +75,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 3
+        version: 0.3.3
   type: :development
   version_requirements: *id004
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.