Merge pull request #7 from payrollhero/feauture/use-updated-faraday-e…

…ncoding-gem Use updated 'faraday-encoding' gem.
payrollhero · Feb 18, 2016 · bb005b7 · bb005b7
2 parents 7cfae0e + 7099e66
commit bb005b7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/lib/faraday_middleware/encoding.rb b/lib/faraday_middleware/encoding.rb
diff --git a/lib/webhook_system.rb b/lib/webhook_system.rb
@@ -4,7 +4,7 @@
 require 'ph_model'
 require 'validate_url'
 require 'faraday'
-require 'faraday_middleware/encoding'
+require 'faraday-encoding'
 
 module WebhookSystem
   extend ActiveSupport::Autoload

diff --git a/lib/webhook_system/job.rb b/lib/webhook_system/job.rb
@@ -58,7 +58,7 @@ def self.log_response(subscription, event, request, response)
     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

diff --git a/webhook_system.gemspec b/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'