diff --git a/core/loader.rb b/core/loader.rb index e0d4eaa40..9c9cb4310 100644 --- a/core/loader.rb +++ b/core/loader.rb @@ -32,6 +32,7 @@ require 'ansi' require 'term/ansicolor' require 'json' require 'data_objects' +require 'dm-do-adapter' require 'parseconfig' require 'erubis' require 'mime/types' diff --git a/core/ruby.rb b/core/ruby.rb index 8450e3da5..2ea23600d 100644 --- a/core/ruby.rb +++ b/core/ruby.rb @@ -14,6 +14,3 @@ require 'core/ruby/string' require 'core/ruby/print' require 'core/ruby/hash' -# @note Patching DataMapper Data Objects Adapter (dm-do-adapter) -require 'core/ruby/patches/dm-do-adapter/adapter.rb' - diff --git a/core/ruby/patches/dm-do-adapter/adapter.rb b/core/ruby/patches/dm-do-adapter/adapter.rb deleted file mode 100644 index 2209b0d09..000000000 --- a/core/ruby/patches/dm-do-adapter/adapter.rb +++ /dev/null @@ -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 -