rdf-json 0.2.0 → 0.3.0.pre

data/README

@@ -1,8 +1,8 @@
 RDF/JSON Support for RDF.rb
 ===========================
 
-This is an [RDF.rb][] plugin that adds support for parsing/serializing the
-[RDF/JSON][] serialization format.
+This is an [RDF.rb][] plugin that adds support for parsing/serializing
+[RDF/JSON][], a simple JSON-based RDF serialization format.
 
 * <http://github.com/bendiken/rdf-json>
 * <http://blog.datagraph.org/2010/04/parsing-rdf-with-ruby>
@@ -19,8 +19,8 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.2.0)
-* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.3)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
+* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.2)
 
 Installation
 ------------
@@ -37,21 +37,31 @@ To get a local working copy of the development repository, do:
 
     % git clone git://github.com/bendiken/rdf-json.git
 
-Alternatively, you can download the latest development version as a tarball
-as follows:
+Alternatively, download the latest development version as a tarball as
+follows:
 
     % wget http://github.com/bendiken/rdf-json/tarball/master
 
+Mailing List
+------------
+
+* <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
+
 Author
 ------
 
-* [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
+* [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
+
+Contributors
+------------
+
+Refer to the accompanying {file:CREDITS} file.
 
 License
 -------
 
-`RDF::JSON` is free and unencumbered public domain software. For more
-information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
+This is free and unencumbered public domain software. For more information,
+see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 [RDF.rb]:   http://rdf.rubyforge.org/
 [RDF/JSON]: http://n2.talis.com/wiki/RDF_JSON_Specification

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0.pre

data/lib/rdf/json.rb

@@ -42,5 +42,5 @@ module RDF
     autoload :Reader,  'rdf/json/reader'
     autoload :Writer,  'rdf/json/writer'
     autoload :VERSION, 'rdf/json/version'
-  end # module JSON
-end # module RDF
+  end # JSON
+end # RDF

data/lib/rdf/json/extensions.rb

@@ -51,7 +51,7 @@ module RDF::JSON
         # Any RDF/JSON-compatible class must implement `#to_rdf_json`:
         to_rdf_json.to_json
       end
-    end
+    end # Value
 
     ##
     # RDF/JSON extensions for `RDF::Node`.
@@ -63,7 +63,7 @@ module RDF::JSON
       def to_rdf_json
         {:type => :bnode, :value => to_s}
       end
-    end
+    end # Node
 
     ##
     # RDF/JSON extensions for `RDF::URI`.
@@ -75,7 +75,7 @@ module RDF::JSON
       def to_rdf_json
         {:type => :uri, :value => to_s}
       end
-    end
+    end # URI
 
     ##
     # RDF/JSON extensions for `RDF::Literal`.
@@ -94,7 +94,7 @@ module RDF::JSON
             {:type => :literal, :value => value.to_s}
         end
       end
-    end
+    end # Literal
 
     ##
     # RDF/JSON extensions for `RDF::Statement`.
@@ -106,7 +106,7 @@ module RDF::JSON
       def to_rdf_json
         {subject.to_s => {predicate.to_s => [object.to_rdf_json]}}
       end
-    end
+    end # Statement
 
     ##
     # RDF/JSON extensions for `RDF::Enumerable`.
@@ -135,20 +135,38 @@ module RDF::JSON
         end
         json
       end
-    end
+    end # Enumerable
 
     ##
     # RDF/JSON extensions for `RDF::Graph`.
     module Graph
       include Enumerable
-    end
+    end # Graph
 
     ##
     # RDF/JSON extensions for `RDF::Repository`.
     module Repository
       include Enumerable
-    end
-  end # module Extensions
+    end # Repository
+
+    ##
+    # RDF/JSON extensions for `RDF::Transaction`.
+    module Transaction
+      ##
+      # Returns the serialized JSON representation of this object.
+      #
+      # @return [String]
+      def to_json
+        json = options.dup.to_hash rescue {}
+        json.merge!({
+          :graph  => graph ? graph.to_uri.to_s : nil,
+          :delete => deletes.to_rdf_json,
+          :insert => inserts.to_rdf_json,
+        })
+        json.to_json
+      end
+    end # Transaction
+  end # Extensions
 
   Extensions.install!
-end # module RDF::JSON
+end # RDF::JSON

data/lib/rdf/json/format.rb

@@ -2,6 +2,9 @@ module RDF::JSON
   ##
   # RDF/JSON format specification.
   #
+  # @example Loading RDF/JSON format support
+  #   require 'rdf/json'
+  #
   # @example Obtaining an RDF/JSON format class
   #   RDF::Format.for(:json)         #=> RDF::JSON::Format
   #   RDF::Format.for("etc/doap.json")
@@ -18,5 +21,5 @@ module RDF::JSON
     writer { RDF::JSON::Writer }
 
     require 'json'
-  end # class Format
-end # module RDF::JSON
+  end # Format
+end # RDF::JSON

data/lib/rdf/json/reader.rb

@@ -2,6 +2,9 @@ module RDF::JSON
   ##
   # RDF/JSON parser.
   #
+  # @example Loading RDF/JSON parsing support
+  #   require 'rdf/json'
+  #
   # @example Obtaining an RDF/JSON reader class
   #   RDF::Reader.for(:json)         #=> RDF::JSON::Reader
   #   RDF::Reader.for("etc/doap.json")
@@ -29,6 +32,8 @@ module RDF::JSON
     format RDF::JSON::Format
 
     ##
+    # The graph constructed when parsing.
+    #
     # @return [RDF::Graph]
     attr_reader :graph
 
@@ -43,7 +48,7 @@ module RDF::JSON
       super do
         @graph = RDF::Graph.new
 
-        JSON.parse(@input.read).each do |subject, predicates|
+        ::JSON.parse(@input.read).each do |subject, predicates|
           subject = parse_subject(subject)
           predicates.each do |predicate, objects|
             predicate = parse_predicate(predicate)
@@ -65,8 +70,8 @@ module RDF::JSON
     # @return [RDF::Resource]
     def parse_subject(subject)
       case subject
-        when /^_:/ then RDF::Node.new(subject[2..-1])
-        else RDF::URI.new(subject)
+        when /^_:/ then parse_node(subject)
+        else parse_uri(subject)
       end
     end
 
@@ -76,8 +81,8 @@ module RDF::JSON
     # @param  [String] predicate
     # @return [RDF::URI]
     def parse_predicate(predicate)
-      # TODO: optional support for CURIE predicates (issue #1 on GitHub).
-      RDF::URI.intern(predicate)
+      # TODO: optional support for CURIE predicates? (issue #1 on GitHub).
+      parse_uri(predicate, :intern => true)
     end
 
     ##
@@ -86,44 +91,80 @@ module RDF::JSON
     # @param  [Hash{String => Object}] object
     # @return [RDF::Value]
     def parse_object(object)
-      raise RDF::ReaderError.new, "missing 'type' key in #{object.inspect}"  unless object.has_key?('type')
-      raise RDF::ReaderError.new, "missing 'value' key in #{object.inspect}" unless object.has_key?('value')
+      raise RDF::ReaderError, "missing 'type' key in #{object.inspect}"  unless object.has_key?('type')
+      raise RDF::ReaderError, "missing 'value' key in #{object.inspect}" unless object.has_key?('value')
 
       case type = object['type']
         when 'bnode'
-          RDF::Node.new(object['value'][2..-1])
+          parse_node(object['value'])
         when 'uri'
-          RDF::URI.new(object['value'])
+          parse_uri(object['value'])
         when 'literal'
-          RDF::Literal.new(object['value'], {
+          literal = RDF::Literal.new(object['value'], {
             :language => object['lang'],
             :datatype => object['datatype'],
           })
+          literal.validate!     if validate?
+          literal.canonicalize! if canonicalize?
+          literal
         else
           raise RDF::ReaderError, "expected 'type' to be 'bnode', 'uri', or 'literal', but got #{type.inspect}"
       end
     end
 
+    ##
+    # Parses an RDF/JSON blank node string into an `RDF::Node` instance.
+    #
+    # @param  [String] string
+    # @return [RDF::Node]
+    def parse_node(string)
+      RDF::Node.new(string[2..-1]) # strips off the initial '_:'
+    end
+    alias_method :parse_bnode, :parse_node
+
+    ##
+    # Parses an RDF/JSON URI string into an `RDF::URI` instance.
+    #
+    # @param  [String] string
+    # @param  [Hash{Symbol => Object}] options
+    # @option options [Boolean] :intern (false)
+    # @return [RDF::URI]
+    def parse_uri(string, options = {})
+      uri = RDF::URI.send(intern = intern? && options[:intern] ? :intern : :new, string)
+      uri.validate!     if validate?
+      uri.canonicalize! if canonicalize? && !intern
+      uri
+    end
+
     ##
     # @private
     # @see   RDF::Reader#each_graph
     # @since 0.2.0
     def each_graph(&block)
-      block_given? ? @block.call(@graph) : enum_for(:each_graph).extend(RDF::Countable)
+      if block_given?
+        block.call(@graph)
+      end
+      enum_graph
     end
 
     ##
     # @private
     # @see   RDF::Reader#each_statement
     def each_statement(&block)
-      block_given? ? @graph.each_statement(&block) : enum_for(:each_statement).extend(RDF::Countable)
+      if block_given?
+        @graph.each_statement(&block)
+      end
+      enum_statement
     end
 
     ##
     # @private
-    # @see   RDF::Reader#each_statement
+    # @see   RDF::Reader#each_triple
     def each_triple(&block)
-      block_given? ? @graph.each_triple(&block) : enum_for(:each_triple).extend(RDF::Countable)
+      if block_given?
+        @graph.each_triple(&block)
+      end
+      enum_triple
     end
-  end # class Reader
-end # module RDF::JSON
+  end # Reader
+end # RDF::JSON

data/lib/rdf/json/version.rb

@@ -1,9 +1,9 @@
 module RDF; module JSON
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
-    EXTRA = nil
+    EXTRA = :pre
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 

data/lib/rdf/json/writer.rb

@@ -2,6 +2,9 @@ module RDF::JSON
   ##
   # RDF/JSON serializer.
   #
+  # @example Loading RDF/JSON serialization support
+  #   require 'rdf/json'
+  #
   # @example Obtaining an RDF/JSON writer class
   #   RDF::Writer.for(:json)         #=> RDF::JSON::Writer
   #   RDF::Writer.for("etc/test.json")
@@ -86,5 +89,5 @@ module RDF::JSON
         else RDF::Literal.new(value).to_json
       end
     end
-  end # class Writer
-end # module RDF::JSON
+  end # Writer
+end # RDF::JSON

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-json
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  - pre
+  version: 0.3.0.pre
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -14,36 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +02:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdf-spec
+  name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
+        - 1
+        - 4
         - 2
-        - 0
-        version: 0.2.0
-  type: :development
+        version: 1.4.2
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rdf
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 0
         - 3
         - 0
-        version: 1.3.0
-  type: :development
+        - pre
+        version: 0.3.0.pre
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -54,38 +56,39 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
         - 6
-        version: 0.5.6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdf
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 3
         - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
+        version: 1.3.0
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: rdf-spec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 4
+        - 0
         - 3
-        version: 1.4.3
-  type: :runtime
+        - 0
+        - pre
+        version: 0.3.0.pre
+  type: :development
   version_requirements: *id005
 description: RDF.rb plugin for parsing/serializing RDF/JSON data.
 email: public-rdf-ruby@w3.org
@@ -97,6 +100,7 @@ extra_rdoc_files: []
 
 files: 
 - AUTHORS
+- CREDITS
 - README
 - UNLICENSE
 - VERSION
@@ -127,11 +131,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rdf