txgh 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe316847be46da3963313952b4861525ddf6b43f
-  data.tar.gz: 89c7ac7f13c1d2e165cdaae3f6b110cf499888d3
+  metadata.gz: 083d15ac3686b54241f76f3cf7da05783ed9b189
+  data.tar.gz: 42bbf8c31844b25f9c05a74701a6625980d3e7ea
 SHA512:
-  metadata.gz: 6793b41001e8e2fb32c808f179d5de0b8a5f4fe0eb4736fc8998657204d6e0c760e5937f0bfb066eb216852efca0e6ab83c3bffdd48c576338719c3f61384094
-  data.tar.gz: c1ece2694a02648b5553d7bc226b1180f6d492678b4fbc015a8c507114dbc3805f3b5e98ac3de674287676f4351f35e43a60ce07a9c5b73007faad932d869416
+  metadata.gz: 4117c59c816d16878946db1cc5451dfd822c7386c8347d11b952c8e68c620cf88d98ed5360f04752c781621dece4bcb9507debef086a682f38cb31baca14c391
+  data.tar.gz: d24d9cad4af2d0d8ee8bdf3f8a93f681650e535184d1f25a8d0e29818f7de86cc41751ab9927243de2ab04dd0406a14abc514e691c4059aab116c710690ebc5e

data/lib/txgh/handlers/download_handler.rb

@@ -54,7 +54,10 @@ module Txgh
       end
 
       def execute
-        downloader = ResourceDownloader.new(project, repo, params['branch'])
+        downloader = ResourceDownloader.new(
+          project, repo, params['branch'], languages: project.languages
+        )
+
         response_class.new(attachment, downloader.each)
       end
 

data/lib/txgh/handlers/transifex/hook_handler.rb

@@ -20,25 +20,38 @@ module Txgh
         def execute
           logger.info(resource_slug)
 
-          if tx_config
-            if tx_resource
-              committer = ResourceCommitter.new(project, repo, logger)
-              committer.commit_resource(tx_resource, branch, language)
+          check_error_response || begin
+            committer = ResourceCommitter.new(project, repo, logger)
+            committer.commit_resource(tx_resource, branch, language)
+            respond_with(200, true)
+          end
+        end
 
-              respond_with(200, true)
-            else
-              respond_with_error(
-                404, "Could not find resource '#{resource_slug}' in config"
-              )
-            end
-          else
+        private
+
+        def check_error_response
+          check_supported_language || check_tx_config || check_tx_resource
+        end
+
+        def check_supported_language
+          respond_with(304, true) unless supported_language?
+        end
+
+        def check_tx_config
+          unless tx_config
             respond_with_error(
               404, "Could not find configuration for branch '#{branch}'"
             )
           end
         end
 
-        private
+        def check_tx_resource
+          unless tx_resource
+            respond_with_error(
+              404, "Could not find resource '#{resource_slug}' in config"
+            )
+          end
+        end
 
         def tx_config
           @tx_config ||= Txgh::Config::TxManager.tx_config(project, repo, branch)
@@ -71,6 +84,10 @@ module Txgh
         def process_all_branches?
           repo.process_all_branches?
         end
+
+        def supported_language?
+          project.supported_language?(language)
+        end
       end
     end
   end

data/lib/txgh/handlers/triggers/pull_handler.rb

@@ -5,6 +5,8 @@ module Txgh
 
         def execute
           languages.each do |language|
+            next unless project.supported_language?(language['language_code'])
+
             committer.commit_resource(
               branch_resource, branch, language['language_code']
             )

data/lib/txgh/transifex_project.rb

@@ -33,5 +33,13 @@ module Txgh
     def tx_config_uri
       config['tx_config']
     end
+
+    def languages
+      config.fetch('languages', [])
+    end
+
+    def supported_language?(language)
+      languages.include?(language)
+    end
   end
 end

data/lib/txgh/version.rb

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

data/spec/app_spec.rb

@@ -310,6 +310,7 @@ describe Txgh::Triggers do
     it 'updates translations (in all locales) in the expected repo' do
       committer = double(:committer)
       languages = [{ 'language_code' => 'pt' }, { 'language_code' => 'ja' }]
+      project_config['languages'] = %w(pt ja)
       expect(Txgh::ResourceCommitter).to receive(:new).and_return(committer)
       expect(Txgh::TransifexApi).to receive(:new).and_return(transifex_api)
       expect(transifex_api).to receive(:get_languages).and_return(languages)

data/spec/handlers/download_handler_spec.rb

@@ -77,5 +77,15 @@ describe DownloadHandler do
         expect(handler.execute).to be_a(TgzStreamResponse)
       end
     end
+
+    context 'with a set of languages' do
+      let(:supported_languages) { %w(is fr) }
+
+      it "downloads translations for the project's supported languages" do
+        allow(transifex_api).to receive(:download)
+        files = handler.execute.enum.to_a.map(&:first)
+        expect(files).to eq(%w(translations/is/sample.yml translations/fr/sample.yml))
+      end
+    end
   end
 end

data/spec/handlers/transifex/hook_handler_spec.rb

@@ -112,4 +112,17 @@ describe HookHandler do
       expect(response.body).to eq(true)
     end
   end
+
+  context 'with an unsupported language' do
+    let(:language) { 'pt' }
+    let(:supported_languages) { ['ja'] }
+
+    it "doesn't make a commit" do
+      expect(github_api).to_not receive(:commit)
+
+      response = handler.execute
+      expect(response.status).to eq(304)
+      expect(response.body).to eq(true)
+    end
+  end
 end

data/spec/helpers/standard_txgh_setup.rb

@@ -15,6 +15,7 @@ module StandardTxghSetup
   let(:tag) { 'all' }
   let(:ref) { 'heads/master' }
   let(:language) { 'ko_KR' }
+  let(:supported_languages) { [language] }
   let(:translations) { 'translation file contents' }
   let(:diff_point) { nil }
 
@@ -26,7 +27,8 @@ module StandardTxghSetup
       'name' => project_name,
       'tx_config' => "raw://#{tx_config_raw}",
       'webhook_secret' => 'abc123',
-      'auto_delete_resources' => 'true'
+      'auto_delete_resources' => 'true',
+      'languages' => supported_languages
     }
   end
 

data/spec/integration/hooks_spec.rb

@@ -45,7 +45,8 @@ describe 'hook integration tests', integration: true do
             'api_username' => 'txgh.bot',
             'api_password' => '2aqFGW99fPRKWvXBPjbrxkdiR',
             'push_translations_to' => 'txgh-bot/txgh-test-resources',
-            'webhook_secret' => 'fce95b1748fd638c22174d34200f10cf'
+            'webhook_secret' => 'fce95b1748fd638c22174d34200f10cf',
+            'languages' => ['el_GR']
           }
         }
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad