txgh-server 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08999181efe8b160394afe81270055aea22ba8df
-  data.tar.gz: 80f4a180a3a7d20f97adb2c587bcf884f3ba85c1
+  metadata.gz: 0ed650a35c78fd2a4a616a5e106aceea35eae654
+  data.tar.gz: a8df5a3a0ab04c9e30c86444dd06c49bf5127768
 SHA512:
-  metadata.gz: 11edfef929681456b7e0977a34a67b99e658341e82e6f6a71f18034fada792614eaf4d3547f14ee9205c6d4fc0a14fe944676c6e0cf1c8e1ca8df1bf6b4716e4
-  data.tar.gz: ee273984933596d9363ecf632e2f85a895fc06559c6458f7244946459dac03f9b7350a603f6069fc5c825980bfb444720e08837886f4b607bc20c109945fe96c
+  metadata.gz: ece1db6aa35c8d561d6e8c1f8335190e23e0dc97d32ed90d4f1a83e38fdeaceef90bf86ceb46aab83c6ab13d760b999e726362df45a6a4568f619b4f5a59b403
+  data.tar.gz: f9bdf5680ac0306ffa52564e7b8d31733d7e60e7bac5ae250086520ab3266e4e22325bb230bf0c42b7bd063d451fd6c9806dd1f824b30b5e66175a1a691e2b61

data/lib/txgh-server/application.rb

@@ -1,6 +1,5 @@
 require 'sinatra'
 require 'sinatra/json'
-require 'sinatra/reloader'
 require 'sinatra/streaming'
 
 module TxghServer
@@ -37,10 +36,6 @@ module TxghServer
       set :logger, logger
     end
 
