riak.rb in riak-client-0.9.2

- old
+ new
@@ -11,54 +11,16 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 
-require 'base64'
-require 'uri'
-require 'cgi'
-require 'set'
-require 'net/http'
-require 'yaml'
-require 'riak/i18n'
-
-# Load JSON
-unless defined? JSON
-  begin
-    require 'yajl/json_gem'
-  rescue LoadError
-    require 'json'
-  end
-end
-
 require 'riak/core_ext'
+require 'riak/client'
+require 'riak/map_reduce'
 
-# The Riak module contains all aspects of the HTTP client interface
-# to Riak.
+# The Riak module contains all aspects of the client interface to
+# Riak.
 module Riak
-  # Domain objects
-  autoload :Bucket,          "riak/bucket"
-  autoload :Client,          "riak/client"
-  autoload :Link,            "riak/link"
-  autoload :WalkSpec,        "riak/walk_spec"
-  autoload :RObject,         "riak/robject"
-  autoload :MapReduce,       "riak/map_reduce"
-
-  # Cache store - only supports Rails 3 style
-  autoload :CacheStore,      "riak/cache_store"
-
-  # Exceptions
-  autoload :FailedRequest,   "riak/failed_request"
-  autoload :InvalidResponse, "riak/invalid_response"
-  autoload :MapReduceError,  "riak/map_reduce_error"
-
-  # Test server
-  autoload :TestServer,      "riak/test_server"
-
   # Utility classes and mixins
   module Util
-    autoload :Escape,        "riak/util/escape"
-    autoload :Headers,       "riak/util/headers"
-    autoload :Multipart,     "riak/util/multipart"
-    autoload :Translation,   "riak/util/translation"
   end
 end