lib/yammer.rb in yammer-client-0.1.2 vs lib/yammer.rb in yammer-client-0.1.3

@@ -1,33 +1,29 @@
 require 'yammer/version'
 require 'yammer/error'
-require 'yammer/http_connection'
 require 'yammer/configurable'
-require 'yammer/response'
+require 'yammer/api'
+require 'yammer/http_adapter'
 require 'yammer/client'
+require 'yammer/api_handler'
+require 'yammer/api_response'
 require 'yammer/identity_map'
 require 'yammer/base'
 require 'yammer/user'
 require 'yammer/group'
 require 'yammer/group_membership'
 require 'yammer/message'
 require 'yammer/thread'
-require 'yammer/api'
 
 module Yammer
   class << self
     include Configurable
+    include ApiHandler
 
-    def client
-      @client = Yammer::Client.new
-    end
-
   private
-
     def method_missing(method_name, *args, &block)
-      return super unless client.respond_to?(method_name)
-      client.send(method_name, *args, &block)
+      return super unless api_handler.respond_to?(method_name)
+      api_handler.send(method_name, *args, &block)
     end
   end
 end
-
 Yammer.reset!
\ No newline at end of file