pub_sub_model_sync 0.2.2 → 0.4.0

data/lib/pub_sub_model_sync/service_base.rb

@@ -18,11 +18,11 @@ module PubSubModelSync
 
     private
 
-    # @param payload (String JSON): '{"data":{},"attributes":{..}}'
-    #   refer: PubSubModelSync::Publisher (.publish_model | .publish_data)
+    # @param payload (String JSON): '{"data":{}, "attributes":{..}}'
+    #   refer: PubSubModelSync::MessagePublisher(.publish_model | .publish_data)
     def perform_message(payload)
       data, attrs = parse_message_payload(payload)
-      args = [data, attrs[:klass], attrs[:action], attrs]
+      args = [data, attrs[:klass], attrs[:action]]
       PubSubModelSync::MessageProcessor.new(*args).process
     end
 

data/lib/pub_sub_model_sync/service_google.rb

@@ -30,9 +30,11 @@ module PubSubModelSync
 
     def publish(data, attributes)
       log("Publishing message: #{[data, attributes]}")
-
       payload = { data: data, attributes: attributes }.to_json
       topic.publish(payload, { SERVICE_KEY => true })
+    rescue => e
+      info = [data, attributes, e.message, e.backtrace]
+      log("Error publishing: #{info}", :error)
     end
 
     def stop

data/lib/pub_sub_model_sync/service_rabbit.rb

@@ -19,7 +19,8 @@ module PubSubModelSync
       log('Listener starting...')
       subscribe_to_queue
       log('Listener started')
-      queue.subscribe(block: true, manual_ack: false, &method(:process_message))
+      queue.subscribe(subscribe_settings, &method(:process_message))
+      loop { sleep 5 }
     rescue PubSubModelSync::Runner::ShutDown
       raise
     rescue => e
@@ -28,9 +29,12 @@ module PubSubModelSync
 
     def publish(data, attributes)
       log("Publishing: #{[data, attributes]}")
-      subscribe_to_queue
-      payload = { data: data, attributes: attributes }
-      topic.publish(payload.to_json, message_settings)
+      deliver_data(data, attributes)
+    # TODO: max retry
+    rescue Timeout::Error => e
+      log("Error publishing (retrying....): #{e.message}", :error)
+      initialize
+      retry
     rescue => e
       info = [data, attributes, e.message, e.backtrace]
       log("Error publishing: #{info}", :error)
@@ -47,6 +51,10 @@ module PubSubModelSync
       { routing_key: queue.name, type: SERVICE_KEY }
     end
 
+    def subscribe_settings
+      { manual_ack: false }
+    end
+
     def process_message(_delivery_info, meta_info, payload)
       return unless meta_info[:type] == SERVICE_KEY
 
@@ -72,5 +80,16 @@ module PubSubModelSync
     def log(msg, kind = :info)
       config.log("Rabbit Service ==> #{msg}", kind)
     end
+
+    def deliver_data(data, attributes)
+      subscribe_to_queue
+      payload = { data: data, attributes: attributes }
+      topic.publish(payload.to_json, message_settings)
+
+      # Ugly fix: "IO timeout when reading 7 bytes"
+      # https://stackoverflow.com/questions/39039129/rabbitmq-timeouterror-io-timeout-when-reading-7-bytes
+      channel.close
+      service.close
+    end
   end
 end

