rdf-json 0.3.0 → 1.0.0

data/AUTHORS

@@ -1 +1 @@
-* Arto Bendiken <arto.bendiken@gmail.com>
+* Arto Bendiken <arto@bendiken.net>

data/README

@@ -19,8 +19,8 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.0)
-* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.2)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
+* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-0.3.0
+1.0.0

data/etc/doap.json

@@ -20,7 +20,7 @@
       
       ],
     "http://xmlns.com/foaf/0.1/mbox" : [ {
-        "value" : "mailto:arto.bendiken@gmail.com",
+        "value" : "mailto:arto@bendiken.net",
         "type" : "uri"
         }
       

data/lib/rdf/json.rb

@@ -22,13 +22,13 @@ module RDF
   #   end
   #
   # @example Serializing RDF values into RDF/JSON strings
-  #   RDF::Node.new('foobar').to_json
-  #   RDF::URI.new("http://rdf.rubyforge.org/").to_json
-  #   RDF::Literal.new("Hello, world!").to_json
-  #   RDF::Literal.new("Hello, world!", :language => 'en-US').to_json
-  #   RDF::Literal.new(3.1415).to_json
-  #   RDF::Literal.new('true', :datatype => RDF::XSD.boolean).to_json
-  #   RDF::Statement.new(s, p, o).to_json
+  #   RDF::Node.new('foobar').to_rdf_json.to_json
+  #   RDF::URI.new("http://rdf.rubyforge.org/").to_rdf_json.to_json
+  #   RDF::Literal.new("Hello, world!").to_rdf_json
+  #   RDF::Literal.new("Hello, world!", :language => 'en-US').to_rdf_json.to_json
+  #   RDF::Literal.new(3.1415).to_rdf_json.to_json
+  #   RDF::Literal.new('true', :datatype => RDF::XSD.boolean).to_rdf_json.to_json
+  #   RDF::Statement.new(s, p, o).to_rdf_json.to_json
   #
   # @see http://rdf.rubyforge.org/
   # @see http://n2.talis.com/wiki/RDF_JSON_Specification

data/lib/rdf/json/extensions.rb

@@ -6,53 +6,39 @@ module RDF::JSON
   # Classes are extended with two new instance methods:
   #
   # * `#to_rdf_json` returns the RDF/JSON representation as a `Hash` object.
-  # * `#to_json` returns the serialized RDF/JSON representation as a string.
+  # * `#to_rdf_json.to_json` returns the serialized RDF/JSON representation as a string.
   #
   # @example Serializing blank nodes into RDF/JSON format
-  #   RDF::Node.new(id).to_json
+  #   RDF::Node.new(id).to_rdf_json.to_json
   #
   # @example Serializing URI references into RDF/JSON format
-  #   RDF::URI.new("http://rdf.rubyforge.org/").to_json
+  #   RDF::URI.new("http://rdf.rubyforge.org/").to_rdf_json.to_json
   #
   # @example Serializing plain literals into RDF/JSON format
-  #   RDF::Literal.new("Hello, world!").to_json
+  #   RDF::Literal.new("Hello, world!").to_rdf_json.to_json
   #
   # @example Serializing language-tagged literals into RDF/JSON format
-  #   RDF::Literal.new("Hello, world!", :language => 'en-US').to_json
+  #   RDF::Literal.new("Hello, world!", :language => 'en-US').to_rdf_json.to_json
   #
   # @example Serializing datatyped literals into RDF/JSON format
-  #   RDF::Literal.new(3.1415).to_json
-  #   RDF::Literal.new('true', :datatype => RDF::XSD.boolean).to_json
+  #   RDF::Literal.new(3.1415).to_rdf_json.to_json
+  #   RDF::Literal.new('true', :datatype => RDF::XSD.boolean).to_rdf_json.to_json
   #
   # @example Serializing statements into RDF/JSON format
-  #   RDF::Statement.new(s, p, o).to_json
+  #   RDF::Statement.new(s, p, o).to_rdf_json.to_json
   #
   # @example Serializing enumerables into RDF/JSON format
-  #   [RDF::Statement.new(s, p, o)].extend(RDF::Enumerable).to_json
+  #   [RDF::Statement.new(s, p, o)].extend(RDF::Enumerable).to_rdf_json.to_json
   #
   module Extensions
     ##
     # @private
     def self.install!
       self.constants.each do |klass|
-        RDF.const_get(klass).send(:include, self.const_get(:Value)) # needed on Ruby 1.8.x
         RDF.const_get(klass).send(:include, self.const_get(klass))
       end
     end
 
-    ##
-    # RDF/JSON extensions for `RDF::Value`.
-    module Value
-      ##
-      # Returns the serialized RDF/JSON representation of this value.
-      #
-      # @return [String]
-      def to_json
-        # Any RDF/JSON-compatible class must implement `#to_rdf_json`:
-        to_rdf_json.to_json
-      end
-    end # Value
-
     ##
     # RDF/JSON extensions for `RDF::Node`.
     module Node
@@ -111,14 +97,6 @@ module RDF::JSON
     ##
     # RDF/JSON extensions for `RDF::Enumerable`.
     module Enumerable
-      ##
-      # Returns the serialized RDF/JSON representation of this object.
-      #
-      # @return [String]
-      def to_json
-        to_rdf_json.to_json
-      end
-
       ##
       # Returns the RDF/JSON representation of this object.
       #
@@ -153,17 +131,16 @@ module RDF::JSON
     # RDF/JSON extensions for `RDF::Transaction`.
     module Transaction
       ##
-      # Returns the serialized JSON representation of this object.
+      # Returns the serialized RDF/JSON representation of this object.
       #
-      # @return [String]
-      def to_json
+      # @return [Hash]
+      def to_rdf_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

data/lib/rdf/json/version.rb

@@ -1,11 +1,8 @@
 module RDF; module JSON
   module VERSION
-    MAJOR = 0
-    MINOR = 3
-    TINY  = 0
-    EXTRA = nil
-
-    STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
+    FILE = File.expand_path('../../../../VERSION', __FILE__)
+    MAJOR, MINOR, TINY, EXTRA = File.read(FILE).chomp.split('.')
+    STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.').freeze
 
     ##
     # @return [String]

data/lib/rdf/json/writer.rb

@@ -64,7 +64,7 @@ module RDF::JSON
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_node(value, options = {})
-      value.to_json
+      value.to_rdf_json.to_json
     end
 
     ##
@@ -74,7 +74,7 @@ module RDF::JSON
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_uri(value, options = {})
-      value.to_json
+      value.to_rdf_json.to_json
     end
 
     ##
@@ -85,8 +85,8 @@ module RDF::JSON
     # @return [String]
     def format_literal(value, options = {})
       case value
-        when RDF::Literal then value.to_json
-        else RDF::Literal.new(value).to_json
+        when RDF::Literal then value.to_rdf_json.to_json
+        else RDF::Literal.new(value).to_rdf_json.to_json
       end
     end
   end # Writer

metadata

@@ -1,101 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-json
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2013-01-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: RDF.rb plugin for parsing/serializing RDF/JSON data.
 email: public-rdf-ruby@w3.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - CREDITS
 - README
@@ -108,37 +109,30 @@ files:
 - lib/rdf/json/version.rb
 - lib/rdf/json/writer.rb
 - lib/rdf/json.rb
-has_rdoc: false
-homepage: http://rdf.rubyforge.org/json/
-licenses: 
+homepage: http://ruby-rdf.github.com/rdf-json/
+licenses:
 - Public Domain
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rdf
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RDF/JSON support for RDF.rb.
 test_files: []
-
+has_rdoc: false