Merge branch 'floryndev-master'

Author: pboling

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * HISTORY renamed to CHANGELOG.md, and follows Keep a Changelog (#214, #215 by @pboling)
 * CHANGELOG, LICENSE, and README now ship with packaged gem (#214, #215 by @pboling)
 * README.rdoc renamed to README.md (#217, #218 by @pboling)
+* Require plaintext signature method by default (#135 by @confiks & @pboling)
 
 ### Fixed
 

lib/oauth.rb

@@ -6,6 +6,7 @@
 require "oauth/oauth"
 
 require "oauth/client/helper"
+require "oauth/signature/plaintext"
 require "oauth/signature/hmac/sha1"
 require "oauth/signature/hmac/sha256"
 require "oauth/signature/rsa/sha1"

test/integration/consumer_test.rb

@@ -32,7 +32,6 @@ def test_that_signing_auth_headers_on_get_requests_works
     end
 
     def test_that_setting_signature_method_on_consumer_effects_signing
-      require "oauth/signature/plaintext"
       request = Net::HTTP::Get.new(@request_uri.path)
       consumer = @consumer.dup
       consumer.options[:signature_method] = "PLAINTEXT"
@@ -44,7 +43,6 @@ def test_that_setting_signature_method_on_consumer_effects_signing
     end
 
     def test_that_setting_signature_method_on_consumer_effects_signature_base_string
-      require "oauth/signature/plaintext"
       request = Net::HTTP::Get.new(@request_uri.path)
       consumer = @consumer.dup
       consumer.options[:signature_method] = "PLAINTEXT"
@@ -58,7 +56,7 @@ def test_that_setting_signature_method_on_consumer_effects_signature_base_string
 
     def test_that_plaintext_signature_works
       # Invalid test because server expects double-escaped signature
-      require "oauth/signature/plaintext"
+
       # consumer = OAuth::Consumer.new("key", "secret",
       #   :site => "http://term.ie", :signature_method => 'PLAINTEXT')
       # access_token = OAuth::AccessToken.new(consumer, 'accesskey', 'accesssecret')

test/units/test_em_http_client.rb

@@ -29,7 +29,6 @@ def test_that_using_auth_headers_on_get_requests_works
   end
 
   def test_that_using_auth_headers_on_get_requests_works_with_plaintext
-    require "oauth/signature/plaintext"
     c = OAuth::Consumer.new("consumer_key_86cad9", "5888bf0345e5d237",{
       :signature_method => "PLAINTEXT"
     })

test/units/test_net_http_client.rb

@@ -25,7 +25,6 @@ def test_that_using_auth_headers_on_get_requests_works
   end
 
   def test_that_using_auth_headers_on_get_requests_works_with_plaintext
-    require "oauth/signature/plaintext"
     c = OAuth::Consumer.new("consumer_key_86cad9", "5888bf0345e5d237",{
       :signature_method => "PLAINTEXT"
     })

test/units/test_signature_plain_text.rb

@@ -1,7 +1,5 @@
 require File.expand_path("../../test_helper", __FILE__)
 
-require "oauth/signature/plaintext"
-
 class TestSignaturePlaintext < Minitest::Test
   def test_that_plaintext_implements_plaintext
     assert OAuth::Signature.available_methods.include?("plaintext")