rdf-rdfxml 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0332cc835b70ad36d5ee0e1eb355bade399237
-  data.tar.gz: 288a1e274067f6d24accdef8dcf942a38e9a3577
+  metadata.gz: a90f0decb2d5769b68f23c4a19a731c33eda92bf
+  data.tar.gz: 7ac194df96fa5ec2908f42677ec65d30ad978833
 SHA512:
-  metadata.gz: ff585ff8d1613982db5cbbe3f1440b513692ab8fbacbbf58360d80d6f56cb5bcef3b89319d8a3c646585aa2284d6d29be357e97e4cd0173424f7814f42e98e43
-  data.tar.gz: 84711dfeb7846737eaafa9aca1acdf90cdf3e743ac1abb87049238818a0dfcfd9e5112aa75fa19ad313e5ac2b12984c346a07029362601c38eb3750e43618b7a
+  metadata.gz: c6795af0c35adb59c6b19e5a21fe62acaaaadd0090abf9e18c11fa9dd323aad186541832cd773827b029335028222e1b4cf8be38ad2779a608401272cde4c7a3
+  data.tar.gz: 729224eb90c7ba48fffa67738c060fd06f7f2acfd6816775dfa45ad8cab793883b199655a72ef79ad7a0c27607ad99ef9f23913063a4c5a4b5bf8c51f69120cc

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/rdf/rdfxml/reader.rb

@@ -64,10 +64,11 @@ module RDF::RDFXML
 
       # Extract Evaluation Context from an element
       def extract_from_element(el, &cb)
-        b = el.base
-        lang = el.language
-        self.base = self.base.join(b) if b
-        self.language = lang if lang
+        self.language = el.language if el.language
+        if b = el.base
+          b = RDF::URI(b)
+          self.base = b.absolute? ? b : self.base.join(b)
+        end
         self.uri_mappings.merge!(extract_mappings(el, &cb))
       end
       
@@ -302,7 +303,7 @@ module RDF::RDFXML
           # If there is an attribute a in propertyAttr with a.URI == rdf:type
           # then u:=uri(identifier:=resolve(a.string-value))
           # and the following triple is added to the graph:
-          u = ec.base.join(attr.value)
+          u = uri(ec.base, attr.value)
           add_triple(attr, subject, RDF.type, u)
         elsif is_propertyAttr?(attr)
           # Attributes not RDF.type
@@ -530,12 +531,12 @@ module RDF::RDFXML
             # Reification
             reify(id, child, subject, predicate, literal, child_ec) if id
           else
-            if resourceAttr
-              resource = ec.base.join(resourceAttr)
+            resource = if resourceAttr
+              uri(ec.base, resourceAttr)
             elsif nodeID
-              resource = bnode(nodeID)
+              bnode(nodeID)
             else
-              resource = RDF::Node.new
+              RDF::Node.new
             end
 
             # produce triples for attributes
@@ -605,7 +606,7 @@ module RDF::RDFXML
       when about
         about = RDF::NTriples.unescape(about.value)
         add_debug(el) {"parse_subject, about: #{about.inspect}"}
-        ec.base.join(about)
+        uri(ec.base, about)
       else
         add_debug(el, "parse_subject, BNode")
         RDF::Node.new
@@ -687,8 +688,15 @@ module RDF::RDFXML
     end
     
     def uri(value, append = nil)
-      value = RDF::URI.new(value)
-      value = value.join(append) if append
+      append = RDF::URI(append)
+      value = RDF::URI(value)
+      value = if append.absolute?
+        value = append
+      elsif append
+        value = value.join(append)
+      else
+        value
+      end
       value.validate! if validate?
       value.canonicalize! if canonicalize?
       value = RDF::URI.intern(value) if intern?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -133,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfxml
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RDF/XML reader/writer for RDF.rb.