metasploit-model 0.27.3 → 0.27.4

data/lib/metasploit/model/derivation/full_name.rb

@@ -1,25 +1,19 @@
-module Metasploit
-  module Model
-    module Derivation
-      # Methods for deriving full_name from module_type and reference_name in `Mdm::Module::Ancestor`,
-      # `Mdm::Module::Class`, `Metasploit::Framework::Module::Ancestor`, and `Metasploit::Framework::Module::Class`.
-      module FullName
-        # Derives full_name by combining module_type and reference_name in the same way used to create modules using
-        # Msf::ModuleManager#create in metasploit-framework.
-        #
-        # @return [String] <module_type>/<reference_name>
-        # @return [nil] if module_type is `nil`.
-        # @return [nil] if reference_name is `nil`.
-        def derived_full_name
-          derived = nil
+# Methods for deriving full_name from module_type and reference_name in `Mdm::Module::Ancestor`,
+# `Mdm::Module::Class`, `Metasploit::Framework::Module::Ancestor`, and `Metasploit::Framework::Module::Class`.
+module Metasploit::Model::Derivation::FullName
+  # Derives full_name by combining module_type and reference_name in the same way used to create modules using
+  # Msf::ModuleManager#create in metasploit-framework.
+  #
+  # @return [String] <module_type>/<reference_name>
+  # @return [nil] if module_type is `nil`.
+  # @return [nil] if reference_name is `nil`.
+  def derived_full_name
+    derived = nil
 
-          if module_type and reference_name
-            derived = "#{module_type}/#{reference_name}"
-          end
-
-          derived
-        end
-      end
+    if module_type and reference_name
+      derived = "#{module_type}/#{reference_name}"
     end
+
+    derived
   end
-end
+end

data/lib/metasploit/model/email_address.rb

@@ -1,130 +1,124 @@
-require 'metasploit/model/translation'
-
-module Metasploit
-  module Model
-    # Code shared between `Mdm::EmailAddress` and `Metasploit::Framework::EmailAddress`.
-    module EmailAddress
-      extend ActiveModel::Naming
-      extend ActiveSupport::Concern
-
-      include Metasploit::Model::Translation
-
-      included do
-        include ActiveModel::MassAssignmentSecurity
-        include ActiveModel::Validations
-        include Metasploit::Model::Derivation
-        include Metasploit::Model::Search
-
-        #
-        # Derivations
-        #
-
-        derives :domain, :validate => true
-        derives :full, :validate => true
-        derives :local, :validate => true
-
-        #
-        # Mass Assignment Security
-        #
-
-        attr_accessible :domain
-        attr_accessible :full
-        attr_accessible :local
-
-        #
-        # Search Attributes
-        #
-
-        search_attribute :domain, :type => :string
-        search_attribute :full, :type => :string
-        search_attribute :local, :type => :string
-
-        #
-        # Validations
-        #
-
-        validates :domain, :presence => true
-        validates :local, :presence => true
-      end
-
-      #
-      # Associations
-      #
-
-      # @!attribute [rw] module_authors
-      #   Credits where {#authors} used this email address for {#module_instances modules}.
-      #
-      #   @return [Array<Metasploit::Model::Module::Author>]
-
-      # @!attribute [r] authors
-      #   Authors that used this email address.
-      #
-      #   @return [Array<Metasploit::Model::Author>]
-
-      # @!attribute [r] module_instances
-      #   Modules where this email address was used.
-      #
-      #   @return [Array<Metasploit::Module::Instance>]
-
-      #
-      # Attributes
-      #
-
-      # @!attribute [rw] domain
-      #   The domain part of the email address after the `'@'`.
-      #
-      #   @return [String]
-
-      # @!attribute [rw] full
-      #   The full email address.
-      #
-      #   @return [String] <{#local}>@<{#domain}
-
-      # @!attribute [rw] local
-      #   The local part of the email address before the `'@'`.
-      #
-      #   @return [String]
-
-      #
-      # Methods
-      #
-
-      # Derives {#domain} from {#full}
-      #
-      # @return [String] if {#full} is present
-      # @return [nil] if {#full} is not present
-      def derived_domain
-        domain = nil
-
-        if full.present?
-          _local, domain = full.split('@', 2)
-        end
-
-        domain
-      end
-
-      # Derives {#full} from {#domain} and {#local}
-      #
-      # @return [String]
-      def derived_full
-        if domain.present? && local.present?
-          "#{local}@#{domain}"
-        end
-      end
-
-      # Derives {#local} from {#full}.
-      #
-      # @return [String] if {#full} is present
-      # @return [nil] if {#full} is not present
-      def derived_local
-        local = nil
-
-        if full.present?
-          local, _domain = full.split('@', 2)
-        end
-
-        local
-      end
+# Code shared between `Mdm::EmailAddress` and `Metasploit::Framework::EmailAddress`.
+module Metasploit::Model::EmailAddress
+  extend ActiveModel::Naming
+  extend ActiveSupport::Concern
+
+  include Metasploit::Model::Translation
+
+  included do
+    include ActiveModel::MassAssignmentSecurity
+    include ActiveModel::Validations
+    include Metasploit::Model::Derivation
+    include Metasploit::Model::Search
+
+    #
+    # Derivations
+    #
+
+    derives :domain, :validate => true
+    derives :full, :validate => true
+    derives :local, :validate => true
+
+    #
+    # Mass Assignment Security
+    #
+
+    attr_accessible :domain
+    attr_accessible :full
+    attr_accessible :local
+
+    #
+    # Search Attributes
+    #
+
+    search_attribute :domain, :type => :string
+    search_attribute :full, :type => :string
+    search_attribute :local, :type => :string
+
+    #
+    # Validations
+    #
+
+    validates :domain, :presence => true
+    validates :local, :presence => true
+  end
+
+  #
+  # Associations
+  #
+
+  # @!attribute [rw] module_authors
+  #   Credits where {#authors} used this email address for {#module_instances modules}.
+  #
+  #   @return [Array<Metasploit::Model::Module::Author>]
+
+  # @!attribute [r] authors
+  #   Authors that used this email address.
+  #
+  #   @return [Array<Metasploit::Model::Author>]
+
+  # @!attribute [r] module_instances
+  #   Modules where this email address was used.
+  #
+  #   @return [Array<Metasploit::Module::Instance>]
+
+  #
+  # Attributes
+  #
+
+  # @!attribute [rw] domain
+  #   The domain part of the email address after the `'@'`.
+  #
+  #   @return [String]
+
+  # @!attribute [rw] full
+  #   The full email address.
+  #
+  #   @return [String] <{#local}>@<{#domain}
+
+  # @!attribute [rw] local
+  #   The local part of the email address before the `'@'`.
+  #
+  #   @return [String]
+
+  #
+  # Methods
+  #
+
+  # Derives {#domain} from {#full}
+  #
+  # @return [String] if {#full} is present
+  # @return [nil] if {#full} is not present
+  def derived_domain
+    domain = nil
+
+    if full.present?
+      _local, domain = full.split('@', 2)
+    end
+
+    domain
+  end
+
+  # Derives {#full} from {#domain} and {#local}
+  #
+  # @return [String]
+  def derived_full
+    if domain.present? && local.present?
+      "#{local}@#{domain}"
     end
   end
-end
+
+  # Derives {#local} from {#full}.
+  #
+  # @return [String] if {#full} is present
+  # @return [nil] if {#full} is not present
+  def derived_local
+    local = nil
+
+    if full.present?
+      local, _domain = full.split('@', 2)
+    end
+
+    local
+  end
+end

data/lib/metasploit/model/engine.rb

@@ -1,28 +1,33 @@
 require 'rails'
 
-module Metasploit
-  module Model
-    # Rails engine for Metasploit::Model.  Will automatically be used if `Rails` is defined when
-    # 'metasploit/model' is required, as should be the case in any normal Rails application Gemfile where
-    # gem 'rails' is the first gem in the Gemfile.
-    class Engine < Rails::Engine
-      # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
-      config.generators do |g|
-        g.assets false
-        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-        g.helper false
-        g.test_framework :rspec, :fixture => false
-      end
+# Rails engine for Metasploit::Model.  Will automatically be used if `Rails` is defined when
+# 'metasploit/model' is required, as should be the case in any normal Rails application Gemfile where
+# gem 'rails' is the first gem in the Gemfile.
+class Metasploit::Model::Engine < Rails::Engine
+  # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
+  config.generators do |g|
+    g.assets false
+    g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+    g.helper false
+    g.test_framework :rspec, :fixture => false
+  end
+
+  # Remove ActiveSupport::Dependencies loading paths to save time during constant resolution and to ensure that
+  # metasploit-model is properly declaring all autoloads and not falling back on ActiveSupport::Dependencies
+  config.paths.each_value do |path|
+    path.skip_autoload!
+    path.skip_autoload_once!
+    path.skip_eager_load!
+    path.skip_load_path!
+  end
 
-      initializer 'metasploit-model.prepend_factory_path', :after => 'factory_girl.set_factory_paths' do
-        if defined? FactoryGirl
-          relative_definition_file_path = config.generators.options[:factory_girl][:dir]
-          definition_file_path = root.join(relative_definition_file_path)
+  initializer 'metasploit-model.prepend_factory_path', :after => 'factory_girl.set_factory_paths' do
+    if defined? FactoryGirl
+      relative_definition_file_path = config.generators.options[:factory_girl][:dir]
+      definition_file_path = root.join(relative_definition_file_path)
 
-          # unshift so that dependent gems can modify metasploit-model's factories
-          FactoryGirl.definition_file_paths.unshift definition_file_path
-        end
-      end
+      # unshift so that dependent gems can modify metasploit-model's factories
+      FactoryGirl.definition_file_paths.unshift definition_file_path
     end
   end
 end

data/lib/metasploit/model/error.rb

@@ -1,7 +1,3 @@
-module Metasploit
-  module Model
-    # Base class for error hierarchy for {Metasploit::Model}
-    class Error < StandardError
-    end
-  end
-end
+# Base class for error hierarchy for {Metasploit::Model}
+class Metasploit::Model::Error < StandardError
+end

data/lib/metasploit/model/file.rb

@@ -1,5 +1,3 @@
-require 'metasploit/model'
-
 if RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
   require 'java'
 

data/lib/metasploit/model/invalid.rb

@@ -1,19 +1,13 @@
-require 'metasploit/model/error'
+# Error raised if a {Metasploit::Model} ActiveModel is invalid.
+class Metasploit::Model::Invalid < Metasploit::Model::Error
+  def initialize(model)
+    @model = model
 
-module Metasploit
-  module Model
-    # Error raised if a {Metasploit::Model} ActiveModel is invalid.
-    class Invalid < Metasploit::Model::Error
-      def initialize(model)
-        @model = model
-
-        errors = @model.errors.full_messages.join(', ')
-        # Must be called model_invalid so it doesn't alias errors.messages.invalid
-        translated_message = ::I18n.translate('metasploit.model.errors.messages.model_invalid', :errors => errors)
-        super(translated_message)
-      end
-
-      attr_reader :model
-    end
+    errors = @model.errors.full_messages.join(', ')
+    # Must be called model_invalid so it doesn't alias errors.messages.invalid
+    translated_message = ::I18n.translate('metasploit.model.errors.messages.model_invalid', :errors => errors)
+    super(translated_message)
   end
-end
+
+  attr_reader :model
+end

data/lib/metasploit/model/login.rb

@@ -1,6 +1,3 @@
-require 'metasploit/model'
-
-
 # Namespace for constants used in `Metasploit::Credential::Login` that need to be accessible without
 # `metasploit-credential`
 module Metasploit::Model::Login

data/lib/metasploit/model/login/status.rb

@@ -1,5 +1,3 @@
-require 'metasploit/model/login'
-
 # Canonical `Metasploit::Credential::Login#status`.
 #
 # `Metasploit::Credential::Login#status` is restricted to values in {ALL}, so new valid values need to be added to this

data/lib/metasploit/model/module.rb

@@ -1,24 +1,20 @@
-module Metasploit
-  module Model
-    # Namespace that maps to `Mdm::Module` and `Metasploit::Framework::Module` and contains constants and mixins to
-    # DRY the implementation of the in-memory and in-database models in those namespaces.
-    module Module
-      extend ActiveSupport::Autoload
+# Namespace that maps to `Mdm::Module` and `Metasploit::Framework::Module` and contains constants and mixins to
+# DRY the implementation of the in-memory and in-database models in those namespaces.
+module Metasploit::Model::Module
+  extend ActiveSupport::Autoload
 
-      autoload :Action
-      autoload :Ancestor
-      autoload :Architecture
-      autoload :Author
-      autoload :Class
-      autoload :Handler
-      autoload :Instance
-      autoload :Path
-      autoload :Platform
-      autoload :Rank
-      autoload :Reference
-      autoload :Stance
-      autoload :Target
-      autoload :Type
-    end
-  end
-end
+  autoload :Action
+  autoload :Ancestor
+  autoload :Architecture
+  autoload :Author
+  autoload :Class
+  autoload :Handler
+  autoload :Instance
+  autoload :Path
+  autoload :Platform
+  autoload :Rank
+  autoload :Reference
+  autoload :Stance
+  autoload :Target
+  autoload :Type
+end