pubsub_tie 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f82d8df23558dbc3dcf344a437b904175908e0e44269945b36200c57a38f287
-  data.tar.gz: 622af1530672c9c8b2d6a300572f4af21f156a57adbc0404c92bbedcae8bdf5c
+  metadata.gz: faee4cb155d95a73de21722c7fb96a438d077c01f29ae74baee1415a4c98441a
+  data.tar.gz: 1812f9b354cd6ae24b22b61a96bfd3accd5395ef65125bcd91ed1a393322a1e1
 SHA512:
-  metadata.gz: d7a579d0d2a0b0e7a831d835f4c992ee81f987d02221b35b0dd9b540b2583af9f22e34747640159f546820d6179891ce3bea4fe2139bfec8e981a35af30b0dee
-  data.tar.gz: f50c1f716690b895f2b9e02368c22d0a672b35b55cce36bb99d5e98cf72080350456c67ebeb79ff7a721ef865680612aaed2298052a6de1060bd3c2ecf066bf8
+  metadata.gz: 5f68b6486e17275576bee73f4e7ce5dcb2571b64c4ba497ecf1dd5ecba9c6d8352030bd5933d9ddb78aec8e9023991c4145d8071d0ef332661d8da6256e0ebd0
+  data.tar.gz: f0f9018abe1e62b07489cdc3339736a6b0abf1514c7e3a89ec71cceec266c557a64e8cd6c83812203b1323208474ffd0708876e14452eeb7ac4b8c3a81c481a6

data/lib/pubsub_tie/events.rb

@@ -4,10 +4,20 @@ module PubSubTie
 
     def configure(config)
       @prefix = config['app_prefix']
+      common_fields = config['common'] || []
 
       evs = config['events'].map{|e| e['name']}
       @events = Hash[evs.map(&:to_sym).zip(config['events'])]
       @events.each do |k, evt|
+        # Inject root-level common fields into each event's definitions
+        common_fields.each do |cf|
+          mode_key = cf['mode'] == 'REQUIRED' ? 'required' : 'optional'
+          evt[mode_key] ||= []
+          unless evt[mode_key].any? { |field| field['name'] == cf['name'] }
+            evt[mode_key] << cf
+          end
+        end
+
         fields = (evt['required'] || []) + 
             (evt['optional'] || []) +
             (evt['repeated'] || [])

data/lib/pubsub_tie/publisher.rb

@@ -1,4 +1,5 @@
 require 'google/cloud/pubsub'
+require 'securerandom'
 
 module PubSubTie
   module Publisher
@@ -81,8 +82,11 @@ module PubSubTie
     end
 
     def augmented(data, event_sym)
+      hash_data = data.to_hash.to_options
+      user_id = hash_data[:event_id]
+      event_id = (user_id && !user_id.to_s.strip.empty?) ? user_id : SecureRandom.uuid
       {event_name: Events.name(event_sym), 
-       event_time: Time.current.utc}.merge(data.to_hash.to_options)
+       event_time: Time.current.utc}.merge(hash_data).merge(event_id: event_id)
     end
 
     def validate_types(sym, data)

data/lib/pubsub_tie/version.rb

@@ -1,3 +1,3 @@
 module PubSubTie
-  VERSION = "1.5.0"
+  VERSION = "1.6.1"
 end

data/lib/pubsub_tie.rb

@@ -27,15 +27,23 @@ module PubSubTie
   end
 
   def configure_publisher
-    config = YAML.load_file(File.join(app_root, 'config', 'gcp.yml'), aliases: true)[env]
+    config = load_yaml_file(File.join(app_root, 'config', 'gcp.yml'))[env]
     Publisher.configure(config)
   end
 
   def configure_events
-    config = YAML.load_file(File.join(app_root, 'config', 'events.yml'), aliases: true)[env]
+    config = load_yaml_file(File.join(app_root, 'config', 'events.yml'))[env]
     Events.configure(config)
   end
 
+  def load_yaml_file(file_path)
+    if defined?(Psych::VERSION) && Gem::Version.new(Psych::VERSION) >= Gem::Version.new('4.0.0')
+      YAML.load_file(file_path, aliases: true)
+    else
+      YAML.load_file(file_path)
+    end
+  end
+
   def publish(topic, data, resource: nil)
     Publisher.publish(topic, data, resource)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsub_tie
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Pablo Calderon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-27 00:00:00.000000000 Z
+date: 2026-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub