rdf-rdfxml 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3ada350c5677d2a143dcbd5af7e789f22786b11
-  data.tar.gz: 5e6a3a327cd63768c241c0f8c576d66846b83d1f
+  metadata.gz: 8f0332cc835b70ad36d5ee0e1eb355bade399237
+  data.tar.gz: 288a1e274067f6d24accdef8dcf942a38e9a3577
 SHA512:
-  metadata.gz: f467b070afe52055efc33650615d87af8c73212416c2ec0525833b1516f1d32d40453471aa26d597cde600530cd49e3862c3b2088ce54b63eb62714819eb59e1
-  data.tar.gz: ebfa2248b95722a2702c0b0c2742ec93be999c9846263dd336dadefb10596ac3cd1d57ff2d72b4854cc74820f8e7ea871f538b440791e79b5132fd0b3a161d85
+  metadata.gz: ff585ff8d1613982db5cbbe3f1440b513692ab8fbacbbf58360d80d6f56cb5bcef3b89319d8a3c646585aa2284d6d29be357e97e4cd0173424f7814f42e98e43
+  data.tar.gz: 84711dfeb7846737eaafa9aca1acdf90cdf3e743ac1abb87049238818a0dfcfd9e5112aa75fa19ad313e5ac2b12984c346a07029362601c38eb3750e43618b7a

data/README.md

@@ -101,7 +101,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [Ruby]:         http://ruby-lang.org/
 [RDF]:          http://www.w3.org/RDF/
 [RDF.rb]:       http://rubygems.org/gems/rdf
-[RDF/XML]:      http://www.w3.org/TR/REC-rdf-syntax/  "RDF/XML Syntax Specification"
+[RDF/XML]:      hhttp://www.w3.org/TR/rdf-syntax-grammar/ "RDF/XML Syntax Specification"
 [YARD]:         http://yardoc.org/
 [YARD-GS]:      http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:          http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/rdf/rdfxml/reader/nokogiri.rb

@@ -232,7 +232,7 @@ module RDF::RDFXML
           options[:encoding] ||= 'utf-8'
           options[:encoding] = options[:encoding].to_s if options[:encoding]
 
-          ::Nokogiri::XML.parse(input, base_uri.to_s, options[:encoding]) do |config|
+          ::Nokogiri::XML.parse(input.respond_to?(:read) ? input.read : input.to_s, base_uri.to_s, options[:encoding]) do |config|
             config.noent
           end
         end

data/lib/rdf/rdfxml/writer.rb

@@ -65,6 +65,8 @@ module RDF::RDFXML
     #   the prefix mappings to use (not supported by all writers)
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when constructing relative URIs
+    # @option options [Integer]  :max_depth (10)
+    #   Maximum depth for recursively defining resources
     # @option options [#to_s]   :lang   (nil)
     #   Output as root xml:lang attribute, and avoid generation _xml:lang_ where possible
     # @option options [Symbol]    :attributes   (nil)
@@ -92,7 +94,8 @@ module RDF::RDFXML
 
     def write_epilogue
       @force_RDF_about = {}
-      @attributes = @options[:attributes] || :none
+      @max_depth = @options.fetch(:max_depth, 10)
+      @attributes = @options.fetch(:attributes, :none)
 
       super
     end
@@ -151,7 +154,7 @@ module RDF::RDFXML
         {}
       end
 
-      predicates -= attr_props.keys
+      predicates -= attr_props.keys.map {|k| expand_curie(k).to_s}
       super(subject, predicates, options.merge(:attr_props => attr_props), &block)
     end
     # See if we can serialize as attribute.
@@ -259,9 +262,10 @@ module RDF::RDFXML
         raise RDF::WriterError, "Missing property template" if template.nil?
 
         options = {
-          :object     => objects.first,
-          :predicate  => predicate,
-          :property   => get_qname(predicate),
+          object:     objects.first,
+          predicate:  predicate,
+          property:   get_qname(predicate),
+          recurse:    @depth <= @max_depth
         }.merge(options)
         hamlify(template, options, &block)
       end
@@ -285,9 +289,10 @@ module RDF::RDFXML
       template = options[:haml] || haml_template[:collection]
 
       options = {
-        :list       => list,
-        :predicate  => predicate,
-        :property   => get_qname(predicate),
+        list:       list,
+        predicate:  predicate,
+        property:   get_qname(predicate),
+        recurse:    @depth <= @max_depth,
       }.merge(options)
       hamlify(template, options) do |object|
         yield object

data/lib/rdf/rdfxml/writer/haml_templates.rb

@@ -49,7 +49,7 @@ module RDF::RDFXML
       # If nil is returned, render as a leaf
       # Otherwise, render result
       :property_value => %q(
-      - if res = yield(object)
+      - if recurse && res = yield(object)
         - haml_tag(property) do
           = res
       - elsif object.literal? && object.datatype == RDF.XMLLiteral
@@ -57,7 +57,7 @@ module RDF::RDFXML
           = object.value
       - elsif object.literal?
         - haml_tag(property, :"<", "xml:lang" => object.language, "rdf:datatype" => (object.datatype unless object.plain?)) do
-          = object.value
+          = object.value.to_s.encode(xml: :text)
       - elsif object.node?
         - haml_tag(property, :"/", "rdf:nodeID" => object.id)
       - else
@@ -72,7 +72,7 @@ module RDF::RDFXML
       :collection => %q(
         - haml_tag(property, get_qname(RDF.parseType) => "Collection") do
           - list.each do |object|
-            - if res = yield(object)
+            - if recurse && res = yield(object)
               = res
             - elsif object.node?
               - haml_tag(get_qname(RDF.Description), :"/", "rdf:nodeID" => (object.id if ref_count(object) > 1))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfxml
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: RDF/XML reader/writer for RDF.rb.