rdf-json 1.99.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ef4b7b6ad563714cf9e145f0b2519db02df22b
-  data.tar.gz: 63343732f7e824abb4e55621b42c4902c45feb1b
+  metadata.gz: 154e7fa55e959df970398bc70f9a7053a7b67750
+  data.tar.gz: 2dcf9417e9175cfd8d6dde901b64fa200debee48
 SHA512:
-  metadata.gz: b0a93b2946ab3392f5010b15c3f2a4611ac87da7fe3232129427fe1f152b0233f121f7ef17a0ae8119b8a0f6173b97927f658d9f75ca9a4b81c6bffa22bf5bc4
-  data.tar.gz: 4c04874942c0951b69c7287ec36b9aa6687e70b6d0ec670ec844ffeca62818fed4a2f9879b972e86aaea2d2250a875da282c718a0dc3584363de366c091e91bc
+  metadata.gz: 46232f5d84a8cca3aeabc3f40af9f163a331d5534d6d15ad51fa32d2bbc3aa488e5956560d4c14721aabde2dc9e536aa394cb2d0b1eea518f8f510308758930d
+  data.tar.gz: e930686197617083944f30d154468f6856de21be4b88a704c44cb565349763722009ba40a51a3acee113c5965e36021ea52e0e0ddf9047f98835b8db73ed39ea

data/VERSION

@@ -1 +1 @@
-1.99.0
+2.0.0.beta1

data/lib/rdf/json/reader.rb

@@ -29,6 +29,7 @@ module RDF::JSON
   #
   # @see http://n2.talis.com/wiki/RDF_JSON_Specification
   class Reader < RDF::Reader
+    include RDF::Util::Logger
     format RDF::JSON::Format
 
     ##
@@ -48,20 +49,6 @@ module RDF::JSON
     # @yieldreturn [void] ignored
     def initialize(input = $stdin, options = {}, &block)
       super do
-        @graph = RDF::Graph.new
-
-        @input.rewind
-        ::JSON.parse(@input.read).each do |subject, predicates|
-          subject = parse_subject(subject)
-          predicates.each do |predicate, objects|
-            predicate = parse_predicate(predicate)
-            objects.each do |object|
-              object = parse_object(object)
-              @graph << [subject, predicate, object]
-            end
-          end
-        end
-
         if block_given?
           case block.arity
             when 0 then instance_eval(&block)
@@ -99,8 +86,8 @@ module RDF::JSON
     # @param  [Hash{String => Object}] object
     # @return [RDF::Value]
     def parse_object(object)
-      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')
+      log_error("missing 'type' key in #{object.inspect}", exception: RDF::ReaderError) unless object.has_key?('type')
+      log_error("missing 'value' key in #{object.inspect}", exception: RDF::ReaderError) unless object.has_key?('value')
 
       case type = object['type']
         when 'bnode'
@@ -116,8 +103,10 @@ module RDF::JSON
           literal.canonicalize! if canonicalize?
           literal
         else
-          raise RDF::ReaderError, "expected 'type' to be 'bnode', 'uri', or 'literal', but got #{type.inspect}"
+          log_error("expected 'type' to be 'bnode', 'uri', or 'literal', but got #{type.inspect}", exception: RDF::ReaderError)
       end
+    rescue RDF::ReaderError
+      nil
     end
 
     ##
@@ -127,7 +116,9 @@ module RDF::JSON
     # @return [RDF::Node]
     # @since  0.3.0
     def parse_node(string)
-      RDF::Node.new(string[2..-1]) # strips off the initial '_:'
+      @nodes ||= {}
+      id = string[2..-1] # strips off the initial '_:'
+      @nodes[id.to_sym] ||= RDF::Node.new(id)
     end
     alias_method :parse_bnode, :parse_node
 
@@ -146,25 +137,31 @@ module RDF::JSON
       uri
     end
 
-    ##
-    # @private
-    # @see   RDF::Reader#each_graph
-    # @since 0.2.0
-    def each_graph(&block)
-      if block_given?
-        block.call(@graph)
-      end
-      enum_graph
-    end
-
     ##
     # @private
     # @see   RDF::Reader#each_statement
     def each_statement(&block)
       if block_given?
-        @graph.each_statement(&block)
+        @input.rewind rescue nil
+        begin
+          ::JSON.parse(@input.read).each do |subject, predicates|
+            subject = parse_subject(subject)
+            predicates.each do |predicate, objects|
+              predicate = parse_predicate(predicate)
+              objects.each do |object|
+                object = parse_object(object)
+                yield RDF::Statement(subject, predicate, object) if object
+              end
+            end
+          end
+        rescue ::JSON::ParserError => e
+          log_error(e.message)
+        end
+        if validate? && log_statistics[:error]
+          raise RDF::ReaderError, "Errors found during processing"
+        end
       end
-      enum_statement
+      enum_for(:each_statement)
     end
 
     ##
@@ -172,9 +169,11 @@ module RDF::JSON
     # @see   RDF::Reader#each_triple
     def each_triple(&block)
       if block_given?
-        @graph.each_triple(&block)
+        each_statement do |statement|
+          block.call(*statement.to_triple)
+        end
       end
-      enum_triple
+      enum_for(:each_triple)
     end
   end # Reader
 end # RDF::JSON

data/lib/rdf/json/version.rb

@@ -14,6 +14,6 @@ module RDF; module JSON
 
     ##
     # @return [Array(Integer, Integer, Integer)]
-    def self.to_a() [MAJOR, MINOR, TINY] end
+    def self.to_a() STRING.split(".") end
   end
 end; end

data/lib/rdf/json/writer.rb

@@ -55,6 +55,7 @@ module RDF::JSON
     # @see    #write_triple
     def write_epilogue
       puts @json.to_json
+      super
     end
 
     ##

metadata

@@ -1,57 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: rdf-json
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +120,7 @@ extra_rdoc_files: []
 files:
 - AUTHORS
 - CREDITS
-- README
+- README.md
 - UNLICENSE
 - VERSION
 - etc/doap.rj
@@ -114,7 +132,7 @@ files:
 - lib/rdf/json/writer.rb
 homepage: http://ruby-rdf.github.com/rdf-json
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -124,15 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RDF/JSON support for RDF.rb.