metasploit-model 0.24.1 → 0.25.1.pre.metasploit.pre.model.pre.search.pre.operator.pre.and.pre.operation.pre.groups

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE2M2IyZmM0ZTc5ODc3MjA3MGI3ODcwMzIwYjM1YjQ2ZDQ2NDMyYQ==
+    NGRmNzk4ODM0OTMzZmUwMDYxNzc4NDcxZGVkODZlODI5YTliMDE3Mw==
   data.tar.gz: !binary |-
-    OTM2Yzk0NzhlMmY2YjNiYmNmYjVjZjIyMTQxNTVmMmMwMjhkM2I2OA==
+    MWJjZGNlNDE3NjZiMGYyY2NmMDU1MzgwMmY4MzA0YzE4NTcyOGY5Yg==
 SHA512:
   metadata.gz: !binary |-
-    MTgxMGFjY2I5YTMyMjQwY2M4YTljOTc4OWM2Y2UzOGFhOTY0MTYyMjUwZmVl
-    ODBjNjNkNjU5MjJjNjc5YjY3ODdlOGYyNDgzMDNmZTVlZTFlNTA3NmQ5YmQ5
-    YzZhZGUzMDY5NTQzMzY3Njc4YzJmOTY1OTJiODljN2UzZGI3NzU=
+    NTkwNThiYzNkZWU4NDIwZjNhNGE1NzJhM2EzMWI4NjczNmM0Yzg5MGYwZmE5
+    Y2YxNWQwODVlZGQyODE2YWMyY2FiNGYzNzU5NGJkZTI0NGFmYzhkNzI3NDUx
+    YThiMjZiNjJkMDNlNTRlNzkwNmZhMGYxNmViYzRiZTgzNzBkZDA=
   data.tar.gz: !binary |-
-    OThkZTM0OWYxNmQ5MzI3MTlhMzNlZTYzOGI3OTYxN2FmZGRiMjAzMDhlYWI4
-    MmFhNGQ1NGVlNmNhMjYyZTIwNzlmNGE2Y2MxNzZmMmY3NzY1NjBlNDMyZmMw
-    ZjEwYmY1ZjhmNDc3OTQ4OWE0NmEzZWM3ZWJlODk4MjAzMDdiMGQ=
+    OTUyYmExODZjNzc4YTcyNTc3MzdmYjQxZmI5ODJjZDRjYjNhOTU2YzA0MGI3
+    OTVhOGVkODg3MWRjYzBmMTA3YjZhNmJkYTBlMTIxYTRjMDEwZWFiNDA1YmY0
+    MzQ1NjhhZTcwNThjOWU0ZGY5MGE2OTJiNWRmMjZlN2E4NjllNDg=

data/app/models/metasploit/model/search/operation/{union.rb → group/base.rb}

@@ -1,6 +1,6 @@
-# A union of one or more {#children child operations} from an operator's `#operate_on`, should be visited the same as
+# A group of one or more {#children child operations} from an operator's `#operate_on`, should be visited the same as
 # {Metasploit::Model::Search::Group::Base}.
-class Metasploit::Model::Search::Operation::Union < Metasploit::Model::Search::Operation::Base
+class Metasploit::Model::Search::Operation::Group::Base < Metasploit::Model::Search::Operation::Base
   #
   # Attributes
   #

data/app/models/metasploit/model/search/operation/group/intersection.rb

@@ -0,0 +1,4 @@
+# An intersection of one or more {Metasploit::Model::Search::Operation::Group::Base#children child operations} from an
+# operator's `#operate_on`, should be visited the same as {Metasploit::Model::Search::Group::Base}.
+class Metasploit::Model::Search::Operation::Group::Intersection < Metasploit::Model::Search::Operation::Group::Base
+end

data/app/models/metasploit/model/search/operation/group/union.rb

@@ -0,0 +1,4 @@
+# A union of one or more {Metasploit::Model::Search::Operation::Group::Base#children child operations} from an
+# operator's `#operate_on`, should be visited the same as {Metasploit::Model::Search::Group::Base}.
+class Metasploit::Model::Search::Operation::Group::Union < Metasploit::Model::Search::Operation::Group::Base
+end

data/app/models/metasploit/model/search/operator/deprecated/author.rb

@@ -1,7 +1,7 @@
 # Operator that emulates the behavior of 'author' operator that could search `Mdm::Module::Detail` by making
