ezcater_rubocop 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bac13ea668d2b0aece9d826156baceaf021911bad36ad355086e7f6a53efe6b
-  data.tar.gz: 71339942639c5d6e12282656e7e8e4bc8469eda4b8fd081f2bd38ac5e169fc4f
+  metadata.gz: 2096c91ae045203c587668c5973b89b1b873645d0f0d1d95641eb556dd536dff
+  data.tar.gz: a989856aa682768b8a3e9c47270dc441cd6743420cf8884451b53579a61c6c1f
 SHA512:
-  metadata.gz: 297e28c0e816b378fcd08ad2ee9e44286d25a00230cf81022ba06e67597472c5b6392ac3b77a16d647808402827c7cd3288080ed5d790868b2eaa268aa911ed7
-  data.tar.gz: c4f7a84f1699a263ac4d1bf51b7bbe520a5e83a0db43db12d1d79cb7079b743cf6cb3f245b309782f385bb7eddb67938f5913f372a5ceae4cd5be6e570190b8f
+  metadata.gz: 772cc5d23fa87784f870effdc91bccf4bdb12665c017b7f3a845f38c572c46a3232ad2acddd89e48be6f6566144e63b6693c4a78638e18e1231eb0086c8bfea9
+  data.tar.gz: 7396c095538e84ca0984ecec837d18164a0bc3fdd3b2a11b5dcf8ae586f926100518ab78bb757a10f998c0b3c819d0e62a59025561653877e6f8829aa4a013ce

data/CHANGELOG.md

@@ -6,6 +6,10 @@ This gem is moving onto its own [Semantic Versioning](https://semver.org/) schem
 
 Prior to v1.0.0 this gem was versioned based on the `MAJOR`.`MINOR` version of RuboCop. The first release of the ezcater_rubocop gem was `v0.49.0`.
 
+## v2.4.0
+- Fix `FeatureFlagActive` cop so that it allows feature flag names to be variables in addition to strings.
+- Add check to `FeatureFlagActive` that the first parameter is a string or a variable, and use the appropriate messaging.
+
 ## v2.3.0
 - Add `FeatureFlagActive` cop. This provides confidence that upgrading to `ezcater_feature_flag-client` v2.0.0, which
     contains breaking API changes, can be done safely.

data/lib/ezcater_rubocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EzcaterRubocop
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/lib/rubocop/cop/ezcater/feature_flag_active.rb

@@ -10,22 +10,27 @@ module RuboCop
       #   # good
       #   EzFF.active?("FlagName", tracking_id: "user:12345")
       #   EzFF.active?("FlagName", identifiers: ["user:12345", "user:23456"])
+      #   EzFF.active?(defined_flag_name_var, tracking_id: "brand:12345")
+      #   EzFF.active?(@flag_name_ivar, tracking_id: "brand:12345")
       #
       #   # bad
       #   EzFF.active?("FlagName")
+      #   EzFF.active?(defined_flag_name_var)
+      #   EzFF.active?(@flag_name_ivar)
 
       class FeatureFlagActive < Cop
         MSG = "`EzFF.active?` must be called with at least one of `tracking_id` or `identifiers`"
+        FIRST_PARAM_MSG = "The first argument to `EzFF.active?` must be a string or predefined variable"
 
         def_node_matcher :ezff_active_one_arg, <<-PATTERN
           (send
-            (_ _ {:EzFF :EzcaterFeatureFlag}) :active? (str _))
+            (_ _ {:EzFF :EzcaterFeatureFlag}) :active? ${str lvar ivar})
         PATTERN
 
         def_node_matcher :args_matcher, <<-PATTERN
           (send
             (_ _ {:EzFF :EzcaterFeatureFlag}) :active?
-              (str _)
+              ${str lvar ivar}
               (_
                 (pair
                   (sym {:tracking_id :identifiers})
@@ -33,6 +38,11 @@ module RuboCop
                 ...))
         PATTERN
 
+        def_node_matcher :first_param_good, <<-PATTERN
+          (send
+            (_ _ {:EzFF :EzcaterFeatureFlag}) :active? ${str lvar ivar} ...)
+        PATTERN
+
         def_node_matcher :method_call_matcher, <<-PATTERN
           (send
             (_ _ {:EzFF :EzcaterFeatureFlag}) :active? ...)
@@ -41,6 +51,10 @@ module RuboCop
         def on_send(node)
           return unless method_call_matcher(node)
 
+          if !first_param_good(node)
+            add_offense(node, location: :expression, message: FIRST_PARAM_MSG)
+          end
+
           if ezff_active_one_arg(node) || !args_matcher(node)
             add_offense(node, location: :expression, message: MSG)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler