changed method names to be more descriptive, other minor

fixes

lib/open_auth2.rb

@@ -13,7 +13,6 @@
 
 require_relative 'open_auth2/delegate_to_config'
 require_relative 'open_auth2/config'
-#require_relative 'open_auth2/config'
 require_relative 'open_auth2/connection'
 require_relative 'open_auth2/token'
 require_relative 'open_auth2/client'

lib/open_auth2/config.rb

@@ -46,7 +46,7 @@ def provider=(name)
 
     # Removes all overwritten config & reset to default.
     def reset_provider
-      remove_instance_vars
+      remove_stored_info
       set_default_as_provider
     end
 
@@ -89,7 +89,7 @@ def copy_provider_keys
       end
     end
 
-    def remove_instance_vars
+    def remove_stored_info
       instance_variables.each do |var|
         remove_instance_variable var
       end

lib/open_auth2/connection.rb

@@ -11,7 +11,7 @@ def self.included(base)
       end
     end
 
-    # Yields: Faraday object, so user can choose choose their own
+    # Yields: Faraday object, so user can choose their own
     # middleware.
     #
     # Examples:
@@ -24,14 +24,14 @@ def self.included(base)
     #
     # Returns: Faraday object.
     #
-    def connection(&blk)
-      @connection ||= Faraday.new(:url => @faraday_url) do |builder|
+    def faraday_connection(&blk)
+      @faraday_connection ||= Faraday.new(:url => @faraday_url) do |builder|
         builder.request :url_encoded
         builder.adapter :net_http
         builder.instance_eval(&blk) if block_given?
       end
 
-      @connection
+      @faraday_connection
     end
   end
 end

lib/open_auth2/token.rb

@@ -4,6 +4,9 @@ module OpenAuth2
 
   # Gets Access/Refresh tokens from OAuth server.
   class Token < Client
+
+    attr_reader :config
+
     def initialize(config)
       @config      = config
       @faraday_url = authorize_url
@@ -39,7 +42,7 @@ def build_code_url(params={})
     #                       request.
     #
     def get(params={})
-      body        = get_body_hash(params)
+      body        = get_body(params)
       raw_request = post(body)
 
       parse(raw_request)
@@ -52,7 +55,7 @@ def get(params={})
     #                       request.
     #
     def refresh(params={})
-      body        = refresh_body_hash(params)
+      body        = refresh_body(params)
       raw_request = post(body)
 
       parse(raw_request)
@@ -72,11 +75,11 @@ def host
     end
 
     def encoded_body(params)
-      URI.encode_www_form(url_body_hash(params))
+      URI.encode_www_form(url_body(params))
     end
 
     # Combine default options & user arguments.
-    def url_body_hash(params)
+    def url_body(params)
 
       # user can define scope as String or Array
       joined_scope = scope.join(',') if scope.respond_to?(:join)
@@ -89,7 +92,7 @@ def url_body_hash(params)
       }.merge(params)
     end
 
-    def get_body_hash(params)
+    def get_body(params)
       {
         :client_id      => client_id,
         :client_secret  => client_secret,
@@ -99,7 +102,7 @@ def get_body_hash(params)
       }.merge(params)
     end
 
-    def refresh_body_hash(params)
+    def refresh_body(params)
        {
          :client_id         => client_id,
          :client_secret     => client_secret,
@@ -119,7 +122,7 @@ def post(body)
     end
 
     def parse(response)
-      @config.parse(response.body)
+      config.parse(response.body)
       response
     end
   end