-# {Metasploit::Model::Search::Operation::Union} between `authors.name`, `email_addresss.domain`, and
+# {Metasploit::Model::Search::Operation::Group::Union} between `authors.name`, `email_addresss.domain`, and
 # `email_addresses.local`.
-class Metasploit::Model::Search::Operator::Deprecated::Author < Metasploit::Model::Search::Operator::Union
+class Metasploit::Model::Search::Operator::Deprecated::Author < Metasploit::Model::Search::Operator::Group::Union
   # Turns author:<formatted_value> into Array of authors.name:<formatted_value>,
   # email_addresses.domain:<formatted_value>, and email_addresses.local:<formatted_value> operations.  If there is an
   # '@' in `formatted_value`, then the portion of `formatted_value` before the '@' is used for `email_addresses.local`

data/app/models/metasploit/model/search/operator/deprecated/platform.rb

@@ -1,6 +1,6 @@
 # Translates `<name>:<value>` to the union of `platforms.name:<value>` and `targets.name:<value>` in order to support
 # the `os` and `platform` operators.
-class Metasploit::Model::Search::Operator::Deprecated::Platform < Metasploit::Model::Search::Operator::Union
+class Metasploit::Model::Search::Operator::Deprecated::Platform < Metasploit::Model::Search::Operator::Group::Union
   #
   # CONSTANTS
   #

data/app/models/metasploit/model/search/operator/deprecated/ref.rb

@@ -1,6 +1,6 @@
 # Translates `ref:<value>` to union of `authorities.abbreviation:<value>`, `references.designation:<value>`, and
 # `references.designation:<value>`.
-class Metasploit::Model::Search::Operator::Deprecated::Ref < Metasploit::Model::Search::Operator::Union
+class Metasploit::Model::Search::Operator::Deprecated::Ref < Metasploit::Model::Search::Operator::Group::Union
   # Array of `authorities.abbreviation:<formatted_value>`, `references.designation:<formatted_value>`, and
   # `references.url:<formatted_value>`.  If `formatted_value` contains a '-' then the portion of `formatted_value`
   # before '-' is treated is passed to `authorities.abbreviation` and the portion of `formatted_value` after '-' is

data/app/models/metasploit/model/search/operator/deprecated/text.rb

@@ -1,11 +1,11 @@
 # Search the equivalent of the text fields from `Mdm::Module::Detail` and its associations, making a union of
 # `description`, `name`, `actions.name`, `architectures.abbreviation`, `platform`, and `ref`.
-class Metasploit::Model::Search::Operator::Deprecated::Text < Metasploit::Model::Search::Operator::Union
+class Metasploit::Model::Search::Operator::Deprecated::Text < Metasploit::Model::Search::Operator::Group::Union
   #
   # CONSTANTS
   #
 
