Load files from namespaced location to avoid conflicts

jennyd · Feb 26, 2014 · 054ddc1 · 054ddc1
1 parent d8e09ea
commit 054ddc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/json-schema.rb b/lib/json-schema.rb
@@ -14,13 +14,11 @@
   MultiJson.respond_to?(:adapter) ? MultiJson.adapter : MultiJson.engine
 end
 
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/json-schema"
-
 require 'rubygems'
-require 'util/hash'
-require 'util/array_set'
-require 'schema'
-require 'validator'
+require 'json-schema/util/hash'
+require 'json-schema/util/array_set'
+require 'json-schema/schema'
+require 'json-schema/validator'
 Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*.rb")].each {|file| require file }
 Dir[File.join(File.dirname(__FILE__), "json-schema/validators/*.rb")].sort!.each {|file| require file }
-require 'uri/file'
+require 'json-schema/uri/file'
diff --git a/lib/json-schema/validator.rb b/lib/json-schema/validator.rb
@@ -553,7 +553,7 @@ def parse(s)
       require 'uuidtools'
       @@fake_uri_generator = lambda{|s| UUIDTools::UUID.sha1_create(UUIDTools::UUID_URL_NAMESPACE, s).to_s }
     else
-      require 'uri/uuid'
+      require 'json-schema/uri/uuid'
       @@fake_uri_generator = lambda{|s| JSON::Util::UUID.create_v5(s,JSON::Util::UUID::Nil).to_s }
     end