rdf-n3 1.1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bde49398d0b9fdf810f8a1bbadb05a3445866fb
-  data.tar.gz: 9500aab28d6873b4653ce5d945bbcdeac963d5dc
+  metadata.gz: 995b8be3bfe211680ed83a57b52cae6d6e11b4f5
+  data.tar.gz: b40ed881bbd1645be390be541ae7422a64db3145
 SHA512:
-  metadata.gz: d7a3e5bef3cfaa6c2bcaf818345a98a8fb73e76dd45d25e25ed07558b13615e70ef997ece4e3119dd62a3249b630abf936a1b31b40e77f019ba716ce8466e10c
-  data.tar.gz: 12fb0eba083f823772410ddc07cd8bbf39fbc245ba58db9636bf8811c4529c7f3a5201574f25bc6af6b6caf0b11c4f6785e2e26f5ad106e4e9bbddf0856c54b4
+  metadata.gz: b8494636f459a20bfbd829d0eb1e35f2717814cab326a0cf904ccdaab0797ccc6af75c88d3c9b3262d656b3a6eacf028b2e9bae9093a983ac610ed774d72e6ad
+  data.tar.gz: 98e6b501afcc1ea8d8101f3bce9646fbef7f55a67a25d257242e7883a6f31821bad9671771634c666f187fc87dfc98e2fa8a5fb0911e232e0eb3fbd8e354029b

data/VERSION

@@ -1 +1 @@
-1.1.0.1
+1.1.1

data/lib/rdf/n3/writer.rb

@@ -78,6 +78,8 @@ module RDF::N3
     #   Add standard prefixes to @prefixes, if necessary.
     # @option options [String]   :default_namespace (nil)
     #   URI to use as default namespace, same as prefixes[nil]
+    # @option options [Boolean]  :unique_bnodes   (false)
+    #   Use unique node identifiers, defaults to using the identifier which the node was originall initialized with (if any).
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
@@ -156,7 +158,7 @@ module RDF::N3
     def get_qname(resource)
       case resource
       when RDF::Node
-        return resource.to_s
+        return options[:unique_bnodes] ? resource.to_unique_base : resource.to_base
       when RDF::URI
         uri = resource.to_s
       else
@@ -261,7 +263,7 @@ module RDF::N3
     # @param  [Hash{Symbol => Object}] options
     # @return [String]
     def format_node(node, options = {})
-      "_:%s" % node.id
+      options[:unique_bnodes] ? node.to_unique_base : node.to_base
     end
     
     protected
@@ -322,7 +324,7 @@ module RDF::N3
       # Sort subjects by resources over bnodes, ref_counts and the subject URI itself
       recursable = @subjects.keys.
         select {|s| !seen.include?(s)}.
-        map {|r| [r.is_a?(RDF::Node) ? 1 : 0, ref_count(r), r]}.
+        map {|r| [r.node? ? 1 : 0, ref_count(r), r]}.
         sort
       
       add_debug {"subjects3: #{subjects.inspect}"}
@@ -445,7 +447,7 @@ module RDF::N3
     end
     
     def p_squared?(node, position)
-      node.is_a?(RDF::Node) &&
+      node.node? &&
         !@serialized.has_key?(node) &&
         ref_count(node) <= 1
     end
@@ -466,7 +468,7 @@ module RDF::N3
     
     def p_default(node, position)
       #add_debug {"p_default: #{node.inspect}, #{position}"}
-      l = (position == :subject ? "" : " ") + format_value(node)
+      l = (position == :subject ? "" : " ") + format_value(node, options)
       @output.write(l)
     end
     
@@ -514,8 +516,7 @@ module RDF::N3
       prop_list.each_with_index do |prop, i|
         begin
           @output.write(";\n#{indent(2)}") if i > 0
-          prop[0, 2] == "_:"
-          verb(prop[0, 2] == "_:" ? RDF::Node.new(prop.split(':').last) : RDF::URI.intern(prop))
+          verb(prop[0, 2] == "_:" ? RDF::Node.intern(prop.split(':').last) : RDF::URI.intern(prop))
           object_list(properties[prop])
         rescue Addressable::URI::InvalidURIError => e
           add_debug {"Predicate #{prop.inspect} is an invalid URI: #{e.message}"}
@@ -524,7 +525,7 @@ module RDF::N3
     end
     
     def s_squared?(subject)
-      ref_count(subject) == 0 && subject.is_a?(RDF::Node) && !is_valid_list(subject)
+      ref_count(subject) == 0 && subject.node? && !is_valid_list(subject)
     end
     
     def s_squared(subject)

metadata

@@ -1,134 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Gregg
 - Kellogg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  requirement: !ruby/object:Gem::Requirement
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  type: :runtime
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: json-ld
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-spec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-isomorphic
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: RDF::N3 is an Notation-3 reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -154,24 +160,24 @@ homepage: http://ruby-rdf.github.com/rdf-n3
 licenses:
 - Public Domain
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-n3
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Notation3 reader/writer for RDF.rb.
 test_files: []