metasploit-model 0.25.7-java → 0.26.1-java

data/lib/metasploit/model/version.rb

@@ -5,9 +5,9 @@ module Metasploit
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 25
+      MINOR = 26
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 7
+      PATCH = 1
 
       # 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/spec/app/models/metasploit/model/search/operation/association_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Association do
+  subject(:operation) {
+    described_class.new(
+        source_operation: source_operation
+    )
+  }
+
+  let(:source_operation) {
+    nil
+  }
+
+  context 'validation' do
+    before(:each) do
+      operation.valid?
+    end
+
+    context 'errors on #source_operation' do
+      subject(:source_operation_errors) {
+        operation.errors[:source_operation]
+      }
+
+      let(:invalid_error) {
+        I18n.translate!('errors.messages.invalid')
+      }
+
+      context 'with #source_operation' do
+        let(:source_operation) {
+          double('#source_operation', valid?: valid)
+        }
+
+        context 'with valid' do
+          let(:valid) {
+            true
+          }
+
+          it { should_not include(invalid_error) }
+        end
+
+        context 'without valid' do
+          let(:valid) {
+            false
+          }
+
+          it { should include(invalid_error) }
+        end
+      end
+
+      context 'without #source_operation' do
+        let(:blank_error) {
+          I18n.translate!('errors.messages.blank')
+        }
+
+        let(:source_operation) {
+          nil
+        }
+
+        it { should include(blank_error) }
+        it { should_not include(invalid_error) }
+      end
+    end
+  end
+
+  it { should_not respond_to :value }
+  it { should_not respond_to :value= }
+end

data/spec/app/models/metasploit/model/search/operator/association_spec.rb

@@ -1,108 +1,108 @@
 require 'spec_helper'
 
 describe Metasploit::Model::Search::Operator::Association do
-  it { should be_a Metasploit::Model::Search::Operator::Single }
+  subject(:operator) do
+    described_class.new(
+        :association => association,
+        :source_operator => source_operator
+    )
+  end
+
+  let(:association) do
+    FactoryGirl.generate :metasploit_model_search_operator_association_association
+  end
+
+  let(:source_operator) do
+    double('Metasploit::Model::Search::Operator::Base')
+  end
+
+  it { should be_a Metasploit::Model::Search::Operator::Base }
 
   context 'validations' do
     it { should validate_presence_of(:association) }
-    it { should validate_presence_of(:attribute_operator) }
+    it { should validate_presence_of(:source_operator) }
   end
 
-  context 'delegate :to  => attribute_operator' do
-    let(:association) do
-      FactoryGirl.generate :metasploit_model_search_operator_association_association
+  context '#help' do
+    subject(:help) do
+      operator.help
     end
 
-    let(:association_operator) do
-      described_class.new(
-          :association => association,
-          :attribute_operator => attribute_operator
-      )
-    end
+    it 'should delegate to #source_operator' do
+      expect(source_operator).to receive(:help)
 
-    let(:attribute_operator) do
-      double('Metasploit::Model::Search::Operator::Attribute')
+      help
     end
+  end
 
-    context '#attribute' do
-      subject(:attribute) do
-        association_operator.attribute
-      end
-
-      it 'should delegate to #attribute_operator' do
-        attribute_operator.should_receive(:attribute)
-
-        attribute
-      end
+  context '#name' do
+    subject(:name) do
+      operator.name
     end
 
-    context '#attribute_set' do
-      subject(:attribute_set) do
-        association_operator.attribute_set
-      end
-
-      it 'should delegate to #attribute_operator' do
-        attribute_operator.should_receive(:attribute_set)
+    let(:source_operator) {
+      double(
+          'Metasploit::Model::Search::Operator::Base',
+          name: source_operator_name
+      )
+    }
 
-        attribute_set
-      end
-    end
+    let(:source_operator_name) {
+      'source_operator_name'
+    }
 
-    context '#help' do
-      subject(:help) do
-        association_operator.help
-      end
-
-      it 'should delegate to #attribute_operator' do
-        attribute_operator.should_receive(:help)
+    it { should be_a Symbol }
 
-        help
-      end
+    it 'should be <association>.<source_operator.name>' do
+      expect(name).to eq :"#{association}.#{source_operator_name}"
     end
+  end
 
-    context '#type' do
-      subject(:type) do
-        association_operator.type
-      end
+  context '#operate_on' do
+    subject(:operate_on) {
+      operator.operate_on(formatted_value)
+    }
 
-      it 'should delegate to #attribute_operator' do
-        attribute_operator.should_receive(:type)
+    #
+    # lets
+    #
 
-        type
-      end
-    end
-  end
+    let(:expected_source_operation) {
+      double('source operation')
+    }
 
-  context '#name' do
-    subject(:name) do
-      association_operator.name
-    end
+    let(:formatted_value) {
+      'formatted-value'
+    }
 
-    let(:association) do
-      FactoryGirl.generate :metasploit_model_search_operator_association_association
-    end
+    let(:source_operator) {
+      super().tap { |source_operator|
+        expect(source_operator).to receive(:operate_on).with(formatted_value).and_return(expected_source_operation)
+      }
+    }
 
-    let(:association_operator) do
-      described_class.new(
-          :association => association,
-          :attribute_operator => attribute_operator
-      )
-    end
+    it { should be_a Metasploit::Model::Search::Operation::Association }
 
-    let(:attribute) do
-      FactoryGirl.generate :metasploit_model_search_operator_attribute_attribute
-    end
+    context 'Metasploit::Model::Search::Operation::Association' do
+      context '#operator' do
+        subject(:operation_operator) {
+          operate_on.operator
+        }
 
-    let(:attribute_operator) do
-      Metasploit::Model::Search::Operator::Attribute.new(
-          :attribute => attribute
-      )
-    end
+        it 'is this association operator' do
+          expect(operation_operator).to eq(operator)
+        end
+      end
 
-    it { should be_a Symbol }
+      context '#source_operation' do
+        subject(:source_operation) {
+          operate_on.source_operation
+        }
 
-    it 'should be <association>.<attribute>' do
-      name.to_s.should == "#{association}.#{attribute}"
+        it 'is operation from Metasploit::Model::Search::Operator::Association#source_operator' do
+          expect(source_operation).to eq(expected_source_operation)
+        end
+      end
     end
   end
 end

data/spec/app/models/metasploit/model/search/operator/deprecated/author_spec.rb

@@ -23,8 +23,8 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
     let(:authors_name_operator) do
       Metasploit::Model::Search::Operator::Association.new(
           :association => :authors,
-          :attribute_operator => name_operator,
-          :klass => klass
+          :klass => klass,
+          :source_operator => name_operator
       )
     end
 
@@ -43,16 +43,16 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
     let(:email_addresses_domain_operator) do
       Metasploit::Model::Search::Operator::Association.new(
           :association => :email_addresses,
-          :attribute_operator => domain_operator,
-          :klass => klass
+          :klass => klass,
+          :source_operator => domain_operator
       )
     end
 
     let(:email_addresses_local_operator) do
       Metasploit::Model::Search::Operator::Association.new(
           :association => :email_addresses,
-          :attribute_operator => local_operator,
-          :klass => klass
+          :klass => klass,
+          :source_operator => local_operator
       )
     end
 
@@ -96,8 +96,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('authors.name')
         end
 
-        it 'should use entire formatted value' do
-          operation.value.should == formatted_value
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it 'uses entire formatted value' do
+            expect(source_operation.value).to eq(formatted_value)
+          end
         end
       end
 
@@ -106,8 +112,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('email_addresses.domain')
         end
 
-        it "should use portion of formatted value after '@'" do
-          operation.value.should == domain
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it "uses portion of formatted value after '@'" do
+            expect(source_operation.value).to eq(domain)
+          end
         end
       end
 
@@ -116,8 +128,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('email_addresses.local')
         end
 
-        it "should use portion of formated value before '@'" do
-          operation.value.should == local
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it "uses portion of formated value before '@'" do
+            expect(source_operation.value).to eq(local)
+          end
         end
       end
     end
@@ -132,8 +150,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('authors.name')
         end
 
-        it 'should use entire formatted value' do
-          operation.value.should == formatted_value
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it 'uses entire formatted value' do
+            expect(source_operation.value).to eq(formatted_value)
+          end
         end
       end
 
@@ -142,8 +166,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('email_addresses.domain')
         end
 
-        it 'should use entire formatted value' do
-          operation.value.should == formatted_value
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it 'uses entire formatted value' do
+            expect(source_operation.value).to eq(formatted_value)
+          end
         end
       end
 
@@ -152,8 +182,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
           child('email_addresses.local')
         end
 
-        it 'should use entire formatted value' do
-          operation.value.should == formatted_value
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          it 'uses entire formatted value' do
+            expect(source_operation.value).to eq(formatted_value)
+          end
         end
       end
     end

data/spec/app/models/metasploit/model/search/operator/deprecated/authority_spec.rb

@@ -66,8 +66,8 @@ describe Metasploit::Model::Search::Operator::Deprecated::Authority do
     let(:authorities_abbreviation_operator) do
       Metasploit::Model::Search::Operator::Association.new(
           :association => :authorities,
-          :attribute_operator => abbreviation_operator,
-          :klass => klass
+          :klass => klass,
+          :source_operator => abbreviation_operator
       )
     end
 
@@ -90,8 +90,8 @@ describe Metasploit::Model::Search::Operator::Deprecated::Authority do
     let(:references_designation_operator) do
       Metasploit::Model::Search::Operator::Association.new(
           :association => :references,
-          :attribute_operator => designation_operator,
-          :klass => klass
+          :klass => klass,
+          :source_operator => designation_operator
       )
     end
 
@@ -105,8 +105,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Authority do
         operation_named('authorities.abbreviation')
       end
 
-      it 'should use #abbrevation for value' do
-        operation.value.should == abbreviation
+      context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+        subject(:source_operation) {
+          operation.source_operation
+        }
+
+        it 'uses #abbreviation for value' do
+          expect(source_operation.value).to eq(abbreviation)
+        end
       end
     end
 
@@ -115,8 +121,14 @@ describe Metasploit::Model::Search::Operator::Deprecated::Authority do
         operation_named('references.designation')
       end
 
-      it 'should use formatted value for value' do
-        operation.value.should == formatted_value
+      context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+        subject(:source_operation) {
+          operation.source_operation
+        }
+
+        it 'uses formatted value for value' do
+          expect(source_operation.value).to eq(formatted_value)
+        end
       end
     end
   end