metasploit-model 0.25.7-java → 0.26.1-java

data/spec/lib/metasploit/model/search/association_spec.rb

@@ -10,24 +10,113 @@ describe Metasploit::Model::Search::Association do
   end
 
   context 'search_association' do
-    it 'should add Symbol to search_association_set' do
-      association_string = 'associated_things'
+    subject(:search_association) {
+      base_class.search_association association
+    }
 
-      base_class.class_eval do
-        search_association association_string
+    let(:association) {
+      :root_association
+    }
+
+    context 'with previous call to search_association with same association' do
+      before(:each) do
+        base_class.search_association association
+      end
+
+      it 'does not change search_association_tree' do
+        expect {
+          search_association
+        }.not_to change(base_class, :search_association_tree)
       end
+    end
 
-      base_class.search_association_set.should include(association_string.to_sym)
+    context 'with association tree rooted on association' do
+      before(:each) do
+        base_class.search_associations association => :child_association
+      end
+
+      it 'leaves the original association tree in place' do
+        expect {
+          search_association
+        }.not_to change(base_class, :search_association_tree)
+      end
+    end
+
+    context 'without association in search_association_tree' do
+      it 'adds association to search_association_tree with nil children' do
+        search_association
+
+        search_association_tree = base_class.search_association_tree
+
+        expect(search_association_tree).to have_key(association)
+        expect(search_association_tree[association]).to be_nil
+      end
     end
   end
 
-  context 'search_association_set' do
-    let(:search_association_set) do
-      base_class.search_association_set
+  context 'search_associations' do
+    subject(:search_associations) {
+      base_class.search_associations *associations
+    }
+
+    let(:associations) {
+      [
+        :association
+      ]
+    }
+
+    let(:expanded_associations) {
+      {
+          association: nil
+      }
+    }
+
+    it 'expands associations' do
+      expect(Metasploit::Model::Association::Tree).to receive(:expand).with(associations).and_return(
+                                                          expanded_associations
+                                                      )
+
+      search_associations
+    end
+
+    it 'merges the expanded associations with the current search_association_tree' do
+      expect(Metasploit::Model::Association::Tree).to receive(:expand).and_return(expanded_associations)
+
+      search_association_tree = {preexisting: nil}
+      expect(base_class).to receive(:search_association_tree).and_return(search_association_tree)
+
+      expect(Metasploit::Model::Association::Tree).to receive(:merge).with(
+                                                          search_association_tree,
+                                                          expanded_associations
+                                                      )
+
+      search_associations
     end
+  end
+
+  context 'search_association_operators' do
+    subject(:search_association_operators) {
+      base_class.search_association_operators
+    }
+
+    let(:search_association_tree) {
+      {
+          parent: {
+              child: nil
+          }
+      }
+    }
+
+    it 'converts search_association_tree to operators' do
+      expect(base_class).to receive(:search_association_tree).and_return(search_association_tree)
+      expect(Metasploit::Model::Association::Tree).to receive(:operators).with(
+                                                          search_association_tree,
+                                                          hash_including(
+                                                              class: base_class
+                                                          )
+                                                      )
 
-    it 'should default to an empty Set' do
-      search_association_set.should == Set.new
+      search_association_operators
     end
   end
 end

data/spec/lib/metasploit/model/search_spec.rb

@@ -52,139 +52,80 @@ describe Metasploit::Model::Search do
     end
 
     context 'with search association' do
+      let(:associated_attribute) do
+        :association_name
+      end
+
       let(:association) do
         :associated_things
       end
 
+      let(:association_class) do
+        Class.new
+      end
+
+      let(:class_name) do
+        'AssociatedThing'
+      end
+
       before(:each) do
         base_class.search_association association
+        base_class.send(:include, Metasploit::Model::Association)
+
+        stub_const(class_name, association_class)
+
+        # Include after stub so search_i18n_scope can use Class#name without error
+        association_class.send(:include, Metasploit::Model::Search)
+        association_class.search_attribute associated_attribute, :type => :string
+
+        base_class.association association, :class_name => class_name
       end
 
-      context 'with reflect_on_association' do
-        before(:each) do
-          base_class.send(:include, Metasploit::Model::Association)
+      context 'operator' do
+        subject(:operator) do
+          search_operator_by_name[expected_name]
+        end
+
+        let(:expected_name) do
+          "#{association}.#{associated_attribute}".to_sym
         end
 
-        context 'with association' do
-          let(:associated_attribute) do
-            :association_name
-          end
+        it { should be_a Metasploit::Model::Search::Operator::Association }
 
-          let(:association_class) do
-            Class.new
+        context 'association' do
+          subject(:operator_association) do
+            operator.association
           end
 
-          let(:class_name) do
-            'AssociatedThing'
+          it 'should be the registered association' do
+            operator_association.should == association
           end
+        end
 
-          before(:each) do
-            stub_const(class_name, association_class)
-
-            # Include after stub so search_i18n_scope can use Class#name without error
-            association_class.send(:include, Metasploit::Model::Search)
-            association_class.search_attribute associated_attribute, :type => :string
+        context 'source_operator' do
+          subject(:source_operator) do
+            operator.source_operator
+          end
 
-            base_class.association association, :class_name => class_name
+          let(:direct_attribute_operator) do
+            association_class.search_operator_by_name.values.first
           end
 
-          context 'operator' do
-            subject(:operator) do
-              search_operator_by_name[expected_name]
-            end
-
-            let(:expected_name) do
-              "#{association}.#{associated_attribute}".to_sym
-            end
-
-            it { should be_a Metasploit::Model::Search::Operator::Association }
-
-            context 'association' do
-              subject(:operator_association) do
-                operator.association
-              end
-
-              it 'should be the registered association' do
-                operator_association.should == association
-              end
-            end
-
-            context 'attribute_operator' do
-              subject(:indirect_attribute_operator) do
-                operator.attribute_operator
-              end
-
-              let(:direct_attribute_operator) do
-                association_class.search_operator_by_name.values.first
-              end
-
-              it 'should be operator from associated class' do
-                indirect_attribute_operator.should == direct_attribute_operator
-              end
-            end
-
-            context 'klass' do
-              subject(:klass) do
-                operator.klass
-              end
-
-              it 'should be class that called search_operator_by_name' do
-                klass.should == base_class
-              end
-            end
+          it 'should be operator from associated class' do
+            source_operator.should == direct_attribute_operator
           end
         end
 
-        context 'without association' do
-          it 'should raise Metasploit::Model::Association::Error' do
-            expect {
-              search_operator_by_name
-            }.to raise_error(Metasploit::Model::Association::Error)
+        context 'klass' do
+          subject(:klass) do
+            operator.klass
           end
 
-          context 'error' do
-            let(:error) do
-              begin
-                search_operator_by_name
-              rescue Metasploit::Model::Association::Error => error
-                error
-              end
-            end
-
-            context 'model' do
-              subject(:model) do
-                error.model
-              end
-
-              it 'should be class on which search_operator_by_name was called' do
-                model.should == base_class
-              end
-            end
-
-            context 'name' do
-              subject(:name) do
-                error.name
-              end
-
-              it 'should be association name' do
-                name.should == association
-              end
-            end
+          it 'should be class that called search_operator_by_name' do
+            klass.should == base_class
           end
         end
       end
-
-      context 'without reflect_on_association' do
-        it 'should raise ArgumentError' do
-          expect {
-            search_operator_by_name
-          }.to raise_error(
-                   NameError,
-                   "#{base_class} does not respond to reflect_on_association.  " \
-                     "It can be added to ActiveModels by including Metasploit::Model::Association into the class."
-               )
-        end
-      end
     end
 
     context 'with search with' do

data/spec/support/shared/examples/search/query/metasploit/model/search/operator/deprecated/authority.rb

@@ -37,7 +37,19 @@ shared_examples_for 'search query with Metasploit::Model::Search::Operator::Depr
           operation_with_formatted_operator('authorities.abbreviation')
         end
 
-        its(:value) { should == formatted_operator }
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
+
+          context 'Metasploit::Model::Search::Operation::Base#value' do
+            subject(:value) {
+              source_operation.value
+            }
+
+            it { should == formatted_operator }
+          end
+        end
       end
 
       context 'references.designation' do
@@ -45,13 +57,13 @@ shared_examples_for 'search query with Metasploit::Model::Search::Operator::Depr
           operation_with_formatted_operator('references.designation')
         end
 
-        context 'value' do
-          subject(:value) do
-            operation.value
-          end
+        context 'Metasploit::Model::Search::Operation::Association#source_operation' do
+          subject(:source_operation) {
+            operation.source_operation
+          }
 
-          it 'should be formatted value' do
-            value.should == formatted_value
+          it 'uses formatted value for value' do
+            expect(source_operation.value).to eq(formatted_value)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.25.7
+  version: 0.26.1
 platform: java
 authors:
 - Luke Imhoff
@@ -105,6 +105,7 @@ files:
 - app/models/metasploit/model/search/group/base.rb
 - app/models/metasploit/model/search/group/intersection.rb
 - app/models/metasploit/model/search/group/union.rb
+- app/models/metasploit/model/search/operation/association.rb
 - app/models/metasploit/model/search/operation/base.rb
 - app/models/metasploit/model/search/operation/boolean.rb
 - app/models/metasploit/model/search/operation/date.rb
@@ -146,6 +147,7 @@ files:
 - lib/metasploit/model/architecture.rb
 - lib/metasploit/model/association.rb
 - lib/metasploit/model/association/error.rb
+- lib/metasploit/model/association/tree.rb
 - lib/metasploit/model/author.rb
 - lib/metasploit/model/authority.rb
 - lib/metasploit/model/authority/bid.rb
@@ -224,6 +226,7 @@ files:
 - spec/app/models/metasploit/model/search/group/base_spec.rb
 - spec/app/models/metasploit/model/search/group/intersection_spec.rb
 - spec/app/models/metasploit/model/search/group/union_spec.rb
+- spec/app/models/metasploit/model/search/operation/association_spec.rb
 - spec/app/models/metasploit/model/search/operation/base_spec.rb
 - spec/app/models/metasploit/model/search/operation/boolean_spec.rb
 - spec/app/models/metasploit/model/search/operation/date_spec.rb
@@ -398,6 +401,7 @@ files:
 - spec/lib/metasploit/model/platform_spec.rb
 - spec/lib/metasploit/model/realm/key_spec.rb
 - spec/lib/metasploit/model/reference_spec.rb
+- 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
@@ -496,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: Metasploit Model Mixins and Validators
@@ -508,6 +512,7 @@ test_files:
 - spec/app/models/metasploit/model/search/group/base_spec.rb
 - spec/app/models/metasploit/model/search/group/intersection_spec.rb
 - spec/app/models/metasploit/model/search/group/union_spec.rb
+- spec/app/models/metasploit/model/search/operation/association_spec.rb
 - spec/app/models/metasploit/model/search/operation/base_spec.rb
 - spec/app/models/metasploit/model/search/operation/boolean_spec.rb
 - spec/app/models/metasploit/model/search/operation/date_spec.rb
@@ -682,6 +687,7 @@ test_files:
 - spec/lib/metasploit/model/platform_spec.rb
 - spec/lib/metasploit/model/realm/key_spec.rb
 - spec/lib/metasploit/model/reference_spec.rb
+- 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