flagsmith 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c4f2e2e68aaffe9c18d2b1e2af5f0018695ecc17c5af3a94051c8bf4cde1b8
-  data.tar.gz: 53e41364ca7a0347f0358d80616c4781f81835bff43b8f2aedc15d5fa53bb77d
+  metadata.gz: 55ba6a7589045f62c03387dfb9fba16bdcf0eec278ee14b3db7549c6d16d0bcc
+  data.tar.gz: 1a91d635ec437cfe284492e11e57b2aa06edd13013dd562db0550cc5245a85a6
 SHA512:
-  metadata.gz: 3da8964610c7fa4dbd31b94fdbc74b323711b49a4b9be7ad6f92738fc4c9b38e9a69f6a97c1875b78d6ccb86283325cc579b3f16d8b7d97e3b23eab89e8f8c1d
-  data.tar.gz: c464168ac8cfaff3611e95503b291b4e136e9bc944549b8ad66689232e0ef7411c2074781fbb8f7fd92bdb80775b3317400eb101f8c95bd83bb4d94206891033
+  metadata.gz: 1e8bc92bbd6382240c16e9a3a48c5f3509ce4d68518d7152594c43095c722dfe3503216d9e77fa1ff740013c5164c998555ec1a95f98ec6c9b4eed35c037fa8b
+  data.tar.gz: 6b3c87dd50db25cc67bb9cca968f9b21ac1a9ed3f935978b6589479cc9ce76689cc9ae7eae9f05cfeb70fd4a8dc090dcd4d3dea6614121d30c08b2b9c9be22eb

data/.rubocop.yml

@@ -9,3 +9,4 @@ AllCops:
   Exclude:
     - 'spec/**/*'
     - 'example/**/*'
+    - 'vendor/**/*'

data/.rubocop_todo.yml

@@ -1,29 +1,22 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2020-12-30 22:56:14 UTC using RuboCop version 1.7.0.
+# `rubocop --auto-gen-config`
+# on 2023-07-20 10:26:52 UTC using RuboCop version 1.54.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
+# Offense count: 6
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
   Exclude:
-    - '**/*.gemspec'
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'lib/flagsmith.rb'
+    - 'flagsmith.gemspec'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'flagsmith.gemspec'
+  Max: 183

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+3.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flagsmith (3.1.0)
+    flagsmith (3.2.0)
       faraday
       faraday-retry
       faraday_middleware
@@ -10,10 +10,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    faraday (1.10.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -39,17 +39,21 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     gem-release (2.2.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    multipart-post (2.2.3)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    multipart-post (2.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.0.3)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -64,21 +68,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
-    rubocop (1.7.0)
+    rubocop (1.54.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     semantic (1.6.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    flagsmith (3.0.0)
+    flagsmith (3.1.1)
       faraday
       faraday-retry
       faraday_middleware
@@ -10,8 +10,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
@@ -20,13 +20,14 @@ GEM
     bigdecimal (1.4.4)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    capybara (3.32.2)
+    capybara (3.39.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
@@ -71,7 +72,7 @@ GEM
       dry-logic (~> 0.4, >= 0.4.0)
       dry-types (~> 0.11.0)
     erubi (1.10.0)
-    faraday (1.10.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -87,8 +88,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -156,28 +157,31 @@ GEM
     inflecto (0.0.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.4.0)
-    multipart-post (2.1.1)
+    multipart-post (2.3.0)
     nio4r (2.5.8)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.14.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.3-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.1)
     puma (5.6.4)
       nio4r (~> 2.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    racc (1.6.2)
+    rack (2.2.7)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (1.8.2)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rom (3.3.3)
       concurrent-ruby (~> 1.0)
@@ -245,6 +249,7 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/flagsmith.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday_middleware'
   spec.add_dependency 'faraday-retry'
   spec.add_dependency 'semantic'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/flagsmith/engine/features/models.rb

@@ -40,9 +40,7 @@ module Flagsmith
         multivariate_feature_state_values.sort.each do |multi_fs_value|
           limit = multi_fs_value.percentage_allocation + start_percentage
 
-          if start_percentage <= percentage_value && percentage_value < limit
-            return multi_fs_value.multivariate_feature_option.value
-          end
+          return multi_fs_value.multivariate_feature_option.value if start_percentage <= percentage_value && percentage_value < limit
 
           start_percentage = limit
         end
@@ -165,7 +163,7 @@ module Flagsmith
         attr_reader :priority
 
         def initialize(params = {})
-          @priority = params[:priority].nil? ? nil : params[:priority].to_i
+          @priority = params[:priority]&.to_i
         end
       end
     end

data/lib/flagsmith/engine/segments/constants.rb

@@ -25,6 +25,7 @@ module Flagsmith
         IS_SET = 'IS_SET'
         IS_NOT_SET = 'IS_NOT_SET'
         MODULO = 'MODULO'
+        IN = 'IN'
 
         CONDITION_OPERATORS = [
           EQUAL,
@@ -37,7 +38,8 @@ module Flagsmith
           NOT_EQUAL,
           REGEX,
           PERCENTAGE_SPLIT,
-          MODULO
+          MODULO,
+          IN
         ].freeze
       end
     end

data/lib/flagsmith/engine/segments/evaluator.rb

@@ -36,6 +36,7 @@ module Flagsmith
             end
         end
 
+        # rubocop:disable Metrics/MethodLength
         def traits_match_segment_rule(identity_traits, rule, segment_id, identity_id)
           matching_block = lambda { |condition|
             traits_match_segment_condition(identity_traits, condition, segment_id, identity_id)
@@ -44,23 +45,25 @@ module Flagsmith
           matches_conditions =
             if rule.conditions&.length&.positive?
               rule.conditions.send(rule.matching_function, &matching_block)
-            else true
+            else
+              true
             end
 
           matches_conditions &&
             rule.rules.all? { |r| traits_match_segment_rule(identity_traits, r, segment_id, identity_id) }
         end
+        # rubocop:enable Metrics/MethodLength
 
         def traits_match_segment_condition(identity_traits, condition, segment_id, identity_id)
           if condition.operator == PERCENTAGE_SPLIT
-            return hashed_percentage_for_object_ids([segment_id, identity_id]) <= condition.value.to_f
+            return hashed_percentage_for_object_ids([segment_id,
+                                                     identity_id]) <= condition.value.to_f
           end
 
           trait = identity_traits.find { |t| t.key.to_s == condition.property }
 
-          if [IS_SET, IS_NOT_SET].include?(condition.operator)
-            return handle_trait_existence_conditions(trait, condition.operator)
-          end
+          return handle_trait_existence_conditions(trait, condition.operator) if [IS_SET,
+                                                                                  IS_NOT_SET].include?(condition.operator)
 
           return condition.match_trait_value?(trait.trait_value) if trait
 

data/lib/flagsmith/engine/segments/models.rb

@@ -56,10 +56,9 @@ module Flagsmith
 
         def match_trait_value?(trait_value)
           # handle some exceptions
-          if @value.is_a?(String) && @value.match?(/:semver$/)
-            trait_value = Semantic::Version.new(trait_value.gsub(/:semver$/, ''))
-          end
+          trait_value = Semantic::Version.new(trait_value.gsub(/:semver$/, '')) if @value.is_a?(String) && @value.match?(/:semver$/)
 
+          return match_in_value(trait_value) if @operator == IN
           return match_modulo_value(trait_value) if @operator == MODULO
 
           type_as_trait_value = format_to_type_of(trait_value)
@@ -73,8 +72,8 @@ module Flagsmith
           {
             'String' => ->(v) { v.to_s },
             'Semantic::Version' => ->(v) { Semantic::Version.new(v.to_s.gsub(/:semver$/, '')) },
-            'TrueClass' => ->(v) { ['True', 'true', 'TRUE', true, 1, '1'].include?(v) ? true : false },
-            'FalseClass' => ->(v) { ['False', 'false', 'FALSE', false, 0, '0'].include?(v) ? false : true },
+            'TrueClass' => ->(v) { ['True', 'true', 'TRUE', true, 1, '1'].include?(v) },
+            'FalseClass' => ->(v) { !['False', 'false', 'FALSE', false, 0, '0'].include?(v) },
             'Integer' => ->(v) { v.to_i },
             'Float' => ->(v) { v.to_f }
           }[input.class.to_s]
@@ -83,11 +82,17 @@ module Flagsmith
 
         def match_modulo_value(trait_value)
           divisor, remainder = @value.split('|')
-          trait_value.is_a?(Numeric) && trait_value % divisor.to_f == remainder.to_f
+          trait_value.is_a?(Numeric) && trait_value % divisor.to_f == remainder.to_f # rubocop:disable Lint/FloatComparison
         rescue StandardError
           false
         end
 
+        def match_in_value(trait_value)
+          return @value.split(',').include?(trait_value.to_s) if trait_value.is_a?(String) || trait_value.is_a?(Integer)
+
+          false
+        end
+
         class << self
           def build(json)
             new(**json.slice(:operator, :value).merge(property: json[:property_]))

data/lib/flagsmith/sdk/analytics_processor.rb

@@ -33,7 +33,7 @@ module Flagsmith
 
     def track_feature(feature_name)
       @analytics_data[feature_name] = @analytics_data.fetch(feature_name, 0) + 1
-      flush if (Time.now - @last_flushed) > TIMER * 1000
+      flush if (Time.now - @last_flushed) > TIMER
     end
   end
 end

data/lib/flagsmith/sdk/config.rb

@@ -84,7 +84,7 @@ module Flagsmith
 
     class << self
       def environment_key
-        ENV['FLAGSMITH_ENVIRONMENT_KEY']
+        ENV.fetch('FLAGSMITH_ENVIRONMENT_KEY', nil)
       end
     end
   end

data/lib/flagsmith/sdk/models/flags.rb

@@ -4,32 +4,34 @@ module Flagsmith
   module Flags
     class NotFound < StandardError; end
 
+    # Base data class for the flag entity
     class BaseFlag
       include Comparable
 
       attr_reader :enabled, :value, :default
-      
+
       def initialize(enabled:, value:, default:)
         @enabled = enabled
         @value = value
         @default = default
       end
-  
+
       def enabled?
         enabled
       end
-      
+
       alias is_default default
     end
 
+    # Flag class to be used by default handler logic
     class DefaultFlag < BaseFlag
       def initialize(enabled:, value:)
         super(enabled: enabled, value: value, default: true)
       end
     end
 
+    # 'live' Flag class as returned by API or local evaluation
     class Flag < BaseFlag
-
       attr_reader :feature_name, :feature_id
 
       def initialize(feature_name:, enabled:, value:, feature_id:)
@@ -77,6 +79,8 @@ module Flagsmith
       end
     end
 
+    # Implementation of a class to hold a collection of flags.
+    # Implements methods for working with the list to avoid requesting flags for each feature evaluation.
     class Collection
       include Enumerable
 
@@ -159,7 +163,7 @@ module Flagsmith
         def from_feature_state_models(feature_states, identity_id: nil, **args)
           to_flag_object = lambda { |feature_state, acc|
             acc[normalize_key(feature_state.feature.name)] =
-            Flagsmith::Flags::Flag.from_feature_state_model(feature_state, identity_id)
+              Flagsmith::Flags::Flag.from_feature_state_model(feature_state, identity_id)
           }
 
           new(

data/lib/flagsmith/sdk/models/segments.rb

@@ -2,9 +2,10 @@
 
 module Flagsmith
   module Segments
+    # Data class to hold segment information.
     class Segment
       attr_reader :id, :name
-      
+
       def initialize(id:, name:)
         @id = id
         @name = name

data/lib/flagsmith/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flagsmith
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/flagsmith.rb

@@ -22,7 +22,7 @@ require 'flagsmith/engine/core'
 # no-doc
 module Flagsmith
   # Ruby client for flagsmith.com
-  class Client
+  class Client # rubocop:disable Metrics/ClassLength
     extend Forwardable
     # A Flagsmith client.
     #
@@ -153,13 +153,13 @@ module Flagsmith
 
     def get_identity_segments(identifier, traits = {})
       unless environment
-        raise Flagsmith::ClientError, 
-          'Local evaluation required to obtain identity segments.'
+        raise Flagsmith::ClientError,
+              'Local evaluation required to obtain identity segments.'
       end
 
       identity_model = build_identity_model(identifier, traits)
       segment_models = engine.get_identity_segments(environment, identity_model)
-      return segment_models.map { |sm| Flagsmith::Segments::Segment.new(id: sm.id, name: sm.name) }.compact
+      segment_models.map { |sm| Flagsmith::Segments::Segment.new(id: sm.id, name: sm.name) }.compact
     end
 
     private

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flagsmith
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tom Stuart
 - Brian Moelk
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,8 +228,9 @@ files:
 - lib/flagsmith/version.rb
 homepage: https://flagsmith.com
 licenses: []
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -244,8 +245,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Flagsmith - Ship features with confidence
 test_files: []