rdf-turtle 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8fb1c87f5b5149cc3430a1cdac50fdd7bfbaeacfeaa1a6770e54e83a1aff09
-  data.tar.gz: 7bf9532ca0c78ce4e24e51ef3a4076a8563e2f0fa2e9f9853616f47776f0947f
+  metadata.gz: 499e06e63d69ec0216db2600e34260d5eda5c7a3736e8f1a42c63a91c716779c
+  data.tar.gz: 3443fdb3e53d2b12d66f6a9534a9532dabde58b0b319ecc62ffff0a4bd87afb3
 SHA512:
-  metadata.gz: 55ec7f72b8b020506c134805828ff43341ce455b469edfb396332c61b67ae3cc7bdf2a0dcfcb3808c47201c77564e046a84d0aaaba2a74553fd2d1c30c93a184
-  data.tar.gz: 308390211f1da6158fe12d322d8dec7e24ce94931ccd994fb202bf9ac5f38665ac3f1f2e7c02ae9a20e8f3b775462e8831b1357a96be045f8f427d5d241dbf84
+  metadata.gz: 1cad03d53fb973b02f541168549cc110769fde86da3b37c1a6187d7fbfffe8bee3f72bea687d14786094ad0cb6a2cd7d4f2072c9989ec4d0c62b6ad81020bccd
+  data.tar.gz: 1e7f38e3f561a6f16304727fa89b2bbeab0b93b31e8e5a58633f533ba69e2a874e461f59bcf31d015d23382290e33b9b2ecfd007691fe6f5dc0961c98ca0d285

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/rdf/turtle/writer.rb

@@ -189,7 +189,7 @@ module RDF::Turtle
         # Remove lists that are referenced and have non-list properties;
         # these are legal, but can't be serialized as lists
         @lists.reject! do |node, list|
-          ref_count(node) > 0 && non_list_prop_count(node) > 0
+          ref_count(node) > 0 && prop_count(node) > 0
         end
 
         order_subjects.each do |subject|
@@ -454,6 +454,44 @@ module RDF::Turtle
       end
     end
 
+    # Can subject be represented as a blankNodePropertyList?
+    def blankNodePropertyList?(resource, position)
+      resource.node? &&
+        !is_valid_list?(resource) &&
+        (!is_done?(resource) || position == :subject) &&
+        ref_count(resource) == (position == :object ? 1 : 0)
+    end
+
+    # Return the number of statements having this resource as a subject other than for list properties
+    # @return [Integer]
+    def prop_count(subject)
+      @subjects.fetch(subject, {}).
+        reject {|k, v| [RDF.type, RDF.first, RDF.rest].include?(k)}.
+        values.reduce(:+) || 0
+    end
+
+    # Return the number of times this node has been referenced in the object position
+    # @return [Integer]
+    def ref_count(resource)
+      @references.fetch(resource, 0)
+    end
+
+    # Increase the reference count of this resource
+    # @param [RDF::Resource] resource
+    # @return [Integer] resulting reference count
+    def bump_reference(resource)
+      @references[resource] = ref_count(resource) + 1
+    end
+
+    def is_done?(subject)
+      @serialized.include?(subject)
+    end
+
+    # Mark a subject as done.
+    def subject_done(subject)
+      @serialized[subject] = true
+    end
+
     private
 
     # Checks if l is a valid RDF list, i.e. no nodes have other properties.
@@ -478,7 +516,7 @@ module RDF::Turtle
     def collection(node, position)
       return false if !is_valid_list?(node)
       return false if position == :subject && ref_count(node) > 0
-      return false if position == :object && non_list_prop_count(node) > 0
+      return false if position == :object && prop_count(node) > 0
       #log_debug("collection") {"#{node.to_ntriples}, #{position}"}
 
       @output.write(position == :subject ? "(" : " (")
@@ -486,14 +524,6 @@ module RDF::Turtle
       @output.write(')')
     end
 
-    # Can subject be represented as a blankNodePropertyList?
-    def blankNodePropertyList?(resource, position)
-      resource.node? &&
-        !is_valid_list?(resource) &&
-        (!is_done?(resource) || position == :subject) &&
-        ref_count(resource) == (position == :object ? 1 : 0)
-    end
-
     # Represent resource as a blankNodePropertyList
     def blankNodePropertyList(resource, position)
       return false unless blankNodePropertyList?(resource, position)
@@ -592,41 +622,5 @@ module RDF::Turtle
       blankNodePropertyList(subject, :subject) || triples(subject)
       @output.puts
     end
-
-    # Return the number of statements having this resource as a subject
-    # @return [Integer]
-    def prop_count(subject)
-      @subjects.fetch(subject, {}).values.reduce(:+) || 0
-    end
-
-    # Return the number of statements having this resource as a subject other than for list properties
-    # @return [Integer]
-    def non_list_prop_count(subject)
-      @subjects.fetch(subject, {}).
-        reject {|k, v| [RDF.type, RDF.first, RDF.rest].include?(k)}.
-        values.reduce(:+) || 0
-    end
-
-    # Return the number of times this node has been referenced in the object position
-    # @return [Integer]
-    def ref_count(resource)
-      @references.fetch(resource, 0)
-    end
-
-    # Increase the reference count of this resource
-    # @param [RDF::Resource] resource
-    # @return [Integer] resulting reference count
-    def bump_reference(resource)
-      @references[resource] = ref_count(resource) + 1
-    end
-
-    def is_done?(subject)
-      @serialized.include?(subject)
-    end
-
-    # Mark a subject as done.
-    def subject_done(subject)
-      @serialized[subject] = true
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-turtle
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf