mirror of
https://github.com/samsonjs/simple_oauth.git
synced 2026-04-27 14:57:45 +00:00
Don't extend Ruby core
This commit is contained in:
parent
4c7e836933
commit
e48aa4e141
3 changed files with 7 additions and 17 deletions
|
|
@ -2,5 +2,4 @@ require 'base64'
|
||||||
require 'cgi'
|
require 'cgi'
|
||||||
require 'openssl'
|
require 'openssl'
|
||||||
require 'uri'
|
require 'uri'
|
||||||
require 'simple_oauth/core_ext/object'
|
|
||||||
require 'simple_oauth/header'
|
require 'simple_oauth/header'
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -30,17 +30,18 @@ module SimpleOAuth
|
||||||
|
|
||||||
def initialize(method, url, params, oauth = {})
|
def initialize(method, url, params, oauth = {})
|
||||||
@method = method.to_s.upcase
|
@method = method.to_s.upcase
|
||||||
@uri = URI.parse(url.to_s).tap do |uri|
|
@uri = URI.parse(url.to_s)
|
||||||
uri.scheme = uri.scheme.downcase
|
@uri.scheme = @uri.scheme.downcase
|
||||||
uri.normalize!
|
@uri.normalize!
|
||||||
uri.fragment = nil
|
@uri.fragment = nil
|
||||||
end
|
|
||||||
@params = params
|
@params = params
|
||||||
@options = oauth.is_a?(Hash) ? self.class.default_options.merge(oauth) : self.class.parse(oauth)
|
@options = oauth.is_a?(Hash) ? self.class.default_options.merge(oauth) : self.class.parse(oauth)
|
||||||
end
|
end
|
||||||
|
|
||||||
def url
|
def url
|
||||||
@uri.dup.tap{|u| u.query = nil }.to_s
|
uri = @uri.dup
|
||||||
|
uri.query = nil
|
||||||
|
uri.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue