posthog-ruby 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 987f48b8d0cfa660cf9fc2d53f7da5d7e59150b774fc8403c4b65b94873b577d
-  data.tar.gz: 84402895313a99ebbf865e50ab06b5ee9876510e4c621b206a521dde8d371bc7
+  metadata.gz: 0b0fe64cbfa7e53a76fdd9241fb1eff4b428babe557ae8ee1ce62c2a287e42a5
+  data.tar.gz: afc4e5c842f2b38e8c2f9fa0247dfb4a01db2021ffccbb8d3e62f6acc904bf88
 SHA512:
-  metadata.gz: e34a38c0b8386e95ab5fde0fad897f4bbccacf727cd72c7a72b3ec832977b460055b2ea35d2ab670e65bc916feb84f7d00e8bfa7eaee6e451ae1e6a156e6471f
-  data.tar.gz: d338821ad6066df5a7036421d62b2de806f07fcb266cd695f87f605084b6644e96e954c90ab3395fcc2d246642d6e8055be04c6e6af15b90a730290156733c11
+  metadata.gz: 23134246b45ee9c507e4fb52aca1539ecf2af4b036976f7f5a6c6fbe2dafc20f3a3da677014019f5366243b10f5c2b29521dc81e4911ea2820d966d21b5c54ea
+  data.tar.gz: 72dea55baf64ca45b28d5642e8881004a6f0f2dc5f9f43e30d27a3392949a3994a16d805ce20e7bf2ac9f94ddce3d1817df33b152664b0dc582170281f03587d

data/lib/posthog/client.rb

@@ -174,6 +174,7 @@ class PostHog
     #     group_properties: {"organization": {"name": "PostHog", "employees": 11}}
     # ```
     def get_feature_flag(key, distinct_id, groups: {}, person_properties: {}, group_properties: {}, only_evaluate_locally: false, send_feature_flag_events: true)
+      person_properties, group_properties = add_local_person_and_group_properties(distinct_id, groups, person_properties, group_properties)
       feature_flag_response, flag_was_locally_evaluated = @feature_flags_poller.get_feature_flag(key, distinct_id, groups, person_properties, group_properties, only_evaluate_locally)
 
       feature_flag_reported_key = "#{key}_#{feature_flag_response}"
@@ -204,6 +205,7 @@ class PostHog
     # 
     # @return [Hash] String (not symbol) key value pairs of flag and their values
     def get_all_flags(distinct_id, groups: {}, person_properties: {}, group_properties: {}, only_evaluate_locally: false)
+      person_properties, group_properties = add_local_person_and_group_properties(distinct_id, groups, person_properties, group_properties)
       return @feature_flags_poller.get_all_flags(distinct_id, groups, person_properties, group_properties, only_evaluate_locally)
     end
 
@@ -218,6 +220,7 @@ class PostHog
     # @option [Boolean] only_evaluate_locally
     #
     def get_feature_flag_payload(key, distinct_id, match_value: nil, groups: {}, person_properties: {}, group_properties: {}, only_evaluate_locally: false)
+      person_properties, group_properties = add_local_person_and_group_properties(distinct_id, groups, person_properties, group_properties)
       @feature_flags_poller.get_feature_flag_payload(key, distinct_id, match_value, groups, person_properties, group_properties, only_evaluate_locally)
     end
 
@@ -230,6 +233,7 @@ class PostHog
     # @option [Boolean] only_evaluate_locally
     #
     def get_all_flags_and_payloads(distinct_id, groups: {}, person_properties: {}, group_properties: {}, only_evaluate_locally: false)
+      person_properties, group_properties = add_local_person_and_group_properties(distinct_id, groups, person_properties, group_properties)
       @feature_flags_poller.get_all_flags_and_payloads(distinct_id, groups, person_properties, group_properties, only_evaluate_locally)
     end
 
@@ -288,5 +292,32 @@ class PostHog
     def worker_running?
       @worker_thread && @worker_thread.alive?
     end
+
+    def add_local_person_and_group_properties(distinct_id, groups, person_properties, group_properties)
+
+      groups ||= {}
+      person_properties ||= {}
+      group_properties ||= {}
+
+      symbolize_keys! groups
+      symbolize_keys! person_properties
+      symbolize_keys! group_properties
+
+      group_properties.each do |key, value|
+        symbolize_keys! value
+      end
+
+      all_person_properties = { "$current_distinct_id" => distinct_id }.merge(person_properties)
+
+      all_group_properties = {}
+      if groups
+        groups.each do |group_name, group_key|
+          all_group_properties[group_name] = {
+            "$group_key" => group_key}.merge(group_properties&.dig(group_name) || {})
+        end
+      end
+
+      return all_person_properties, all_group_properties
+    end
   end
 end

data/lib/posthog/feature_flags.rb

@@ -205,6 +205,52 @@ class PostHog
 
     # Class methods
 
+    def self.compare(lhs, rhs, operator)
+      if operator == "gt"
+        return lhs > rhs
+      elsif operator == "gte"
+        return lhs >= rhs
+      elsif operator == "lt"
+        return lhs < rhs
+      elsif operator == "lte"
+        return lhs <= rhs
+      else
+        raise "Invalid operator: #{operator}"
+      end
+    end
+
+    def self.relative_date_parse_for_feature_flag_matching(value)
+      match = /^([0-9]+)([a-z])$/.match(value)
+      parsed_dt = DateTime.now.new_offset(0)
+      if match
+        number = match[1].to_i
+
+        if number >= 10000
+          # Guard against overflow, disallow numbers greater than 10_000
+          return nil
+        end
+        
+        interval = match[2]
+        if interval == "h"
+          parsed_dt = parsed_dt - (number/24r)
+        elsif interval == "d"
+          parsed_dt = parsed_dt.prev_day(number)
+        elsif interval == "w"
+          parsed_dt = parsed_dt.prev_day(number*7)
+        elsif interval == "m"
+          parsed_dt = parsed_dt.prev_month(number)
+        elsif interval == "y"
+          parsed_dt = parsed_dt.prev_year(number)
+        else
+          return nil
+        end
+        parsed_dt
+      else
+        nil
+      end
+    end
+
+
     def self.match_property(property, property_values)
       # only looks for matches where key exists in property_values
       # doesn't support operator is_not_set
@@ -225,11 +271,21 @@ class PostHog
       override_value = property_values[key]
 
       case operator
-      when 'exact'
-        value.is_a?(Array) ? value.include?(override_value) : value == override_value
-      when 'is_not'
-        value.is_a?(Array) ? !value.include?(override_value) : value != override_value
-      when'is_set'
+      when 'exact', 'is_not'
+        if value.is_a?(Array)
+          values_stringified = value.map { |val| val.to_s.downcase }
+          if operator == 'exact'
+            return values_stringified.any?(override_value.to_s.downcase)
+          else
+            return !values_stringified.any?(override_value.to_s.downcase)
+          end
+        end
+        if operator == 'exact'
+          value.to_s.downcase == override_value.to_s.downcase
+        else
+          value.to_s.downcase != override_value.to_s.downcase
+        end
+      when 'is_set'
         property_values.key?(key)
       when 'icontains'
         override_value.to_s.downcase.include?(value.to_s.downcase)
@@ -239,25 +295,39 @@ class PostHog
         PostHog::Utils.is_valid_regex(value.to_s) && !Regexp.new(value.to_s).match(override_value.to_s).nil?
       when 'not_regex'
         PostHog::Utils.is_valid_regex(value.to_s) && Regexp.new(value.to_s).match(override_value.to_s).nil?
-      when 'gt'
-        override_value.class == value.class && override_value > value
-      when 'gte'
-        override_value.class == value.class && override_value >= value
-      when 'lt'
-        override_value.class == value.class && override_value < value
-      when 'lte'
-        override_value.class == value.class && override_value <= value
-      when 'is_date_before', 'is_date_after'
-        parsed_date = PostHog::Utils::convert_to_datetime(value)
-        override_date = PostHog::Utils::convert_to_datetime(override_value)
-        if operator == 'is_date_before'
-          return override_date < parsed_date
+      when 'gt', 'gte', 'lt', 'lte'
+        parsed_value = nil
+        begin
+          parsed_value = Float(value)
+        rescue StandardError => e
+        end
+        if !parsed_value.nil? && !override_value.nil?
+          if override_value.is_a?(String)
+            self.compare(override_value, value.to_s, operator)
+          else
+            self.compare(override_value, parsed_value, operator)
+          end
+        else
+          self.compare(override_value.to_s, value.to_s, operator)
+        end
+      when 'is_date_before', 'is_date_after', 'is_relative_date_before', 'is_relative_date_after'
+        if operator == 'is_relative_date_before' || operator == 'is_relative_date_after'
+          parsed_date = self.relative_date_parse_for_feature_flag_matching(value.to_s)
+          override_date = PostHog::Utils.convert_to_datetime(override_value.to_s)
         else
+          parsed_date = PostHog::Utils.convert_to_datetime(value.to_s)
+          override_date = PostHog::Utils.convert_to_datetime(override_value.to_s)
+        end
+        if !parsed_date
+          raise InconclusiveMatchError.new("Invalid date format")
+        end
+        if operator == 'is_date_before' or operator == 'is_relative_date_before'
+          return override_date < parsed_date
+        elsif operator == 'is_date_after' or operator == 'is_relative_date_after'
           return override_date > parsed_date
         end
       else
-        logger.error "Unknown operator: #{operator}"
-        false
+        raise InconclusiveMatchError.new("Unknown operator: #{operator}")
       end
     end
 

data/lib/posthog/version.rb

@@ -1,3 +1,3 @@
 class PostHog
-  VERSION = '2.3.1'
+  VERSION = '2.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posthog-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby