webhook_system 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341113a9e842aad6e6425cd7674c14d3122adde0316dd95663e5397d93459446
-  data.tar.gz: d07b90ac598e7a5a929248f649f6a5bcd4a2465c0b81a34c3ecc56acee6cb6bd
+  metadata.gz: 428ebdafe157c314eb2426f47c9a04ab236dc6261b7ab469ddbbee5ff86fdf87
+  data.tar.gz: 22dc65660838f49875cdefb303e7ef783e97e53931c9ad889e20a3954bb22000
 SHA512:
-  metadata.gz: bfc631f53dfbc28294c5d5f25ffc54ba3214c8b52f75a69a375dc1ab138b9f1afa8e0676177177ecf9f79aa8253565e093d9db48f5ac61d7fc4ed687c4a5322c
-  data.tar.gz: 5500acb854e2dee0a695b00354e1bc244861731885f63dea849d4a39d7cb9a53755a22a82af35c47b4b2fe759ad901248f30e023b73fad618e3980d126e8c0fe
+  metadata.gz: da4e60ad66ac25c63eff52f51f8e46f3fc0a1087b9f4ff5e355290cefe3d6003853666cf3a92db84f2dcd1f1ec3efb47d559d31819afb16548b14223e2b58b66
+  data.tar.gz: f4ace79d2aa3f3b63492f7220f27f03a7dc5af3b49e503197b6f98f9ac8648ea28ac08d2e794c521fc80910391ddb77cc3baea275d33b41ac1e17ac45f35469c

data/lib/webhook_system/job.rb

@@ -47,13 +47,20 @@ module WebhookSystem
         end
 
       log_response(subscription, event, request, response)
-      ensure_success(response, :POST, subscription.url)
+      ensure_success(response, :POST, subscription)
     end
 
-    def self.ensure_success(response, http_method, url)
+    def self.ensure_success(response, http_method, subscription)
+      url = subscription.url
       status = response.status
       unless (200..299).cover? status
-        text = "#{http_method} request to #{url} failed with code: #{status} and error #{response.body}"
+        if subscription.respond_to?(:account_id)
+          account_info = subscription.account_info
+          inner = "failed for account #{account_info} with"
+        else
+          inner = "failed with"
+        end
+        text = "#{http_method} request to #{url} #{inner} code: #{status} and error #{response.body}"
         raise RequestFailed.new(text, status, response.body)
       end
     end

data/lib/webhook_system/subscription.rb

@@ -4,6 +4,8 @@ module WebhookSystem
   class Subscription < ActiveRecord::Base
     self.table_name = 'webhook_subscriptions'
 
+    belongs_to :account if defined?(Account)
+
     validates :url, presence: true, url: { no_local: true }
     validates :secret, presence: true
 
@@ -59,5 +61,12 @@ module WebhookSystem
       self.topics_attributes = new_topics_attributes
     end
 
+    def account_info
+      if defined?(Account)
+        "#{account_id}:#{account.try(:name)}"
+      else
+        account_id.to_s
+      end
+    end
   end
 end

data/lib/webhook_system/version.rb

@@ -1,3 +1,3 @@
 module WebhookSystem
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webhook_system
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Piotr Banasik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport