ronin 1.0.0.rc1 → 1.0.0.rc2

data/ChangeLog.md

@@ -5,34 +5,32 @@
 * Require i18n ~> 0.4.1.
 * Require tzinfo ~> 0.3.22.
 * Require activesupport ~> 3.0.0.
-* Require dm-do-adapter ~> 1.0.2.
-* Require dm-sqlite-adapter ~> 1.0.2.
-* Require dm-core ~> 1.0.2.
-* Require dm-types ~> 1.0.2.
-* Require dm-constraints ~> 1.0.2.
-* Require dm-migrations ~> 1.0.2.
-* Require dm-validations ~> 1.0.2.
-* Require dm-serializer ~> 1.0.2.
-* Require dm-aggregates ~> 1.0.2.
-* Require dm-timestamps ~> 1.0.2.
-* Require dm-tags ~> 1.0.2.
-* Require dm-is-predefined ~> 0.3.0.
-* Require uri-query_params ~> 0.5.2.
-* Require open_namespace ~> 0.3.0.
-* Require parameters ~> 0.2.3.
-* Require data_paths ~> 0.2.1.
-* Require contextify ~> 0.2.0.
-* Require env ~> 0.1.2.
-* Require pullr ~> 0.1.2.
+* Require dm-do-adapter ~> 1.1.0.
+* Require dm-sqlite-adapter ~> 1.1.0.
+* Require dm-core ~> 1.1.0.
+* Require dm-types ~> 1.1.0.
+* Require dm-constraints ~> 1.1.0.
+* Require dm-migrations ~> 1.1.0.
+* Require dm-validations ~> 1.1.0.
+* Require dm-serializer ~> 1.1.0.
+* Require dm-aggregates ~> 1.1.0.
+* Require dm-timestamps ~> 1.1.0.
+* Require dm-is-predefined ~> 0.3.1.
+* Require uri-query_params ~> 0.5, >= 0.5.2.
+* Require open_namespace ~> 0.3.
+* Require parameters ~> 0.2, >= 0.2.3.
+* Require data_paths ~> 0.2, >= 0.2.1.
+* Require contextify ~> 0.2.
+* Require env ~> 0.1, >= 0.1.2.
+* Require pullr ~> 0.1, >= 0.1.2.
+* Require hexdump ~> 0.1.
+* Require ripl ~> 0.3.
+* Require ripl-multi_line ~> 0.2.
+* Require ripl-auto_indent ~> 0.1.
+* Require ripl-short_errors ~> 0.1.
+* Require ripl-color_result ~> 0.2.
 * Require thor ~> 0.14.3.
-* Require ripl ~> 0.3.0.
-* Require ripl-multi_line ~> 0.2.0.
-* Require ripl-auto_indent ~> 0.1.0.
-* Require ripl-short_errors ~> 0.1.0.
-* Require ripl-color_result ~> 0.2.0.
 * Require ronin-support ~> 0.1.0.
-* Require bundler ~> 1.0.0.
-* Require yard ~> 0.6.4.
 * Added `ronin/bootstrap` which only loads configuration and the Database.
 * Added {Ronin::Database::Migrations}.
 * Added {Ronin::Model::HasUniqueName}.

data/Gemfile

@@ -1,26 +1,38 @@
-require 'ore/specification'
-
 source 'https://rubygems.org'
 
-DATA_MAPPER = 'http://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
-RONIN = 'http://github.com/ronin-ruby'
+DM_URI = 'http://github.com/datamapper'
+DM_VERSION = '~> 1.1.0'
+DO_VERSION = '~> 0.10.3'
+RONIN_URI = 'http://github.com/ronin-ruby'
 
 gemspec
 
+# DataMapper dependencies
+# gem 'data_objects',       DO_VERSION, :git => "#{DM_URI}/do.git"
+# gem 'do_sqlite3',         DO_VERSION, :git => "#{DM_URI}/do.git"
+# gem 'dm-do-adapter',      DM_VERSION, :git => "#{DM_URI}/dm-do-adapter.git"
+# gem 'dm-sqlite-adapter',  DM_VERSION, :git => "#{DM_URI}/dm-sqlite-adapter.git"
+# gem 'dm-core',            DM_VERSION, :git => "#{DM_URI}/dm-core.git"
+# gem 'dm-types',           DM_VERSION, :git => "#{DM_URI}/dm-types.git"
+# gem 'dm-constraints',     DM_VERSION, :git => "#{DM_URI}/dm-constraints.git"
+# gem 'dm-migrations',      DM_VERSION, :git => "#{DM_URI}/dm-migrations.git"
+# gem 'dm-validations',     DM_VERSION, :git => "#{DM_URI}/dm-validations.git"
+# gem 'dm-serializer',      DM_VERSION, :git => "#{DM_URI}/dm-serializer.git"
+# gem 'dm-aggregates',      DM_VERSION, :git => "#{DM_URI}/dm-aggregates.git"
+# gem 'dm-timestamps',      DM_VERSION, :git => "#{DM_URI}/dm-timestamps.git"
+
 # Library dependencies
-# gem 'ronin-support',	'~> 0.1.0', :git => "#{RONIN}/ronin-support.git"
+# gem 'ronin-support',	'~> 0.1.0', :git => "#{RONIN_URI}/ronin-support.git"
 
 group :development do
   gem 'rake',         '~> 0.8.7'
 
-  gem 'ore-core',     '~> 0.1.1'
-  gem 'ore-tasks',    '~> 0.3.0'
-  gem 'rspec',        '~> 2.3.0'
+  gem 'ore-tasks',    '~> 0.4'
+  gem 'rspec',        '~> 2.4'
 
-  gem 'kramdown',       '~> 0.12.0'
+  gem 'kramdown',       '~> 0.12'
   gem 'ruby-graphviz',  '~> 0.9.10'
-  gem 'dm-visualizer',  '~> 0.1.0'
+  gem 'dm-visualizer',  '~> 0.2.0'
 end
 
 group :test do
@@ -31,7 +43,7 @@ group :test do
 
   unless (DM_ADAPTERS & adapters).empty?
     adapters.each do |adapter|
-      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATA_MAPPER}/dm-#{adapter}-adapter.git"
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DM_URI}/dm-#{adapter}-adapter.git"
     end
   end
 end

data/README.md

@@ -71,6 +71,7 @@ Mercurial or Git.
 * Convenience methods provided by
   [ronin-support](http://github.com/ronin-ruby/ronin-support#readme).
 * Provides a customized Ruby Console with:
+  * Syntax highlighting.
   * Tab-completion enabled.
   * Auto-indentation enabled.
   * Pretty-Print loaded.
@@ -128,30 +129,46 @@ Remove a Database:
 ## Requirements
 
 * [Ruby](http://www.ruby-lang.org/) >= 1.8.7
-* [ActiveSupport](http://rubygems.org/gems/activesupport) >= 3.0.0
 * [DataMapper](http://datamapper.org/):
-  * [dm-do-adapter](http://github.com/datamapper/dm-do-adapter) ~> 1.0.2
-  * [dm-sqlite-adapter](http://github.com/datamapper/dm-sqlite-adapter)
-    ~> 1.0.2
+  * [dm-do-adapter](http://github.com/datamapper/dm-do-adapter#readme)
+    ~> 1.1.0
+  * [dm-sqlite-adapter](http://github.com/datamapper/dm-sqlite-adapter#readme)
+    ~> 1.1.0
     * [libsqlite3](http://sqlite.org/)
-  * [dm-core](http://github.com/datamapper/dm-core) ~> 1.0.2
-  * [dm-types](http://github.com/datamapper/dm-types) ~> 1.0.2
-  * [dm-migrations](http://github.com/datamapper/dm-migrations) ~> 1.0.2
-  * [dm-validations](http://github.com/datamapper/dm-validations) ~> 1.0.2
-  * [dm-aggregates](http://github.com/datamapper/dm-aggregates) ~> 1.0.2
-  * [dm-timestamps](http://github.com/datamapper/dm-timestamps) ~> 1.0.2
-  * [dm-tags](http://github.com/datamapper/dm-tags) ~> 1.0.2
-* [dm-is-predefined](http://github.com/postmodern/dm-is-predefined/)
-  ~> 0.3.0
-* [uri-query_params](http://github.com/postmodern/uri-query_params) ~> 0.4.0
-* [open_namespace](http://github.com/postmodern/open_namespace) ~> 0.3.0
-* [parameters](http://github.com/postmodern/parameters) ~> 0.2.2
-* [data_paths](http://github.com/postmodern/data_paths) ~> 0.2.1
-* [contextify](http://github.com/postmodern/contextify/) ~> 0.1.6
-* [env](http://github.com/postmodern/env) ~> 0.1.2
-* [pullr](http://github.com/postmodern/pullr/) ~> 0.1.2
-* [thor](http://github.com/wycats/thor/) ~> 0.14.2
-* [ronin-support](http://github.com/ronin-ruby/ronin-support/) ~> 0.1.0
+  * [dm-core](http://github.com/datamapper/dm-core#readme)
+    ~> 1.1.0
+  * [dm-types](http://github.com/datamapper/dm-types#readme)
+    ~> 1.1.0
+  * [dm-migrations](http://github.com/datamapper/dm-migrations#readme)
+    ~> 1.1.0
+  * [dm-validations](http://github.com/datamapper/dm-validations#readme)
+    ~> 1.1.0
+  * [dm-aggregates](http://github.com/datamapper/dm-aggregates#readme)
+     ~> 1.1.0
+  * [dm-timestamps](http://github.com/datamapper/dm-timestamps#readme)
+    ~> 1.1.0
+* [dm-is-predefined](http://github.com/postmodern/dm-is-predefined#readme)
+  ~> 0.3.1
+* [uri-query_params](http://github.com/postmodern/uri-query_params#readme)
+  ~> 0.5, >= 0.5.2
+* [open_namespace](http://github.com/postmodern/open_namespace#readme)
+  ~> 0.3
+* [parameters](http://github.com/postmodern/parameters#readme)
+  ~> 0.2, >= 0.2.3
+* [data_paths](http://github.com/postmodern/data_paths#readme)
+  ~> 0.2, >= 0.2.1
+* [contextify](http://github.com/postmodern/contextify#readme)
+  ~> 0.2
+* [env](http://github.com/postmodern/env#readme)
+  ~> 0.1, >= 0.1.2
+* [pullr](http://github.com/postmodern/pullr#readme)
+  ~> 0.1, >= 0.1.2
+* [hexdump](http://github.com/postmodern/hexdump#readme)
+  ~> 0.1
+* [thor](http://github.com/wycats/thor#readme)
+  ~> 0.14.3
+* [ronin-support](http://github.com/ronin-ruby/ronin-support#readme)
+  ~> 0.1.0
 
 ## Install
 

data/Rakefile

@@ -28,15 +28,12 @@ task :default => :spec
 
 require 'dm-visualizer/rake/graphviz_task'
 DataMapper::Visualizer::Rake::GraphVizTask.new(
-  :bundle => [:default],
   :include => %w[lib],
   :require => %w[
     ronin/arch
     ronin/address
     ronin/author
     ronin/campaign
-    ronin/comment
-    ronin/country
     ronin/credential
     ronin/email_address
     ronin/host_name_ip_address
@@ -56,6 +53,7 @@ DataMapper::Visualizer::Rake::GraphVizTask.new(
     ronin/service_credential
     ronin/web_credential
     ronin/software
+    ronin/vendor
     ronin/target
     ronin/tcp_port
     ronin/udp_port
@@ -63,7 +61,7 @@ DataMapper::Visualizer::Rake::GraphVizTask.new(
     ronin/url_query_param
     ronin/url
     ronin/user_name
-    ronin/vendor
+    ronin/password
   ]
 )
 

data/gemspec.yml

@@ -32,46 +32,43 @@ post_install_message: |
 
   *************************************************************************
 
-required_ruby_version: >= 1.8.7
+required_ruby_version: ">= 1.8.7"
 
 dependencies:
-  i18n: ~> 0.4.1
-  tzinfo: ~> 0.3.22
-  activesupport: ~> 3.0.0
   # DataMapper adapters
-  dm-do-adapter: ~> 1.0.2
-  dm-sqlite-adapter: ~> 1.0.2
+  dm-do-adapter: ~> 1.1.0.rc2
+  dm-sqlite-adapter: ~> 1.1.0.rc2
   # DataMapper dependencies
-  dm-core: ~> 1.0.2
-  dm-types: ~> 1.0.2
-  dm-constraints: ~> 1.0.2
-  dm-migrations: ~> 1.0.2
-  dm-validations: ~> 1.0.2
-  dm-serializer: ~> 1.0.2
-  dm-aggregates: ~> 1.0.2
-  dm-timestamps: ~> 1.0.2
-  dm-tags: ~> 1.0.2
+  dm-core: ~> 1.1.0.rc2
+  dm-types: ~> 1.1.0.rc2
+  dm-constraints: ~> 1.1.0.rc2
+  dm-migrations: ~> 1.1.0.rc2
+  dm-validations: ~> 1.1.0.rc2
+  dm-serializer: ~> 1.1.0.rc2
+  dm-aggregates: ~> 1.1.0.rc2
+  dm-timestamps: ~> 1.1.0.rc2
   # DataMapper plugins
-  dm-is-predefined: ~> 0.3.0
+  dm-is-predefined: ~> 0.3.1
   # Library dependencies
-  uri-query_params: ~> 0.5.2
-  open_namespace: ~> 0.3.0
-  parameters: ~> 0.2.3
-  data_paths: ~> 0.2.1
-  contextify: ~> 0.2.0
-  env: ~> 0.1.2
-  pullr: ~> 0.1.2
+  uri-query_params: ~> 0.5, >= 0.5.2
+  open_namespace: ~> 0.3
+  parameters: ~> 0.2, >= 0.2.3
+  data_paths: ~> 0.2, >= 0.2.1
+  contextify: ~> 0.2
+  env: ~> 0.1, >= 0.1.2
+  pullr: ~> 0.1, >= 0.1.2
+  hexdump: ~> 0.1
+  ripl: ~> 0.3
+  ripl-multi_line: ~> 0.2
+  ripl-auto_indent: ~> 0.1
+  ripl-short_errors: ~> 0.1
+  ripl-color_result: ~> 0.3
   thor: ~> 0.14.3
-  ripl: ~> 0.3.0
-  ripl-multi_line: ~> 0.2.0
-  ripl-auto_indent: ~> 0.1.0
-  ripl-short_errors: ~> 0.1.0
-  ripl-color_result: ~> 0.2.0
   # Ronin dependencies:
-  ronin-support: ~> 0.1.0.rc1
+  ronin-support: ~> 0.1.0.rc2
 
 development_dependencies:
-  bundler: ~> 1.0.0
+  bundler: ~> 1.0.10
   yard: ~> 0.6.4
   yard-contextify: ~> 0.1.0
   yard-parameters: ~> 0.1.0

data/lib/ronin/address.rb

@@ -17,14 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/organization'
-require 'ronin/target'
 require 'ronin/model'
 
 require 'dm-timestamps'
-require 'dm-tags'
 
 module Ronin
+  autoload :Organization, 'ronin/organization'
+  autoload :Target, 'ronin/target'
+
   #
   # A base model which represents an Internet Address, such as:
   #
@@ -58,9 +58,6 @@ module Ronin
     # Tracks when the IP Address was first created
     timestamps :created_at
 
-    # Tags
-    has_tags_on :tags
-
     #
     # Finds an address.
     #

data/lib/ronin/cached_file.rb

@@ -18,12 +18,13 @@
 #
 
 require 'ronin/support/inflector'
-require 'ronin/repository'
 require 'ronin/model'
 
 require 'contextify'
 
 module Ronin
+  autoload :Repository, 'ronin/repository'
+
   #
   # The {CachedFile} model stores information in the {Database} about
   # files that {Cacheable} Models were cached from. {CachedFile} also
@@ -92,7 +93,7 @@ module Ronin
               end
 
       # filter out non-Cacheable models
-      return model if model.ancestors.include?(Cacheable)
+      return model if model < Cacheable
     end
 
     #
@@ -127,7 +128,7 @@ module Ronin
       blocks.each do |name,block|
         model = Contextify.contexts[name]
 
-        if model.ancestors.include?(Cacheable)
+        if model < Cacheable
           # create the fresh object
           object = model.new()
 

data/lib/ronin/campaign.rb

@@ -20,9 +20,10 @@
 require 'ronin/model'
 require 'ronin/model/has_unique_name'
 require 'ronin/model/has_description'
-require 'ronin/target'
 
 module Ronin
+  autoload :Target, 'ronin/target'
+
   #
   # Represents a grouping of targeted {Address}es.
   #

data/lib/ronin/credential.rb

@@ -17,11 +17,12 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/user_name'
-require 'ronin/password'
 require 'ronin/model'
 
 module Ronin
+  autoload :UserName, 'ronin/user_name'
+  autoload :Password, 'ronin/password'
+
   #
   # Represents Credentials used to access services or websites.
   #

data/lib/ronin/database/database.rb

@@ -205,6 +205,9 @@ module Ronin
 
       # auto-upgrade the database repository
       Database.upgrade!(&block)
+
+      # finalize the model relationships
+      DataMapper.finalize
     end
 
     #

data/lib/ronin/database/migrations/create_addresses_table.rb

@@ -18,7 +18,6 @@
 #
 
 require 'ronin/database/migrations/create_organizations_table'
-require 'ronin/database/migrations/create_taggings_table'
 require 'ronin/database/migrations/migrations'
 
 module Ronin
@@ -26,7 +25,7 @@ module Ronin
     module Migrations
       migration(
         :create_addresses_table,
-        :needs => [:create_organizations_table, :create_taggings_table]
+        :needs => :create_organizations_table
       ) do
         up do
           create_table :ronin_addresses do
@@ -36,7 +35,6 @@ module Ronin
             column :address, String, :not_null => true
             column :organization_id, Integer
             column :created_at, Time, :not_null => true
-            column :frozen_tag_list, Text
           end
 
           create_index :ronin_addresses, :address, :unique => true

data/lib/ronin/database/migrations/create_open_ports_table.rb

@@ -19,7 +19,6 @@
 
 require 'ronin/database/migrations/create_addresses_table'
 require 'ronin/database/migrations/create_ports_table'
-require 'ronin/database/migrations/create_taggings_table'
 require 'ronin/database/migrations/migrations'
 
 module Ronin
@@ -30,7 +29,6 @@ module Ronin
         :needs => [
           :create_addresses_table,
           :create_ports_table,
-          :create_taggings_table
         ]
       ) do
         up do
@@ -41,7 +39,6 @@ module Ronin
             column :service_id, Integer
             column :last_scanned_at, Time
             column :created_at, Time, :not_null => true
-            column :frozen_tag_list, Text
           end
 
           create_index :ronin_open_ports,

data/lib/ronin/database/migrations/create_organizations_table.rb

@@ -17,23 +17,18 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/database/migrations/create_taggings_table'
 require 'ronin/database/migrations/migrations'
 
 module Ronin
   module Database
     module Migrations
-      migration(
-        :create_organizations_table,
-        :needs => :create_taggings_table
-      ) do
+      migration(:create_organizations_table) do
         up do
           create_table :ronin_organizations do
             column :id, Integer, :serial => true
             column :name, String, :not_null => true
             column :description, Text, :not_null => true
             column :created_at, Time, :not_null => true
-            column :frozen_tag_list, Text
           end
 
           create_index :ronin_organizations, :name, :unique => true

data/lib/ronin/database/migrations/create_urls_table.rb

@@ -21,7 +21,6 @@ require 'ronin/database/migrations/create_url_schemes_table'
 require 'ronin/database/migrations/create_url_query_params_table'
 require 'ronin/database/migrations/create_addresses_table'
 require 'ronin/database/migrations/create_ports_table'
-require 'ronin/database/migrations/create_taggings_table'
 require 'ronin/database/migrations/migrations'
 
 module Ronin
@@ -33,8 +32,7 @@ module Ronin
           :create_url_schemes_table,
           :create_url_query_params_table,
           :create_addresses_table,
-          :create_ports_table,
-          :create_taggings_table
+          :create_ports_table
         ]
       ) do
         up do
@@ -47,7 +45,6 @@ module Ronin
             column :fragment, String
             column :last_scanned_at, Time
             column :created_at, Time, :not_null => true
-            column :frozen_tag_list, Text
           end
 
           create_index :ronin_urls, :scheme_id,

data/lib/ronin/database/migrations.rb

@@ -18,8 +18,6 @@
 #
 
 require 'ronin/database/migrations/migrations'
-require 'ronin/database/migrations/create_tags_table'
-require 'ronin/database/migrations/create_taggings_table'
 require 'ronin/database/migrations/create_arches_table'
 require 'ronin/database/migrations/create_os_table'
 require 'ronin/database/migrations/create_vendors_table'

data/lib/ronin/email_address.rb

@@ -17,13 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/user_name'
-require 'ronin/host_name'
 require 'ronin/model'
 
 require 'dm-timestamps'
 
 module Ronin
+  autoload :UserName, 'ronin/user_name'
+  autoload :HostName, 'ronin/host_name'
+
   #
   # Represents email addresses that can be stored in the {Database}.
   #
@@ -41,7 +42,8 @@ module Ronin
     belongs_to :host_name
 
     # Any IP addresses associated with the host name.
-    has 0..n, :ip_addresses, :through => :host_name
+    has 0..n, :ip_addresses, :through => :host_name,
+                             :model => 'IPAddress'
 
     # Any web credentials that are associated with the email address.
     has 0..n, :web_credentials

data/lib/ronin/environment.rb

@@ -24,10 +24,10 @@ require 'ronin/ronin'
 require 'ronin/extensions'
 require 'ronin/formatting/extensions'
 require 'ronin/network/extensions'
-require 'ronin/ui/hexdump/extensions'
 require 'ronin/ui/output/helpers'
 
 require 'chars/extensions'
+require 'hexdump/extensions'
 
 #
 # Includes the Ronin namespace and output helper methods.

data/lib/ronin/host_name.rb

@@ -18,14 +18,15 @@
 #
 
 require 'ronin/address'
-require 'ronin/host_name_ip_address'
-require 'ronin/url'
-require 'ronin/email_address'
 require 'ronin/model'
 
 require 'resolv'
 
 module Ronin
+  autoload :HostNameIPAddress, 'ronin/host_name_ip_address'
+  autoload :URL, 'ronin/url'
+  autoload :EmailAddress, 'ronin/email_address'
+
   #
   # Represents host names that can be stored in the {Database}.
   #

data/lib/ronin/host_name_ip_address.rb

@@ -17,13 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/host_name'
-require 'ronin/ip_address'
 require 'ronin/model'
 
 require 'dm-timestamps'
 
 module Ronin
+  autoload :HostName, 'ronin/host_name'
+  autoload :IPAddress, 'ronin/ip_address'
+
   #
   # Associates a {HostName} with an {IPAddress}.
   #

data/lib/ronin/ip_address.rb

@@ -19,15 +19,16 @@
 
 require 'ronin/model'
 require 'ronin/address'
-require 'ronin/ip_address_mac_address'
-require 'ronin/host_name_ip_address'
-require 'ronin/os_guess'
-require 'ronin/os'
 
 require 'ipaddr'
 require 'resolv'
 
 module Ronin
+  autoload :IPAddressMACAddress, 'ronin/ip_address_mac_address'
+  autoload :HostNameIPAddress, 'ronin/host_name_ip_address'
+  autoload :OSGuess, 'ronin/os_guess'
+  autoload :OS, 'ronin/os'
+
   #
   # Represents IP addresses that can be stored in the {Database}.
   #

data/lib/ronin/ip_address_mac_address.rb

@@ -17,13 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/ip_address'
-require 'ronin/mac_address'
 require 'ronin/model'
 
 require 'dm-timestamps'
 
 module Ronin
+  autoload :IPAddress, 'ronin/ip_address'
+  autoload :MACAddress, 'ronin/mac_address'
+
   #
   # Associates an {IPAddress} with a {MACAddress}.
   #

data/lib/ronin/mac_address.rb

@@ -18,10 +18,12 @@
 #
 
 require 'ronin/address'
-require 'ronin/ip_address_mac_address'
 require 'ronin/model'
 
 module Ronin
+  autoload :IPAddressMACAddress, 'ronin/ip_address_mac_address'
+  autoload :IPAddress, 'ronin/ip_address'
+
   #
   # Represents MAC addresses that can be stored in the {Database}.
   #