lib/flattr/client.rb in flattr-0.2.3 vs lib/flattr/client.rb in flattr-0.3.0

@@ -14,10 +14,11 @@
   class Client
     require 'flattr/client/users'
     require 'flattr/client/things'
     require 'flattr/client/languages'
     require 'flattr/client/categories'
+    require 'flattr/client/flattrs'
 
     include Flattr::Connection
     include Flattr::Request
 
     include Flattr::Authenticatable
@@ -25,10 +26,11 @@
 
     include Flattr::Client::Users
     include Flattr::Client::Things
     include Flattr::Client::Languages
     include Flattr::Client::Categories
+    include Flattr::Client::Flattrs
 
     attr_accessor *Config::VALID_OPTIONS_KEYS
 
     # Initializes a new API object
     #
@@ -43,15 +45,14 @@
 
     # Returns the configured name or the name of the authenticated user
     #
     # @return [Flattr::User]
     def current_user
-      @current_user ||= Flattr::User.new(self.verify_credentials)
+      @current_user ||= self.user
     end
 
-    def base64_encode str
+    def self.base64_encode str
       [str].pack("m9999").chomp
     end
-
 
   end
 end