pub_sub_model_sync 0.3.0 → 0.4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04acaa2b5befa05fd52978367afdb24c6a1a5858e10441620a2860a57ea9cd55
-  data.tar.gz: 25297748dd5e1099f9f251d73f7f94c0680e9c04820c3396143f9b3ca17170ad
+  metadata.gz: 30ddd2acf4ff439f66a35b747794b606dbe7949c31fe3f9bf064e87e718c8e48
+  data.tar.gz: 95724a2190dd0cdb8d9a4ef4e841c90462cd53794dbf5cde7c04e2699171f55a
 SHA512:
-  metadata.gz: dea58e39fd6d77599000a932f7db942052d5309069c8adb0e571fcb2b7be4a5d4429048371b5bac51c18ff9f016dc88fc0e85ea73ca04bc93f36536c580ea544
-  data.tar.gz: cead04daf416641b5d900d4c8c6a13509c49fa8256dd343552c70b578f5af3a3ba39465069999688418e4de60ba4f9a62b4e40e3b54c0c55dd89dcf366f28ab2
+  metadata.gz: 417260220e8c7c89a0fd37a23814d4b5436f29218bd212541b11e9ec1f815cb283fc8f1a1d579dd23ee5ada60c8138cc6a53515ddea2a0ec7dd75c5ee59c2be3
+  data.tar.gz: ded28709d868ec234553ac1d47927d48423f909126fc1a4b119d5cb98801181927883ae1b0b7e01c979b0225bafbd6685f2f7b9d843722da673e3d63760b8057

data/.github/workflows/ruby.yml

@@ -6,28 +6,45 @@ on:
       - master
   pull_request:
 
-
 jobs:
   build:
     name: Tests and Code Style
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.4, 2.5, 2.6]
+        rails: [4, 5, 6]
+        include:
+          - ruby: 2.7
+            rails: 6
+        exclude: # rails 6 requires ruby >= 2.5
+          - ruby: 2.4
+            rails: 6
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.6
+      - name: Set up Ruby
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
-
+          ruby-version: ${{ matrix.ruby }}
       - name: Install sqlite3
         run: sudo apt-get install libsqlite3-dev
 
-      - name: Bundle install
+      - name: Install bundler
+        env:
+          GEMFILE_PATH: gemfiles/Gemfile_${{ matrix.rails }}
+          RAILS_V: ${{ matrix.rails }}
         run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+          rm -f Gemfile.lock && rm -f Gemfile
+          cp $GEMFILE_PATH ./Gemfile
+          bundler_v='2.1.4'
+          if [ $RAILS_V = "4" ]; then bundler_v="1.16.6"; fi
+          gem install bundler -v "~> $bundler_v"
+          bundle _${bundler_v}_ install --jobs 4 --retry 3
+
       - name: Tests (rspec)
         run: |
           bundle exec rspec
+
       - name: Code style (Rubocop)
         run: bundle exec rubocop

data/.rubocop.yml

@@ -1,17 +1,19 @@
 # This is the configuration used to check the rubocop source code.
 
 AllCops:
+  TargetRubyVersion: 2.4
   Exclude:
     - 'spec/spec_helper.rb'
     - 'Gemfile'
     - 'Rakefile'
     - 'bin/*'
-  TargetRubyVersion: 2.3
 
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
 
+Layout/LineLength:
+  Max: 80
 
 Style/SymbolArray:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+# 0.4.2.1 (August 20, 2020)
+- Improve ```ps_subscriber_changed?``` to run validations and check for changes
+ 
+# 0.4.2 (May 12, 2020)
+- chore: remove typo
+
+# 0.4.1 (May 12, 2020)
+- chore: improve log messages
+- feat: do not update model if no changes
+- feat: skip publisher after updating if no changes
+
+
+# 0.4.0 (May 06, 2020)
+- rename as_klass to from_klass and as_action to from_action for subscribers
+- refactor subscribers to be independent
+- refactor message_publisher to use publisher
+- rename publisher into message_publisher
+- reformat publisher to reuse connector
+
+# 0.3.1 (May 05, 2020)
+- improve rabbit service to use sleep instead of block ("Block is not recommended for production")
+- improve message ID
+
 # 0.3.0 (April 29, 2020)
 - Support for multiple identifiers when syncing
 - Add klass.ps_find_model method for a custom model finder

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_sub_model_sync (0.3.0)
-      activesupport
+    pub_sub_model_sync (0.4.2.1)
       rails
 
 GEM
