ronin 0.2.3 → 0.2.4

data/lib/ronin/formatting/extensions/binary/file.rb

@@ -0,0 +1,60 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+require 'ronin/formatting/extensions/binary/string'
+
+class File
+
+  #
+  # Converts the hexdump at the specified _path_ back into the original
+  # raw-data using the given _options_.
+  #
+  # _options_ may contain the following keys:
+  # <tt>:format</tt>:: The expected format of the hexdump. Must be either
+  #                    <tt>:od</tt> or <tt>:hexdump</tt>.
+  # <tt>:encoding</tt>:: Denotes the encoding used for the bytes within the
+  #                      hexdump. Must be one of the following:
+  #                      <tt>:binary</tt>:: Binary encoded bytes.
+  #                      <tt>:octal</tt>:: Octal encoding.
+  #                      <tt>:octal_bytes</tt>:: Octal encoded bytes.
+  #                      <tt>:octal_shorts</tt>:: Octal encoded shorts.
+  #                      <tt>:octal_ints</tt>:: Octal encoded integers.
+  #                      <tt>:octal_quads</tt>:: Octal encoded quads.
+  #                      <tt>:decimal</tt>:: Unsigned decimal encoding.
+  #                      <tt>:decimal_bytes</tt>:: Unsigned decimal bytes.
+  #                      <tt>:decimal_shorts</tt>:: Unsigned decimal shorts.
+  #                      <tt>:decimal_ints</tt>:: Unsigned decimal ints.
+  #                      <tt>:decimal_quads</tt>:: Unsigned decimal quads.
+  #                      <tt>:hex</tt>:: Hexadecimal encoding.
+  #                      <tt>:hex_bytes</tt>:: Hexadecimal bytes.
+  #                      <tt>:hex_shorts</tt>:: Hexadecimal shorts.
+  #                      <tt>:hex_ints</tt>:: Hexadecimal ints.
+  #                      <tt>:hex_quads</tt>:: Hexadecimal quads.
+  # <tt>:segment</tt>:: The length in bytes of each segment in the hexdump.
+  #                     Defaults to 16, if not specified.
+  #
+  def File.unhexdump(path,options={})
+    File.read(path).unhexdump(options)
+  end
+
+end

data/lib/ronin/formatting/extensions/text.rb

@@ -22,3 +22,4 @@
 #
 
 require 'ronin/formatting/extensions/text/string'
+require 'ronin/formatting/extensions/text/array'

data/lib/ronin/formatting/extensions/text/array.rb

@@ -0,0 +1,67 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+class Array
+
+  #
+  # Returns the bytes contained in the array.
+  #
+  #   [0x41, 0x41, 0x20].bytes
+  #   # => [0x41, 0x41, 0x20]
+  #
+  #   ['A', 'BB', 0x90].bytes
+  #   # => [0x41, 0x42, 0x42, 0x90]
+  #
+  def bytes
+    self.inject([]) do |accum,elem|
+      if elem.kind_of?(Integer)
+        accum << elem
+      else
+        elem.to_s.each_byte { |b| accum << b }
+      end
+
+      accum
+    end
+  end
+
+  #
+  # Returns the Array of characters generated from the array.
+  #
+  #   [0x41, 0x41, 0x20].chars
+  #   # => ["A", "A", " "]
+  #
+  def chars
+    self.bytes.map { |b| b.chr }
+  end
+
+  #
+  # Returns the String created from the characters within the array.
+  #
+  #   [0x41, 0x41, 0x20].char_string
+  #   # => "AA "
+  #
+  def char_string
+    chars.join
+  end
+
+end

data/lib/ronin/model.rb

@@ -21,43 +21,4 @@
 #++
 #
 
-require 'dm-core'
-require 'dm-types'
-require 'dm-serializer'
-require 'dm-validations'
-
-module Ronin
-  module Model
-    include DataMapper::Types
-
-    # Name of Ronin's DataMapper repository
-    REPOSITORY_NAME = :ronin
-
-    def self.included(base)
-      unless base.ancestors.include?(DataMapper::Resource)
-        base.module_eval do
-          include DataMapper::Resource
-          include DataMapper::AutoMigrations
-
-          #
-          # Returns the default repository name for the model.
-          #
-          def self.default_repository_name
-            Model::REPOSITORY_NAME
-          end
-
-          # The class type property
-          property :type, Discriminator
-
-          #
-          # Finds the first resource by conditions, or initializes a new
-          # resource with the attributes if none found.
-          #
-          def self.first_or_new(query,attributes={})
-            first(query) || new(query.merge(attributes))
-          end
-        end
-      end
-    end
-  end
-end
+require 'ronin/model/model'

data/lib/ronin/{has_license.rb → model/has_description.rb}

@@ -22,28 +22,26 @@
 #
 
 require 'ronin/model'
-require 'ronin/license'
 
 module Ronin
-  module HasLicense
-    def self.included(base)
-      base.module_eval do
-        include Ronin::Model
+  module Model
+    module HasDescription
+      include DataMapper::Types
 
-        # The license
-        belongs_to :license,
-                   :child_key => [:license_id],
-                   :class_name => 'Ronin::License'
+      def self.included(base)
+        base.module_eval do
+          include Ronin::Model
 
-        #
-        # Returns all models having the predefined license with the
-        # predefined _name_.
-        #
-        #   LicensedModel.licensed_under(:cc_by_nc)
-        #   # => [#<Ronin::LicensedModel: ...>, ...]
-        #
-        def self.licensed_under(name)
-          self.all(:license_id => Ronin::License[name].id)
+          # The description of the model
+          property :description, Text
+
+          #
+          # Finds models with descriptions similar to the specified
+          # _description_.
+          #
+          def self.describing(description)
+            self.all(:description.like => "%#{description}%")
+          end
         end
       end
     end

data/lib/ronin/model/has_license.rb

@@ -0,0 +1,53 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+require 'ronin/model'
+require 'ronin/license'
+
+module Ronin
+  module Model
+    module HasLicense
+      def self.included(base)
+        base.module_eval do
+          include Ronin::Model
+
+          # The license
+          belongs_to :license,
+                     :child_key => [:license_id],
+                     :class_name => 'Ronin::License'
+
+          #
+          # Returns all models having the predefined license with the
+          # predefined _name_.
+          #
+          #   LicensedModel.licensed_under(:cc_by_nc)
+          #   # => [#<Ronin::LicensedModel: ...>, ...]
+          #
+          def self.licensed_under(name)
+            self.all(:license_id => Ronin::License[name].id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ronin/model/has_name.rb

@@ -0,0 +1,49 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+require 'ronin/model'
+
+module Ronin
+  module Model
+    module HasName
+      def self.included(base)
+        base.module_eval do
+          include Ronin::Model
+
+          # The name of the model
+          property :name, String, :index => true
+
+          # Validations
+          validates_present :name
+
+          #
+          # Finds models with names like the specified _name_.
+          #
+          def self.named(name)
+            self.all(:name.like => "%#{name}%")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ronin/model/has_version.rb

@@ -0,0 +1,46 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+require 'ronin/model'
+
+module Ronin
+  module Model
+    module HasVersion
+      def self.included(base)
+        base.module_eval do
+          include Ronin::Model
+
+          # The version of the model
+          property :version, String, :default => '0.1', :index => true
+
+          #
+          # Finds latest version of the model.
+          #
+          def self.latest
+            self.first(:order => [:version.desc])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ronin/model/model.rb

@@ -0,0 +1,64 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+gem 'addressable', '2.0.2'
+
+require 'dm-core'
+require 'dm-types'
+require 'dm-validations'
+
+module Ronin
+  module Model
+    include DataMapper::Types
+
+    # Name of Ronin's DataMapper repository
+    REPOSITORY_NAME = :ronin
+
+    def self.included(base)
+      unless base.ancestors.include?(DataMapper::Resource)
+        base.module_eval do
+          include DataMapper::Resource
+          include DataMapper::AutoMigrations
+
+          #
+          # Returns the default repository name for the model.
+          #
+          def self.default_repository_name
+            Model::REPOSITORY_NAME
+          end
+
+          # The class type property
+          property :type, Discriminator
+
+          #
+          # Finds the first resource by conditions, or initializes a new
+          # resource with the attributes if none found.
+          #
+          def self.first_or_new(query,attributes={})
+            first(query) || new(query.merge(attributes))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ronin/network/extensions/http/net.rb

@@ -32,14 +32,14 @@ module Net
   # is given it will be passed the newly created <tt>Net::HTTP</tt> object.
   #
   # _options_ may contain the following keys:
-  # <tt>:host</tt>:: The host the HTTP server is running on.
-  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
-  #                  <tt>Net::HTTP.default_port</tt>.
   # <tt>:url</tt>:: The full URL to request.
   # <tt>:user</tt>:: The user to authenticate with when connecting to the
   #                  HTTP server.
   # <tt>:password</tt>:: The password to authenticate with when connecting
   #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
   # <tt>:path</tt>:: The path to request from the HTTP server.
   # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
   #                   the HTTP server. Defaults to
@@ -53,40 +53,77 @@ module Net
   #                                        when connecting to the HTTP
   #                                        proxy.
   #
-  #
   def Net.http_session(options={},&block)
-    host = options[:host]
-    port = (options[:port] || ::Net::HTTP.default_port)
+    options = Ronin::Network::HTTP.expand_options(options)
 
-    if options[:url]
-      url = URI(options[:url].to_s)
-
-      host = url.host
-      port = url.port
+    host = options[:host]
+    port = options[:port]
+    proxy = options[:proxy]
 
-      options[:user] = url.user if url.user
-      options[:password] = url.password if url.password
+    sess = Net::HTTP::Proxy(proxy[:host],proxy[:port],proxy[:user],proxy[:pass]).start(host,port)
 
-      if url.query
-        options[:path] = "#{url.path}?#{url.query}"
+    if block
+      if block.arity == 2
+        block.call(sess,options)
       else
-        options[:path] = url.path
+        block.call(sess)
       end
     end
 
-    proxy = (options[:proxy] || Ronin::Network::HTTP.proxy)
+    return sess
+  end
 
-    if proxy
-      proxy_host = proxy[:host]
-      proxy_port = (proxy[:port] || Ronin::Network::HTTP.default_proxy_port)
-      proxy_user = proxy[:user]
-      proxy_pass = proxy[:password]
-    end
+  #
+  # Connects to the HTTP server and sends an HTTP Request using the given
+  # _options_. If a _block_ is given it will be passed the newly created
+  # HTTP Request object. Returns the <tt>Net::HTTP::Response</tt> that
+  # was returned.
+  #
+  # _options_ may contain the following keys:
+  # <tt>:method</tt>:: The HTTP method to use for the request.
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the request.
+  #                     May use Strings or Symbols for the keys of the Hash.
+  #
+  def Net.http_request(options={},&block)
+    resp = nil
 
-    sess = Net::HTTP::Proxy(proxy_host,proxy_port,proxy_user,proxy_pass).start(host,port)
+    Net.http_session(options) do |http,expanded_options|
+      http_body = expanded_options.delete(:body)
 
-    block.call(sess) if block
-    return sess
+      req = Ronin::Network::HTTP.request(expanded_options)
+
+      if block
+        if block.arity == 2
+          block.call(req,expanded_options)
+        else
+          block.call(req)
+        end
+      end
+
+      resp = http.request(req,http_body)
+    end
+
+    return resp
   end
 
   #
@@ -94,13 +131,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Copy request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_copy(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:copy,options))
+    resp = Net.http_request(options.merge(:method => :copy))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -108,16 +168,45 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Delete request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_delete(options={},&block)
-    Net.http_session(options) do |http|
-      req = Ronin::Network::HTTP.request(:delete,options)
-      req['Depth'] = (options[:depth].to_s || 'Infinity')
+    original_headers = options[:headers]
 
-      resp = http.request(req)
+    # set the HTTP Depth header
+    options[:headers] = {:depth => 'Infinity'}
 
-      block.call(resp) if block
-      return resp
+    if original_headers
+      options[:header].merge!(original_headers)
     end
+
+    resp = Net.http_request(options.merge(:method => :delete))
+
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -125,13 +214,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Get request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_get(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:get,options))
+    resp = Net.http_request(options.merge(:method => :get))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -139,6 +251,31 @@ module Net
   # is given, it will be passed the response body from the HTTP server.
   # Returns the response body from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Get request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_get_body(options={},&block)
     Net.http_get(options,&block).body
   end
@@ -148,25 +285,100 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Head request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_head(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:head,options))
+    resp = Net.http_request(options.merge(:method => :head))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
   # Returns +true+ if a HTTP Head request with the given _options_ returns
   # the HTTP status code of 200, returns +false+ otherwise.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Head request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
+  #
   def Net.http_ok?(options={})
     Net.http_head(options).code == 200
   end
 
   #
-  # Returns the HTTP Server header for the given _options_.
+  # Sends a HTTP Head request using the given _options_ and returns the
+  # HTTP Server header.
+  #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Head request. May use Strings or Symbols for the
+  #                     keys of the Hash.
   #
   #   Net.http_server(:url => 'http://www.darkc0de.com/)
   #   # => "Apache/2.2.11 (Unix) PHP/4.4.9 mod_ssl/2.2.11 OpenSSL/0.9.8c
@@ -177,7 +389,33 @@ module Net
   end
 
   #
-  # Returns the HTTP X-Powered-By header for the given _options_.
+  # Sends an HTTP Head request using the given _options_ and returns the
+  # HTTP X-Powered-By header.
+  #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Head request. May use Strings or Symbols for the
+  #                     keys of the Hash.
   #
   #   Net.http_powered_by(:url => 'http://www.stalkdaily.com/')
   #   # => "PHP/5.2.9"
@@ -197,13 +435,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Lock request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_lock(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:lock,options),options[:body])
+    resp = Net.http_request(options.merge(:method => :lock))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -211,13 +472,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Mkcol request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_mkcol(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:mkcol,options),options[:body])
+    resp = Net.http_request(options.merge(:method => :mkcol))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -225,13 +509,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Move request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_move(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:move,options))
+    resp = Net.http_request(options.merge(:method => :move))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -239,13 +546,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Options request. May use Strings or Symbols for
+  #                     the keys of the Hash.
+  #
   def Net.http_options(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:options,options))
+    resp = Net.http_request(options.merge(:method => :options))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -253,19 +583,47 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:post_data</tt>:: The POSTDATA to send with the HTTP Post request.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Post request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_post(options={},&block)
-    Net.http_session(options) do |http|
-      url = URI(options[:url].to_s)
-      post_data = (options[:post_data] || url.query_params)
+    options = options.merge(:method => :post)
+    post_data = options.delete(:post_data)
 
-      req = Ronin::Network::HTTP.request(:post,options)
-      req.set_form_data(post_data)
-
-      resp = http.request(req)
+    if options[:url]
+      url = URI(options[:url].to_s)
+      post_data ||= url.query_params
+    end
 
-      block.call(resp) if block
-      return resp
+    resp = Net.http_request(options) do |req,expanded_options|
+      req.set_form_data(post_data) if post_data
     end
+
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -273,6 +631,31 @@ module Net
   # is given, it will be passed the response body from the HTTP server.
   # Returns the response body from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Post request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_post_body(options={},&block)
     Net.http_post(options,&block).body
   end
@@ -282,16 +665,45 @@ module Net
   # _block_ is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Propfind request. May use Strings or Symbols for
+  #                     the keys of the Hash.
+  #
   def Net.http_prop_find(options={},&block)
-    Net.http_session(options) do |http|
-      req = Ronin::Network::HTTP.request(:propfind,options)
-      req['Depth'] = (options[:depth] || '0')
+    original_headers = options[:headers]
 
-      resp = http.request(req,options[:body])
+    # set the HTTP Depth header
+    options[:headers] = {:depth => '0'}
 
-      block.call(resp) if block
-      return resp
+    if original_headers
+      options[:header].merge!(original_headers)
     end
+
+    resp = Net.http_request(options.merge(:method => :propfind))
+
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -299,13 +711,36 @@ module Net
   # _block_ is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Proppatch request. May use Strings or Symbols for
+  #                     the keys of the Hash.
+  #
   def Net.http_prop_patch(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:proppatch,options),options[:body])
+    resp = Net.http_request(options.merge(:method => :proppatch))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -313,13 +748,36 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Trace request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_trace(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:trace,options))
+    resp = Net.http_request(options.merge(:method => :trace))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 
   #
@@ -327,12 +785,35 @@ module Net
   # is given, it will be passed the response from the HTTP server.
   # Returns the response from the HTTP server.
   #
+  # _options_ may contain the following keys:
+  # <tt>:url</tt>:: The full URL to request.
+  # <tt>:user</tt>:: The user to authenticate with when connecting to the
+  #                  HTTP server.
+  # <tt>:password</tt>:: The password to authenticate with when connecting
+  #                      to the HTTP server.
+  # <tt>:host</tt>:: The host the HTTP server is running on.
+  # <tt>:port</tt>:: The port the HTTP server is running on. Defaults to
+  #                  <tt>Net::HTTP.default_port</tt>.
+  # <tt>:path</tt>:: The path to request from the HTTP server.
+  # <tt>:proxy</tt>:: A Hash of proxy settings to use when connecting to
+  #                   the HTTP server. Defaults to
+  #                   <tt>Ronin::Network::HTTP.proxy</tt>.
+  #                   <tt>:host</tt>:: The HTTP proxy host to connect to.
+  #                   <tt>:port</tt>:: The HTTP proxy port to connect to.
+  #                                    Defaults to <tt>Ronin::Network::HTTP.default_proxy_port</tt>.
+  #                   <tt>:user</tt>:: The user to authenticate with
+  #                                    when connecting to the HTTP proxy.
+  #                   <tt>:password</tt>:: The password to authenticate with
+  #                                        when connecting to the HTTP
+  #                                        proxy.
+  # <tt>:headers</tt>:: A Hash of the HTTP Headers to send with the HTTP
+  #                     Unlock request. May use Strings or Symbols for the
+  #                     keys of the Hash.
+  #
   def Net.http_unlock(options={},&block)
-    Net.http_session(options) do |http|
-      resp = http.request(Ronin::Network::HTTP.request(:unlock,options),options[:body])
+    resp = Net.http_request(options.merge(:method => :unlock))
 
-      block.call(resp) if block
-      return resp
-    end
+    block.call(resp) if block
+    return resp
   end
 end