pubsub_tie 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc8c5620bfda35e60f358ea6b2cdee4e800c027d1ca9c405dbce3ce861be5fe
-  data.tar.gz: f8d6f1c5b6bb267e64dca4fedb13cf48aa2a7cc7cef10899c4711809fa129471
+  metadata.gz: 34f6b84fac7ce4deacc85da202eb97c5991a8d39f8cb655eae8f1aff487316d9
+  data.tar.gz: 874c65f960fd033f90b70262f7dc06e282470a31190351b8fafeea01e924ec37
 SHA512:
-  metadata.gz: 22f689074bb1dde17cfd75de1a40fdc9a6efe53cd1f6456a76a6b30ea1726a85ba4c526b3c2552904764fd2b4788a177e32847c2fd4d89e0ffae48f1ede5caff
-  data.tar.gz: 700eedab10a24a766b278a677c4cd582a70e151fdcfd510784811be9191478abad8a12e68d91bf7c532a0222892ad39ddfbbee1fbb6f26c810f2098907188426
+  metadata.gz: 8653c31411d06e09597d7bab07e5ed27f196cc82f623f0848fcacc8397def04768df71122cb6d5254b946abf5bb140dde88677fe1ed4d176658606c268a9c1c1
+  data.tar.gz: e97c1edc4606b1e9f8662f54178b13853a74b323a29327fb5d51302bb7475220975a6fc5b9cbf04f103d0385ad0efcaf750b5d0843bb1ae3cd07eb9fc96590cb

data/lib/pubsub_tie/events.rb

@@ -7,25 +7,41 @@ module PubSubTie
 
       evs = config['events'].map{|e| e['name']}
       @events = Hash[evs.map(&:to_sym).zip(config['events'])]
+      @events.each do |k, evt|
+        fields = (evt['required'] || []) + (evt['optional'] || [])
+        evt['fields'] = Hash[ fields.map {|f| [f['name'], f['type']]} ]
+      end
     end
 
     # Full event name from symbol protecting from typos
     # Raises KeyError if bad symbol
+    def full_name(sym)
+      "#{@prefix}-#{name(sym)}"
+    end
+
     def name(sym)
-      "#{@prefix}-#{value(sym, 'name')}"
+      value(sym, 'name')
     end
 
     def required(sym)
-      (value(sym, 'required') || []).map(&:to_sym)
+      field_names(sym, 'required')
     end
 
     def optional(sym)
-      (value(sym, 'optional') || []).map(&:to_sym)
+      field_names(sym, 'optional')
+    end
+
+    def types(sym)
+      value(sym, 'fields')
     end
 
   private
     def value(sym, key)
       @events.fetch(sym)[key]
     end
+
+    def field_names(sym, mode)
+      (value(sym, mode) || []).map {|field| field['name'].to_sym}
+    end
   end
 end

data/lib/pubsub_tie/publisher.rb

@@ -16,28 +16,36 @@ module PubSubTie
                                 credentials: creds)
     end
 
-    def publish(topic_sym, data, resource)
+    # 
+    # Publishes event data asynchronously to topic inferred from event_sym.
+    # Data is augmented with event_name and event_time and validated against
+    # loaded configuration 
+    #
+    def publish(event_sym, data, resource)
+      message = augmented(data, event_sym)      
+
       @pubsub.
-        topic(Events.name topic_sym).
-        # publish(message(data, resource), publish_time: Time.now.utc)
-        publish_async(message(validate_data(topic_sym, data), resource),
+        topic(Events.full_name event_sym).
+        # publish(message(payload, resource), publish_time: Time.now.utc)
+        publish_async(payload(validate_data(event_sym, message), resource),
                       publish_time: Time.now.utc) do |result|
           unless result.succeeded?
             Rails.logger.error(
-              "Failed to publish #{data} to #{topic_sym} on #{resource} due to #{result.error}")
+              "Failed to publish #{message} to #{event_sym} on #{resource} due to #{result.error}")
           end
         end
     end
 
-    def batch(topic_sym, messages, resource)
+    def batch(event_sym, messages, resource)
       topic = @pubsub.
-          topic(Events.name topic_sym)
+          topic(Events.full_name event_sym)
       messages.each do |data|
-        topic.publish_async(message(validate_data(topic_sym, data), resource),
+        message = augmented(data, event_sym)
+        topic.publish_async(payload(validate_data(event_sym, message), resource),
                             publish_time: Time.now.utc) do |result|
           unless result.succeeded?
             Rails.logger.error(
-                "Failed to publish #{data} to #{topic_sym} on #{data} due to #{result.error}")
+                "Failed to publish #{message} to #{event_sym} on #{resource} due to #{result.error}")
           end
         end
       end
@@ -45,7 +53,7 @@ module PubSubTie
     end
 
   private
-    def message(data, resource)
+    def payload(data, resource)
       # TODO: embed resource in message
       data.to_json
     end
@@ -57,11 +65,44 @@ module PubSubTie
           "Missing event required args for #{sym}: #{missing}")
       end
 
-      data.slice(*(Events.required(sym) + Events.optional(sym)))
+      validate_types(sym, 
+                     data.slice(*(Events.required(sym) + Events.optional(sym))))
     end
 
     def missing_required(sym, data)
       Events.required(sym) - data.keys
     end
+
+    def augmented(data, event_sym)
+      {event_name: Events.name(event_sym), 
+       event_time: Time.current.utc}.merge(data.to_hash.to_options)
+    end
+
+    def validate_types(sym, data)
+      types = Events.types(sym)
+
+      data.each do |field, val|
+        case val
+        when String
+          bad_type(field, data) unless types[field.to_s] == "STRING" 
+        when Integer
+          bad_type(field, data) unless ["INT", "FLOAT"].include? types[field.to_s]
+        when Numeric
+          bad_type(field, data) unless types[field.to_s] == "FLOAT"
+        when Time
+          bad_type(field, data) unless types[field.to_s] == "TIMESTAMP"
+        when DateTime
+          bad_type(field, data) unless types[field.to_s] == "DATETIME"
+        else
+          bad_type(field, data)
+        end
+      end
+
+      data
+    end
+
+    def bad_type(field, data)
+      raise ArgumentError.new("Bad type for field #{field} in event #{data}")
+    end
   end
 end

data/lib/pubsub_tie/version.rb

@@ -1,3 +1,3 @@
 module PubSubTie
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubsub_tie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Pablo Calderon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ homepage: https://github.com/ClipInteractive/pubsub-tie
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Hook for Google PubSub for publication of events enforcing autoimposed rules
 test_files: []