lib/redlander.rb in redlander-0.3.5 vs lib/redlander.rb in redlander-0.3.6

@@ -1,30 +1,16 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'uri'
 require 'xml_schema'
+require 'redland'
+require 'redlander/version'
 
-module Redlander
-  require 'redland'
-  require 'redlander/version'
+require "redlander/exceptions"
+require 'redlander/uri'
+require 'redlander/node'
+require 'redlander/model'
+require 'redlander/statement'
 
-  class RedlandError < RuntimeError; end
-
-  autoload :ErrorContainer, 'redlander/error_container'
-  autoload :Uri, 'redlander/uri'
-  autoload :Parser, 'redlander/parser'
-  autoload :ParserProxy, 'redlander/parser_proxy'
-  autoload :Serializer, 'redlander/serializer'
-  autoload :Model, 'redlander/model'
-  autoload :ModelProxy, 'redlander/model_proxy'
-  autoload :Node, 'redlander/node'
-  autoload :Stream, 'redlander/stream'
-  autoload :Storage, 'redlander/storage'
-  autoload :ParsingInstanceMethods, 'redlander/parser'
-  autoload :SerializingInstanceMethods, 'redlander/serializer'
-  autoload :StreamEnumerator, 'redlander/stream_enumerator'
-  autoload :Statement, 'redlander/statement'
+module Redlander
 
   class << self
     def rdf_world
       unless @rdf_world
         @rdf_world = Redland.librdf_new_world