Create public accessor methods for default values

sferik · Oct 18, 2010 · 9ad0ef0 · 9ad0ef0
1 parent eaa72a0
commit 9ad0ef0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/lib/twitter.rb b/lib/twitter.rb
@@ -30,52 +30,76 @@ def configure
 
   module ConfigHelper
     def adapter
-      @adapter ||= Faraday.default_adapter
+      @adapter ||= default_adapter
     end
 
     def adapter=(value)
       @adapter = value
     end
 
+    def default_adapter
+      @default_adapter ||= Faraday.default_adapter
+    end
+
     def api_endpoint
-      @api_endpoint ||= Addressable::URI.heuristic_parse("api.twitter.com/#{api_version}").to_s
+      @api_endpoint ||= default_api_endpoint
     end
 
     def api_endpoint=(value)
       @api_endpoint = Addressable::URI.heuristic_parse(value).to_s
     end
 
+    def default_api_endpoint
+      @default_api_endpoint ||= Addressable::URI.heuristic_parse("api.twitter.com/#{api_version}").to_s
+    end
+
     def api_version
-      @api_version ||= 1
+      @api_version ||= default_api_version
     end
 
     def api_version=(value)
       @api_version = value
     end
 
+    def default_api_version
+      @default_api_version ||= 1
+    end
+
     def format
-      @format ||= 'json'
+      @format ||= default_format
     end
 
     def format=(value)
       @format = value
     end
 
+    def default_format
+      @default_format ||= 'json'
+    end
+
     def protocol
-      @protocol ||= 'https'
+      @protocol ||= default_protocol
     end
 
     def protocol=(value)
       @protocol = value
     end
 
+    def default_protocol
+      @default_protocol ||= 'https'
+    end
+
     def user_agent
-      @user_agent ||= 'Ruby Twitter Gem'
+      @user_agent ||= default_user_agent
     end
 
     def user_agent=(value)
       @user_agent = value
     end
+
+    def default_user_agent
+      @default_user_agent ||= 'Ruby Twitter Gem'
+    end
   end
 
   extend ConfigHelper

diff --git a/test/twitter/search_test.rb b/test/twitter/search_test.rb
@@ -20,7 +20,7 @@ class SearchTest < Test::Unit::TestCase
       Twitter.user_agent = 'Foobar'
       assert_equal 'Ruby Twitter Gem', Twitter::Search.user_agent
       # Reset
-      Twitter.user_agent = 'Ruby Twitter Gem'
+      Twitter.user_agent = Twitter.default_user_agent
     end
 
     should "specify from" do

diff --git a/test/twitter_test.rb b/test/twitter_test.rb
@@ -27,7 +27,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.adapter = :typhoeus
       assert_equal :typhoeus, Twitter.adapter
       # Reset
-      Twitter.adapter = Faraday.default_adapter
+      Twitter.adapter = Twitter.default_adapter
     end
   end
 
@@ -40,7 +40,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.user_agent = 'My Twitter Gem'
       assert_equal 'My Twitter Gem', Twitter.user_agent
       # Reset
-      Twitter.user_agent = 'Ruby Twitter Gem'
+      Twitter.user_agent = Twitter.default_user_agent
     end
   end
 
@@ -53,7 +53,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.api_endpoint = 'tumblr.com'
       assert_equal 'http://tumblr.com', Twitter.api_endpoint
       # Reset
-      Twitter.api_endpoint = "api.twitter.com/#{Twitter.api_version}"
+      Twitter.api_endpoint = Twitter.default_api_endpoint
     end
   end
 
@@ -66,7 +66,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.api_version = 2
       assert_equal 2, Twitter.api_version
       # Reset
-      Twitter.api_version = 1
+      Twitter.api_version = Twitter.default_api_version
     end
   end
 
@@ -79,7 +79,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.format = "xml"
       assert_equal "xml", Twitter.format
       # Reset
-      Twitter.format = "json"
+      Twitter.format = Twitter.default_format
     end
   end
 
@@ -92,7 +92,7 @@ class TwitterTest < Test::Unit::TestCase
       Twitter.protocol = "http"
       assert_equal "http", Twitter.protocol
       # Reset
-      Twitter.protocol = "https"
+      Twitter.protocol = Twitter.default_protocol
     end
   end