pubsub_tie 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bfeb0e77cfa698d1865e56952d563c96134a95040656a155eb052e7b6c0e2a8
-  data.tar.gz: c0c464b6d28a021f20b665d102947a0190d0b14d110c411065961342c54084cd
+  metadata.gz: 40c644acb7776853d96799043e28493eff5b74ac84c1312d281fba816db2c358
+  data.tar.gz: 2b4821f62ecae6fd39ed7d119839ee75fd4884651200f26ab68a5224a414f49e
 SHA512:
-  metadata.gz: cc4e6427ee4fc31483f155feec2348d42fd5f920cde89d46e07089eef8384129bf3d4368b24df0230a022763845017f52dd061715689ac59b20feacaec48c29f
-  data.tar.gz: a79bbfbaf4020ca081c5e7532328849df2f381cbc7b249a2ac1e072511eff6bdd5118384b444e5ab59b327ddfb9a03bf5ca502d16e5c259e3267051b32f01ca6
+  metadata.gz: 2f628c6c9db7f9345c94f5e522e448ee23c9b4c701214ba92c4bb7dadd7b31c21828b3fcae24eb0ee7b44a0e6df2d06041b6973d7cd168d60b2dc5c1e29962e7
+  data.tar.gz: 0e110201d32ebabdaf66703258e1bf44ea133ec76665522100d030b2534b87ba7c4b6f3855c4f5965097a421a4763e8b3180594e56005ac721a4769c60283b22

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
@@ -9,11 +10,18 @@ module PubSubTie
     end
 
     def google_pubsub(config)
-      keyfile = File.join(PubSubTie.app_root, 'config', config['keyfile'])
-      creds = Google::Cloud::PubSub::Credentials.new keyfile
+      keyfile_name = config && config['keyfile']
+      project_id = (config && config['project_id']) || ENV['PUBSUB_PROJECT'] || ENV['GOOGLE_CLOUD_PROJECT']
 
-      Google::Cloud::PubSub.new(project_id: config['project_id'],
-                                credentials: creds)
+      kwargs = {}
+      kwargs[:project_id] = project_id if project_id
+
+      if keyfile_name && !keyfile_name.to_s.strip.empty?
+        keyfile = File.expand_path(keyfile_name, File.join(PubSubTie.app_root, 'config'))
+        kwargs[:credentials] = ::Google::Cloud::PubSub::Credentials.new(keyfile)
+      end
+
+      ::Google::Cloud::PubSub.new(**kwargs)
     end
 
     # 
@@ -74,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.4.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsub_tie
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Pablo Calderon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2026-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement