rdfobjects 0.10.4 → 0.10.5

data/lib/rdf_objects/parsers.rb

@@ -77,14 +77,16 @@ module RDFObject
         end        
       else
         # Check to see if it is a URI being passed
-        begin
-          uri = URI.parse(rdf)
-          if uri.is_a?(URI::HTTP)
-            response =  HTTPClient.fetch(rdf)
-            rdf = response[:content]
-            options[:base_uri] = response[:uri]
+        if rdf.is_a?(String)
+          begin
+            uri = Addressable::URI.parse(rdf)
+            if uri.ip_based?
+              response =  HTTPClient.fetch(rdf)
+              rdf = response[:content]
+              options[:base_uri] = response[:uri]
+            end
+          rescue URI::InvalidURIError
           end
-        rescue URI::InvalidURIError
         end
         # Check if the format is XML or RDFa
         doc = XMLTestDocument.new
@@ -141,7 +143,7 @@ module RDFObject
       if uri.is_a?(URI)
         @base_uri = uri
       else
-        @base_uri = URI.parse(uri)
+        @base_uri = Addressable::URI.parse(uri).normalize
       end
     end
     
@@ -151,7 +153,7 @@ module RDFObject
       # Return if there's nothing to sanitize with
       return uri unless self.base_uri
       begin
-        u = URI.parse(uri)
+        u = Addressable::URI.parse(uri).normalize
         return uri if u.host
         fq_uri = self.base_uri+u
         fq_uri.to_s
@@ -365,7 +367,7 @@ module RDFObject
         layer[:datatype] = attributes["http://www.w3.org/1999/02/22-rdf-syntax-ns#datatype"] if attributes["http://www.w3.org/1999/02/22-rdf-syntax-ns#datatype"]
         layer[:language] = attributes["http://www.w3.org/XML/1998/namespace/lang"] if attributes["http://www.w3.org/XML/1998/namespace/lang"]        
       end    
-      layer[:base_uri] = URI.parse(attributes["http://www.w3.org/XML/1998/namespace/base"]) if attributes["http://www.w3.org/XML/1998/namespace/base"]  
+      layer[:base_uri] = Addressable::URI.parse(attributes["http://www.w3.org/XML/1998/namespace/base"]).normalize if attributes["http://www.w3.org/XML/1998/namespace/base"]  
       @hierarchy << layer  
       attributes_as_assertions(attributes)
     end

data/lib/rdf_objects/rdf_resource.rb

@@ -279,8 +279,8 @@ module RDFObject
         str = Curie.parse str
       end
       begin
-        uri = URI.parse(str)
-        return true unless uri.scheme
+        uri = Addressable::URI.parse(str).normalize
+        return true if uri.scheme.nil? or !uri.scheme =~ /[A-z]/
       rescue URI::InvalidURIError
         return true
       end

data/lib/rdf_objects.rb

@@ -2,6 +2,7 @@ module RDFObject
   require 'rubygems'
   require 'ostruct'
   require 'curies'
+  require 'addressable/uri'
   require File.dirname(__FILE__) + '/rdf_objects/parsers'
   require File.dirname(__FILE__) + '/rdf_objects/rdf_resource'
   require File.dirname(__FILE__) + '/rdf_objects/curies'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdfobjects
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 5
+  version: 0.10.5
 platform: ruby
 authors: 
 - Ross Singer
@@ -9,29 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-03-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: curies
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: RDFObjects are intended to simplify working with RDF data by providing a (more) Ruby-like interface to resources (thanks to OpenStruct).
 email: rossfsinger@gmail.com
 executables: []
@@ -68,18 +89,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - json, json_pure or json-ruby required for parsing RDF/JSON
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A DSL for working with RDF resources.