txgh 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4214fc0aed73a268ba39c70ddc665ddee94b3be2
-  data.tar.gz: 20ffbec32c8d965b1380a89de2bc8f40bfba3a55
+  metadata.gz: 4bb912342a3ab872d5d346aa7d5aaf772028e579
+  data.tar.gz: e75989c9cd6bf3ae01d72d6aee86a060ba5ce177
 SHA512:
-  metadata.gz: c4164c9d888d4b3af5c9d5f3b91f2a3d0ae688cd19b422119dfef2003ff57ba0817afa69cacbcc2bb00d126704d8807b29a38a1593073520d09d960391052483
-  data.tar.gz: d0faaa542a3c471f2f61b7e93ca31f208a89d155d169202f581c283c70407771d000f93438fd824d2e3db55b5f7c78a956f0298fcdfe55144f185e1994cb9c24
+  metadata.gz: d2182c6060eee76d2935b1d897a695bdc619ed5c4abb48a0dc065daae06fe50e670fb5fb74a61de4ec3d677d9ae1c0183bf926f396019234c273e89543355178
+  data.tar.gz: b59b80fd0d0960cfadcbd67d6a003d5aaea27a576269b46e87818a71057914558be39cfe33648ada16da33197c9e86ab6504a23b53978b4c4a93d3113e915ff3

data/lib/txgh/resource_downloader.rb

@@ -1,3 +1,5 @@
+require 'octokit'
+
 module Txgh
   class ResourceDownloader
     include Enumerable
@@ -97,11 +99,15 @@ module Txgh
     def transifex_download(resource, language)
       transifex_api.download(resource, language)
     rescue TransifexNotFoundError
+      # return nil here so wrap() will return an instance of EmptyResourceContents
       nil
     end
 
     def git_download(resource, branch)
       repo.api.download(resource.source_file, branch)[:content]
+    rescue Octokit::NotFound
+      # return nil here so wrap() will return an instance of EmptyResourceContents
+      nil
     end
 
     def transifex_api
@@ -123,13 +129,7 @@ module Txgh
       return to_enum(__method__) unless block_given?
       return @languages.each(&block) if @languages
 
-      raw_languages.each(&block)
-    end
-
-    def raw_languages
-      @raw_languages ||= transifex_api.get_languages(project.name).map do |lang|
-        lang['language_code']
-      end
+      project.languages.each(&block)
     end
 
     def tx_config

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '6.1.1'
+  VERSION = '6.1.2'
 end

data/spec/resource_downloader_spec.rb

@@ -7,7 +7,7 @@ include Txgh
 describe ResourceDownloader do
   include StandardTxghSetup
 
-  let(:api_languages) { %w(es de ja) }
+  let(:supported_languages) { %w(es de ja) }
   let(:format) { '.zip' }
 
   let(:downloader) do
@@ -15,14 +15,6 @@ describe ResourceDownloader do
   end
 
   before(:each) do
