rollbar-notification-rules-generator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce56e1023a93951426676ff62816edb599695be468306635a129a2632a72caec
-  data.tar.gz: 21d676802ff8a98c601feebc951768f4ff4272b354d05408ec3d389178953cd8
+  metadata.gz: b69971ea33eb831637b2fbc7170b01dd6cce53e45f02d6f0b2c45c019900ed5a
+  data.tar.gz: 43b362b542727d83795bbc5efd0f9f219a224e0f2030d3579be755e97477f111
 SHA512:
-  metadata.gz: a20f5505d0561574e10d6f7faa1d281b41fd44f0d4d540fb64e931df814bb90575b97a05dc89c47978e5d05257efccbb3ae827e984c3b074c88d48d16bcc9af8
-  data.tar.gz: 5fee029c6a281b1ba9633eaa0f143fa65e21f45192d492a4b20daa55b61c7337af64ccec3614047326e84ff9a67b9432040161b502325a9c69dd08165ee21cf7
+  metadata.gz: f61baf0e620d426b92f9bcd5ea00709969d1b183febcbfe0f4cc8b9f288f2f23e33d4aea71d8e4a0357eb441b4a111ebbdfd40b45e54d37df971ff475df061ec
+  data.tar.gz: 0baee819bff11502752157d296a978a5a50e48f2e9efcaac4593a9820e192fe3801c2cafa1566857f12dc2b2df98fcd8e570fd17c8b760548a1c893effd48bc4

data/lib/rollbar/notification/condition/base.rb

@@ -25,6 +25,12 @@ module Rollbar
             operation == other.operation &&
             value == other.value
         end
+        alias :eql? :==
+
+        def hash
+          [self.class, type, operation, value].hash
+        end
+
         def to_tf
           <<~TF
             filters {

data/lib/rollbar/notification/condition/path.rb

@@ -33,6 +33,12 @@ module Rollbar
         def ==(other)
           super && path == other.path
         end
+        alias :eql? :==
+
+        def hash
+          [self.class, type, operation, value, path].hash
+        end
+
 
         def to_tf
           <<~TF

data/lib/rollbar/notification/rule.rb

@@ -50,12 +50,22 @@ module Rollbar
 
       # @return [Rule]
       def remove_redundant_conditions!
+        @conditions.uniq!
         @conditions.delete_if do |condition|
           @conditions.any? { |other| condition.redundant_to?(other) }
         end
         self
       end
 
+      def never_met?
+        @conditions.each.with_index.any? do |condition, i|
+          @conditions[i + 1 ..].any? do |other|
+            next false unless condition.respond_to?(:build_complement_condition)
+            other == condition.build_complement_condition
+          end
+        end
+      end
+
       # @param old_condition [Condition::Base]
       # @param new_condition [Condition::Base]
       # @return [Rule]

data/lib/rollbar/notification/trigger.rb

@@ -102,9 +102,12 @@ module Rollbar
               new_rules << new_rule
             else
               additional_conditions_set.each do |additional_conditions|
-                new_rules << new_rule.dup
-                               .add_conditions!(additional_conditions)
-                               .remove_redundant_conditions!
+                new_rule_with_additional_conds = new_rule.dup
+                  .add_conditions!(additional_conditions)
+                  .remove_redundant_conditions!
+                unless new_rule_with_additional_conds.never_met?
+                  new_rules << new_rule_with_additional_conds
+                end
               end
             end
           end
@@ -114,7 +117,15 @@ module Rollbar
             highest_lowest_target_level = lowest_target_level
           end
           level_value_to_additional_conditions_set.merge!(rule.build_additional_conditions_set_for_subsequent_rules) do |_, v1, v2|
-            v1.product(v2).map(&:flatten)
+            additional_conditions_set = v1.product(v2).map(&:flatten)
+
+            additional_conditions_set.reject! do |conditions|
+              conditions.each.with_index.any? do |condition, i|
+                conditions[i + 1 ..].any? { |other| other == condition.build_complement_condition }
+              end
+            end
+
+            additional_conditions_set
           end
         end
 

data/rollbar-notification-rules-generator.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rollbar-notification-rules-generator"
-  spec.version = "0.2.1"
+  spec.version = "0.2.2"
   spec.authors = ["abicky"]
   spec.email = ["takeshi.arabiki@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar-notification-rules-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - abicky
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies: []
 description: This tool generates Rollbar notification rules that are mutually exclusive
   from a simple YAML file.