metasploit-model 0.27.3 → 0.27.4

data/lib/metasploit/model/translation.rb

@@ -1,5 +1,3 @@
-require 'metasploit/model'
-
 # ActiveRecord::Translation is a dirty bastard and overrides `ActiveModel::Translation#lookup_ancestors`, so that it
 # will only count superclasses, and not all ancestors.  Metasploit::Model needs the original behavior so that its
 # {Metasploit::Model::Module} modules can supply translations to both `ActiveRecord::Base` descendants in `Mdm` and

data/lib/metasploit/model/version.rb

@@ -7,7 +7,7 @@ module Metasploit
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 27
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 3
+      PATCH = 4
 
       # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/lib/metasploit/model/visitation.rb

@@ -1,11 +1,8 @@
-module Metasploit
-  module Model
-    # Namespace for `metasploit-model`'s implementation of the {http://en.wikipedia.org/wiki/Visitor_pattern visitor
-    # pattern}.
-    module Visitation
-      extend ActiveSupport::Autoload
+# Namespace for `metasploit-model`'s implementation of the {http://en.wikipedia.org/wiki/Visitor_pattern visitor
+# pattern}.
+module Metasploit::Model::Visitation
+  extend ActiveSupport::Autoload
 
-      autoload :Visit
-    end
-  end
-end
+  autoload :Visit
+  autoload :Visitor
+end

data/lib/metasploit/model/visitation/visit.rb

@@ -1,103 +1,97 @@
-module Metasploit
-  module Model
-    module Visitation
-      # {ClassMethods#visit DSL} to declare {Metasploit::Model::Visitation::Visitor visitors} for a given `Module#name`
-      # (or any Class that has an ancestor in `Class#ancestors` with that `Module#name`) and then use then to {#visit}
-      # instances of those class and/or modules.
-      module Visit
-        extend ActiveSupport::Concern
+# {ClassMethods#visit DSL} to declare {Metasploit::Model::Visitation::Visitor visitors} for a given `Module#name`
+# (or any Class that has an ancestor in `Class#ancestors` with that `Module#name`) and then use then to {#visit}
+# instances of those class and/or modules.
+module Metasploit::Model::Visitation::Visit
+  extend ActiveSupport::Concern
 
-        # Adds {#visit} DSL to class to declare {Metasploit::Model::Visitation::Visitor visitors}.
-        module ClassMethods
-          # Defines how to visit a node with one or more `Module#names` in its `Module#ancestors`.
-          #
-          # @param module_names [Array<String>] Names of class/module to be visited with block.
-          # @yield [node] Block instance_exec'd on instance of the class {#visit} was called.
-          # @yieldparam node [Object]
-          # @return [Array<Metasploit::Model::Visitation::Visitor>] visitors created.
-          # @raise [ArgumentError] if `module_names` is empty
-          # @raise [Metasploit::Model::Invalid] unless `block` is given.
-          def visit(*module_names, &block)
-            if module_names.empty?
-              raise ArgumentError,
-                    "At least one Modul#name must be passed to #{__method__} so the visitor(s) knows which Modules " \
+  # Adds {#visit} DSL to class to declare {Metasploit::Model::Visitation::Visitor visitors}.
+  module ClassMethods
+    # Defines how to visit a node with one or more `Module#names` in its `Module#ancestors`.
+    #
+    # @param module_names [Array<String>] Names of class/module to be visited with block.
+    # @yield [node] Block instance_exec'd on instance of the class {#visit} was called.
+    # @yieldparam node [Object]
+    # @return [Array<Metasploit::Model::Visitation::Visitor>] visitors created.
+    # @raise [ArgumentError] if `module_names` is empty
+    # @raise [Metasploit::Model::Invalid] unless `block` is given.
+    def visit(*module_names, &block)
+      if module_names.empty?
+        raise ArgumentError,
+              "At least one Modul#name must be passed to #{__method__} so the visitor(s) knows which Modules " \
                     "it/they can visit."
-            end
+      end
 
-            module_names.collect do |module_name|
-              visitor = Metasploit::Model::Visitation::Visitor.new(
-                  :module_name => module_name,
-                  :parent => self,
-                  &block
-              )
-              visitor.valid!
+      module_names.collect do |module_name|
+        visitor = Metasploit::Model::Visitation::Visitor.new(
+            :module_name => module_name,
+            :parent => self,
+            &block
+        )
+        visitor.valid!
 
-              visitor_by_module_name[visitor.module_name] = visitor
-            end
-          end
+        visitor_by_module_name[visitor.module_name] = visitor
+      end
+    end
 
-          # {Metasploit::Model::Visitation::Visitor Visitor} for `klass` or one of its `Class#ancestors`.
-          #
-          # @return [Metasploit::Model::Visitation::Visitor]
-          # @raise [TypeError] if there is not visitor for `klass` or one of its ancestors.
-          def visitor(klass)
-            visitor = visitor_by_module[klass]
+    # {Metasploit::Model::Visitation::Visitor Visitor} for `klass` or one of its `Class#ancestors`.
+    #
+    # @return [Metasploit::Model::Visitation::Visitor]
+    # @raise [TypeError] if there is not visitor for `klass` or one of its ancestors.
+    def visitor(klass)
+      visitor = visitor_by_module[klass]
 
-            unless visitor
-              klass.ancestors.each do |mod|
-                visitor = visitor_by_module[mod]
+      unless visitor
+        klass.ancestors.each do |mod|
+          visitor = visitor_by_module[mod]
 
-                unless visitor
-                  visitor = visitor_by_module_name[mod.name]
-                end
+          unless visitor
+            visitor = visitor_by_module_name[mod.name]
+          end
 
-                if visitor
-                  visitor_by_module[klass] = visitor
+          if visitor
+            visitor_by_module[klass] = visitor
 
-                  break
-                end
-              end
-            end
+            break
+          end
+        end
+      end
 
-            unless visitor
-              raise TypeError,
-                    "No visitor that handles #{klass} or " \
+      unless visitor
+        raise TypeError,
+              "No visitor that handles #{klass} or " \
                     "any of its ancestors (#{klass.ancestors.map(&:name).to_sentence})"
-            end
+      end
 
-            visitor
-          end
+      visitor
+    end
 
-          # Allows {Metasploit::Model::Visitation::Visitor visitors} to be looked up by Module instead of `Module#name`.
-          #
-          # @return [Hash{Class => Metasploit::Model::Visitation::Visitor}]
-          def visitor_by_module
-            @visitor_by_module ||= {}
-          end
+    # Allows {Metasploit::Model::Visitation::Visitor visitors} to be looked up by Module instead of `Module#name`.
+    #
+    # @return [Hash{Class => Metasploit::Model::Visitation::Visitor}]
+    def visitor_by_module
+      @visitor_by_module ||= {}
+    end
 
-          # Maps `Module#name` passed to {ClassMethods#visit} through :module_name to the
-          # {Metasploit::Model::Visitation::Visitor} with the `Module#name` as
-          # {Metasploit::Model::Visitation::Visitor#module_name}.
-          #
-          # @return [Hash{String => Metasploit::Model::Visitation::Visitor}]
-          def visitor_by_module_name
-            @visitor_by_module_name ||= {}
-          end
-        end
+    # Maps `Module#name` passed to {ClassMethods#visit} through :module_name to the
+    # {Metasploit::Model::Visitation::Visitor} with the `Module#name` as
+    # {Metasploit::Model::Visitation::Visitor#module_name}.
+    #
+    # @return [Hash{String => Metasploit::Model::Visitation::Visitor}]
+    def visitor_by_module_name
+      @visitor_by_module_name ||= {}
+    end
+  end
 
-        #
-        # Instance Methods
-        #
+  #
+  # Instance Methods
+  #
 
-        # Visits `node`
-        #
-        # @return (see Metasploit::Model::Visitation::Visitor#visit)
-        def visit(node)
-          visitor = self.class.visitor(node.class)
+  # Visits `node`
+  #
+  # @return (see Metasploit::Model::Visitation::Visitor#visit)
+  def visit(node)
+    visitor = self.class.visitor(node.class)
 
-          visitor.visit(self, node)
-        end
-      end
-    end
+    visitor.visit(self, node)
   end
-end
+end

data/metasploit-model.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = %w{app/models app/validators lib}
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/spec/app/models/metasploit/model/search/operation/integer_spec.rb

@@ -5,5 +5,5 @@ describe Metasploit::Model::Search::Operation::Integer do
     it { should validate_numericality_of(:value).only_integer }
   end
 
-  it_should_behave_like 'Metasploit::Model::Search::Operation::Integer::Value'
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'
 end

data/spec/app/models/metasploit/model/search/operation/set/integer_spec.rb

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe Metasploit::Model::Search::Operation::Set::Integer do
   it { should be_a Metasploit::Model::Search::Operation::Set }
 
-  it_should_behave_like 'Metasploit::Model::Search::Operation::Integer::Value'
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'
 end

data/spec/app/models/metasploit/model/search/operation/set/string_spec.rb

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe Metasploit::Model::Search::Operation::Set::String do
   it { should be_a Metasploit::Model::Search::Operation::Set }
 
-  it_should_behave_like 'Metasploit::Model::Search::Operation::String::Value'
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'
 end

data/spec/app/models/metasploit/model/search/operation/string_spec.rb

@@ -5,5 +5,5 @@ describe Metasploit::Model::Search::Operation::String do
     it { should validate_presence_of(:value) }
   end
 
-  it_should_behave_like 'Metasploit::Model::Search::Operation::String::Value'
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'
 end

data/spec/dummy/config/application.rb

@@ -3,6 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
+
 # require the engine being tested.  In a non-dummy app this would be handled by the engine's gem being in the Gemfile
 # for real app and Bundler.require requiring the gem.
 require 'metasploit/model'

data/spec/lib/metasploit/model/search/operation/{integer/value_spec.rb → value/integer_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Metasploit::Model::Search::Operation::Integer::Value do
-  it_should_behave_like 'Metasploit::Model::Search::Operation::Integer::Value' do
+describe Metasploit::Model::Search::Operation::Value::Integer do
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer' do
     let(:operation_class) do
       described_class = self.described_class
 

data/spec/lib/metasploit/model/search/operation/{string/value_spec.rb → value/string_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Metasploit::Model::Search::Operation::String::Value do
-  it_should_behave_like 'Metasploit::Model::Search::Operation::String::Value' do
+describe Metasploit::Model::Search::Operation::Value::String do
+  it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String' do
     let(:operation_class) do
       described_class = self.described_class
 

data/spec/support/shared/examples/metasploit/model/search/operation/{integer/value.rb → value/integer.rb}

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Model::Search::Operation::Integer::Value' do
+shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
   let(:operation_class) do
     described_class
   end
@@ -8,7 +8,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Integer::Value' do
       operation_class
     end
 
-    it { should include Metasploit::Model::Search::Operation::Integer::Value }
+    it { should include Metasploit::Model::Search::Operation::Value::Integer }
   end
 
   context '#value' do

data/spec/support/shared/examples/metasploit/model/search/operation/{string/value.rb → value/string.rb}

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Model::Search::Operation::String::Value' do
+shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
   let(:operation_class) do
     described_class
   end
@@ -8,7 +8,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::String::Value' do
       operation_class
     end
 
-    it { should include Metasploit::Model::Search::Operation::String::Value }
+    it { should include Metasploit::Model::Search::Operation::Value::String }
   end
 
   context '#value' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.27.4
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,8 +216,9 @@ files:
 - lib/metasploit/model/search/group.rb
 - lib/metasploit/model/search/operation.rb
 - lib/metasploit/model/search/operation/group.rb
-- lib/metasploit/model/search/operation/integer/value.rb
-- lib/metasploit/model/search/operation/string/value.rb
+- lib/metasploit/model/search/operation/value.rb
+- lib/metasploit/model/search/operation/value/integer.rb
+- lib/metasploit/model/search/operation/value/string.rb
 - lib/metasploit/model/search/operator.rb
 - lib/metasploit/model/search/operator/deprecated.rb
 - lib/metasploit/model/search/operator/group.rb
@@ -416,8 +417,8 @@ files:
 - spec/lib/metasploit/model/search/association/tree_spec.rb
 - spec/lib/metasploit/model/search/association_spec.rb
 - spec/lib/metasploit/model/search/attribute_spec.rb
-- spec/lib/metasploit/model/search/operation/integer/value_spec.rb
-- spec/lib/metasploit/model/search/operation/string/value_spec.rb
+- spec/lib/metasploit/model/search/operation/value/integer_spec.rb
+- spec/lib/metasploit/model/search/operation/value/string_spec.rb
 - spec/lib/metasploit/model/search/operation_spec.rb
 - spec/lib/metasploit/model/search/operator/help_spec.rb
 - spec/lib/metasploit/model/search/with_spec.rb
@@ -463,8 +464,8 @@ files:
 - spec/support/shared/examples/metasploit/model/platform.rb
 - spec/support/shared/examples/metasploit/model/real_pathname.rb
 - spec/support/shared/examples/metasploit/model/reference.rb
-- spec/support/shared/examples/metasploit/model/search/operation/integer/value.rb
-- spec/support/shared/examples/metasploit/model/search/operation/string/value.rb
+- spec/support/shared/examples/metasploit/model/search/operation/value/integer.rb
+- spec/support/shared/examples/metasploit/model/search/operation/value/string.rb
 - spec/support/shared/examples/metasploit/model/search/operator/help.rb
 - spec/support/shared/examples/metasploit/model/translation.rb
 - spec/support/shared/examples/search/query.rb
@@ -496,6 +497,8 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
+- app/models
+- app/validators
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
@@ -509,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Metasploit Model Mixins and Validators
@@ -694,8 +697,8 @@ test_files:
 - spec/lib/metasploit/model/search/association/tree_spec.rb
 - spec/lib/metasploit/model/search/association_spec.rb
 - spec/lib/metasploit/model/search/attribute_spec.rb
-- spec/lib/metasploit/model/search/operation/integer/value_spec.rb
-- spec/lib/metasploit/model/search/operation/string/value_spec.rb
+- spec/lib/metasploit/model/search/operation/value/integer_spec.rb
+- spec/lib/metasploit/model/search/operation/value/string_spec.rb
 - spec/lib/metasploit/model/search/operation_spec.rb
 - spec/lib/metasploit/model/search/operator/help_spec.rb
 - spec/lib/metasploit/model/search/with_spec.rb
@@ -741,8 +744,8 @@ test_files:
 - spec/support/shared/examples/metasploit/model/platform.rb
 - spec/support/shared/examples/metasploit/model/real_pathname.rb
 - spec/support/shared/examples/metasploit/model/reference.rb
-- spec/support/shared/examples/metasploit/model/search/operation/integer/value.rb
-- spec/support/shared/examples/metasploit/model/search/operation/string/value.rb
+- spec/support/shared/examples/metasploit/model/search/operation/value/integer.rb
+- spec/support/shared/examples/metasploit/model/search/operation/value/string.rb
 - spec/support/shared/examples/metasploit/model/search/operator/help.rb
 - spec/support/shared/examples/metasploit/model/translation.rb
 - spec/support/shared/examples/search/query.rb