Remove dm-do-adapter monkey patch

This commit is contained in:
Brendan Coles
2019-03-02 06:47:34 +00:00
parent 2fa56c419f
commit f24a25f6b1
3 changed files with 1 additions and 77 deletions

View File

@@ -1,74 +0,0 @@
#
# Copyright (c) 2006-2019 Wade Alcorn - wade@bindshell.net
# Browser Exploitation Framework (BeEF) - http://beefproject.com
# See the file 'doc/COPYING' for copying permission
#
# @note The following file contains patches for DataMapper Data Objects Adapter (dm-do-adapter)
# This patch fixes the following error:
# DataObjects::URI.new with arguments is deprecated, use a Hash of URI components (/home/username/.rvm/gems/ruby-1.9.2-p290/gems/dm-do-adapter-1.1.0/lib/dm-do-adapter/adapter.rb:231:in `new')
# The error is patched in dm-do-adapter 1.1.1 however it has yet to be released.
# Patch: https://github.com/datamapper/dm-do-adapter/commit/7f0b53d1ada8735910e04ff37d60c6ff037ce288
=begin
Deleted:
< DataObjects::URI.new(
< @options[:adapter],
< @options[:user] || @options[:username],
< @options[:password],
< @options[:host],
< port,
< @options[:path] || @options[:database],
< query,
< @options[:fragment]
< ).freeze
Added:
> DataObjects::URI.new({
> :scheme => @options[:adapter],
> :user => @options[:user] || @options[:username],
> :password => @options[:password],
> :host => @options[:host],
> :port => port,
> :path => @options[:path] || @options[:database],
> :query => query,
> :fragment => @options[:fragment]
> }).freeze
=end
require 'dm-do-adapter'
module DataMapper
module Adapters
class DataObjectsAdapter < AbstractAdapter
def normalized_uri
@normalized_uri ||=
begin
keys = [
:adapter, :user, :password, :host, :port, :path, :fragment,
:scheme, :query, :username, :database ]
query = DataMapper::Ext::Hash.except(@options, keys)
query = nil if query.empty?
# Better error message in case port is no Numeric value
port = @options[:port].nil? ? nil : @options[:port].to_int
DataObjects::URI.new({
:scheme => @options[:adapter],
:user => @options[:user] || @options[:username],
:password => @options[:password],
:host => @options[:host],
:port => port,
:path => @options[:path] || @options[:database],
:query => query,
:fragment => @options[:fragment]
}).freeze
end
end
end
end
end