txgh-server 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759f65691df917f6705c476c987285b4941b9343
-  data.tar.gz: ba32bd6e35a211fa01757d30609949fb48006f4f
+  metadata.gz: 4c9f1fb77b7c74f24d52f7c465388f5ede398508
+  data.tar.gz: b85ae41e96ce548b1954d71b9deec88d1f6dc69b
 SHA512:
-  metadata.gz: e5683453efde01a21ed1b3f9410a8ae11509764aeeee0323f320d0c4cb86ffa20526b6cb45b3bd04a9ecbce344fbee910cc4bb69a678bd5606381891e8362ec9
-  data.tar.gz: 07b1d539ddb62965a186b4987e7b4d1e315018e42a4dcd7e0af149877cc7d60df7ae18e7105d4e68629b844038c02b9acaa3178fd5ac451daca1e913cbfd98af
+  metadata.gz: 31eec7e52a4d1d04fb7b6dae903afb050e8a68ebbebea4d64c13bace9e6494b1ba314c011e9bfbefa77a5c1a4889994e0f4654c671281d621d05078fb483501e
+  data.tar.gz: 79d896e7ad7719183151f1420cdba37a175d0b4f493058abc2c490700cdc618f6849fe1d29e7a48f14ef4c61a9ea398eb5f51175713fdf3dce059d1f3dac5e0a

data/lib/txgh-server/version.rb

@@ -1,3 +1,3 @@
 module TxghServer
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/lib/txgh-server/webhooks/transifex/request_handler.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'uri'
 
 module TxghServer
   module Webhooks
@@ -92,7 +93,12 @@ module TxghServer
 
         def payload
           @payload ||= Txgh::Utils.deep_symbolize_keys(
-            JSON.parse(raw_payload)
+            case request.env['CONTENT_TYPE']
+              when 'application/json'
+                JSON.parse(raw_payload)
+              else
+                Hash[URI.decode_www_form(raw_payload)]
+            end
           )
         end
 

data/spec/application_spec.rb

@@ -140,6 +140,8 @@ describe TxghServer::WebhookEndpoints do
     let(:payload) { params.to_json }
 
     before(:each) do
+      header('Content-Type', 'application/json')
+
       allow(TxghServer::Webhooks::Transifex::HookHandler).to(
         receive(:new) do |options|
           expect(options[:project].name).to eq(project_name)

data/spec/integration/hooks_spec.rb

@@ -66,6 +66,8 @@ describe 'hook integration tests', integration: true do
   end
 
   before(:each) do
+    header('Content-Type', 'application/json')
+
     allow(Txgh::Config::KeyManager).to(
       receive(:raw_config).and_return("raw://#{YAML.dump(base_config)}")
     )

data/spec/webhooks/transifex/request_handler_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'helpers/nil_logger'
 require 'helpers/standard_txgh_setup'
 require 'helpers/test_request'
+require 'uri'
 
 include TxghServer::Webhooks
 
@@ -11,10 +12,15 @@ describe Transifex::RequestHandler do
   let(:logger) { NilLogger.new }
   let(:body) { payload.to_json }
   let(:signature) { 'abc123' }
-  let(:headers) { { TxghServer::TransifexRequestAuth::RACK_HEADER => signature } }
   let(:request) { TestRequest.new(body: body, headers: headers, request_method: 'POST') }
   let(:handler) { described_class.new(request, logger) }
   let(:payload) { { 'project' => project_name, 'resource' => resource_slug, 'language' => 'pt' } }
+  let(:headers) do
+    {
+      TxghServer::TransifexRequestAuth::RACK_HEADER => signature,
+      'CONTENT_TYPE' => 'application/json'
+    }
+  end
 
   describe '#handle_request' do
     it 'publishes an event' do
@@ -52,6 +58,21 @@ describe Transifex::RequestHandler do
         expect_any_instance_of(Transifex::HookHandler).to receive(:execute).and_return(:response)
         expect(handler.handle_request).to eq(:response)
       end
+
+      # this is for legacy webhooks, new ones use JSON
+      context 'when the content type is www-form' do
+        let(:headers) { super().merge('CONTENT_TYPE' => 'application/x-www-form-encoded') }
+        let(:body) { URI.encode_www_form(payload) }
+
+        it 'handles the request successfully' do
+          Txgh.events.subscribe('transifex.webhook_received') { true }
+
+          expect(handler.handle_request.status).to eq(204)
+
+          event = Txgh.events.published_in('transifex.webhook_received').first
+          expect(event[:options][:payload]).to eq(Txgh::Utils.deep_symbolize_keys(payload))
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.5
 signing_key: 
 specification_version: 4
 summary: An HTTP server for interacting with txgh.