From 512fcdfc22b796d39dd07c2dcc712aa48131d7c6 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Wed, 13 Oct 2010 13:12:24 -0700
Subject: [PATCH] Rename scheme -> protocol

---
 lib/twitter.rb                 |  8 ++++----
 lib/twitter/base.rb            |  2 +-
 lib/twitter/geo.rb             |  2 +-
 lib/twitter/search.rb          |  2 +-
 lib/twitter/trends.rb          |  2 +-
 lib/twitter/unauthenticated.rb |  2 +-
 test/twitter_test.rb           | 14 +++++++-------
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/twitter.rb b/lib/twitter.rb
index 04cdb5e10..a50c023f0 100644
--- a/lib/twitter.rb
+++ b/lib/twitter.rb
@@ -46,12 +46,12 @@ def self.format=(value)
     @format = value
   end
 
-  def self.scheme
-    @scheme ||= 'https'
+  def self.protocol
+    @protocol ||= 'https'
   end
 
-  def self.scheme=(value)
-    @scheme = value
+  def self.protocol=(value)
+    @protocol = value
   end
 
   def self.api_endpoint
diff --git a/lib/twitter/base.rb b/lib/twitter/base.rb
index 49f9c970f..d28efd57d 100644
--- a/lib/twitter/base.rb
+++ b/lib/twitter/base.rb
@@ -465,7 +465,7 @@ def connection_with_builders(builders)
         builder.adapter(@adapter || Faraday.default_adapter)
         builders.each do |b| builder.use b end
       end
-      @connection.scheme = Twitter.scheme
+      @connection.scheme = Twitter.protocol
       @connection
     end
 
diff --git a/lib/twitter/geo.rb b/lib/twitter/geo.rb
index fabb21406..0ca492665 100644
--- a/lib/twitter/geo.rb
+++ b/lib/twitter/geo.rb
@@ -136,7 +136,7 @@ def connection
         end
         builder.use Faraday::Response::Mashify
       end
-      @connection.scheme = Twitter.scheme
+      @connection.scheme = Twitter.protocol
       @connection
     end
     
diff --git a/lib/twitter/search.rb b/lib/twitter/search.rb
index 0eade2061..59a7d1786 100644
--- a/lib/twitter/search.rb
+++ b/lib/twitter/search.rb
@@ -284,7 +284,7 @@ def connection
         end
         builder.use Faraday::Response::Mashify
       end
-      @connection.scheme = Twitter.scheme
+      @connection.scheme = Twitter.protocol
       @connection
     end
 
diff --git a/lib/twitter/trends.rb b/lib/twitter/trends.rb
index bc4fe31df..c2f23f336 100644
--- a/lib/twitter/trends.rb
+++ b/lib/twitter/trends.rb
@@ -110,7 +110,7 @@ def connection
         end
         builder.use Faraday::Response::Mashify
       end
-      @connection.scheme = Twitter.scheme
+      @connection.scheme = Twitter.protocol
       @connection
     end
 
diff --git a/lib/twitter/unauthenticated.rb b/lib/twitter/unauthenticated.rb
index 399fb164e..9b57c8aad 100644
--- a/lib/twitter/unauthenticated.rb
+++ b/lib/twitter/unauthenticated.rb
@@ -126,7 +126,7 @@ def connection_with_builders(builders)
         builder.adapter(@adapter || Faraday.default_adapter)
         builders.each do |b| builder.use b end
       end
-      @connection.scheme = Twitter.scheme
+      @connection.scheme = Twitter.protocol
       @connection
     end
 
diff --git a/test/twitter_test.rb b/test/twitter_test.rb
index 6a13f4708..c18af6439 100644
--- a/test/twitter_test.rb
+++ b/test/twitter_test.rb
@@ -83,16 +83,16 @@ class TwitterTest < Test::Unit::TestCase
     end
   end
 
-  should "default scheme to https" do
-    assert_equal "https", Twitter.scheme
+  should "default protocol to https" do
+    assert_equal "https", Twitter.protocol
   end
 
-  context "when overriding scheme" do
-    should "be able to specify scheme" do
-      Twitter.scheme = "http"
-      assert_equal "http", Twitter.scheme
+  context "when overriding protocol" do
+    should "be able to specify protocol" do
+      Twitter.protocol = "http"
+      assert_equal "http", Twitter.protocol
       # Reset
-      Twitter.scheme = "https"
+      Twitter.protocol = "https"
     end
   end