-    def initialize(app = nil)
-      super(app)
-    end
-
     get '/health_check' do
       respond_with(
         Response.new(200, {})
@@ -89,14 +84,6 @@ module TxghServer
       set :logger, logger
     end
 
-    configure :development do
-      register Sinatra::Reloader
-    end
-
-    def initialize(app = nil)
-      super(app)
-    end
-
     post '/transifex' do
       respond_with(
         Transifex::RequestHandler.handle_request(request, settings.logger)
@@ -121,10 +108,6 @@ module TxghServer
       set :logger, logger
     end
 
-    configure :development do
-      register Sinatra::Reloader
-    end
-
     patch '/push' do
       respond_with(
         PushHandler.handle_request(request, settings.logger)

data/lib/txgh-server/version.rb

@@ -1,3 +1,3 @@
 module TxghServer
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/lib/txgh-server/webhooks/github/blank_attributes.rb

@@ -0,0 +1,20 @@
+module TxghServer
+  module Webhooks
+    module Github
+      class BlankAttributes
+        class << self
+          def from_webhook_payload(payload)
+            new
+          end
+        end
+
+        def initialize(options = {})
+        end
+
+        def to_h
+          {}
+        end
+      end
+    end
+  end
+end

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

@@ -21,21 +21,32 @@ module TxghServer
 
         def handle_request
           handle_safely do
-            case request.env['HTTP_X_GITHUB_EVENT']
+            case github_event
               when 'push'
-                handle_push
+                PushHandler.new(project, repo, logger, attributes).execute
               when 'delete'
-                handle_delete
+                DeleteHandler.new(project, repo, logger, attributes).execute
               when 'ping'
-                handle_ping
+                PingHandler.new(logger).execute
               else
-                handle_unexpected
+                respond_with_error(400, 'Unexpected event type')
             end
           end
         end
 
         private
 
+        def attributes
+          case github_event
+            when 'push'
+              PushAttributes.from_webhook_payload(payload)
+            when 'delete'
+              DeleteAttributes.from_webhook_payload(payload)
+            else
+              BlankAttributes.from_webhook_payload(payload)
+          end
+        end
+
         def handle_safely
           if authentic_request?
             yield
@@ -46,24 +57,6 @@ module TxghServer
           respond_with_error(500, "Internal server error: #{e.message}", e)
         end
 
-        def handle_push
-          attributes = PushAttributes.from_webhook_payload(payload)
-          PushHandler.new(project, repo, logger, attributes).execute
-        end
-
-        def handle_delete
-          attributes = DeleteAttributes.from_webhook_payload(payload)
-          DeleteHandler.new(project, repo, logger, attributes).execute
-        end
-
-        def handle_ping
-          PingHandler.new(logger).execute
-        end
-
-        def handle_unexpected
-          respond_with_error(400, 'Unexpected event type')
-        end
-
         def payload
           @payload ||= begin
             if request.params[:payload]
@@ -76,6 +69,10 @@ module TxghServer
           end
         end
 
+        def github_event
+          request.env['HTTP_X_GITHUB_EVENT']
+        end
+
         def github_repo_name
           payload.fetch('repository', {})['full_name']
         end

data/lib/txgh-server/webhooks/github.rb

@@ -1,6 +1,7 @@
 module TxghServer
   module Webhooks
     module Github
+      autoload :BlankAttributes,  'txgh-server/webhooks/github/blank_attributes'
       autoload :DeleteAttributes, 'txgh-server/webhooks/github/delete_attributes'
       autoload :DeleteHandler,    'txgh-server/webhooks/github/delete_handler'
       autoload :Handler,          'txgh-server/webhooks/github/handler'

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

@@ -5,11 +5,9 @@ module TxghServer
     module Transifex
       class RequestHandler
         class << self
-
           def handle_request(request, logger)
-            new(request, logger).handle(TxghServer::Webhooks::Transifex::HookHandler)
+            new(request, logger).handle_request
           end
-
         end
 
         include ResponseHelpers
@@ -21,13 +19,13 @@ module TxghServer
           @logger = logger
         end
 
-        def handle(klass)
+        def handle_request
           handle_safely do
-            handler = klass.new(
+            handler = TxghServer::Webhooks::Transifex::HookHandler.new(
               project: config.transifex_project,
               repo: config.github_repo,
-              resource_slug: payload['resource'],
-              language: payload['language'],
+              resource_slug: payload[:resource],
+              language: payload[:language],
               logger: logger
             )
 
@@ -62,13 +60,16 @@ module TxghServer
         end
 
         def config
-          @config ||= Txgh::Config::KeyManager.config_from_project(payload['project'])
+          @config ||= Txgh::Config::KeyManager.config_from_project(payload[:project])
         end
 
         def payload
           @payload ||= begin
             request.body.rewind
-            Hash[URI.decode_www_form(request.body.read)]
+
+            Txgh::Utils.deep_symbolize_keys(
+              Hash[URI.decode_www_form(request.body.read)]
+            )
           end
         end
 

data/lib/txgh-server.rb

@@ -3,20 +3,12 @@ require 'txgh'
 module TxghServer
   autoload :Application,          'txgh-server/application'
   autoload :DownloadHandler,      'txgh-server/download_handler'
-
-  # @TODO: refactor/remove
-  autoload :WebhookEndpoints,     'txgh-server/application'
-
   autoload :GithubRequestAuth,    'txgh-server/github_request_auth'
   autoload :Response,             'txgh-server/response'
   autoload :ResponseHelpers,      'txgh-server/response_helpers'
   autoload :StreamResponse,       'txgh-server/stream_response'
   autoload :TgzStreamResponse,    'txgh-server/tgz_stream_response'
   autoload :TransifexRequestAuth, 'txgh-server/transifex_request_auth'
-
-  # @TODO: refactor/remove
-  autoload :TriggerEndpoints,     'txgh-server/application'
-
   autoload :Triggers,             'txgh-server/triggers'
   autoload :Webhooks,             'txgh-server/webhooks'
   autoload :ZipStreamResponse,    'txgh-server/zip_stream_response'

data/spec/helpers/test_request.rb

@@ -0,0 +1,10 @@
+class TestRequest
+  attr_reader :body, :params, :headers
+  alias_method :env, :headers
+
+  def initialize(body: , params: {}, headers: {})
+    @body = StringIO.new(body)
+    @params = params
+    @headers = headers
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $:.push(File.join(Gem.loaded_specs['txgh'].full_gem_path, 'spec'))
 require 'pry-byebug'
 require 'rake'
 require 'rspec'
+require 'txgh'
 require 'txgh-server'
 require 'vcr'
 require 'webmock'

data/spec/webhooks/github/request_handler_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'helpers/github_payload_builder'
+require 'helpers/nil_logger'
+require 'helpers/standard_txgh_setup'
+require 'helpers/test_request'
+
+include TxghServer::Webhooks
+
+describe Github::RequestHandler do
+  include StandardTxghSetup
+
+  let(:logger) { NilLogger.new }
+  let(:ref) { 'heads/my_ref' }
+  let(:headers) { { 'HTTP_X_GITHUB_EVENT' => event } }
+  let(:body) { payload.to_json }
+  let(:request) { TestRequest.new(body: body, headers: headers) }
+  let(:handler) { described_class.new(request, logger) }
+
+  describe '#handle_request' do
+    context 'push event' do
+      let(:event) { 'push' }
+      let(:payload) { GithubPayloadBuilder.push_payload(repo_name, ref).tap { |p| p.add_commit } }
+
+      it 'does not execute if unauthorized' do
+        expect_any_instance_of(Github::PushHandler).to_not receive(:execute)
+        response = handler.handle_request
+        expect(response.status).to eq(401)
+      end
+
+      context 'with an authentic request' do
+        before(:each) do
+          allow(handler).to receive(:authentic_request?).and_return(true)
+        end
+
+        it 'handles the request with the push handler' do
+          expect_any_instance_of(Github::PushHandler).to receive(:execute).and_return(:response)
+          expect(handler.handle_request).to eq(:response)
+        end
+      end
+    end
+
+    context 'delete event' do
+      let(:event) { 'delete' }
+      let(:payload) { GithubPayloadBuilder.delete_payload(repo_name, ref) }
+
+      it 'does not execute if unauthorized' do
+        expect_any_instance_of(Github::DeleteHandler).to_not receive(:execute)
+        response = handler.handle_request
+        expect(response.status).to eq(401)
+      end
+
+      context 'with an authentic request' do
+        before(:each) do
+          allow(handler).to receive(:authentic_request?).and_return(true)
+        end
+
+        it 'handles the request with the delete handler' do
+          expect_any_instance_of(Github::DeleteHandler).to receive(:execute).and_return(:response)
+          expect(handler.handle_request).to eq(:response)
+        end
+      end
+    end
+
+    context 'unrecognized event' do
+      let(:event) { 'foo' }
+      let(:payload) { { repository: { full_name: repo_name } } }
+
+      it 'responds with a 400' do
+        allow(handler).to receive(:authentic_request?).and_return(true)
+        response = handler.handle_request
+        expect(response.status).to eq(400)
+      end
+    end
+  end
+end

data/spec/webhooks/transifex/request_handler_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'helpers/nil_logger'
+require 'helpers/standard_txgh_setup'
+require 'helpers/test_request'
+
+include TxghServer::Webhooks
+
+describe Transifex::RequestHandler do
+  include StandardTxghSetup
+
+  let(:logger) { NilLogger.new }
+  let(:body) { URI.encode_www_form(payload.to_a) }
+  let(:request) { TestRequest.new(body: body) }
+  let(:handler) { described_class.new(request, logger) }
+  let(:payload) { { 'project' => project_name, 'resource' => resource_slug, 'language' => 'pt' } }
+
+  describe '#handle_request' do
+    it 'does not execute if unauthorized' do
+      expect_any_instance_of(Transifex::HookHandler).to_not receive(:execute)
+      response = handler.handle_request
+      expect(response.status).to eq(401)
+    end
+
+    context 'with an authentic request' do
+      before(:each) do
+        allow(handler).to receive(:authentic_request?).and_return(true)
+      end
+
+      it 'handles the request with the hook handler' do
+        expect_any_instance_of(Transifex::HookHandler).to receive(:execute).and_return(:response)
+        expect(handler.handle_request).to eq(:response)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -112,6 +112,7 @@ files:
 - lib/txgh-server/version.rb
 - lib/txgh-server/webhooks.rb
 - lib/txgh-server/webhooks/github.rb
+- lib/txgh-server/webhooks/github/blank_attributes.rb
 - lib/txgh-server/webhooks/github/delete_attributes.rb
 - lib/txgh-server/webhooks/github/delete_handler.rb
 - lib/txgh-server/webhooks/github/ping_handler.rb
@@ -127,6 +128,7 @@ files:
 - spec/github_request_auth_spec.rb
 - spec/helpers/github_payload_builder.rb
 - spec/helpers/integration_setup.rb
+- spec/helpers/test_request.rb
 - spec/integration/cassettes/pull.yml
 - spec/integration/cassettes/push.yml
 - spec/integration/cassettes/transifex_hook_endpoint.yml
@@ -144,7 +146,9 @@ files:
 - spec/webhooks/github/ping_handler_spec.rb
 - spec/webhooks/github/push_attributes_spec.rb
 - spec/webhooks/github/push_handler_spec.rb
+- spec/webhooks/github/request_handler_spec.rb
 - spec/webhooks/transifex/hook_handler_spec.rb
+- spec/webhooks/transifex/request_handler_spec.rb
 - spec/zip_stream_response_spec.rb
 - txgh-server.gemspec
 homepage: https://github.com/lumoslabs/txgh