Finish 1.0.4

Author: gkellogg

.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.test_files            = Dir.glob('spec/**/*.rb') + Dir.glob('spec/test-files/*')
   gem.has_rdoc              = false
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 1.9.2'
   gem.requirements          = []
   gem.add_runtime_dependency     'rdf',             '>= 1.0.7'
   gem.add_runtime_dependency     'json',            '>= 1.7.5'

VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

lib/json/ld/context.rb

@@ -159,7 +159,7 @@ def initialize(options = {})
     # @param [String] value must be an absolute IRI
     def base=(value)
       if value
-        raise InvalidContext::InvalidBaseIRI, "@base must be a string: #{value.inspect}" unless value.is_a?(String)
+        raise InvalidContext::InvalidBaseIRI, "@base must be a string: #{value.inspect}" unless value.is_a?(String) || value.is_a?(RDF::URI)
         @base = RDF::URI(value)
         @base.canonicalize!
         @base.fragment = nil
@@ -266,8 +266,8 @@ def parse(local_context, remote_contexts = [])
               result = context
               debug("parse") {"=> provided_context: #{context.inspect}"}
             rescue Exception => e
-              debug("parse") {"Failed to retrieve @context from remote document at #{context.inspect}: #{e.message}"}
-              raise InvalidContext::InvalidRemoteContext, "#{context}", e.backtrace if @options[:validate]
+              debug("parse") {"Failed to retrieve @context from remote document at #{context_no_base.context_base.inspect}: #{e.message}"}
+              raise InvalidContext::InvalidRemoteContext, "#{context_no_base.context_base}", e.backtrace if @options[:validate]
             end
           when Hash
             # If context has a @vocab member: if its value is not a valid absolute IRI or null trigger an INVALID_VOCAB_MAPPING error; otherwise set the active context's vocabulary mapping to its value and remove the @vocab member from context.