data/lib/pub_sub_model_sync/subscriber.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module PubSubModelSync
+  class Subscriber
+    attr_accessor :klass, :action, :attrs, :settings
+
+    # @param settings: (Hash) { id: :id, direct_mode: false,
+    #                           from_klass: klass, from_action: action }
+    def initialize(klass, action, attrs: nil, settings: {})
+      def_settings = { id: :id, direct_mode: false,
+                       from_klass: klass, from_action: action }
+      @klass = klass
+      @action = action
+      @attrs = attrs
+      @settings = def_settings.merge(settings)
+    end
+
+    def eval_message(message)
+      if settings[:direct_mode]
+        run_class_message(message)
+      else
+        run_model_message(message)
+      end
+    end
+
+    private
+
+    def run_class_message(message)
+      model_class = klass.constantize
+      model_class.send(action, message)
+    end
+
+    # support for: create, update, destroy
+    def run_model_message(message)
+      model = find_model(message)
+      if action == :destroy
+        model.destroy!
+      else
+        populate_model(model, message)
+        model.save!
+      end
+    end
+
+    def find_model(message)
+      model_class = klass.constantize
+      if model_class.respond_to?(:ps_find_model)
+        return model_class.ps_find_model(message)
+      end
+
+      model_class.where(model_identifiers(message)).first_or_initialize
+    end
+
+    def model_identifiers(message)
+      identifiers = Array(settings[:id])
+      identifiers.map { |key| [key, message[key.to_sym]] }.to_h
+    end
+
+    def populate_model(model, message)
+      values = message.slice(*attrs)
+      values.each do |attr, value|
+        model.send("#{attr}=", value)
+      end
+    end
+  end
+end

data/lib/pub_sub_model_sync/subscriber_concern.rb

@@ -7,38 +7,34 @@ module PubSubModelSync
     end
 
     module ClassMethods
-      # @param settings (Hash): { as_klass: nil, actions: nil, id: nil }
-      def ps_subscribe(attrs, settings = {})
-        as_klass = (settings[:as_klass] || name).to_s
-        actions = settings.delete(:actions) || %i[create update destroy]
-        settings = settings.merge(attrs: attrs)
+      def ps_subscribe(attrs, actions: nil, from_klass: name, id: :id)
+        settings = { id: id, from_klass: from_klass }
+        actions ||= %i[create update destroy]
         actions.each do |action|
-          add_ps_subscriber(as_klass, action, action, false, settings)
+          add_ps_subscriber(action, attrs, settings)
         end
       end
 
-      def ps_class_subscribe(action, as_action: nil, as_klass: nil)
-        add_ps_subscriber(as_klass, action, as_action, true, {})
+      def ps_class_subscribe(action, from_action: nil, from_klass: nil)
+        settings = { direct_mode: true }
+        settings[:from_action] = from_action if from_action
+        settings[:from_klass] = from_klass if from_klass
+        add_ps_subscriber(action, nil, settings)
       end
 
       def ps_subscriber(action = :create)
-        PubSubModelSync::Config.listeners.select do |listener|
-          listener[:klass] == name && listener[:action] == action
-        end.last
+        PubSubModelSync::Config.subscribers.find do |subscriber|
+          subscriber.klass == name && subscriber.action == action
+        end
       end
 
       private
 
-      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,
-          settings: settings
-        }
-        PubSubModelSync::Config.listeners << listener
+      # @param settings (Hash): refer to PubSubModelSync::Subscriber.settings
+      def add_ps_subscriber(action, attrs, settings = {})
+        klass = PubSubModelSync::Subscriber
+        subscriber = klass.new(name, action, attrs: attrs, settings: settings)
+        PubSubModelSync::Config.subscribers.push(subscriber) && subscriber
       end
     end
   end

data/lib/pub_sub_model_sync/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_sub_model_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,10 +101,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".idea/.gitignore"
+- ".idea/.rakeTasks"
+- ".idea/codeStyles/codeStyleConfig.xml"
+- ".idea/encodings.xml"
+- ".idea/inspectionProfiles/Project_Default.xml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/pub_sub_model_sync.iml"
+- ".idea/vcs.xml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -118,6 +127,7 @@ files:
 - lib/pub_sub_model_sync/config.rb
 - lib/pub_sub_model_sync/connector.rb
 - lib/pub_sub_model_sync/message_processor.rb
+- lib/pub_sub_model_sync/message_publisher.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
@@ -129,6 +139,7 @@ files:
 - 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.rb
 - lib/pub_sub_model_sync/subscriber_concern.rb
 - lib/pub_sub_model_sync/tasks/worker.rake
 - lib/pub_sub_model_sync/version.rb
@@ -155,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Permit to sync models between apps through pub/sub

data/.travis.yml

@@ -1,13 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.1
-before_install: gem install bundler
-
-script:
-  - bundle install
-  # disabled cause of: An error occurred while Style/PercentLiteralDelimiters cop
-  # - bundle exec rubocop
-  - bundle exec rspec