pub_sub_model_sync 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2474d763e9b95cd2ddf83284ed095af1e1c8d53fe4ffc89fbe7249e8c198d38b
-  data.tar.gz: 87ab9ca1c4167ebf314c1bdbd48bd7216e7e1036acbbb2a6c93f82ddd7bb80e6
+  metadata.gz: 6f3074098a97136efdb1698c4e0d3161e02f20d36d3ce4803608dcacdc826700
+  data.tar.gz: 0408d088ec5ee19373a6e49fa639830948d41387efc27a9fc904c04e2b5e11fe
 SHA512:
-  metadata.gz: 7a9ecb33cb7e85a76d797de1e390cf2a6a1086c245512695e46610cc18c1fa9273c821002177d30bc78ffe4159239733f287a665b69ded4f0d4490486072ff97
-  data.tar.gz: be9b8bf52ae416e9bf2667c3a6aa18cbbdc30aad265d71f00f1b90594a1f09d5a7498843e6f5361dd1562f151f0a7d73b7166bc4351fe02992a4dd1080ec587c
+  metadata.gz: e80c2eda985a22d547f2cce08c97a997e8d06da9ff2324e5760832d81070526a34d31e9f6c5e5d6156932ce839bd70eb4e033d1c17a86ac9207b7ae582f9f854
+  data.tar.gz: 13c9e536b71740620f5aaa2a4bce195f0a10dddc5fe5e2ba36e41e48191b7a4f7dce3077a7cf76f3f8882b29054a9b5b015d9150872f641e9875bf66f0748586

data/.travis.yml

@@ -4,7 +4,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 2.0.2
+before_install: gem install bundler
 
 script:
   - bundle install

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+# 0.2.1
+- Add on demand model sync method
+
+# 0.2.0
+- Add apache kafka support
+- Add Service interface for future references
+- Improve Services to use a single/common message performer
+
+# 0.1.4
+- Add attribute aliases when publishing, ```ps_publish(['name:full_name', 'email'])```
+- Ability to retrieve publisher/subscriber crud settings
+
+# 0.1.3
+- shorter publisher/subscriber methods: ps_msync_subscribe into ps_subscribe
+
+# 0.1.2
+- fix not found pub/sub library (buggy)
+
 # 0.1.1
 - Add rabbitmq pub/sub service support
 - Reformat to support multiple pub/sub services

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gem 'rubocop'
 gem 'bunny' # rabbit-mq
 gem 'google-cloud-pubsub' # google pub/sub
+gem 'ruby-kafka' # kafka pub/sub
 
 # Specify your gem's dependencies in pub_sub_model_sync.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_sub_model_sync (0.1.2)
+    pub_sub_model_sync (0.2.1)
       activesupport
       rails
 
@@ -60,6 +60,7 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     diff-lcs (1.3)
+    digest-crc (0.5.1)
     erubi (1.9.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
@@ -81,7 +82,7 @@ GEM
       googleauth (>= 0.6.2, < 0.10.0)
       grpc (>= 1.7.2, < 2.0)
       rly (~> 0.2.3)
-    google-protobuf (3.11.4-universal-darwin)
+    google-protobuf (3.11.4)
     googleapis-common-protos (1.3.9)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
@@ -95,7 +96,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    grpc (1.27.0-universal-darwin)
+    grpc (1.27.0)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.9)
@@ -180,6 +181,8 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-kafka (1.0.0)
+      digest-crc
     ruby-progressbar (1.10.1)
     signet (0.11.0)
       addressable (~> 2.3)
@@ -214,6 +217,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  ruby-kafka
   sqlite3
 
 BUNDLED WITH

data/README.md

@@ -1,5 +1,5 @@
 # PubSubModelSync
-Permit to sync models data and make calls between rails apps using google or rabbitmq pub/sub service. 
+Permit to sync models data and make calls between rails apps using google or rabbitmq or apache kafka pub/sub service. 
 
 Note: This gem is based on [MultipleMan](https://github.com/influitive/multiple_man) which for now looks unmaintained.
 
@@ -14,8 +14,10 @@ Note: This gem is based on [MultipleMan](https://github.com/influitive/multiple_
 Add this line to your application's Gemfile:
 ```ruby
 gem 'pub_sub_model_sync'
+
 gem 'google-cloud-pubsub' # to use google pub/sub service
 gem 'bunny' # to use rabbit-mq pub/sub service
+gem 'ruby-kafka' # to use apache kafka pub/sub service
 ```
 And then execute: $ bundle install
 
@@ -43,9 +45,17 @@ And then execute: $ bundle install
     ```
     See details here: https://github.com/ruby-amqp/bunny
 
+- configuration for Apache Kafka (You need kafka installed)
+    ```ruby
+    PubSubModelSync::Config.service_name = :kafka
+    PubSubModelSync::Config.kafka_connection = [["kafka1:9092", "localhost:2121"], logger: Rails.logger]
+    PubSubModelSync::Config.topic_name = 'sample-topic'
+    ```
+    See details here: https://github.com/zendesk/ruby-kafka    
+
 - Add publishers/subscribers to your models (See examples below)
 
-- Start listening for publishers (Only in the app that has subscribers)
+- Start subscribers to listen for publishers (Only in the app that has subscribers)
     ```ruby
     rake pub_sub_model_sync:start
     ```
@@ -53,18 +63,18 @@ And then execute: $ bundle install
 
 ## Examples
 ```ruby
-# App 1
+# App 1 (Publisher)
 # attributes: name email age 
 class User < ActiveRecord::Base
   include PubSubModelSync::PublisherConcern
-  ps_msync_publish(%i[name email])
+  ps_publish(%i[name email])
 end
 
-# App 2
+# App 2 (Subscriber)
 class User < ActiveRecord::Base
   include PubSubModelSync::SubscriberConcern
-  ps_msync_subscribe(%i[name])
-  ps_msync_class_subscribe(:greeting)
+  ps_subscribe(%i[name])
+  ps_class_subscribe(:greeting)
 
   def self.greeting(data)
     puts 'Class message called'
@@ -72,29 +82,32 @@ class User < ActiveRecord::Base
 end
 
 # Samples
-User.create(name: 'test user') # Review your App 2 to see the created user (only name will be saved)
-User.ps_msync_class_publish({ msg: 'Hello' }, action: :greeting) # User.greeting method (Class method) will be called in App2
+User.create(name: 'test user', email: 'sample@gmail.com') # Review your App 2 to see the created user (only name will be saved)
+User.new(name: 'test user').ps_perform_sync(:create) # similar to above to perform sync on demand
+
+User.ps_class_publish({ msg: 'Hello' }, action: :greeting) # User.greeting method (Class method) will be called in App2
+PubSubModelSync::Publisher.new.publish_data(User, { msg: 'Hello' }, :greeting) # similar to above when not included publisher concern
 ```
 
 ## Advanced Example
 ```ruby
-# App 1
+# App 1 (Publisher)
 class User < ActiveRecord::Base
   self.table_name = 'publisher_users'
   include PubSubModelSync::PublisherConcern
-  ps_msync_publish(%i[name], actions: %i[update], as_klass: 'Client', id: :client_id)
+  ps_publish(%i[name:full_name email], actions: %i[update], as_klass: 'Client', id: :client_id)
   
-  def ps_msync_skip_for?(_action)
+  def ps_skip_for?(_action)
     false # here logic with action to skip push message
   end
 end
 
-# App 2
+# App 2 (Subscriber)
 class User < ActiveRecord::Base
   self.table_name = 'subscriber_users'
   include PubSubModelSync::SubscriberConcern
-  ps_msync_subscribe(%i[name], actions: %i[update], as_klass: 'Client', id: :custom_id)
-  ps_msync_class_subscribe(:greeting, as_action: :custom_greeting, as_klass: 'CustomUser')
+  ps_subscribe(%i[name], actions: %i[update], as_klass: 'Client', id: :custom_id)
+  ps_class_subscribe(:greeting, as_action: :custom_greeting, as_klass: 'CustomUser')
   
   def self.greeting(data)
     puts 'Class message called through custom_greeting'
@@ -102,22 +115,56 @@ class User < ActiveRecord::Base
 end
 ```
 
-## Testing
-- Rspec: (spec/rails_helper.rb)
+## API
+- Perform sync on demand (:create, :update, :destroy):   
+  The target model will receive a notification to perform the indicated action  
+  ```my_model.ps_perform_sync(action_name)```
+    
+- Class level notification:     
+  ```User.ps_class_publish(data, action: action_name, as_klass: custom_klass_name)```
+  Target class ```User.action_name``` will be called when message is received    
+  * data: (required, :hash) message value to deliver    
+  * action_name: (required, :sim) same action name as defined in ps_class_subscribe(...)    
+  * as_klass: (optional, :string) same class name as defined in ps_class_subscribe(...)
+      
+- Class level notification (Same as above: on demand call)    
+  ```PubSubModelSync::Publisher.new.publish_data(Klass_name, data, action_name)```  
+  * klass_name: (required, Class) same class name as defined in ps_class_subscribe(...)
+  * data: (required, :hash) message value to deliver    
+  * action_name: (required, :sim) same action name as defined in ps_class_subscribe(...)
+  
+- Get crud subscription configured for the class   
+  ```User.ps_subscriber(action_name)```  
+  * action_name (default :create, :sym): can be :create, :update, :destroy
+- Get crud publisher configured for the class   
+  ```User.ps_publisher(action_name)```  
+  * action_name (default :create, :sym): can be :create, :update, :destroy
+- Inspect all listeners configured for a class  
+  ```PubSubModelSync::Config.listeners```
+  
+## Testing with RSpec
+- Config: (spec/rails_helper.rb)
     ```ruby
       
       # when using google service
       require 'pub_sub_model_sync/mock_google_service'
       config.before(:each) do
-        pub_sub_mock = PubSubModelSync::MockGoogleService.new
-        allow(Google::Cloud::Pubsub).to receive(:new).and_return(pub_sub_mock)
+        google_mock = PubSubModelSync::MockGoogleService.new
+        allow(Google::Cloud::Pubsub).to receive(:new).and_return(google_mock)
       end
       
       # when using rabbitmq service
       require 'pub_sub_model_sync/mock_rabbit_service' 
       config.before(:each) do
-        bunny_mock = PubSubModelSync::MockRabbitService.new
-        allow(Bunny).to receive(:new).and_return(bunny_mock)
+        rabbit_mock = PubSubModelSync::MockRabbitService.new
+        allow(Bunny).to receive(:new).and_return(rabbit_mock)
+      end
+    
+      # when using apache kafka service
+      require 'pub_sub_model_sync/mock_kafka_service' 
+      config.before(:each) do
+        kafka_mock = PubSubModelSync::MockKafkaService.new
+        allow(Kafka).to receive(:new).and_return(kafka_mock)
       end
   
     ```
@@ -147,7 +194,7 @@ end
       publisher = PubSubModelSync::Publisher  
       data = { name: 'hello'}
       action = :create
-      User.ps_msync_class_publish(data, action: action)
+      User.ps_class_publish(data, action: action)
       user = User.create(name: 'name', email: 'email')
       expect_any_instance_of(publisher).to receive(:publish_model).with(user, :create, anything)
     end
@@ -156,19 +203,10 @@ end
       publisher = PubSubModelSync::Publisher  
       data = {msg: 'hello'}
       action = :greeting
-      User.ps_msync_class_publish(data, action: action)
+      User.ps_class_publish(data, action: action)
       expect_any_instance_of(publisher).to receive(:publish_data).with('User', data, action)
     end
     ```
-    
-    There are two special methods to extract crud configuration settings (attrs, id, ...):
-    
-    Subscribers: ```User.ps_msync_subscriber_settings```
-    
-    Publishers: ```User.ps_msync_publisher_settings```
-    
-    Note: Inspect all configured listeners with: 
-    ``` PubSubModelSync::Config.listeners ```
 
 ## Contributing
 

data/lib/pub_sub_model_sync.rb

@@ -11,8 +11,11 @@ require 'pub_sub_model_sync/publisher_concern'
 require 'pub_sub_model_sync/runner'
 require 'pub_sub_model_sync/connector'
 require 'pub_sub_model_sync/message_processor'
+
+require 'pub_sub_model_sync/service_base'
 require 'pub_sub_model_sync/service_google'
 require 'pub_sub_model_sync/service_rabbit'
+require 'pub_sub_model_sync/service_kafka'
 
 module PubSubModelSync
   class Error < StandardError; end

data/lib/pub_sub_model_sync/config.rb

@@ -3,6 +3,7 @@
 module PubSubModelSync
   class Config
     cattr_accessor :listeners, default: []
+    cattr_accessor :publishers, default: []
     cattr_accessor :service_name, default: :google
     cattr_accessor :logger
 
@@ -12,9 +13,16 @@ module PubSubModelSync
     # rabbitmq service
     cattr_accessor :bunny_connection, :queue_name, :topic_name
 
+    # kafka service
+    cattr_accessor :kafka_connection, :topic_name
+
     def self.log(msg, kind = :info)
       msg = "PS_MSYNC ==> #{msg}"
-      logger ? logger.send(kind, msg) : puts(msg)
+      if logger == :raise_error
+        kind == :error ? raise(msg) : puts(msg)
+      else
+        logger ? logger.send(kind, msg) : puts(msg)
+      end
     end
   end
 end

data/lib/pub_sub_model_sync/connector.rb

@@ -16,6 +16,8 @@ module PubSubModelSync
       case Config.service_name
       when :google
         PubSubModelSync::ServiceGoogle.new
+      when :kafka
+        PubSubModelSync::ServiceKafka.new
       else # :rabbit_mq
         PubSubModelSync::ServiceRabbit.new
       end

data/lib/pub_sub_model_sync/message_processor.rb

@@ -40,7 +40,6 @@ module PubSubModelSync
 
     # support for: create, update, destroy
     def call_listener(listener)
-      listener_add_crud_settings(listener)
       model = find_model(listener)
       if attrs[:action].to_sym == :destroy
         model.destroy!
@@ -74,11 +73,6 @@ module PubSubModelSync
       end
     end
 
-    def listener_add_crud_settings(listener)
-      model_class = listener[:klass].constantize
-      listener[:settings] = model_class.ps_msync_subscriber_settings
-    end
-
     def log(message, kind = :info)
       PubSubModelSync::Config.log "#{message} ==> #{[data, attrs]}", kind
     end

data/lib/pub_sub_model_sync/mock_kafka_service.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module PubSubModelSync
+  class MockKafkaService
+    class MockProducer
+      def produce(*_args)
+        true
+      end
+
+      def deliver_messages(*_args)
+        true
+      end
+
+      def shutdown
+        true
+      end
+    end
+
+    class MockConsumer
+      def each_message(*_args)
+        true
+      end
+
+      def stop(*_args)
+        true
+      end
+
+      def subscribe(*_args)
+        true
+      end
+    end
+
+    def producer(*_args)
+      MockProducer.new
+    end
+
+    def consumer(*_args)
+      MockConsumer.new
+    end
+
+    def close
+      true
+    end
+  end
+end

data/lib/pub_sub_model_sync/publisher.rb

@@ -14,12 +14,10 @@ module PubSubModelSync
 
     # @param settings (Hash): { attrs: [], as_klass: nil, id: nil }
     def publish_model(model, action, settings = nil)
-      settings ||= model.class.ps_msync_publisher_settings
+      settings ||= model.class.ps_publisher_info(action)
       attributes = build_model_attrs(model, action, settings)
       data = {}
-      if action != 'destroy'
-        data = model.as_json(only: settings[:attrs], methods: settings[:attrs])
-      end
+      data = build_model_data(model, settings[:attrs]) if action != :destroy
       connector.publish(data.symbolize_keys, attributes)
     end
 
@@ -27,13 +25,23 @@ module PubSubModelSync
       {
         klass: klass.to_s,
         action: action.to_sym,
-        id: id,
-        service_model_sync: true
+        id: id
       }
     end
 
     private
 
+    def build_model_data(model, model_props)
+      source_props = model_props.map { |prop| prop.to_s.split(':').first }
+      data = model.as_json(only: source_props, methods: source_props)
+      aliased_props = model_props.select { |prop| prop.to_s.include?(':') }
+      aliased_props.each do |prop|
+        source, target = prop.to_s.split(':')
+        data[target] = data.delete(source)
+      end
+      data.symbolize_keys
+    end
+
     def build_model_attrs(model, action, settings)
       as_klass = (settings[:as_klass] || model.class.name).to_s
       id_val = model.send(settings[:id] || :id)

data/lib/pub_sub_model_sync/publisher_concern.rb

@@ -7,41 +7,49 @@ module PubSubModelSync
     end
 
     # Permit to skip a publish callback
-    def ps_msync_skip_for?(_action)
+    def ps_skip_for?(_action)
       false
     end
 
+    def ps_perform_sync(action = :create)
+      service = self.class.ps_publisher_service
+      service.publish_model(self, action, self.class.ps_publisher_info(action))
+    end
+
     module ClassMethods
       # Permit to publish crud actions (:create, :update, :destroy)
       # @param settings (Hash): { actions: nil, as_klass: nil, id: nil }
-      def ps_msync_publish(attrs, settings = {})
+      def ps_publish(attrs, settings = {})
         actions = settings.delete(:actions) || %i[create update destroy]
-        @ps_msync_publisher_settings = settings.merge(attrs: attrs)
-        ps_msync_register_callbacks(actions)
+        actions.each do |action|
+          info = settings.merge(klass: name, action: action, attrs: attrs)
+          PubSubModelSync::Config.publishers << info
+          ps_register_callback(action.to_sym, info)
+        end
       end
 
-      def ps_msync_publisher_settings
-        @ps_msync_publisher_settings
+      def ps_publisher_info(action = :create)
+        PubSubModelSync::Config.publishers.select do |listener|
+          listener[:klass] == name && listener[:action] == action
+        end.last
       end
 
-      def ps_msync_class_publish(data, action:, as_klass: nil)
+      def ps_class_publish(data, action:, as_klass: nil)
         as_klass = (as_klass || name).to_s
-        ps_msync_publisher.publish_data(as_klass, data, action.to_sym)
+        ps_publisher_service.publish_data(as_klass, data, action.to_sym)
       end
 
-      def ps_msync_publisher
+      def ps_publisher_service
         PubSubModelSync::Publisher.new
       end
 
       private
 
-      def ps_msync_register_callbacks(actions)
-        actions.each do |action|
-          after_commit(on: action) do |model|
-            unless model.ps_msync_skip_for?(action)
-              publisher = model.class.ps_msync_publisher
-              publisher.publish_model(model, action.to_sym)
-            end
+      def ps_register_callback(action, info)
+        after_commit(on: action) do |model|
+          unless model.ps_skip_for?(action)
+            service = model.class.ps_publisher_service
+            service.publish_model(model, action.to_sym, info)
           end
         end
       end

data/lib/pub_sub_model_sync/service_base.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module PubSubModelSync
+  class ServiceBase
+    SERVICE_KEY = 'service_model_sync'
+
+    def listen_messages
+      raise 'method :listen_messages must be defined in service'
+    end
+
+    def publish(_data, _attributes)
+      raise 'method :publish must be defined in service'
+    end
+
+    def stop
+      raise 'method :stop must be defined in service'
+    end
+
+    private
+
+    # @param payload (String JSON): '{"data":{},"attributes":{..}}'
+    #   refer: PubSubModelSync::Publisher (.publish_model | .publish_data)
+    def perform_message(payload)
+      data, attrs = parse_message_payload(payload)
+      args = [data, attrs[:klass], attrs[:action], attrs]
+      PubSubModelSync::MessageProcessor.new(*args).process
+    end
+
+    def parse_message_payload(payload)
+      message_payload = JSON.parse(payload).symbolize_keys
+      data = message_payload[:data].symbolize_keys
+      attrs = message_payload[:attributes].symbolize_keys
+      [data, attrs]
+    end
+  end
+end

data/lib/pub_sub_model_sync/service_google.rb

@@ -6,7 +6,7 @@ rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
 module PubSubModelSync
-  class ServiceGoogle
+  class ServiceGoogle < ServiceBase
     attr_accessor :service, :topic, :subscription, :config, :subscriber
 
     def initialize
@@ -30,7 +30,9 @@ module PubSubModelSync
 
     def publish(data, attributes)
       log("Publishing message: #{[data, attributes]}")
-      topic.publish(data.to_json, attributes)
+
+      payload = { data: data, attributes: attributes }.to_json
+      topic.publish(payload, { SERVICE_KEY => true })
     end
 
     def stop
@@ -47,20 +49,17 @@ module PubSubModelSync
 
     def process_message(received_message)
       message = received_message.message
-      attrs = message.attributes.symbolize_keys
-      return unless attrs[:service_model_sync]
+      return unless message.attributes[SERVICE_KEY]
 
-      data = JSON.parse(message.data).symbolize_keys
-      args = [data, attrs[:klass], attrs[:action], attrs]
-      PubSubModelSync::MessageProcessor.new(*args).process
+      perform_message(message.data)
     rescue => e
-      log("Error processing message: #{[received_message, e.message]}")
+      log("Error processing message: #{[received_message, e.message]}", :error)
     ensure
       received_message.acknowledge!
     end
 
-    def log(msg)
-      config.log("Google Service ==> #{msg}")
+    def log(msg, kind = :info)
+      config.log("Google Service ==> #{msg}", kind)
     end
   end
 end

data/lib/pub_sub_model_sync/service_kafka.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+begin
+  require 'kafka'
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end
+
+module PubSubModelSync
+  class ServiceKafka < ServiceBase
+    cattr_accessor :producer
+
+    attr_accessor :service, :consumer
+    attr_accessor :config
+    CONSUMER_GROUP = 'service_model_sync'
+
+    def initialize
+      @config = PubSubModelSync::Config
+      @service = Kafka.new(*config.kafka_connection)
+    end
+
+    def listen_messages
+      log('Listener starting...')
+      start_consumer
+      consumer.each_message(&method(:process_message))
+    rescue PubSubModelSync::Runner::ShutDown
+      raise
+    rescue => e
+      log("Error listening message: #{[e.message, e.backtrace]}", :error)
+    end
+
+    def publish(data, attributes)
+      log("Publishing: #{[data, attributes]}")
+      payload = { data: data, attributes: attributes }
+      producer.produce(payload.to_json, message_settings)
+      producer.deliver_messages
+    rescue => e
+      info = [data, attributes, e.message, e.backtrace]
+      log("Error publishing: #{info}", :error)
+    end
+
+    def stop
+      log('Listener stopping...')
+      consumer.stop
+    end
+
+    private
+
+    def message_settings
+      { topic: config.topic_name, headers: { SERVICE_KEY => true } }
+    end
+
+    def start_consumer
+      @consumer = service.consumer(group_id: CONSUMER_GROUP)
+      consumer.subscribe(config.topic_name)
+    end
+
+    def producer
+      return self.class.producer if self.class.producer
+
+      at_exit { self.class.producer.shutdown }
+      self.class.producer = service.producer
+    end
+
+    def process_message(message)
+      return unless message.headers[SERVICE_KEY]
+
+      perform_message(message.value)
+    rescue => e
+      error = [message, e.message, e.backtrace]
+      log("Error processing message: #{error}", :error)
+    end
+
+    def log(msg, kind = :info)
+      config.log("Kafka Service ==> #{msg}", kind)
+    end
+  end
+end

data/lib/pub_sub_model_sync/service_rabbit.rb

@@ -6,10 +6,9 @@ rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
 module PubSubModelSync
-  class ServiceRabbit
+  class ServiceRabbit < ServiceBase
     attr_accessor :service, :channel, :queue, :topic
     attr_accessor :config
-    SERVICE_KEY = 'service_model_sync'
 
     def initialize
       @config = PubSubModelSync::Config
@@ -24,16 +23,17 @@ module PubSubModelSync
     rescue PubSubModelSync::Runner::ShutDown
       raise
     rescue => e
-      log("Error listening message: #{[e.message, e.backtrace]}")
+      log("Error listening message: #{[e.message, e.backtrace]}", :error)
     end
 
     def publish(data, attributes)
       log("Publishing: #{[data, attributes]}")
       subscribe_to_queue
       payload = { data: data, attributes: attributes }
-      topic.publish(payload.to_json, routing_key: queue.name, type: SERVICE_KEY)
+      topic.publish(payload.to_json, message_settings)
     rescue => e
-      log("Error publishing: #{[data, attributes, e.message, e.backtrace]}")
+      info = [data, attributes, e.message, e.backtrace]
+      log("Error publishing: #{info}", :error)
     end
 
     def stop
@@ -43,22 +43,17 @@ module PubSubModelSync
 
     private
 
+    def message_settings
+      { routing_key: queue.name, type: SERVICE_KEY }
+    end
+
     def process_message(_delivery_info, meta_info, payload)
       return unless meta_info[:type] == SERVICE_KEY
 
-      data, attrs = parse_message_payload(payload)
-      args = [data, attrs[:klass], attrs[:action], attrs]
-      PubSubModelSync::MessageProcessor.new(*args).process
+      perform_message(payload)
     rescue => e
       error = [payload, e.message, e.backtrace]
-      log("Error processing message: #{error}")
-    end
-
-    def parse_message_payload(payload)
-      message_payload = JSON.parse(payload).symbolize_keys
-      data = message_payload[:data].symbolize_keys
-      attrs = message_payload[:attributes].symbolize_keys
-      [data, attrs]
+      log("Error processing message: #{error}", :error)
     end
 
     def subscribe_to_queue
@@ -74,8 +69,8 @@ module PubSubModelSync
       queue.bind(topic, routing_key: queue.name)
     end
 
-    def log(msg)
-      config.log("Rabbit Service ==> #{msg}")
+    def log(msg, kind = :info)
+      config.log("Rabbit Service ==> #{msg}", kind)
     end
   end
 end

data/lib/pub_sub_model_sync/subscriber_concern.rb

@@ -8,32 +8,35 @@ module PubSubModelSync
 
     module ClassMethods
       # @param settings (Hash): { as_klass: nil, actions: nil, id: nil }
-      def ps_msync_subscribe(attrs, settings = {})
-        settings[:as_klass] = (settings[:as_klass] || name).to_s
+      def ps_subscribe(attrs, settings = {})
+        as_klass = (settings[:as_klass] || name).to_s
         actions = settings.delete(:actions) || %i[create update destroy]
-        @ps_msync_subscriber_settings = { attrs: attrs }.merge(settings)
+        settings = settings.merge(attrs: attrs)
         actions.each do |action|
-          add_ps_msync_subscriber(settings[:as_klass], action, action, false)
+          add_ps_subscriber(as_klass, action, action, false, settings)
         end
       end
 
-      def ps_msync_class_subscribe(action, as_action: nil, as_klass: nil)
-        add_ps_msync_subscriber(as_klass, action, as_action, true)
+      def ps_class_subscribe(action, as_action: nil, as_klass: nil)
+        add_ps_subscriber(as_klass, action, as_action, true, {})
       end
 
-      def ps_msync_subscriber_settings
-        @ps_msync_subscriber_settings || {}
+      def ps_subscriber(action = :create)
+        PubSubModelSync::Config.listeners.select do |listener|
+          listener[:klass] == name && listener[:action] == action
+        end.last
       end
 
       private
 
-      def add_ps_msync_subscriber(as_klass, action, as_action, direct_mode)
+      def add_ps_subscriber(as_klass, action, as_action, direct_mode, settings)
         listener = {
           klass: name,
           as_klass: (as_klass || name).to_s,
           action: action.to_sym,
           as_action: (as_action || action).to_sym,
-          direct_mode: direct_mode
+          direct_mode: direct_mode,
+          settings: settings
         }
         PubSubModelSync::Config.listeners << listener
       end

data/lib/pub_sub_model_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PubSubModelSync
-  VERSION = '0.1.2'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_sub_model_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,12 +119,15 @@ files:
 - lib/pub_sub_model_sync/connector.rb
 - lib/pub_sub_model_sync/message_processor.rb
 - lib/pub_sub_model_sync/mock_google_service.rb
+- lib/pub_sub_model_sync/mock_kafka_service.rb
 - lib/pub_sub_model_sync/mock_rabbit_service.rb
 - lib/pub_sub_model_sync/publisher.rb
 - lib/pub_sub_model_sync/publisher_concern.rb
 - lib/pub_sub_model_sync/railtie.rb
 - lib/pub_sub_model_sync/runner.rb
+- lib/pub_sub_model_sync/service_base.rb
 - lib/pub_sub_model_sync/service_google.rb
+- lib/pub_sub_model_sync/service_kafka.rb
 - lib/pub_sub_model_sync/service_rabbit.rb
 - lib/pub_sub_model_sync/subscriber_concern.rb
 - lib/pub_sub_model_sync/tasks/worker.rake