-  # Names of operators that are unioned together for {Metasploit::Model::Search::Operator::Union#operate_on}.
+  # Names of operators that are unioned together for {Metasploit::Model::Search::Operator::Group::Union#operate_on}.
   OPERATOR_NAMES = [
       'description',
       'name',

data/app/models/metasploit/model/search/operator/group/base.rb

@@ -0,0 +1,77 @@
+# Operator that {#operate_on produces} {Metasploit::Model::Search::Operation::Group::Base group operations}.
+class Metasploit::Model::Search::Operator::Group::Base < Metasploit::Model::Search::Operator::Delegation
+  #
+  # Class Attributes
+  #
+
+  # @!method self.operation_class_name()
+  #   The name of the {operation_class}.
+  #
+  #   @return [String]
+  #
+  # @!method self.operation_class_name=(operation_class_name)
+  #   Set the name of the {operation_class}.
+  #
+  #   @param operation_class_name [String]
+  #   @return [void]
+  class_attribute :operation_class_name
+
+  #
+  # Class Methods
+  #
+
+  # {Metasploit::Model::Search::Operation::Group::Base Group operation class} to wrap {#children} in and return from
+  # {#operate_on}.
+  #
+  # @return [Class<Metasploit::Model::Search::Operation::Group::Base>]
+  def self.operation_class
+    @operation_class ||= operation_class_name.constantize
+  end
+
+  # Sets the {operation_class_name} to the operation with same name as this operator, but with 'Operation' substituted
+  # for 'Operator'.
+  #
+  # @return (see operation_class_name=)
+  def self.operation_class_name!
+    self.operation_class_name = name.gsub('Operator', 'Operation')
+  end
+
+  operation_class_name!
+
+  #
+  # Instance Methods
+  #
+
+  # {Metasploit::Model::Search::Operation::Group::Base#children}.
+  #
+  # @param formatted_value [String] value parsed from formatted operation
+  # @return [Array<Metasploit::Model::Search::Operation::Base>]
+  def children(formatted_value)
+    raise NotImplementedError
+  end
+
+  # (see operation_class)
+  def operation_class
+    self.class.operation_class
+  end
+
+  # Group's children operating on `formatted_value`.
+  #
+  # @param formatted_value [String] value parsed from formatted operation.
+  # @return [Metasploit::Model::Search::Operation::Group::Base] {#operation_class} instance will not contain {#children}
+  #   that are invalid.
+  def operate_on(formatted_value)
+    children = self.children(formatted_value)
+
+    # filter children for validity as valid values for one child won't necessarily be valid values for another child.
+    # this is specifically a problem with Metasploit::Model::Search::Operation::Set as no partial matching is allowed,
+    # but can also be a problem with string vs integer operations.
+    valid_children = children.select(&:valid?)
+
+    operation_class.new(
+        :children => valid_children,
+        :operator => self,
+        :value => formatted_value
+    )
+  end
+end

data/app/models/metasploit/model/search/operator/group/intersection.rb

@@ -0,0 +1,5 @@
+# Operator that {Metasploit::Model::Search::Operator::Group::Base#operate_on produces}
+# {Metasploit::Model::Search::Operation::Group::Intersection intersection operations}.
+class Metasploit::Model::Search::Operator::Group::Intersection < Metasploit::Model::Search::Operator::Group::Base
+  operation_class_name!
+end

data/app/models/metasploit/model/search/operator/group/union.rb

@@ -0,0 +1,5 @@
+# Operator that {Metasploit::Model::Search::Operator::Group::Base#operate_on produces}
+# {Metasploit::Model::Search::Operation::Group::Union union operations}.
+class Metasploit::Model::Search::Operator::Group::Union < Metasploit::Model::Search::Operator::Group::Base
+  operation_class_name!
+end

data/config/locales/en.yml

@@ -186,7 +186,7 @@ en:
               value:
                 inclusion: "is not part of the set (%{set})"
 
-          metasploit/model/search/operation/union:
+          metasploit/model/search/operation/group/base:
             attributes:
               children:
                 too_short: "is too short (minimum is %{count} child)"

data/lib/metasploit/model/version.rb

@@ -5,9 +5,11 @@ module Metasploit
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 24
+      MINOR = 25
       # The patch number, scoped to the {MINOR} version number.
       PATCH = 1
+      # The prerelease version number, scoped to the {PATCH} version number.
+      PRERELEASE = 'metasploit-model-search-operator-and-operation-groups'
 
       # 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/metasploit-model.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
 
   # documentation
-  spec.add_development_dependency 'yard'
+  # 0.8.7.4 has a bug where attribute setters show up as undocumented
+  spec.add_development_dependency 'yard', '< 0.8.7.4'
 
   # Dependency loading
   spec.add_runtime_dependency 'activesupport'

data/spec/app/models/metasploit/model/search/operation/{union_spec.rb → group/base_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Metasploit::Model::Search::Operation::Union do
-  subject(:union) do
+describe Metasploit::Model::Search::Operation::Group::Base do
+  subject(:group) do
     described_class.new
   end
 
@@ -13,7 +13,7 @@ describe Metasploit::Model::Search::Operation::Union do
 
       context '#children_valid' do
         subject(:children_valid) do
-          union.send(:children_valid)
+          group.send(:children_valid)
         end
 
         #
@@ -24,7 +24,7 @@ describe Metasploit::Model::Search::Operation::Union do
           I18n.translate!(:'errors.messages.invalid')
         end
 
-        let(:union) do
+        let(:group) do
           described_class.new(
               children: children
           )
@@ -53,9 +53,9 @@ describe Metasploit::Model::Search::Operation::Union do
             end
 
             it 'does not add error on :children' do
-              union.valid?
+              group.valid?
 
-              union.errors[:children].should_not include(error)
+              group.errors[:children].should_not include(error)
             end
           end
 
@@ -72,9 +72,9 @@ describe Metasploit::Model::Search::Operation::Union do
             end
 
             it 'should add error on :children' do
-              union.valid?
+              group.valid?
 
-              union.errors[:children].should include(error)
+              group.errors[:children].should include(error)
             end
           end
         end
@@ -85,9 +85,9 @@ describe Metasploit::Model::Search::Operation::Union do
           end
 
           it 'does not add error on :children' do
-            union.valid?
+            group.valid?
 
-            union.errors[:children].should_not include(error)
+            group.errors[:children].should_not include(error)
           end
         end
       end
@@ -96,7 +96,7 @@ describe Metasploit::Model::Search::Operation::Union do
 
   context '#children' do
     subject(:children) do
-      union.children
+      group.children
     end
 
     context 'default' do
@@ -110,7 +110,7 @@ describe Metasploit::Model::Search::Operation::Union do
         ]
       end
 
-      let(:union) do
+      let(:group) do
         described_class.new(
             children: expected_children
         )

data/spec/app/models/metasploit/model/search/operation/group/intersection_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Group::Intersection do
+  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+end

data/spec/app/models/metasploit/model/search/operation/group/union_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operation::Group::Union do
+  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+end

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

@@ -14,7 +14,7 @@ describe Metasploit::Model::Search::Operator::Deprecated::Author do
   it { should be_a Metasploit::Model::Search::Operator::Delegation }
 
   context '#children' do
-    include_context 'Metasploit::Model::Search::Operator::Union#children'
+    include_context 'Metasploit::Model::Search::Operator::Group::Union#children'
 
     let(:author_class) do
       Class.new

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

@@ -16,7 +16,7 @@ describe Metasploit::Model::Search::Operator::Deprecated::Platform do
     ['os', 'platform'].sample
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Union }
+  it { should be_a Metasploit::Model::Search::Operator::Group::Union }
 
   context 'CONSTANTS' do
     context 'FORMATTED_OPERATORS' do
@@ -34,7 +34,7 @@ describe Metasploit::Model::Search::Operator::Deprecated::Platform do
   end
 
   context '#children' do
-    include_context 'Metasploit::Model::Search::Operator::Union#children'
+    include_context 'Metasploit::Model::Search::Operator::Group::Union#children'
 
     let(:formatted_value) do
       'platform_or_target'

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

@@ -12,7 +12,7 @@ describe Metasploit::Model::Search::Operator::Deprecated::Ref do
   end
 
   context '#children' do
-    include_context 'Metasploit::Model::Search::Operator::Union#children'
+    include_context 'Metasploit::Model::Search::Operator::Group::Union#children'
 
     let(:abbreviation_operator) do
       Metasploit::Model::Search::Operator::Attribute.new(

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

@@ -37,7 +37,7 @@ describe Metasploit::Model::Search::Operator::Deprecated::Text do
   end
 
   context '#children' do
-    include_context 'Metasploit::Model::Search::Operator::Union#children'
+    include_context 'Metasploit::Model::Search::Operator::Group::Union#children'
 
     let(:action_name_operator) do
       Metasploit::Model::Search::Operator::Attribute.new(

data/spec/app/models/metasploit/model/search/operator/{union_spec.rb → group/base_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Metasploit::Model::Search::Operator::Union do
+describe Metasploit::Model::Search::Operator::Group::Base do
   subject(:operator) do
     described_class.new
   end
@@ -53,7 +53,7 @@ describe Metasploit::Model::Search::Operator::Union do
       operator.stub(:children => children)
     end
 
-    it { should be_a Metasploit::Model::Search::Operation::Union }
+    it { should be_a Metasploit::Model::Search::Operation::Group::Base }
 
     context 'children' do
       subject(:operation_children) do

data/spec/app/models/metasploit/model/search/operator/group/intersection_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operator::Group::Intersection do
+  it { should be_a Metasploit::Model::Search::Operator::Group::Base }
+
+  context 'operation_class_name' do
+    subject(:operation_class_name) {
+      described_class.operation_class_name
+    }
+
+    it { should == 'Metasploit::Model::Search::Operation::Group::Intersection' }
+  end
+end

data/spec/app/models/metasploit/model/search/operator/group/union_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Metasploit::Model::Search::Operator::Group::Union do
+  it { should be_a Metasploit::Model::Search::Operator::Group::Base }
+
+  context 'operation_class_name' do
+    subject(:operation_class_name) {
+      described_class.operation_class_name
+    }
+
+    it { should == 'Metasploit::Model::Search::Operation::Group::Union' }
+  end
+end

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

@@ -60,7 +60,7 @@ describe Metasploit::Model::Version do
               expect(prerelease).to eq(match[:prerelease])
             end
           else
-            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(-(?<prerelease>.*))?\z/
+            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(\.pre\.(?<prerelease>.*))?\z/
             # travis-ci sets TRAVIS_BRANCH to the tag name for tag builds
             match = branch.match(tag_regex)
 
@@ -68,8 +68,8 @@ describe Metasploit::Model::Version do
               tag_prerelease = match[:prerelease]
 
               if tag_prerelease
-                it 'matches the tag prerelease' do
-                  expect(prerelease).to eq(tag_prerelease)
+                it 'matches the tag prerelease converted from a gem version to a VERSION' do
+                  expect(prerelease).to eq(tag_prerelease.gsub('.pre.', '-'))
                 end
               else
                 it 'does not have a PRERELEASE' do

data/spec/support/shared/contexts/metasploit/model/search/operator/union/children.rb

@@ -1,4 +1,4 @@
-shared_context 'Metasploit::Model::Search::Operator::Union#children' do
+shared_context 'Metasploit::Model::Search::Operator::Group::Union#children' do
   subject(:children) do
     operator.children(formatted_value)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.1.pre.metasploit.pre.model.pre.search.pre.operator.pre.and.pre.operation.pre.groups
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -108,13 +108,15 @@ files:
 - app/models/metasploit/model/search/operation/base.rb
 - app/models/metasploit/model/search/operation/boolean.rb
 - app/models/metasploit/model/search/operation/date.rb
+- app/models/metasploit/model/search/operation/group/base.rb
+- app/models/metasploit/model/search/operation/group/intersection.rb
+- app/models/metasploit/model/search/operation/group/union.rb
 - app/models/metasploit/model/search/operation/integer.rb
 - app/models/metasploit/model/search/operation/null.rb
 - app/models/metasploit/model/search/operation/set.rb
 - app/models/metasploit/model/search/operation/set/integer.rb
 - app/models/metasploit/model/search/operation/set/string.rb
 - app/models/metasploit/model/search/operation/string.rb
-- app/models/metasploit/model/search/operation/union.rb
 - app/models/metasploit/model/search/operator/association.rb
 - app/models/metasploit/model/search/operator/attribute.rb
 - app/models/metasploit/model/search/operator/base.rb
@@ -125,9 +127,11 @@ files:
 - app/models/metasploit/model/search/operator/deprecated/platform.rb
 - app/models/metasploit/model/search/operator/deprecated/ref.rb
 - app/models/metasploit/model/search/operator/deprecated/text.rb
+- app/models/metasploit/model/search/operator/group/base.rb
+- app/models/metasploit/model/search/operator/group/intersection.rb
+- app/models/metasploit/model/search/operator/group/union.rb
 - app/models/metasploit/model/search/operator/null.rb
 - app/models/metasploit/model/search/operator/single.rb
-- app/models/metasploit/model/search/operator/union.rb
 - app/models/metasploit/model/search/query.rb
 - app/models/metasploit/model/spec/template.rb
 - app/models/metasploit/model/visitation/visitor.rb
@@ -221,13 +225,15 @@ files:
 - 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
+- spec/app/models/metasploit/model/search/operation/group/base_spec.rb
+- spec/app/models/metasploit/model/search/operation/group/intersection_spec.rb
+- spec/app/models/metasploit/model/search/operation/group/union_spec.rb
 - spec/app/models/metasploit/model/search/operation/integer_spec.rb
 - spec/app/models/metasploit/model/search/operation/null_spec.rb
 - spec/app/models/metasploit/model/search/operation/set/integer_spec.rb
 - spec/app/models/metasploit/model/search/operation/set/string_spec.rb
 - spec/app/models/metasploit/model/search/operation/set_spec.rb
 - spec/app/models/metasploit/model/search/operation/string_spec.rb
-- spec/app/models/metasploit/model/search/operation/union_spec.rb
 - spec/app/models/metasploit/model/search/operator/association_spec.rb
 - spec/app/models/metasploit/model/search/operator/attribute_spec.rb
 - spec/app/models/metasploit/model/search/operator/base_spec.rb
@@ -238,9 +244,11 @@ files:
 - spec/app/models/metasploit/model/search/operator/deprecated/platform_spec.rb
 - spec/app/models/metasploit/model/search/operator/deprecated/ref_spec.rb
 - spec/app/models/metasploit/model/search/operator/deprecated/text_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/base_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/intersection_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/union_spec.rb
 - spec/app/models/metasploit/model/search/operator/null_spec.rb
 - spec/app/models/metasploit/model/search/operator/single_spec.rb
-- spec/app/models/metasploit/model/search/operator/union_spec.rb
 - spec/app/models/metasploit/model/search/query_spec.rb
 - spec/app/models/metasploit/model/spec/template_spec.rb
 - spec/app/models/metasploit/model/visitation/visitor_spec.rb
@@ -480,9 +488,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -500,13 +508,15 @@ test_files:
 - 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
+- spec/app/models/metasploit/model/search/operation/group/base_spec.rb
+- spec/app/models/metasploit/model/search/operation/group/intersection_spec.rb
+- spec/app/models/metasploit/model/search/operation/group/union_spec.rb
 - spec/app/models/metasploit/model/search/operation/integer_spec.rb
 - spec/app/models/metasploit/model/search/operation/null_spec.rb
 - spec/app/models/metasploit/model/search/operation/set/integer_spec.rb
 - spec/app/models/metasploit/model/search/operation/set/string_spec.rb
 - spec/app/models/metasploit/model/search/operation/set_spec.rb
 - spec/app/models/metasploit/model/search/operation/string_spec.rb
-- spec/app/models/metasploit/model/search/operation/union_spec.rb
 - spec/app/models/metasploit/model/search/operator/association_spec.rb
 - spec/app/models/metasploit/model/search/operator/attribute_spec.rb
 - spec/app/models/metasploit/model/search/operator/base_spec.rb
@@ -517,9 +527,11 @@ test_files:
 - spec/app/models/metasploit/model/search/operator/deprecated/platform_spec.rb
 - spec/app/models/metasploit/model/search/operator/deprecated/ref_spec.rb
 - spec/app/models/metasploit/model/search/operator/deprecated/text_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/base_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/intersection_spec.rb
+- spec/app/models/metasploit/model/search/operator/group/union_spec.rb
 - spec/app/models/metasploit/model/search/operator/null_spec.rb
 - spec/app/models/metasploit/model/search/operator/single_spec.rb
-- spec/app/models/metasploit/model/search/operator/union_spec.rb
 - spec/app/models/metasploit/model/search/query_spec.rb
 - spec/app/models/metasploit/model/spec/template_spec.rb
 - spec/app/models/metasploit/model/visitation/visitor_spec.rb

data/app/models/metasploit/model/search/operator/union.rb

@@ -1,33 +0,0 @@
-# Operator that {#operate_on produces} {Metasploit::Model::Search::Operation::Union union operations}.
-class Metasploit::Model::Search::Operator::Union < Metasploit::Model::Search::Operator::Delegation
-  #
-  # Methods
-  #
-
-  # {Metasploit::Model::Search::Operation::Union#children}.
-  #
-  # @param formatted_value [String] value parsed from formatted operation
-  # @return [Array<Metasploit::Model::Search::Operation::Base>]
-  def children(formatted_value)
-    raise NotImplementedError
-  end
-
-  # Unions children operating on `formatted_value`.
-  #
-  # @param formatted_value [String] value parsed from formatted operation.
-  # @return [Metasploit::Model::Search::Operation::Union] Union will not contain {#children} that are invalid.
-  def operate_on(formatted_value)
-    children = self.children(formatted_value)
-
-    # filter children for validity as valid values for one child won't necessarily be valid values for another child.
-    # this is specifically a problem with Metasploit::Model::Search::Operation::Set as no partial matching is allowed,
-    # but can also be a problem with string vs integer operations.
-    valid_children = children.select(&:valid?)
-
-    Metasploit::Model::Search::Operation::Union.new(
-        :children => valid_children,
-        :operator => self,
-        :value => formatted_value
-    )
-  end
-end