diff --git a/lib/simple_oauth.rb b/lib/simple_oauth.rb index e4b2a7e..4789ccb 100644 --- a/lib/simple_oauth.rb +++ b/lib/simple_oauth.rb @@ -2,5 +2,4 @@ require 'base64' require 'cgi' require 'openssl' require 'uri' -require 'simple_oauth/core_ext/object' require 'simple_oauth/header' diff --git a/lib/simple_oauth/core_ext/object.rb b/lib/simple_oauth/core_ext/object.rb deleted file mode 100644 index c4b4e17..0000000 --- a/lib/simple_oauth/core_ext/object.rb +++ /dev/null @@ -1,10 +0,0 @@ -major, minor, patch = RUBY_VERSION.split('.') - -if major.to_i == 1 && minor.to_i == 8 && patch.to_i <= 6 - class Object - def tap - yield self - self - end - end -end diff --git a/lib/simple_oauth/header.rb b/lib/simple_oauth/header.rb index 97bb7de..6b34dad 100644 --- a/lib/simple_oauth/header.rb +++ b/lib/simple_oauth/header.rb @@ -30,17 +30,18 @@ module SimpleOAuth def initialize(method, url, params, oauth = {}) @method = method.to_s.upcase - @uri = URI.parse(url.to_s).tap do |uri| - uri.scheme = uri.scheme.downcase - uri.normalize! - uri.fragment = nil - end + @uri = URI.parse(url.to_s) + @uri.scheme = @uri.scheme.downcase + @uri.normalize! + @uri.fragment = nil @params = params @options = oauth.is_a?(Hash) ? self.class.default_options.merge(oauth) : self.class.parse(oauth) end def url - @uri.dup.tap{|u| u.query = nil }.to_s + uri = @uri.dup + uri.query = nil + uri.to_s end def to_s