rdf-json 0.1.1 → 0.2.0

data/README

@@ -19,7 +19,7 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.10)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.2.0)
 * [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.3)
 
 Installation

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rdf/json/extensions.rb

@@ -31,6 +31,15 @@ module RDF::JSON
   #   [RDF::Statement.new(s, p, o)].extend(RDF::Enumerable).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
@@ -77,9 +86,9 @@ module RDF::JSON
       # @return [Hash]
       def to_rdf_json
         case
-          when datatype? # FIXME: use `has_datatype?` in RDF.rb 0.1.0
+          when has_datatype?
             {:type => :literal, :value => value.to_s, :datatype => datatype.to_s}
-          when language? # FIXME: use `has_language?` in RDF.rb 0.1.0
+          when has_language?
             {:type => :literal, :value => value.to_s, :lang => language.to_s}
           else
             {:type => :literal, :value => value.to_s}
@@ -95,9 +104,7 @@ module RDF::JSON
       #
       # @return [Hash]
       def to_rdf_json
-        # FIXME: improve the RDF::Statement constructor in RDF.rb 0.1.0
-        s, p, o = subject.to_s, predicate.to_s, object.is_a?(RDF::Value) ? object : RDF::Literal.new(object)
-        {s => {p => [o.to_rdf_json]}}
+        {subject.to_s => {predicate.to_s => [object.to_rdf_json]}}
       end
     end
 
@@ -143,7 +150,5 @@ module RDF::JSON
     end
   end # module Extensions
 
-  Extensions.constants.each do |klass|
-    RDF.const_get(klass).send(:include, Extensions.const_get(klass))
-  end
+  Extensions.install!
 end # module RDF::JSON

data/lib/rdf/json/reader.rb

@@ -76,8 +76,8 @@ module RDF::JSON
     # @param  [String] predicate
     # @return [RDF::URI]
     def parse_predicate(predicate)
-      # TODO: support for CURIE predicates (issue #1 on GitHub).
-      parse_subject(predicate)
+      # TODO: optional support for CURIE predicates (issue #1 on GitHub).
+      RDF::URI.intern(predicate)
     end
 
     ##
@@ -105,25 +105,25 @@ module RDF::JSON
     end
 
     ##
-    # Iterates the given block for each RDF statement in the input.
-    #
-    # @yield  [statement]
-    # @yieldparam [RDF::Statement] statement
-    # @return [void]
+    # @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)
+    end
+
+    ##
+    # @private
+    # @see   RDF::Reader#each_statement
     def each_statement(&block)
-      @graph.each_statement(&block)
+      block_given? ? @graph.each_statement(&block) : enum_for(:each_statement).extend(RDF::Countable)
     end
 
     ##
-    # Iterates the given block for each RDF triple in the input.
-    #
-    # @yield  [subject, predicate, object]
-    # @yieldparam [RDF::Resource] subject
-    # @yieldparam [RDF::URI]      predicate
-    # @yieldparam [RDF::Value]    object
-    # @return [void]
+    # @private
+    # @see   RDF::Reader#each_statement
     def each_triple(&block)
-      @graph.each_triple(&block)
+      block_given? ? @graph.each_triple(&block) : enum_for(:each_triple).extend(RDF::Countable)
     end
   end # class Reader
 end # module RDF::JSON

data/lib/rdf/json/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +02:00
+date: 2010-06-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 5
-        version: 0.5.5
+        - 6
+        version: 0.5.6
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -68,9 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 description: RDF.rb plugin for parsing/serializing RDF/JSON data.
-email: arto.bendiken@gmail.com
+email: public-rdf-ruby@w3.org
 executables: []
 
 extensions: []
@@ -108,7 +108,7 @@ files:
 - lib/rdf/json/writer.rb
 - lib/rdf/json.rb
 has_rdoc: false
-homepage: http://rdf.rubyforge.org/
+homepage: http://rdf.rubyforge.org/json/
 licenses: 
 - Public Domain
 post_install_message: 
@@ -123,8 +123,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
       segments: 
       - 1
       - 8
-      - 2
-      version: 1.8.2
+      - 1
+      version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="