-    allow(transifex_api).to(
-      receive(:get_languages).with(project_name).and_return(
-        api_languages.map do |language_code|
-          { 'language_code' => language_code }
-        end
-      )
-    )
-
     allow(transifex_api).to(
       receive(:download) do |resource, language|
         translations_for(resource, language)
@@ -44,7 +36,7 @@ describe ResourceDownloader do
 
     it 'downloads the resource in all languages' do
       expect(downloader.each.to_a).to eq(
-        api_languages.map do |language|
+        supported_languages.map do |language|
           [
             "translations/#{language}/sample.yml",
             translations_for(resource, language)
@@ -73,14 +65,14 @@ describe ResourceDownloader do
         resource = tx_config.resource(resource_slug)
         actual_results = downloader.each.to_a
 
-        expected_results = api_languages.map do |language|
+        expected_results = supported_languages.map do |language|
           [
             "translations/#{language}/sample.yml",
             translations_for(resource, language)
           ]
         end
 
-        expected_results += api_languages.map do |language|
+        expected_results += supported_languages.map do |language|
           [
             "translations/#{language}/sample2.yml",
             translations_for(resource, language)
@@ -130,7 +122,7 @@ describe ResourceDownloader do
     end
 
     def translations_for(resource, language)
-      branch = resource.respond_to?(:branch) ? resource.branch : nil
+      branch = resource.has_branch? ? resource.branch : nil
 
       if branch == diff_point
         diff_point_translations_for(language)
@@ -162,7 +154,7 @@ describe ResourceDownloader do
     it 'merges the head and diff point strings together' do
       # picard unmodified, janeway modified, sisko added, sulu removed
       expect(downloader.each.to_a).to eq(
-        api_languages.map do |language|
+        supported_languages.map do |language|
           [
             "translations/#{language}/sample.yml",
             outdent(%Q{
@@ -189,7 +181,7 @@ describe ResourceDownloader do
 
       results = downloader.each.to_a
       expect(results).to eq(
-        api_languages.map do |language|
+        supported_languages.map do |language|
           [
             "translations/#{language}/sample.yml",
             outdent(%Q{
@@ -201,5 +193,33 @@ describe ResourceDownloader do
         end
       )
     end
+
+    it "works even if the file doesn't exist in the git repo" do
+      allow(github_api).to(
+        receive(:download) do |path, branch|
+          if branch == 'heads/master'
+            raise Octokit::NotFound
+          else
+            { content: head_source_for(branch) }
+          end
+        end
+      )
+
+      results = downloader.each.to_a
+      expect(results).to eq(
+        supported_languages.map do |language|
+          [
+            "translations/#{language}/sample.yml",
+            outdent(%Q{
+              #{language}:
+                picard: "enterprise (head trans)"
+                janeway: "uss voyager (head trans)"
+                sulu: "excelsior (dp trans)"
+                sisko: "deep space nine (head trans)"
+            })
+          ]
+        end
+      )
+    end
   end
 end

data/spec/utils_spec.rb

@@ -98,48 +98,4 @@ describe Utils do
       expect(Utils.booleanize(false)).to eq(false)
     end
   end
-
-  describe '.deep_symbolize_keys' do
-    it 'symbolizes keys in a hash with depth 1' do
-      hash = { 'abc' => 'def', ghi: 'jkl' }
-      expect(Utils.deep_symbolize_keys(hash)).to eq(
-        { abc: 'def', ghi: 'jkl' }
-      )
-    end
-
-    it 'symbolizes keys in a hash with depth 2' do
-      hash = { 'abc' => { 'def' => 'ghi' } }
-      expect(Utils.deep_symbolize_keys(hash)).to eq(
-        { abc: { def: 'ghi' } }
-      )
-    end
-
-    it 'symbolizes keys in a hash with depth 3' do
-      hash = { 'abc' => { 'def' => { 'ghi' => 'jkl' }, 'mno' => 'pqr' } }
-      expect(Utils.deep_symbolize_keys(hash)).to eq(
-        { abc: { def: { ghi: 'jkl' }, mno: 'pqr' } }
-      )
-    end
-
-    it 'symbolizes hash keys in an array' do
-      array = [{ 'def' => 'ghi' }]
-      expect(Utils.deep_symbolize_keys(array)).to eq(
-        [{ def: 'ghi' }]
-      )
-    end
-
-    it 'symbolizes keys nested inside arrays' do
-      hash = { 'abc' => [{ 'def' => 'ghi' }] }
-      expect(Utils.deep_symbolize_keys(hash)).to eq(
-        { abc: [{ def: 'ghi' }] }
-      )
-    end
-
-    it "doesn't modify objects that aren't hashes" do
-      hash = { 'abc' => Set.new(%w(a b c)) }
-      expect(Utils.deep_symbolize_keys(hash)).to eq(
-        { abc: hash['abc'] }
-      )
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad