icalia-sdk-event-notification 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86053ae78a901ffca0b5adf3147662d027a1da2bd1a243b16932111d07cb061
-  data.tar.gz: d71ad0bd60910e81afc8377a92a69e09b72b2a7089ce7f1d924750a0633417df
+  metadata.gz: 3e583e484d0a970df2edc56f33704aebe466cecd93fa6ef6dcaeeb5b4d7c6f08
+  data.tar.gz: e80864146a628dff860b33c16a09fb706a4ea790a98b600512ad1ff62c5cdfde
 SHA512:
-  metadata.gz: 3ac2b0afa58fe93b2d2e1d0354b1c6ec63d60697ceb7031b59e47c2a2fcde61ff70ba9134fd82720ec7739ead167595c09e19c0579159924d5ec0992af161709
-  data.tar.gz: caef3c6b1d737bdeda71821712a7f46a436c00a87ab4805f51934ad2744e0c2689f67678de32fd46a350eb8dcfc341070170549bcde5d389059283906b65ffdd
+  metadata.gz: 94b811d44aa4791850f9e8579dfe52709414b985cc39a32f45c4e4b7ce6ae16c29a7c1055ce0e08688a660c6da6218b53cc2ec99abc320bfe9a9949cad55a80c
+  data.tar.gz: 55d0b60702888eac4cf3d534372e95d98811c7c596e38956e5eb1b3b0039c79cb74dd1f9f3fc56dca3304877d7b5a6f121e11f153663b18ddc98a36031ac991c

data/lib/icalia-sdk-event-notification.rb

@@ -10,7 +10,6 @@ module Icalia
   module Event
     autoload :Publisher, 'icalia/event/publisher'
     autoload :Subscriber, 'icalia/event/subscriber'
-    autoload :Notification, 'icalia/event/notification'
     autoload :TopicMessageProcessing, 'icalia/event/topic_message_processing'
 
     mattr_reader :deferred_publishing, default: true

data/lib/icalia-sdk-event-notification/version.rb

@@ -2,6 +2,6 @@
 
 module Icalia
   module SDK
-    EVENT_NOTIFICATION_VERSION = '0.3.6'
+    EVENT_NOTIFICATION_VERSION = '0.3.7'
   end
 end

data/lib/icalia/event/subscriber.rb

@@ -37,25 +37,46 @@ module Icalia::Event
       end
 
       def subscription_name
-        Rails.application.class.module_parent_name.underscore +
-        '-' +
-        ENV.fetch('DEPLOYMENT_NAME', Rails.env).downcase +
-        "-#{topic_name}"
+        "#{subscription_name_prefix}-#{topic_name}"
       end
 
-      def ensure_subscription_exists
+      def auto_subscribe
         client = Subserver::Pubsub.client
         topic = client.topic(topic_name) || client.create_topic(topic_name)
 
         topic.subscription(subscription_name) ||
-        topic.subscribe(subscription_name)
+          topic.subscribe(subscription_name)
       end
 
       def process(event_class_name, options = {})
-        processor = options.delete :with
-        return unless processor.present?
+        return unless (processor = options.delete(:with)).present?
+
         processor_map[event_class_name] = processor
       end
+
+      protected
+
+      def subscription_name_prefix
+        "#{rails_app_name.underscore}-#{deployment_name.underscore}"
+      end
+
+      def deployment_name
+        ENV.fetch('DEPLOYMENT_NAME', Rails.env)
+      end
+
+      def rails_app_name
+        return rails_app_name_since_rails_six if Rails.version.starts_with?('6')
+
+        rails_app_name_until_rails_six
+      end
+
+      def rails_app_name_until_rails_six
+        Rails.application.class.parent_name
+      end
+
+      def rails_app_name_since_rails_six
+        Rails.application.class.module_parent_name
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalia-sdk-event-notification
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Roberto Quintanilla
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -116,10 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
 - lib/icalia-sdk-event-notification.rb
 - lib/icalia-sdk-event-notification/version.rb
-- lib/icalia/event/notification.rb
 - lib/icalia/event/publisher.rb
 - lib/icalia/event/subscriber.rb
 - lib/icalia/event/topic_message_processing.rb

data/lib/icalia/event/notification.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Icalia::Event
-  #= Icalia::Event::Notification
-  class Notification
-    attr_reader :data,
-                :topic,
-                :event_data,
-                :included_data,
-                :metadata
-    
-    def initialize(raw_notification)
-      @data = parse_raw_notification raw_notification
-    end
-
-    def topic_arn; data.fetch :topic_arn; end
-    def topic;     @topic ||= topic_arn.split(':')[5..-1].join(':'); end
-
-    def metadata;  @metadata ||= data.dig :message, :meta; end
-    def emitter;   metadata.dig :emitter; end
-
-    def message;   data.fetch :message; end
-
-    def event_data; @event_data ||= deserialize_data(message.fetch(:data)); end
-    def action; event_data.fetch(:action, 'message'); end
-
-    def included_data
-      @included_data ||= message
-      .fetch(:included)
-      .each_with_object({}) do |data, included|
-        included[data.slice(:id, :type)] = deserialize_data(data)
-      end
-    end
-
-    def fetch_data(property_name)
-      fetched_property = fetch_attribute property_name
-      return fetched_property if fetched_property.present?
-
-      fetch_relationship property_name
-    end
-
-    delegate :parse_raw_notification, :deserialize_data, to: :class
-
-    class << self
-      delegate :decode, to: ActiveSupport::JSON, prefix: :json
-
-      def parse_raw_notification(raw_notification)
-        json_decode(raw_notification)
-          .transform_keys(&:underscore)
-          .tap { |parsed| parsed['message'] = json_decode parsed['message'] }
-          .with_indifferent_access
-      end
-  
-      def deserialize_data(data)
-        klass = data.fetch(:type).underscore.classify
-        deserializer = "Icalia::Event::Deserializable#{klass}".constantize
-        deserializer.call(data).with_indifferent_access
-      end
-    end
-
-    private
-
-    def fetch_attribute(attribute_name)
-      message.dig(:data, :attributes, attribute_name) ||
-      message.dig(:data, :attributes, attribute_name.to_s.dasherize)
-    end
-
-    def fetch_relationship(relationship_name)
-      rel = message.dig(:data, :relationships, relationship_name) ||
-            message.dig(:data, :relationships, relationship_name.to_s.dasherize)
-      return unless rel.present?
-      included_data[rel.fetch(:data)]
-    end
-  end
-end