txgh 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9465db2fe6577a296e42811b797fd6c5bb3c8f0
-  data.tar.gz: 8dd5386796713e113a14ae4289c4bbf2543b988e
+  metadata.gz: fe316847be46da3963313952b4861525ddf6b43f
+  data.tar.gz: 89c7ac7f13c1d2e165cdaae3f6b110cf499888d3
 SHA512:
-  metadata.gz: 4b91e729d9edf9ce4a02243350fdcbc0204a5fdd396b5444a90b4c664f54c1e7af4cf4b50ac7a71bbc308c319c60a9aa7bb0ac13bd76a931f8fdcb7465bab36d
-  data.tar.gz: e3ee849cb2c84cd12e9d8c5a9f91134b9a24ccf3379517347788be27b7c7624a96b6de586ef65d016eb2c4785d6b87b3621cf72706a2450eeca617f677fe1acd
+  metadata.gz: 6793b41001e8e2fb32c808f179d5de0b8a5f4fe0eb4736fc8998657204d6e0c760e5937f0bfb066eb216852efca0e6ab83c3bffdd48c576338719c3f61384094
+  data.tar.gz: c1ece2694a02648b5553d7bc226b1180f6d492678b4fbc015a8c507114dbc3805f3b5e98ac3de674287676f4351f35e43a60ce07a9c5b73007faad932d869416

data/lib/txgh/handlers/github/ping_handler.rb

@@ -0,0 +1,18 @@
+module Txgh
+  module Handlers
+    module Github
+      # Handles github's ping event, which is a test event fired whenever a new
+      # webhook is set up.
+      class PingHandler
+        include ResponseHelpers
+
+        def initialize(options = {})
+        end
+
+        def execute
+          respond_with(200, {})
+        end
+      end
+    end
+  end
+end

data/lib/txgh/handlers/github/request_handler.rb

@@ -14,6 +14,8 @@ module Txgh
                 handle_push(request, logger)
               when 'delete'
                 handle_delete(request, logger)
+              when 'ping'
+                handle_ping(request, logger)
               else
                 handle_unexpected
             end
@@ -31,6 +33,11 @@ module Txgh
             new(request, logger).handle(klass)
           end
 
+          def handle_ping(request, logger)
+            klass = Txgh::Handlers::Github::PingHandler
+            new(request, logger).handle(klass)
+          end
+
           def handle_unexpected
             respond_with_error(400, 'Unexpected event type')
           end

data/lib/txgh/handlers/github.rb

@@ -3,6 +3,7 @@ module Txgh
     module Github
       autoload :DeleteHandler,  'txgh/handlers/github/delete_handler'
       autoload :Handler,        'txgh/handlers/github/handler'
+      autoload :PingHandler,    'txgh/handlers/github/ping_handler'
       autoload :PushHandler,    'txgh/handlers/github/push_handler'
       autoload :RequestHandler, 'txgh/handlers/github/request_handler'
     end

data/lib/txgh/resource_updater.rb

@@ -15,6 +15,9 @@ module Txgh
     # For each modified resource, get its content and update the content
     # in Transifex.
     def update_resource(tx_resource, commit_sha, categories = {})
+      # don't process the resource unless the project slugs are the same
+      return unless tx_resource.project_slug == project.name
+
       logger.info('process updated resource')
       tree_sha = repo.api.get_commit(repo.name, commit_sha)['commit']['tree']['sha']
       tree = repo.api.tree(repo.name, tree_sha)
@@ -45,8 +48,13 @@ module Txgh
     end
 
     def upload_diff(tx_resource, file, categories)
-      if content = diff_content(tx_resource, file)
-        upload_by_branch(tx_resource, content, categories)
+      # if uploading to master (i.e. the diff point), then upload the full resource
+      if Utils.branches_equal?(tx_resource.branch, repo.diff_point)
+        upload_whole(tx_resource, file, categories)
+      else
+        if content = diff_content(tx_resource, file)
+          upload_by_branch(tx_resource, content, categories)
+        end
       end
     end
 

data/lib/txgh/response_helpers.rb

@@ -6,10 +6,6 @@ module Txgh
       Txgh::Handlers::Response.new(status, body, e)
     end
 
-    def respond_with_success(status, body)
-      respond_with(status, data(body))
-    end
-
     def respond_with_error(status, message, e = nil)
       respond_with(status, error(message), e)
     end

data/lib/txgh/transifex_api.rb

@@ -137,6 +137,13 @@ module Txgh
       JSON.parse(response.body)
     end
 
+    def get_stats(project_slug, resource_slug)
+      url = "#{API_ROOT}/project/#{project_slug}/resource/#{resource_slug}/stats/"
+      response = connection.get(url)
+      raise_error!(response)
+      JSON.parse(response.body)
+    end
+
     private
 
     def get_content_io(tx_resource, content)

data/lib/txgh/tx_resource.rb

@@ -62,5 +62,9 @@ module Txgh
         'name' => translation_file
       }
     end
+
+    def branch
+      nil
+    end
   end
 end

data/lib/txgh/utils.rb

@@ -15,6 +15,10 @@ module Txgh
       end
     end
 
+    def branches_equal?(first, second)
+      absolute_branch(first) == absolute_branch(second)
+    end
+
     def is_tag?(ref)
       ref.include?('tags/')
     end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/handlers/github/ping_handler_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+include Txgh
