external_services 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255b4da146ba0b683ed63958932c09d6c724c8656798b6dee862bbf96eccd572
-  data.tar.gz: 3c04d0ac36c607e4d8c28995dff4a388ecef60785018a8f8afb3d15a4a11d15e
+  metadata.gz: 92c1be5018af4ae557172d9356067a060ed1a5815f776ee0b88c8267cbde8c25
+  data.tar.gz: 80c51c26e32976717e96c114260a165914fada0b4a4106aaf1835fe20798988d
 SHA512:
-  metadata.gz: 6931c8a6581ab4008652f870f4bf79d0b484b97af99302e3e49ab98a7de23e13479692b953b434b754222d49ef378aca10fd182c3d902cc26201b57db599a9f7
-  data.tar.gz: 7e962eaa3711edd494073526789fe7356cfa5381daba2c4228c541cc5a4e30668bdffe06ce64bf9d3d9f72399bd3081ef8a7c4ce306fa57606ae97cfa999ba98
+  metadata.gz: 1f908bc5a978f9db391ec8dc89dc9fd3164a945204c91f1f83db0876381190646df3e3b9b582d8631c1bd63f2bea958df76cb1e61cf813c9a9b32260d37cfa1a
+  data.tar.gz: 707d673a53707fad53ea4e683a22f4d2e674f2a442518b281c20f8fd4a5f28f481502e2778f8a402c0c02246c4fbea837f4f2ebc1cfab3897f80464c975eb1e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    external_services (0.3.1)
+    external_services (0.4.0)
       faraday (>= 0.9)
       faraday_middleware (>= 0.10)
       rails (>= 4.2.5, < 6.0)
@@ -9,43 +9,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
       rack (~> 2.0)
       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)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
       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)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
       arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -53,7 +53,7 @@ GEM
     addressable (2.4.0)
     arel (9.0.0)
     ast (2.4.0)
-    backports (3.11.3)
+    backports (3.11.4)
     builder (3.2.3)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -64,16 +64,16 @@ GEM
     erubi (1.7.1)
     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
@@ -84,38 +84,39 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     highline (1.7.10)
-    i18n (1.0.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     loofah (2.2.2)
       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)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     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)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    overcommit (0.45.0)
+    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)
@@ -125,60 +126,61 @@ GEM
       json
       websocket (~> 1.0)
     rack (2.0.5)
-    rack-test (1.0.0)
+    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)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.0)
+      railties (= 5.2.1)
       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)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (10.5.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
       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-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    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 (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -188,7 +190,7 @@ GEM
     sqlite3 (1.3.13)
     thor (0.20.0)
     thread_safe (0.3.6)
-    travis (1.8.8)
+    travis (1.8.9)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -201,8 +203,8 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.2)
-    websocket (1.2.5)
+    unicode-display_width (1.4.0)
+    websocket (1.2.8)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)

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

@@ -2,6 +2,8 @@ module ExternalServices
   module Action
     extend ActiveSupport::Concern
 
+    QUEUE_PREFIX = 'external_services'
+
     included do
       scope :processed, -> { where.not(processed_at: nil) }
       scope :unprocessed, -> { where(processed_at: nil) }
@@ -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

@@ -19,7 +19,6 @@ module ExternalServices
 
     before_validation :assign_queue
     before_validation :process_data
-    after_commit      :kick_active_job
 
     before_create :calculate_signature
 

data/external_services.gemspec

@@ -18,6 +18,11 @@ 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']

data/lib/external_services/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: external_services
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Gem helps syncronizing objects to different external services like Gitlab,