lib/tumblr/client.rb in tumblr_client-0.6.11 vs lib/tumblr/client.rb in tumblr_client-0.7.0
- old
+ new
@@ -6,18 +6,19 @@
require 'tumblr/tagged'
require 'tumblr/helpers'
module Tumblr
class Client
+
include Tumblr::Request
- include Tumblr::Client::Blog
- include Tumblr::Client::User
- include Tumblr::Client::Post
- include Tumblr::Client::Tagged
- include Tumblr::Client::Helper
+ include Tumblr::Blog
+ include Tumblr::User
+ include Tumblr::Post
+ include Tumblr::Tagged
+ include Tumblr::Helper
include Tumblr::Connection
-
+
def initialize(attrs= {})
attrs = Tumblr.options.merge(attrs)
Config::VALID_OPTIONS_KEYS.each do |key|
instance_variable_set("@#{key}".to_sym, attrs[key])
end
@@ -33,7 +34,8 @@
:consumer_secret => @consumer_secret,
:token => @oauth_token,
:token_secret => @oauth_token_secret
}
end
+
end
end