posthog-ruby 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b54dc83e83826a9f0b9ba3b8fbacbdd6575f1f16bc2b1c051bdaf249501ef9
-  data.tar.gz: aaea2cad50cc149f51224f4693edac7e177daaed821db12ba5a949fecb4d75d1
+  metadata.gz: f17b77ed0648665e282dc6f9483695eebcb955c08f4873350d5bbd01277c6534
+  data.tar.gz: e4e638cd17a013f3b3c1e012a5fd08f825fe6e43ce741050c31f7b084a718b96
 SHA512:
-  metadata.gz: 8a0f8cf3a6f108d96cabea6e31d58a9a13894a49e2d16473e6439bcfa7b025c0a9ee9c7812c7ca6072b5e2f2e9ecedb8467c8e0ab75771e87e1cebbf7b2c5e24
-  data.tar.gz: ab37a07e0cc7e98c274d8cbf708915a96af1c671b8016d1c6158f674583eff1c29b42cebee1ed780f1ba99ec611321d3a9765cac0b9104da759fc3f727822cfa
+  metadata.gz: 9b22dfa3f6765ffbfeb912d775ce5eee8ee4db21be2236dc13679d816c43fff161a707f33ff280ccc4d101e729d593fd909df8ff38c4d8ac8187da48071a506d
+  data.tar.gz: df159e86bc400f53d3d85b4068fc158f600fc32bc5015e022305d27d8cf65487ae946a90934fc7737efdc8086b387a9988883490d7298d261c9520c68c9e1078

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 = { "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

@@ -220,7 +220,7 @@ class PostHog
     end
 
     def self.relative_date_parse_for_feature_flag_matching(value)
-      match = /^([0-9]+)([a-z])$/.match(value)
+      match = /^-?([0-9]+)([a-z])$/.match(value)
       parsed_dt = DateTime.now.new_offset(0)
       if match
         number = match[1].to_i
@@ -310,20 +310,20 @@ class PostHog
         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
+      when 'is_date_before', 'is_date_after'
+        override_date = PostHog::Utils.convert_to_datetime(override_value.to_s)
+        parsed_date = self.relative_date_parse_for_feature_flag_matching(value.to_s)
+
+        if parsed_date.nil?
           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'
+        if operator == 'is_date_before'
           return override_date < parsed_date
-        elsif operator == 'is_date_after' or operator == 'is_relative_date_after'
+        elsif operator == 'is_date_after'
           return override_date > parsed_date
         end
       else

data/lib/posthog/version.rb

@@ -1,3 +1,3 @@
 class PostHog
-  VERSION = '2.4.0'
+  VERSION = '2.4.2'
 end

metadata

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