external_services 0.3.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255b4da146ba0b683ed63958932c09d6c724c8656798b6dee862bbf96eccd572
-  data.tar.gz: 3c04d0ac36c607e4d8c28995dff4a388ecef60785018a8f8afb3d15a4a11d15e
+  metadata.gz: c69a4919cb11efce2424a1b9490cfed1f37ad729c2ab493b563cd2d36566b8b2
+  data.tar.gz: 66b9964bc09a0ceb0b88313a8383dd2b6fb89ae642b4a445d0d0ce3f964f5754
 SHA512:
-  metadata.gz: 6931c8a6581ab4008652f870f4bf79d0b484b97af99302e3e49ab98a7de23e13479692b953b434b754222d49ef378aca10fd182c3d902cc26201b57db599a9f7
-  data.tar.gz: 7e962eaa3711edd494073526789fe7356cfa5381daba2c4228c541cc5a4e30668bdffe06ce64bf9d3d9f72399bd3081ef8a7c4ce306fa57606ae97cfa999ba98
+  metadata.gz: 0d97f6142f73c0a4aa08906400a33c515a6bdc5714aab9faa2bb11f0eeea2277be76318bf60c7ffbfb6424110ee4cf9fb3d9e8cbb413a5016a0d6a6101fe32e7
+  data.tar.gz: f06bdce065196cc64e76601ff3146ec54fc82c90efd093a239a66f41ecad8b493bf4499f3dde463a7e58df92775d189fe1045769d8b4934b8aba40761a1388ee

data/.travis.yml

@@ -1,8 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-- 2.2.4
-before_install: gem install bundler -v 1.12.5
+- 2.5.1
+- 2.7.1
+before_install: gem install bundler -v 1.17.3
 env:
 - RAILS_ENV=test
 script:

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bundler', '~> 1.12'
-gem 'rake', '~> 10.0'
+gem 'rake', '~> 13.0'
 gem 'sqlite3'
 gem 'travis', '~> 1.8', '>= 1.8.2'
 

data/Gemfile.lock

@@ -1,79 +1,96 @@
 PATH
   remote: .
   specs:
-    external_services (0.3.1)
+    external_services (0.4.4)
       faraday (>= 0.9)
       faraday_middleware (>= 0.10)
-      rails (>= 4.2.5, < 6.0)
+      rails (>= 4.2.5, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      mail (>= 2.7.1)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
-      rack (~> 2.0)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
-      marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.4.0)
-    arel (9.0.0)
     ast (2.4.0)
-    backports (3.11.3)
-    builder (3.2.3)
+    backports (3.11.4)
+    builder (3.2.4)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faraday (0.15.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.23)
+    ffi (1.9.25)
     gh (0.15.1)
       addressable (~> 2.4.0)
       backports
