artery 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c33e34232fceb9b1a8a24e7dd6e63902f48df44f8d823c483d68bc286ad32a
-  data.tar.gz: d916e3835cf0a53a6a92b63718d263333688c868095301cbf74f90769c8f03f9
+  metadata.gz: fd74a0468234a04d072dc0235885426aff27b04353a10f3a32176ada5ebd932e
+  data.tar.gz: 70193e8d9f5a01ac73157cf4f105252ed66e59a211b169e10b5e5e95a618b5d2
 SHA512:
-  metadata.gz: 5ad05a7a7ff2f8ec2bd10a927c6d60cd8aec14bc196dd0c4cf45c759b5a2e514af577775b0614bf89ad814d9851f1a8c8a1c55a2fa0e0ca7e1560ac82529eb3a
-  data.tar.gz: 594c855071aa2253c348ff520204bc76c044f77570058c507d935c4bd9c3d2fd286a40ec2f427707c832b689db478beb093eeb1b7cecdb3a72335c4e918712d6
+  metadata.gz: f93909d8a746b73ac81fcf4cecb2e92d6b7c5b761b16a1d8c244527b18f460ad21498ac5b2556f12ad3cafc75eca7a69724447540d6a5c1a2bb086d0a3bf660b
+  data.tar.gz: 0a006ed60df6714bcb0459fb34106ef970c760eb58895437b0ac8ca08303ddd6c15559c657e7ce2353c9427621bd84c514102f0326de803b86e39e0249cc54ef

data/lib/artery/backend.rb

@@ -71,8 +71,9 @@ module Artery
               response = JSON.parse(message).with_indifferent_access
 
               if response.key?(:error)
-                handler.call :error, RequestError.new(uri, response, request: { route: uri.to_route, data: data.to_json },
-                                                                     response: message)
+                handler.call :error, RequestError.new(uri, response,
+                                                      request: { route: uri.to_route, data: data.to_json },
+                                                      response: message)
               else
                 handler.call :success, response
               end

data/lib/artery/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "artery/browser/app"
+require 'artery/browser/app'
 
 module Artery
   class Engine < ::Rails::Engine

data/lib/artery/model/subscriptions.rb

@@ -41,7 +41,7 @@ module Artery
           end
 
           artery[:subscriptions] ||= []
-          artery[:subscriptions].push Subscription.new(self, uri, **options.merge(handler: handler))
+          artery[:subscriptions].push Subscription.new(self, uri, **options, handler: handler)
         end
 
         def artery_watch_model(service:, model: nil, action: nil, **kwargs, &blk)
@@ -124,7 +124,8 @@ module Artery
 
             updates = messages.map do |message|
               upd = message.to_artery.merge('action' => message.action)
-              if %i[create update].include?(message.action.to_sym) && # WARNING: duplicated logic with `Subscription#handle`!
+              # WARNING: duplicated logic with `Subscription#handle`!
+              if %i[create update].include?(message.action.to_sym) &&
                  autoenrich_data &&
                  (attrs = autoenrich_data[message.data['uuid']])
                 upd['attributes'] = attrs

data/lib/artery/subscription/incoming_message.rb

@@ -66,7 +66,8 @@ module Artery
                                 data: data.to_json,
                                 route: from
                               },
-                              request: { data: get_data.to_json, route: get_uri.to_route }, response: attributes.to_json)
+                              request: { data: get_data.to_json, route: get_uri.to_route },
+                              response: attributes.to_json)
             Artery.handle_error error
           end
 
@@ -74,12 +75,15 @@ module Artery
             if e.message == 'not_found'
               yield(:not_found)
             else
-              error = Error.new("Failed to get #{get_uri.model} from #{get_uri.service} with uuid='#{data[:uuid]}': #{e.message}",
-                                e.artery_context.merge(subscription: {
-                                                         subscriber: subscription.subscriber.to_s,
-                                                         data: data.to_json,
-                                                         route: from_uri.to_route
-                                                       }))
+              error = Error.new(
+                "Failed to get #{get_uri.model} from #{get_uri.service} with uuid='#{data[:uuid]}': #{e.message}",
+                **e.artery_context,
+                subscription: {
+                  subscriber: subscription.subscriber.to_s,
+                  data: data.to_json,
+                  route: from_uri.to_route
+                }
+              )
               Artery.handle_error error
             end
           end

data/lib/artery/subscription/synchronization.rb

@@ -29,7 +29,8 @@ module Artery
       end
 
       def synchronize_updates_per_page
-        (options[:synchronize_updates].is_a?(Hash) && options[:synchronize_updates][:per_page]) || synchronization_per_page
+        (options[:synchronize_updates].is_a?(Hash) && options[:synchronize_updates][:per_page]) ||
+          synchronization_per_page
       end
 
       def synchronize_updates_autoenrich?
@@ -132,7 +133,7 @@ module Artery
 
             synchronization_transaction { handler.call(:synchronization, objects, page) }
 
-            if synchronization_per_page && objects.count.positive?
+            if synchronization_per_page && objects.any?
               synchronization_page_update!(page)
               Artery.logger.debug "PAGE #{page} RECEIVED, WILL CONTINUE..."
               should_continue = true
@@ -154,8 +155,11 @@ module Artery
 
           on.error do |e|
             synchronization_in_progress!(false)
-            error = Error.new "Failed to get all objects #{uri.model} from #{uri.service} with scope='#{synchronization_scope}': " \
-                              "#{e.message}", **e.artery_context
+            error = Error.new(
+              "Failed to get all objects #{uri.model} from #{uri.service} with " \
+              "scope='#{synchronization_scope}': #{e.message}",
+              **e.artery_context
+            )
             Artery.handle_error error
           end
         end

data/lib/artery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Artery
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artery
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sergey Gnuskov
@@ -10,33 +10,33 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multiblock
+  name: artery-browser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: artery-browser
+  name: multiblock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: nats-pure
   requirement: !ruby/object:Gem::Requirement