webhook_system 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95522481f50719717dc59eef000851d4f6921c15
-  data.tar.gz: 93e0a7d8465075deeccb66beb51c35870a240732
+  metadata.gz: f1e79d3307cae895f3ea016c4dd81c18c5b6354d
+  data.tar.gz: 3a8cd5f259b506a2fbf305f718b997580dbd5cb4
 SHA512:
-  metadata.gz: 08ae9646bdc1ec58e3b75a715d08aecc973060c5803a9077c88fe6cb1aff2f8a53d394cf4bceac9a7a9b8a4c7f0dcf1622719c3a1270d8e22971909ed3883404
-  data.tar.gz: 83b5ca480c52977eabd1d6dc82189c5e0491cd1a94990fc0992b46bab25f4ff72ab2f01022d72c37ac9530b29a35b327608a70647eea9392edaa7122e330b39e
+  metadata.gz: f64d2e41f827ded493d94c87b2a0ddf8a1bba499111cd34599c006d799c557af9530c4cdbc80d2b7fbdbcb3122f6b0887937f26fffe40b0bb71e57386d278fc2
+  data.tar.gz: 76a400599bfd625ea6fa85dc9e40d1cb3cf22200e8acc25118fb1dd8bcea20a7fe4901fdaa335119ab9ad2ed13b74c0ed263206664143c7c2a1b3bca0b7bf722

data/.gitignore

@@ -3,3 +3,4 @@ doc/
 pkg/
 *.db
 tmp/
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v1.0.1](https://github.com/payrollhero/webhook_system/tree/v1.0.1) (2016-02-16)
+[Full Changelog](https://github.com/payrollhero/webhook_system/compare/v1.0.0...v1.0.1)
+
+- Add missing require for Faraday [\#5](https://github.com/payrollhero/webhook_system/pull/5) ([mykola-kyryk](https://github.com/mykola-kyryk))
+
 ## [v1.0.0](https://github.com/payrollhero/webhook_system/tree/v1.0.0) (2016-02-11)
 [Full Changelog](https://github.com/payrollhero/webhook_system/compare/v0.1.1...v1.0.0)
 

data/lib/faraday_middleware/encoding.rb

@@ -0,0 +1,21 @@
+# This is taken from https://github.com/ma2gedev/faraday-encoding,
+# all credits for this goes to Takayuki Matsubara (takayuki.1229+github@gmail.com).
+# We should be able to switch to the original gem when
+# this PR (https://github.com/ma2gedev/faraday-encoding/pull/2) is merged.
+module Faraday
+  class Faraday::Encoding < Faraday::Middleware
+    def call(environment)
+      @app.call(environment).on_complete do |env|
+        @content_charset = nil
+        if /;\s*charset=\s*(.+?)\s*(;|$)/.match(env[:response_headers][:content_type])
+          encoding = $1
+          encoding = 'utf-8' if encoding == 'utf8' # this is the actual fix
+          @content_charset = ::Encoding.find encoding rescue nil
+        end
+        env[:body].force_encoding @content_charset if @content_charset
+      end
+    end
+  end
+end
+
+Faraday::Response.register_middleware :encoding => Faraday::Encoding

data/lib/webhook_system.rb

@@ -4,6 +4,7 @@ require 'active_job'
 require 'ph_model'
 require 'validate_url'
 require 'faraday'
+require 'faraday_middleware/encoding'
 
 module WebhookSystem
   extend ActiveSupport::Autoload

data/lib/webhook_system/event_log.rb

@@ -4,6 +4,8 @@ module WebhookSystem
   class EventLog < ActiveRecord::Base
     self.table_name = 'webhook_event_logs'
 
+    MAX_JSON_ATTRIBUTE_SIZE = 40_000
+
     belongs_to :subscription, class_name: 'WebhookSystem::Subscription'
 
     validates :event_id, presence: true
@@ -18,12 +20,12 @@ module WebhookSystem
       request_info = {
         'event' => event,
         'headers' => request.headers.to_hash,
-        'body' => request.body,
+        'body' => request.body.truncate(MAX_JSON_ATTRIBUTE_SIZE),
         'url' => request.path,
       }
       response_info = {
         'headers' => response.headers.to_hash,
-        'body' => response.body,
+        'body' => response.body.truncate(MAX_JSON_ATTRIBUTE_SIZE),
       }
 
       attributes = {

data/lib/webhook_system/job.rb

@@ -40,12 +40,26 @@ module WebhookSystem
     end
 
     def self.log_response(subscription, event, request, response)
-      EventLog.construct(subscription, event, request, response).save!
+      event_log = EventLog.construct(subscription, event, request, response)
+
+      # we write log in a separate thread to make sure it is created even if the whole job fails
+      # Usually any background job would be wrapped into transaction,
+      # so if the job fails we would rollback any DB changes, including the even log record.
+      # We want the even log record to always be created, so we check if we are running inside the transaction,
+      # if we are - we create the record in a separate thread. New Thread means a new DB connection and
+      # ActiveRecord transactions are per connection, which gives us the "transaction jailbreak".
+      if ActiveRecord::Base.connection.open_transactions == 0
+        event_log.save!
+      else
+        Thread.new { event_log.save! }.join
+      end
     end
 
     def self.build_client
       Faraday.new do |faraday|
         faraday.response :logger if ENV['WEBHOOK_DEBUG']
+        # use Faraday::Encoding middleware, libfaraday_middleware/encoding.rb
+        faraday.response :encoding
         faraday.adapter Faraday.default_adapter
       end
     end

data/lib/webhook_system/version.rb

@@ -1,3 +1,3 @@
 module WebhookSystem
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/webhook_system.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activesupport', '> 3.2'
   gem.add_runtime_dependency 'activerecord', '> 3.2'
   gem.add_runtime_dependency 'activejob'
-  gem.add_runtime_dependency 'faraday'
+  gem.add_runtime_dependency 'faraday', '~> 0.9'
   gem.add_runtime_dependency 'ph_model'
   gem.add_runtime_dependency 'validate_url', '~> 1.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webhook_system
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Piotr Banasik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,16 +57,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ph_model
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/faraday_middleware/encoding.rb
 - lib/webhook_system.rb
 - lib/webhook_system/base_event.rb
 - lib/webhook_system/dispatcher.rb