txgh-server 1.0.0 → 1.1.0

data/spec/webhooks/github/push_handler_spec.rb

@@ -9,12 +9,11 @@ describe PushHandler do
   include StandardTxghSetup
 
   let(:handler) do
-    PushHandler.new(
-      project: transifex_project,
-      repo: github_repo,
-      payload: payload.to_h,
-      logger: logger
-    )
+    PushHandler.new(transifex_project, github_repo, logger, attributes)
+  end
+
+  let(:attributes) do
+    PushAttributes.from_webhook_payload(payload.to_h)
   end
 
   let(:payload) do
@@ -24,7 +23,7 @@ describe PushHandler do
   let(:modified_files) do
     file_sha = 'def456'
     tx_config.resources.map do |resource|
-      { 'path' => resource.source_file, 'sha' => file_sha.next! }
+      { path: resource.source_file, sha: file_sha.next! }
     end
   end
 
@@ -32,7 +31,7 @@ describe PushHandler do
 
   before(:each) do
     payload.add_commit(
-      modified: modified_files.map { |f| f['path'] }
+      modified: modified_files.map { |f| f[:path] }
     )
 
     allow(Txgh::ResourceUpdater).to receive(:new).and_return(updater)
@@ -41,19 +40,12 @@ describe PushHandler do
   it 'correctly uploads modified resources to transifex' do
     tx_config.resources.each do |resource|
       expect(updater).to(
-        receive(:update_resource) do |resource, sha, categories|
+        receive(:update_resource) do |resource, categories|
           expect(resource.project_slug).to eq(project_name)
           expect(resource.resource_slug).to eq(resource_slug)
-          expect(sha).to eq(payload.head_commit[:id])
           expect(categories).to eq('author' => 'Test User')
         end
       )
-
-      expect(github_api).to(
-        receive(:get_ref).with(repo_name, ref).and_return(
-          object: { sha: payload.head_commit[:id] }
-        )
-      )
     end
 
     response = handler.execute
@@ -61,31 +53,6 @@ describe PushHandler do
     expect(response.body).to eq(true)
   end
 
-  context 'with an L10N branch' do
-    let(:ref) { 'tags/L10N_my_branch' }
-
-    it 'creates an L10N tag' do
-      expect(updater).to receive(:update_resource)
-
-      # this is what we actually care about in this test
-      expect(github_api).to(
-        receive(:create_ref).with(
-          repo_name, 'heads/L10N', payload.head_commit[:id]
-        )
-      )
-
-      expect(github_api).to(
-        receive(:get_ref).with(repo_name, ref).and_return(
-          object: { sha: payload.head_commit[:id] }
-        )
-      )
-
-      response = handler.execute
-      expect(response.status).to eq(200)
-      expect(response.body).to eq(true)
-    end
-  end
-
   context 'with a deleted branch' do
     let(:before) { nil }
     let(:after) { '0' * 40 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -112,9 +112,10 @@ files:
 - lib/txgh-server/version.rb
 - lib/txgh-server/webhooks.rb
 - lib/txgh-server/webhooks/github.rb
+- lib/txgh-server/webhooks/github/delete_attributes.rb
 - lib/txgh-server/webhooks/github/delete_handler.rb
-- lib/txgh-server/webhooks/github/handler.rb
 - lib/txgh-server/webhooks/github/ping_handler.rb
+- lib/txgh-server/webhooks/github/push_attributes.rb
 - lib/txgh-server/webhooks/github/push_handler.rb
 - lib/txgh-server/webhooks/github/request_handler.rb
 - lib/txgh-server/webhooks/transifex.rb
@@ -126,7 +127,6 @@ files:
 - spec/github_request_auth_spec.rb
 - spec/helpers/github_payload_builder.rb
 - spec/helpers/integration_setup.rb
-- spec/integration/cassettes/github_l10n_hook_endpoint.yml
 - spec/integration/cassettes/pull.yml
 - spec/integration/cassettes/push.yml
 - spec/integration/cassettes/transifex_hook_endpoint.yml
@@ -139,8 +139,10 @@ files:
 - spec/spec_helper.rb
 - spec/tgz_stream_response_spec.rb
 - spec/transifex_request_auth_spec.rb
+- spec/webhooks/github/delete_attributes_spec.rb
 - spec/webhooks/github/delete_handler_spec.rb
 - spec/webhooks/github/ping_handler_spec.rb
+- spec/webhooks/github/push_attributes_spec.rb
 - spec/webhooks/github/push_handler_spec.rb
 - spec/webhooks/transifex/hook_handler_spec.rb
 - spec/zip_stream_response_spec.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: An HTTP server for interacting with txgh.

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

@@ -1,20 +0,0 @@
-require 'logger'
-
-module TxghServer
-  module Webhooks
-    module Github
-      class Handler
-        include ResponseHelpers
-
-        attr_reader :project, :repo, :payload, :logger
-
-        def initialize(options = {})
-          @project = options.fetch(:project)
-          @repo = options.fetch(:repo)
-          @payload = options.fetch(:payload)
-          @logger = options.fetch(:logger) { Logger.new(STDOUT) }
-        end
-      end
-    end
-  end
-end