@@ -81,41 +98,41 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     highline (1.7.10)
-    i18n (1.0.1)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
-    json (2.1.0)
+    jaro_winkler (1.5.1)
+    json (2.3.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.2.2)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    marcel (1.0.1)
+    method_source (0.9.2)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nio4r (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    overcommit (0.45.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    overcommit (0.46.0)
       childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -124,71 +141,74 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.5)
-    rack-test (1.0.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.3)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.55.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
+    rubocop (0.59.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sprockets (3.7.1)
+    ruby-progressbar (1.10.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    travis (1.8.8)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
+    travis (1.8.9)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -199,13 +219,14 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.2)
-    websocket (1.2.5)
-    websocket-driver (0.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.4.0)
+    websocket (1.2.8)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -216,11 +237,11 @@ DEPENDENCIES
   factory_bot_rails
   overcommit
   pry-rails
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec-rails
   rubocop (~> 0.48)
   sqlite3
   travis (~> 1.8, >= 1.8.2)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/app/models/concerns/external_services/action.rb

@@ -2,8 +2,10 @@ module ExternalServices
   module Action
     extend ActiveSupport::Concern
 
+    QUEUE_PREFIX = 'external_services'
+
     included do
-      scope :processed, -> { where.not(processed_at: nil) }
+      scope :processed,   -> { where.not(processed_at: nil) }
       scope :unprocessed, -> { where(processed_at: nil) }
 
       after_commit :kick_active_job
@@ -14,7 +16,7 @@ module ExternalServices
     end
 
     def set_processed!
-      update_attributes! processed_at: Time.now
+      update! processed_at: Time.now
     end
 
     def execute!
@@ -22,12 +24,24 @@ module ExternalServices
     end
 
     def kick_active_job
-      return if processed? || api_disabled?
+      # return if processed? || api_disabled?
+
+      job_class.set(queue: prefixed_queue).perform_later(id)
+    end
 
-      job_class.set(queue: queue).perform_later(id)
+    def prefixed_queue
+      [QUEUE_PREFIX, queue].join('__')
     end
 
     module ClassMethods
+      def clear_sidekiq_queues
+        Sidekiq.redis do |conn|
+          conn.keys.select { |k| k.include?(QUEUE_PREFIX) }.each do |k|
+            conn.del k
+          end
+        end
+      end
+
       def perform_unprocessed
         Rails.logger.info "Running unprocessed #{self.class.name.demodulize} api actions..."
 

data/app/models/external_services/api_action.rb

@@ -2,6 +2,8 @@ module ExternalServices
   class ApiAction < ::ActiveRecord::Base
     include ExternalServices::Action
 
+    MAX_ACTION_AGE = ENV.fetch('EXTERNAL_SERVICES_MAX_ACTION_AGE') { '90' }.to_i.days
+
     attr_accessor :async
 
     self.table_name = :external_services_api_actions
@@ -14,15 +16,17 @@ module ExternalServices
     serialize :data,    JSON
     serialize :options, JSON
 
-    scope :unprocessed, -> { where(processed_at: nil) }
     scope :to_create, ->(obj) { where(initiator: obj, method: :post) }
 
     before_validation :assign_queue
     before_validation :process_data
-    after_commit      :kick_active_job
 
     before_create :calculate_signature
 
+    def self.delete_old_processed
+      processed.where(arel_table[:created_at].lt(MAX_ACTION_AGE.ago)).delete_all
+    end
+
     def initiator_class
       # Need to use initiator object for STI in polymorphic.. But still will be bugs with deleted STI object and
       # non-STI inheritance

data/app/models/external_services/service.rb

@@ -7,7 +7,7 @@ module ExternalServices
 
     after_update :on_first_sync, if: proc { # Rails 5.1+ support
       (respond_to?(:saved_change_to_external_id?) ? saved_change_to_external_id? : external_id_changed? ) &&
-      (respond_to?(:external_id_before_last_save) ? external_id_before_last_save.nil? : external_id_was)
+      (respond_to?(:external_id_before_last_save) ? external_id_before_last_save : external_id_was).nil?
     }
 
     def self.to_sym

data/external_services.gemspec

@@ -18,7 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.post_install_message = <<-MSG
+    WARNING: since v0.4 active_job queues are prefixed, so you should check sidekiq config.
+    And there is a sidekiq queue clean function, you should use it on Sidekiq start  instead of cleaning all Redis db.
+  MSG
+
   spec.add_dependency 'faraday', '>= 0.9'
   spec.add_dependency 'faraday_middleware', '>= 0.10'
-  spec.add_dependency 'rails', ['>= 4.2.5', '< 6.0']
+  spec.add_dependency 'rails', ['>= 4.2.5', '< 7']
 end

data/lib/external_services/api.rb

@@ -13,6 +13,12 @@ module ExternalServices
       def message
         @response.inspect
       end
+
+      alias :to_s :message
+
+      def inspect
+        "#{self.class}: #{to_s}"
+      end
     end
 
     def api_url

data/lib/external_services/version.rb

@@ -1,3 +1,3 @@
 module ExternalServices
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.4'.freeze
 end

data/lib/generators/install_generator.rb

@@ -11,6 +11,12 @@ module ExternalServices
 
       desc 'Generates migrations and directories.'
 
+      def migration_version
+       return unless Rails::VERSION::MAJOR >= 5
+
+       "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+     end
+
       def create_migration_files
         add_migration('create_external_services')
         add_migration('create_external_services_api_actions')
@@ -39,7 +45,7 @@ module ExternalServices
         if self.class.migration_exists?(migration_dir, template)
           ::Kernel.warn "Migration already exists: #{template}"
         else
-          migration_template "migrations/#{template}.rb", "db/migrate/#{template}.rb"
+          migration_template "migrations/#{template}.rb", "db/migrate/#{template}.rb", migration_version: migration_version
         end
       end
     end

data/lib/generators/templates/migrations/create_external_services.rb

@@ -1,4 +1,4 @@
-class CreateExternalServices < ActiveRecord::Migration
+class CreateExternalServices < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :external_services do |t|
       t.references :subject, null: false, polymorphic: true, index: true

data/lib/generators/templates/migrations/create_external_services_api_actions.rb

@@ -1,4 +1,4 @@
-class CreateExternalServicesApiActions < ActiveRecord::Migration
+class CreateExternalServicesApiActions < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :external_services_api_actions do |t|
       t.references :initiator, null: false, polymorphic: true, index: { name: 'esaa_on_initiator_type_and_initiator_id' }

data/lib/rspec/helpers.rb

@@ -76,7 +76,7 @@ module ExternalServices
 
             if kwargs[:descendants_identifier_check]
               it 'create actions for all descendants on identifier change' do
-                @api_object.update_attributes! identifier: "#{@api_object.identifier}1"
+                @api_object.update! identifier: "#{@api_object.identifier}1"
 
                 @api_object.descendants.each do |c|
                   expect_api_action_on_update(c)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: external_services
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -47,7 +47,7 @@ dependencies:
         version: 4.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 4.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
 description: 
 email:
 - sergey.gnuskov@flant.com
@@ -102,7 +102,9 @@ homepage: https://github.com/flant/external_services
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2
+      WARNING: since v0.4 active_job queues are prefixed, so you should check sidekiq config.
+      And there is a sidekiq queue clean function, you should use it on Sidekiq start  instead of cleaning all Redis db.
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Gem helps syncronizing objects to different external services like Gitlab,