+include Txgh::Handlers::Github
+
+describe PingHandler do
+  let(:handler) do
+    PingHandler.new
+  end
+
+  it 'responds with a 200 success' do
+    response = handler.execute
+    expect(response.status).to eq(200)
+    expect(response.body).to eq({})
+  end
+end

data/spec/resource_downloader_spec.rb

@@ -179,7 +179,7 @@ describe ResourceDownloader do
     it "works even if the resource doesn't exist in transifex" do
       allow(transifex_api).to(
         receive(:download) do |resource, language|
-          if resource.respond_to?(:branch)
+          if resource.branch
             translations_for(resource, language)
           else
             raise TransifexNotFoundError

data/spec/resource_updater_spec.rb

@@ -19,7 +19,7 @@ describe ResourceUpdater do
     [{ 'path' => resource.source_file, 'sha' => 'def456' }]
   end
 
-  def phrases_for(path)
+  let(:translations) do
     YAML.load("|
       en:
         welcome: Hello
@@ -44,8 +44,6 @@ describe ResourceUpdater do
     )
 
     modified_files.each do |file|
-      translations = phrases_for(file['path'])
-
       allow(github_api).to(
         receive(:blob).with(repo_name, file['sha']) do
           { 'content' => translations, 'encoding' => 'utf-8' }
@@ -56,8 +54,6 @@ describe ResourceUpdater do
 
   it 'correctly uploads modified files to transifex' do
     modified_files.each do |file|
-      translations = phrases_for(file['path'])
-
       expect(transifex_api).to(
         receive(:create_or_update) do |resource, content|
           expect(resource.source_file).to eq(file['path'])
@@ -77,8 +73,6 @@ describe ResourceUpdater do
       allow(transifex_api).to receive(:resource_exists?).and_return(false)
 
       modified_files.each do |file|
-        translations = phrases_for(file['path'])
-
         expect(transifex_api).to(
           receive(:create) do |resource, content, categories|
             expect(resource.source_file).to eq(file['path'])
@@ -95,8 +89,6 @@ describe ResourceUpdater do
       expect(transifex_api).to receive(:resource_exists?).and_return(false)
 
       modified_files.each do |file|
-        translations = phrases_for(file['path'])
-
         expect(transifex_api).to(
           receive(:create) do |resource, content, categories|
             expect(categories).to include('foo:bar')
@@ -109,11 +101,16 @@ describe ResourceUpdater do
   end
 
   context 'when asked to upload diffs' do
+    let(:branch) { 'all' }
+    let(:ref) { 'heads/my_branch' }
     let(:diff_point) { 'heads/diff_point' }
     let(:resource) do
-      TxResource.new(
-        project_name, resource_slug, 'YAML',
-        'en', 'en.yml', '', 'translation_file'
+      TxBranchResource.new(
+        TxResource.new(
+          project_name, resource_slug, 'YAML',
+          'en', 'en.yml', '', 'translation_file'
+        ),
+        ref
       )
     end
 
@@ -137,11 +134,19 @@ describe ResourceUpdater do
         receive(:upload_by_branch).with(resource, diff, anything)
       )
 
-      allow(updater).to(
-        receive(:categories_for).and_return({})
-      )
-
       updater.update_resource(resource, commit_sha)
     end
+
+    context 'when asked to upload the diff point' do
+      let(:ref) { diff_point }
+
+      it 'uploads the whole resource' do
+        expect(updater).to(
+          receive(:upload_by_branch).with(resource, translations, anything)
+        )
+
+        updater.update_resource(resource, commit_sha)
+      end
+    end
   end
 end

data/spec/transifex_api_spec.rb

@@ -342,4 +342,26 @@ describe TransifexApi do
       expect { api.get_formats }.to raise_error(TransifexApiError)
     end
   end
+
+  describe '#get_stats' do
+    it 'makes a request with the correct parameters' do
+      expect(connection).to receive(:get) do |url, payload|
+        expect(url).to end_with("stats/")
+        response
+      end
+
+      allow(response).to receive(:status).and_return(200)
+      allow(response).to receive(:body).and_return('{}')
+      expect(api.get_stats(project_name, resource_slug)).to eq({})
+    end
+
+    it 'raises an exception if the api responds with an error code' do
+      allow(connection).to receive(:get).and_return(response)
+      allow(response).to receive(:status).and_return(404)
+      allow(response).to receive(:body).and_return('{}')
+      expect { api.get_stats(project_name, resource_slug) }.to(
+        raise_error(TransifexApiError)
+      )
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -194,6 +194,7 @@ files:
 - lib/txgh/handlers/github.rb
 - lib/txgh/handlers/github/delete_handler.rb
 - lib/txgh/handlers/github/handler.rb
+- lib/txgh/handlers/github/ping_handler.rb
 - lib/txgh/handlers/github/push_handler.rb
 - lib/txgh/handlers/github/request_handler.rb
 - lib/txgh/handlers/response.rb
@@ -236,6 +237,7 @@ files:
 - spec/github_request_auth_spec.rb
 - spec/handlers/download_handler_spec.rb
 - spec/handlers/github/delete_handler_spec.rb
+- spec/handlers/github/ping_handler_spec.rb
 - spec/handlers/github/push_handler_spec.rb
 - spec/handlers/tgz_stream_response_spec.rb
 - spec/handlers/transifex/hook_handler_spec.rb