@@ -123,7 +122,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     jwt (2.2.1)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -132,21 +131,21 @@ GEM
       mimemagic (~> 0.3.2)
     memoist (0.16.2)
     method_source (1.0.0)
-    mimemagic (0.3.4)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     os (1.0.1)
     parallel (1.19.1)
     parser (2.7.0.4)
       ast (~> 2.4.0)
     public_suffix (4.0.3)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.0.2.2)
@@ -208,7 +207,7 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -221,9 +220,9 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     zeitwerk (2.3.0)
 
 PLATFORMS

data/README.md

@@ -61,6 +61,9 @@ And then execute: $ bundle install
     ```
     Note: Publishers do not need todo this
 
+- Check the service status with:    
+  ```PubSubModelSync::MessagePublisher.publish_data('Test message', {sample_value: 10}, :create)```
+
 ## Examples
 ```ruby
 # App 1 (Publisher)
@@ -86,7 +89,7 @@ User.create(name: 'test user', email: 'sample@gmail.com') # Review your App 2 to
 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
+PubSubModelSync::MessagePublisher.publish_data(User, { msg: 'Hello' }, :greeting) # similar to above when not included publisher concern
 ```
 
 ## Advanced Example
@@ -110,15 +113,15 @@ end
 class User < ActiveRecord::Base
   self.table_name = 'subscriber_users'
   include PubSubModelSync::SubscriberConcern
-  ps_subscribe(%i[name], actions: %i[update], as_klass: 'Client', id: %i[client_id email])
-  ps_class_subscribe(:greeting, as_action: :custom_greeting, as_klass: 'CustomUser')
+  ps_subscribe(%i[name], actions: %i[update], from_klass: 'Client', id: %i[client_id email])
+  ps_class_subscribe(:greeting, from_action: :custom_greeting, from_klass: 'CustomUser')
   alias_attribute :full_name, :name
   
   def self.greeting(data)
     puts 'Class message called through custom_greeting'
   end
   
-  # def self.ps_find_model(data, settings)
+  # def self.ps_find_model(data)
   #   where(email: data[:email], ...).first_or_initialize 
   # end
 end
@@ -126,42 +129,39 @@ end
 
 Note: Be careful with collision of names
 ```
-class User
-    # ps_publish %i[name_data:name name:key] # key will be replaced with name_data 
-    ps_publish %i[name_data:name key_data:key] # use alias to avoid collision
-    
-    def key_data
-      name
-    end
-end
+  # ps_publish %i[name_data:name name:key] # key will be replaced with name_data 
+  ps_publish %i[name_data:name key_data:key] # use alias to avoid collision
 ``` 
 
 ## API
 ### Subscribers
-- Permit to configure class level listeners
-  ```ps_class_subscribe(action_name, as_action: nil, as_klass: nil)```
-  * as_action: (Optional) Source method name
-  * as_klass: (Optional) Source class name
+- Permit to configure class level subscriptions
+  ```ps_class_subscribe(action_name, from_action: nil, from_klass: nil)```
+  * from_action: (Optional) Source method name
+  * from_klass: (Optional) Source class name
   
-- Permit to configure instance level listeners (CRUD)
-  ```ps_subscribe(attrs, as_klass: nil, actions: nil, id: nil)```
+- Permit to configure instance level subscriptions (CRUD)
+  ```ps_subscribe(attrs, from_klass: nil, actions: nil, id: nil)```
   * attrs: (Array/Required) Array of all attributes to be synced
-  * as_klass: (String/Optional) Source class name (Instead of the model class name, will use this value) 
+  * from_klass: (String/Optional) Source class name (Instead of the model class name, will use this value) 
   * actions: (Array/Optional, default: create/update/destroy) permit to customize action names
   * id: (Sym|Array/Optional, default: id) Attr identifier(s) to find the corresponding model
 
 - Permit to configure a custom model finder
-  ```ps_find_model(data, settings)```
+  ```ps_find_model(data)```
   * data: (Hash) Data received from sync
-  * settings: (Hash(:klass, :action)) Class and action name from sync
   Must return an existent or a new model object
 
 - Get crud subscription configured for the class   
   ```User.ps_subscriber(action_name)```  
   * action_name (default :create, :sym): can be :create, :update, :destroy
 
-- Inspect all configured listeners
-  ```PubSubModelSync::Config.listeners```    
+- Inspect all configured subscribers   
+  ```PubSubModelSync::Config.subscribers```    
+
+- Permit to customize the way to detect if the subscribed model was changed (Only for update action).   
+  ```.ps_subscriber_changed?(data)```    
+  By default: ```model.changed?```
 
 ### Publishers
 - Permit to configure crud publishers
@@ -172,6 +172,7 @@ end
 
 - Permit to cancel sync called after create/update/destroy (Before initializing sync service)
   ```model.ps_skip_callback?(action)```    
+  Default: False  
   Note: Return true to cancel sync
   
 - Callback called before preparing data for sync (Permit to stop sync)
@@ -198,7 +199,7 @@ end
   * as_klass: (optional, :string) Custom class name (Default current model name)
       
 - Publish a class level notification (Same as above: on demand call)    
-  ```PubSubModelSync::Publisher.new.publish_data(Klass_name, data, action_name)```  
+  ```PubSubModelSync::MessagePublisher.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(...)
@@ -254,23 +255,29 @@ end
   
     # Publisher
     it 'publish model action' do
-      publisher = PubSubModelSync::Publisher  
+      publisher = PubSubModelSync::MessagePublisher  
       data = { name: 'hello'}
       action = :create
       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)
+      expect(publisher).to receive(:publish_model).with(user, :create, anything)
     end
        
     it 'publish class message' do
-      publisher = PubSubModelSync::Publisher  
+      publisher = PubSubModelSync::MessagePublisher  
       data = {msg: 'hello'}
       action = :greeting
       User.ps_class_publish(data, action: action)
-      expect_any_instance_of(publisher).to receive(:publish_data).with('User', data, action)
+      expect(publisher).to receive(:publish_data).with('User', data, action)
     end
     ```
 
+## TODO
+- Hooks/callbacks when message processed or failed
+- Add alias attributes when subscribing (similar to publisher)
+- Add flag ```model.ps_processing``` to indicate that the current transaction is being processed by pub/sub
+ 
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/owen2345/pub_sub_model_sync. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/gemfiles/Gemfile_4

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gem 'rubocop'
+gem 'bunny' # rabbit-mq
+gem 'google-cloud-pubsub' # google pub/sub
+gem 'ruby-kafka' # kafka pub/sub
+gem 'rails', '~> 4'
+gem 'bundler'
+gem 'sqlite3', '1.3.13'
+
+group :test do
+  gem 'database_cleaner-active_record'
+end
+
+# Specify your gem's dependencies in pub_sub_model_sync.gemspec
+gemspec

data/gemfiles/Gemfile_5

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem 'rubocop'
+gem 'bunny' # rabbit-mq
+gem 'google-cloud-pubsub' # google pub/sub
+gem 'ruby-kafka' # kafka pub/sub
+gem 'rails', '~> 5'
+
+group :test do
+  gem 'database_cleaner-active_record'
+end
+
+# Specify your gem's dependencies in pub_sub_model_sync.gemspec
+gemspec

data/gemfiles/Gemfile_6

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem 'rubocop'
+gem 'bunny' # rabbit-mq
+gem 'google-cloud-pubsub' # google pub/sub
+gem 'ruby-kafka' # kafka pub/sub
+gem 'rails', '~> 6'
+
+group :test do
+  gem 'database_cleaner-active_record'
+end
+
+# Specify your gem's dependencies in pub_sub_model_sync.gemspec
+gemspec

data/lib/pub_sub_model_sync.rb

@@ -6,12 +6,15 @@ require 'active_support'
 require 'pub_sub_model_sync/railtie'
 require 'pub_sub_model_sync/config'
 require 'pub_sub_model_sync/subscriber_concern'
-require 'pub_sub_model_sync/publisher'
+require 'pub_sub_model_sync/message_publisher'
 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/publisher'
+require 'pub_sub_model_sync/subscriber'
+
 require 'pub_sub_model_sync/service_base'
 require 'pub_sub_model_sync/service_google'
 require 'pub_sub_model_sync/service_rabbit'

data/lib/pub_sub_model_sync/config.rb

@@ -2,7 +2,7 @@
 
 module PubSubModelSync
   class Config
-    cattr_accessor(:listeners) { [] }
+    cattr_accessor(:subscribers) { [] }
     cattr_accessor(:publishers) { [] }
     cattr_accessor(:service_name) { :google }
     cattr_accessor :logger

data/lib/pub_sub_model_sync/message_processor.rb

@@ -2,91 +2,39 @@
 
 module PubSubModelSync
   class MessageProcessor
-    attr_accessor :data, :settings, :message_id
+    attr_accessor :data, :klass, :action
 
     # @param data (Hash): any hash value to deliver
     def initialize(data, klass, action)
       @data = data
-      @settings = { klass: klass, action: action }
-      @message_id = [klass, action, Time.current.to_i].join('-')
+      @klass = klass
+      @action = action
     end
 
     def process
-      @failed = false
-      log "processing message: #{[data, settings]}"
-      listeners = filter_listeners
-      return log 'Skipped: No listeners' unless listeners.any?
-
-      eval_message(listeners)
-      log 'processed message' unless @failed
+      subscribers = filter_subscribers
+      subscribers.each { |subscriber| run_subscriber(subscriber) }
     end
 
     private
 
-    def eval_message(listeners)
-      listeners.each do |listener|
-        if listener[:direct_mode]
-          call_class_listener(listener)
-        else
-          call_listener(listener)
-        end
-      end
-    end
-
-    def call_class_listener(listener)
-      model_class = listener[:klass].constantize
-      model_class.send(listener[:action], data)
+    def run_subscriber(subscriber)
+      subscriber.eval_message(data)
+      log "processed message with: #{[klass, action, data]}"
     rescue => e
-      log("Error listener (#{listener}): #{e.message}", :error)
-      @failed = true
-    end
-
-    # support for: create, update, destroy
-    def call_listener(listener)
-      model = find_model(listener)
-      if settings[:action].to_sym == :destroy
-        model.destroy!
-      else
-        populate_model(model, listener)
-        model.save!
-      end
-    rescue => e
-      log("Error listener (#{listener}): #{e.message}", :error)
-      @failed = true
-    end
-
-    def find_model(listener)
-      model_class = listener[:klass].constantize
-      if model_class.respond_to?(:ps_find_model)
-        return model_class.ps_find_model(data, settings)
-      end
-
-      model_class.where(model_identifiers(listener)).first_or_initialize
-    end
-
-    def model_identifiers(listener)
-      identifiers = listener[:settings][:id]
-      identifiers = [identifiers] unless identifiers.is_a?(Array)
-      identifiers.map { |key| [key, data[key.to_sym]] }.to_h
-    end
-
-    def populate_model(model, listener)
-      values = data.slice(*listener[:settings][:attrs])
-      values.each do |attr, value|
-        model.send("#{attr}=", value)
-      end
+      info = [klass, action, data, e.message, e.backtrace]
+      log("error processing message: #{info}", :error)
     end
 
-    def filter_listeners
-      listeners = PubSubModelSync::Config.listeners
-      listeners.select do |listener|
-        listener[:as_klass].to_s == settings[:klass].to_s &&
-          listener[:as_action].to_s == settings[:action].to_s
+    def filter_subscribers
+      PubSubModelSync::Config.subscribers.select do |subscriber|
+        subscriber.settings[:from_klass].to_s == klass.to_s &&
+          subscriber.settings[:from_action].to_s == action.to_s
       end
     end
 
     def log(message, kind = :info)
-      PubSubModelSync::Config.log "(ID: #{message_id}) #{message}", kind
+      PubSubModelSync::Config.log message, kind
     end
   end
 end

data/lib/pub_sub_model_sync/message_publisher.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module PubSubModelSync
+  class MessagePublisher
+    class << self
+      delegate :publish, to: :connector
+
+      def connector
+        @connector ||= PubSubModelSync::Connector.new
+      end
+
+      def publish_data(klass, data, action)
+        attrs = { klass: klass.to_s, action: action.to_sym }
+        publish(data, attrs)
+      end
+
+      # @param model: ActiveRecord model
+      # @param action: (Sym) Action name
+      # @param publisher: (Publisher, optional) Publisher to be used
+      def publish_model(model, action, publisher = nil)
+        return if model.ps_skip_sync?(action)
+
+        publisher ||= model.class.ps_publisher(action)
+        payload = publisher.payload(model, action)
+        res_before = model.ps_before_sync(action, payload[:data])
+        return if res_before == :cancel
+
+        publish(payload[:data], payload[:attrs])
+        model.ps_after_sync(action, payload[:data])
+      end
+    end
+  end
+end

data/lib/pub_sub_model_sync/publisher.rb

@@ -2,42 +2,24 @@
 
 module PubSubModelSync
   class Publisher
-    attr_accessor :connector
-    delegate :publish, to: :connector
-
-    def initialize
-      @connector = PubSubModelSync::Connector.new
-    end
-
-    def publish_data(klass, data, action)
-      attributes = self.class.build_attrs(klass, action)
-      publish(data, attributes)
+    attr_accessor :attrs, :actions, :klass, :as_klass
+    def initialize(attrs, klass, actions = nil, as_klass = nil)
+      @attrs = attrs
+      @klass = klass
+      @actions = actions || %i[create update destroy]
+      @as_klass = as_klass || klass
     end
 
-    # @param custom_settings (Hash): { attrs: [], as_klass: nil }
-    def publish_model(model, action, custom_settings = {})
-      return if model.ps_skip_sync?(action)
-
-      settings = model.class.ps_publisher(action).merge(custom_settings)
-      attributes = build_model_attrs(model, action, settings)
-      data = build_model_data(model, settings[:attrs])
-      res_before = model.ps_before_sync(action, data)
-      return if res_before == :cancel
-
-      publish(data.symbolize_keys, attributes)
-      model.ps_after_sync(action, data)
-    end
-
-    def self.build_attrs(klass, action)
-      { klass: klass.to_s, action: action.to_sym }
+    def payload(model, action)
+      { data: payload_data(model), attrs: payload_attrs(model, action) }
     end
 
     private
 
-    def build_model_data(model, model_props)
-      source_props = model_props.map { |prop| prop.to_s.split(':').first }
+    def payload_data(model)
+      source_props = @attrs.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 = @attrs.select { |prop| prop.to_s.include?(':') }
       aliased_props.each do |prop|
         source, target = prop.to_s.split(':')
         data[target] = data.delete(source)
@@ -45,13 +27,8 @@ module PubSubModelSync
       data.symbolize_keys
     end
 
-    def build_model_attrs(model, action, settings)
-      as_klass = (settings[:as_klass] || model.class.name).to_s
-      self.class.build_attrs(as_klass, action)
-    end
-
-    def log(msg)
-      PubSubModelSync::Config.log(msg)
+    def payload_attrs(model, action)
+      { klass: (as_klass || model.class.name).to_s, action: action.to_sym }
     end
   end
 end

data/lib/pub_sub_model_sync/publisher_concern.rb

@@ -11,6 +11,7 @@ module PubSubModelSync
       false
     end
 
+    # TODO: make it using respond_to?(:ps_skip_sync?)
     # before preparing data to sync
     def ps_skip_sync?(_action)
       false
@@ -23,49 +24,49 @@ module PubSubModelSync
     def ps_after_sync(_action, _data); end
 
     # To perform sync on demand
-    # @param custom_settings (Hash): { attrs: [], as_klass: nil }
-    def ps_perform_sync(action = :create, custom_settings = {})
-      service = self.class.ps_publisher_service
-      model_settings = self.class.ps_publisher(action) || {}
-      service.publish_model(self, action, model_settings.merge(custom_settings))
+    # @param attrs (Array, optional): custom attrs to be used
+    # @param as_klass (Array, optional): custom klass name to be used
+    # @param publisher (Publisher, optional): custom publisher object
+    def ps_perform_sync(action = :create, attrs: nil, as_klass: nil,
+                        publisher: nil)
+      publisher ||= self.class.ps_publisher(action).dup
+      publisher.attrs = attrs if attrs
+      publisher.as_klass = as_klass if as_klass
+      PubSubModelSync::MessagePublisher.publish_model(self, action, publisher)
     end
 
     module ClassMethods
       # Permit to configure to publish crud actions (:create, :update, :destroy)
       def ps_publish(attrs, actions: %i[create update destroy], as_klass: nil)
-        as_klass ||= name
+        klass = PubSubModelSync::Publisher
+        publisher = klass.new(attrs, name, actions, as_klass)
+        PubSubModelSync::Config.publishers << publisher
         actions.each do |action|
-          info = { klass: name, action: action, attrs: attrs,
-                   as_klass: as_klass }
-          PubSubModelSync::Config.publishers << info
-          ps_register_callback(action.to_sym, info)
+          ps_register_callback(action.to_sym, publisher)
         end
       end
 
       # On demand class level publisher
       def ps_class_publish(data, action:, as_klass: nil)
         as_klass = (as_klass || name).to_s
-        ps_publisher_service.publish_data(as_klass, data, action.to_sym)
+        klass = PubSubModelSync::MessagePublisher
+        klass.publish_data(as_klass, data, action.to_sym)
       end
 
       # Publisher info for specific action
       def ps_publisher(action = :create)
-        PubSubModelSync::Config.publishers.find do |listener|
-          listener[:klass] == name && listener[:action] == action
+        PubSubModelSync::Config.publishers.find do |publisher|
+          publisher.klass == name && publisher.actions.include?(action)
         end
       end
 
-      def ps_publisher_service
-        PubSubModelSync::Publisher.new
-      end
-
       private
 
-      def ps_register_callback(action, info)
+      def ps_register_callback(action, publisher)
         after_commit(on: action) do |model|
           unless model.ps_skip_callback?(action)
-            service = model.class.ps_publisher_service
-            service.publish_model(model, action.to_sym, info)
+            klass = PubSubModelSync::MessagePublisher
+            klass.publish_model(model, action.to_sym, publisher)
           end
         end
       end

data/lib/pub_sub_model_sync/service_base.rb

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

data/lib/pub_sub_model_sync/service_google.rb

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

data/lib/pub_sub_model_sync/service_kafka.rb

@@ -29,12 +29,12 @@ module PubSubModelSync
     end
 
     def publish(data, attributes)
-      log("Publishing: #{[data, attributes]}")
+      log("Publishing: #{[attributes, data]}")
       payload = { data: data, attributes: attributes }
       producer.produce(payload.to_json, message_settings)
       producer.deliver_messages
     rescue => e
-      info = [data, attributes, e.message, e.backtrace]
+      info = [attributes, data, e.message, e.backtrace]
       log("Error publishing: #{info}", :error)
     end
 

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
@@ -27,7 +28,7 @@ module PubSubModelSync
     end
 
     def publish(data, attributes)
-      log("Publishing: #{[data, attributes]}")
+      log("Publishing: #{[attributes, data]}")
       deliver_data(data, attributes)
     # TODO: max retry
     rescue Timeout::Error => e
@@ -35,7 +36,7 @@ module PubSubModelSync
       initialize
       retry
     rescue => e
-      info = [data, attributes, e.message, e.backtrace]
+      info = [attributes, data, e.message, e.backtrace]
       log("Error publishing: #{info}", :error)
     end
 
@@ -50,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
 

data/lib/pub_sub_model_sync/subscriber.rb

@@ -0,0 +1,67 @@
+# 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)
+        return if action == :update && !model.ps_subscriber_changed?(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

@@ -6,38 +6,41 @@ module PubSubModelSync
       base.extend(ClassMethods)
     end
 
+    # check if model was changed to skip nonsense .update!()
+    def ps_subscriber_changed?(_data)
+      validate
+      changed?
+    end
+
     module ClassMethods
-      def ps_subscribe(attrs, as_klass: nil, actions: nil, id: :id)
+      def ps_subscribe(attrs, actions: nil, from_klass: name, id: :id)
+        settings = { id: id, from_klass: from_klass }
         actions ||= %i[create update destroy]
-        settings = { attrs: attrs, id: id }
         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.find do |listener|
-          listener[:klass] == name && listener[:action] == action
+        PubSubModelSync::Config.subscribers.find do |subscriber|
+          subscriber.klass == name && subscriber.action == action
         end
       end
 
       private
 
-      # @param settings (Hash): { id:, attrs: }
-      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.push(listener) && 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.3.0'
+  VERSION = '0.4.2.1'
 end

data/pub_sub_model_sync.gemspec

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pub_sub_model_sync/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.4'
   spec.name          = 'pub_sub_model_sync'
   spec.version       = PubSubModelSync::VERSION
   spec.authors       = ['Owen']
@@ -32,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'rails'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pub_sub_model_sync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2.1
 platform: ruby
 authors:
 - Owen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
-- !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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -103,15 +89,6 @@ 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"
 - CHANGELOG.md
@@ -123,10 +100,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/Gemfile_4
+- gemfiles/Gemfile_5
+- gemfiles/Gemfile_6
 - lib/pub_sub_model_sync.rb
 - 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
@@ -138,6 +119,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
@@ -149,7 +131,7 @@ metadata:
   homepage_uri: https://github.com/owen2345/pub_sub_model_sync
   source_code_uri: https://github.com/owen2345/pub_sub_model_sync
   changelog_uri: https://github.com/owen2345/pub_sub_model_sync/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -165,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Permit to sync models between apps through pub/sub
 test_files: []

data/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build pub_sub_model_sync-0.1.0.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install pub_sub_model_sync-0.1.0.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install pub_sub_model_sync-0.1.0.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.0 and build and push pub_sub_model_sync-0.1.0.gem to TODO: Set to 'http://mygemserver.com'" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

data/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,16 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="mySeverityMap">
-        <map>
-          <entry key="convention" value="ERROR" />
-          <entry key="error" value="ERROR" />
-          <entry key="fatal" value="ERROR" />
-          <entry key="refactor" value="ERROR" />
-          <entry key="warning" value="ERROR" />
-        </map>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.5.3" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pub_sub_model_sync.iml" filepath="$PROJECT_DIR$/.idea/pub_sub_model_sync.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/pub_sub_model_sync.iml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.6.5" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actioncable (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailbox (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actiontext (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activejob (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activestorage (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="amq-protocol (v2.3.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bunny (v2.14.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.6, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.6, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.8.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="database_cleaner-active_record (v1.8.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="digest-crc (v0.5.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.9.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.17.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="google-cloud-core (v1.3.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="google-cloud-env (v1.2.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="google-cloud-pubsub (v1.0.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="google-gax (v1.7.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="google-protobuf (v3.11.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="googleapis-common-protos (v1.3.9, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="googleapis-common-protos-types (v1.0.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="googleauth (v0.9.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="grpc (v1.27.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="grpc-google-iam-v1 (v0.6.9, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jwt (v2.2.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.5.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="marcel (v0.3.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="memoist (v0.16.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="method_source (v1.0.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mimemagic (v0.3.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.4.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.14.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.1.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nio4r (v2.5.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.10.9, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="os (v1.0.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.0.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack (v2.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.3.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v6.0.2.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rly (v0.2.3, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.80.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-kafka (v1.0.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="signet (v0.11.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sprockets (v4.0.0, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.4.2, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thor (v1.0.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.7, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.1, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.4, RVM: ruby-2.6.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.3.0, RVM: ruby-2.6.5) [gem]" level="application" />
-  </component>
-</module>

data/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>