webhook_system 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e79d3307cae895f3ea016c4dd81c18c5b6354d
-  data.tar.gz: 3a8cd5f259b506a2fbf305f718b997580dbd5cb4
+  metadata.gz: 9c0a8c510a0ff3b55dc800d604b657c19f85059b
+  data.tar.gz: 5d165f95a27c935c7eb039724039a0e53c9203ee
 SHA512:
-  metadata.gz: f64d2e41f827ded493d94c87b2a0ddf8a1bba499111cd34599c006d799c557af9530c4cdbc80d2b7fbdbcb3122f6b0887937f26fffe40b0bb71e57386d278fc2
-  data.tar.gz: 76a400599bfd625ea6fa85dc9e40d1cb3cf22200e8acc25118fb1dd8bcea20a7fe4901fdaa335119ab9ad2ed13b74c0ed263206664143c7c2a1b3bca0b7bf722
+  metadata.gz: 6f3730e9316cb8d8b1148d5c7f4d1dd81dc86e24b15ca009d29933aadd242ff1181062a5b8f7f89a2c7ed515c1efa94e5cc7b0d58e9473d129ec8e1188c5a43b
+  data.tar.gz: 10a5a58ddc03c9b481377124b0346fef8656f39eb7f12dc7e2003935619f6fc23825c2c4fa40ef7b46d97b2b6bff456af8f9fb8101194832234863453b357e47

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v1.0.2](https://github.com/payrollhero/webhook_system/tree/v1.0.2) (2016-02-17)
+[Full Changelog](https://github.com/payrollhero/webhook_system/compare/v1.0.1...v1.0.2)
+
+- Feature/add faraday encoding middleware and db transaction check [\#6](https://github.com/payrollhero/webhook_system/pull/6) ([mykola-kyryk](https://github.com/mykola-kyryk))
+
 ## [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)
 

data/lib/webhook_system.rb

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

data/lib/webhook_system/job.rb

@@ -58,7 +58,7 @@ module WebhookSystem
     def self.build_client
       Faraday.new do |faraday|
         faraday.response :logger if ENV['WEBHOOK_DEBUG']
-        # use Faraday::Encoding middleware, libfaraday_middleware/encoding.rb
+        # use Faraday::Encoding middleware
         faraday.response :encoding
         faraday.adapter Faraday.default_adapter
       end

data/lib/webhook_system/version.rb

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

data/webhook_system.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activerecord', '> 3.2'
   gem.add_runtime_dependency 'activejob'
   gem.add_runtime_dependency 'faraday', '~> 0.9'
+  gem.add_runtime_dependency 'faraday-encoding', '>= 0.0.2', '< 1.0'
   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.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Piotr Banasik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,6 +67,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday-encoding
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ph_model
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +288,6 @@ 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

data/lib/faraday_middleware/encoding.rb

@@ -1,21 +0,0 @@
-# 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