txgh 6.0.0.beta1 → 6.0.0

data/spec/github_api_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
+require 'base64'
 
 include Txgh
 
 describe GithubApi do
   let(:client) { double(:client) }
-  let(:api) { GithubApi.create_from_client(client) }
+  let(:api) { GithubApi.create_from_client(client, repo) }
   let(:repo) { 'my_org/my_repo' }
   let(:branch) { 'master' }
   let(:sha) { 'abc123' }
@@ -12,26 +13,26 @@ describe GithubApi do
   describe '#tree' do
     it 'retrieves a git tree using the client' do
       expect(client).to receive(:tree).with(repo, sha, recursive: 1)
-      api.tree(repo, sha)
+      api.tree(sha)
     end
   end
 
   describe '#blob' do
     it 'retrieves a git blob using the client' do
       expect(client).to receive(:blob).with(repo, sha)
-      api.blob(repo, sha)
+      api.blob(sha)
     end
   end
 
   describe '#create_ref' do
     it 'creates the given ref using the client' do
       expect(client).to receive(:create_ref).with(repo, branch, sha)
-      api.create_ref(repo, branch, sha)
+      api.create_ref(branch, sha)
     end
 
     it 'returns false on client error' do
       expect(client).to receive(:create_ref).and_raise(StandardError)
-      expect(api.create_ref(repo, branch, sha)).to eq(false)
+      expect(api.create_ref(branch, sha)).to eq(false)
     end
   end
 
@@ -54,7 +55,7 @@ describe GithubApi do
           .with(repo, path, 'message', old_sha, new_contents, { branch: branch })
       )
 
-      api.update_contents(repo, branch, { path => new_contents }, 'message')
+      api.update_contents(branch, { path => new_contents }, 'message')
     end
 
     it "doesn't update the file contents if the file hasn't changed" do
@@ -66,7 +67,7 @@ describe GithubApi do
 
       expect(client).to_not receive(:update_contents)
 
-      api.update_contents(repo, branch, { path => old_contents }, 'message')
+      api.update_contents(branch, { path => old_contents }, 'message')
     end
 
     it "creates the file if it doesn't already exist" do
@@ -80,118 +81,65 @@ describe GithubApi do
           .with(repo, path, 'message', '0' * 40, new_contents, { branch: branch })
       )
 
-      api.update_contents(repo, branch, { path => new_contents }, 'message')
-    end
-  end
-
-  describe '#commit' do
-    let(:path) { 'path/to/translations' }
-    let(:other_path) { 'other/path/to/translations' }
-
-    before(:each) do
-      allow(client).to receive(:create_blob).with(repo, :new_content).and_return(:blob_sha)
-      allow(client).to receive(:ref).with(repo, branch).and_return(object: { sha: :branch_sha })
-      allow(client).to receive(:commit).with(repo, :branch_sha).and_return(commit: { tree: { sha: :base_tree_sha } })
-      allow(client).to receive(:create_tree).and_return(sha: :new_tree_sha)
-    end
-
-    it 'creates a new commit and updates the branch' do
-      expect(client).to(
-        receive(:create_commit)
-          .with(repo, 'message', :new_tree_sha, :branch_sha)
-          .and_return(sha: :new_commit_sha)
-      )
-
-      expect(client).to receive(:update_ref).with(repo, branch, :new_commit_sha, false)
-      api.commit(repo, branch, { path => :new_content }, 'message', true)
-    end
-
-    it 'updates multiple files at a time' do
-      allow(client).to receive(:create_blob).with(repo, :other_content).and_return(:blob_sha_2)
-
-      expect(client).to(
-        receive(:create_commit)
-          .with(repo, 'message', :new_tree_sha, :branch_sha)
-          .and_return(sha: :new_commit_sha)
-      )
-
-      expect(client).to receive(:update_ref).with(repo, branch, :new_commit_sha, false)
-      content_map = { path => :new_content, other_path => :other_content }
-      api.commit(repo, branch, content_map, 'message', true)
-    end
-
-    context 'with an empty commit' do
-      before(:each) do
-        allow(client).to(
-          receive(:compare)
-            .with(repo, :branch_sha, :new_commit_sha)
-            .and_return(files: [])
-        )
-
-        expect(client).to(
-          receive(:create_commit)
-            .with(repo, 'message', :new_tree_sha, :branch_sha)
-            .and_return(sha: :new_commit_sha)
-        )
-      end
-
-      it 'does not allow empty commits by default' do
-        expect(client).to_not receive(:update_ref)
-        api.commit(repo, branch, { path => :new_content }, 'message')
-      end
-    end
-
-    context 'with a non-empty commit' do
-      before(:each) do
-        allow(client).to(
-          receive(:compare)
-            .with(repo, :branch_sha, :new_commit_sha)
-            .and_return(files: %w(abc def))
-        )
-
-        expect(client).to(
-          receive(:create_commit)
-            .with(repo, 'message', :new_tree_sha, :branch_sha)
-            .and_return(sha: :new_commit_sha)
-        )
-      end
-
-      it 'updates the ref as expected' do
-        expect(client).to receive(:update_ref).with(repo, branch, :new_commit_sha, false)
-        api.commit(repo, branch, { path => :new_content }, 'message')
-      end
+      api.update_contents(branch, { path => new_contents }, 'message')
     end
   end
 
   describe '#get_commit' do
     it 'retrieves the given commit using the client' do
       expect(client).to receive(:commit).with(repo, sha)
-      api.get_commit(repo, sha)
+      api.get_commit(sha)
     end
   end
 
   describe '#get_ref' do
     it 'retrieves the given ref (i.e. branch) using the client' do
       expect(client).to receive(:ref).with(repo, sha)
-      api.get_ref(repo, sha)
+      api.get_ref(sha)
     end
   end
 
   describe '#download' do
+    let(:path) { 'path/to/file.xyz' }
+
     it 'downloads the file from the given branch' do
-      path = 'path/to/file.xyz'
+      expect(client).to(
+        receive(:contents)
+          .with(repo, path: path, ref: branch)
+          .and_return(
+            content: 'content', encoding: 'utf-8'
+          )
+      )
+
+      expect(api.download(path, branch)).to eq({ content: 'content' })
+    end
+
+    it 'encodes the string using the encoding specified in the response' do
+      content = 'ありがと'.encode('UTF-16')
 
-      expect(client).to receive(:ref).with(repo, branch).and_return(object: { sha: :branch_sha })
-      expect(client).to receive(:commit).with(repo, :branch_sha).and_return(commit: { tree: { sha: :base_tree_sha } })
-      expect(client).to receive(:tree).with(repo, :base_tree_sha, recursive: 1).and_return(
-        tree: [{ path: path, sha: :blob_sha }]
+      expect(client).to(
+        receive(:contents)
+          .with(repo, path: path, ref: branch)
+          .and_return(
+            content: content, encoding: 'utf-16'
+          )
       )
 
-      expect(client).to receive(:blob).with(repo, :blob_sha).and_return(
-        { 'content' => :blob, 'encoding' => 'utf-8' }
+      result = api.download(path, branch)
+      expect(result[:content].encoding).to eq(Encoding::UTF_16)
+      expect(result[:content]).to eq(content)
+    end
+
+    it 'automatically decodes base64-encoded content' do
+      expect(client).to(
+        receive(:contents)
+          .with(repo, path: path, ref: branch)
+          .and_return(
+            content: Base64.encode64('content'), encoding: 'base64'
+          )
       )
 
-      expect(api.download(repo, path, branch)).to eq(:blob)
+      expect(api.download(path, branch)).to eq({ content: 'content' })
     end
   end
 end

data/spec/github_status_spec.rb

@@ -26,8 +26,7 @@ describe GithubStatus do
 
     context 'with all resources at 100%' do
       it 'reports status as success' do
-        expect(github_api).to receive(:create_status) do |repo, commit_sha, state, options|
-          expect(repo).to eq(repo_name)
+        expect(github_api).to receive(:create_status) do |commit_sha, state, options|
           expect(commit_sha).to eq(sha)
           expect(state).to eq(GithubStatus::State.success)
           expect(options[:description]).to eq('Translations complete!')
@@ -56,7 +55,7 @@ describe GithubStatus do
       end
 
       it 'reports status as pending' do
-        expect(github_api).to receive(:create_status) do |repo, commit_sha, state, options|
+        expect(github_api).to receive(:create_status) do |commit_sha, state, options|
           expect(state).to eq(GithubStatus::State.pending)
           expect(options[:description]).to eq('15/20 translations complete.')
         end

data/spec/merge_calculator_spec.rb

@@ -46,6 +46,22 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array added in HEAD' do
+    let(:diff_point_phrases) do
+      [phrase('planet.earth', 'Human')]
+    end
+
+    let(:head_phrases) do
+      diff_point_phrases + [
+        phrase('villains', %w(Kahn Chang Valeris Shinzon))
+      ]
+    end
+
+    it 'includes the added array' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with phrases removed from HEAD' do
     let(:diff_point_phrases) do
       head_phrases + [
@@ -62,6 +78,22 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array removed from HEAD' do
+    let(:diff_point_phrases) do
+      head_phrases + [
+        phrase('villains', %w(Kahn Chang Valeris Shinzon))
+      ]
+    end
+
+    let(:head_phrases) do
+      [phrase('planet.earth', 'Human')]
+    end
+
+    it 'does not include the removed array' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with phrases modified in HEAD' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Cardassian')]
@@ -76,6 +108,20 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array modified in HEAD' do
+    let(:diff_point_phrases) do
+      [phrase('villains', %w(Kahn Chang Valeris))]
+    end
+
+    let(:head_phrases) do
+      [phrase('villains', %w(Kahn Chang Valeris Shinzon))]
+    end
+
+    it 'includes the modified phrase' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with no phrases modified, added, or removed' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Bajoran')]

data/spec/resource_committer_spec.rb

@@ -32,7 +32,7 @@ describe ResourceCommitter do
 
         expect(github_api).to(
           receive(:update_contents).with(
-            repo_name, branch, { file_name => :translations }, commit_message
+            branch, { file_name => :translations }, commit_message
           )
         )
       end

data/spec/resource_contents_spec.rb

@@ -11,18 +11,29 @@ describe ResourceContents do
     )
   end
 
-  let(:raw_contents) do
+  let(:default_contents) do
     outdent(%Q(
       en:
         welcome:
-          message: Hello!
+          message: "Hello!"
         goodbye:
-          message: Goodbye!
+          message: "Goodbye!"
+    ))
+  end
+
+  let(:array_contents) do
+    outdent(%Q(
+      en:
+        captains:
+        - "Janeway"
+        - "Picard"
+        - "Sisko"
+        - "Kirk"
     ))
   end
 
   let(:contents) do
-    ResourceContents.from_string(tx_resource, raw_contents)
+    ResourceContents.from_string(tx_resource, default_contents)
   end
 
   describe '#phrases' do
@@ -32,6 +43,13 @@ describe ResourceContents do
         { 'key' => 'goodbye.message', 'string' => 'Goodbye!' }
       ])
     end
+
+    it 'preserves arrays' do
+      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
+      expect(rsrc_contents.phrases).to eq([
+        { 'key' => 'captains', 'string' => %w(Janeway Picard Sisko Kirk) }
+      ])
+    end
   end
 
   describe '#add' do
@@ -47,13 +65,14 @@ describe ResourceContents do
     it 'serializes the phrases to the given stream' do
       stream = StringIO.new
       contents.write_to(stream)
-      expect(stream.string).to eq(outdent(%Q(
-        en:
-          welcome:
-            message: "Hello!"
-          goodbye:
-            message: "Goodbye!"
-      )))
+      expect(stream.string).to eq(default_contents)
+    end
+
+    it 'serializes arrays correctly' do
+      stream = StringIO.new
+      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
+      rsrc_contents.write_to(stream)
+      expect(stream.string).to eq(array_contents)
     end
 
     it 'includes phrases that were added after the fact' do

data/spec/resource_downloader_spec.rb

@@ -97,8 +97,8 @@ describe ResourceDownloader do
     let(:ref) { 'heads/mybranch' }
 
     before(:each) do
-      allow(github_api).to receive(:download) do |repo_name, file, branch|
-        source_for(branch)
+      allow(github_api).to receive(:download) do |file, branch|
+        { content: source_for(branch) }
       end
     end
 

data/spec/resource_updater_spec.rb

@@ -15,10 +15,6 @@ describe ResourceUpdater do
   let(:resource) { tx_config.resource(resource_slug, ref) }
   let(:commit_sha) { '8765309' }
 
-  let(:modified_files) do
-    [{ 'path' => resource.source_file, 'sha' => 'def456' }]
-  end
-
   let(:translations) do
     YAML.load("|
       en:
@@ -28,26 +24,14 @@ describe ResourceUpdater do
     ")
   end
 
-  before(:each) do
-    tree_sha = 'abc123'
-
-    allow(github_api).to(
-      receive(:get_commit).with(repo_name, commit_sha) do
-        { 'commit' => { 'tree' => { 'sha' => tree_sha } } }
-      end
-    )
-
-    allow(github_api).to(
-      receive(:tree).with(repo_name, tree_sha) do
-        { 'tree' => modified_files }
-      end
-    )
+  let(:modified_files) do
+    [{ path: resource.source_file, content: translations, sha: commit_sha }]
+  end
 
+  before(:each) do
     modified_files.each do |file|
       allow(github_api).to(
-        receive(:blob).with(repo_name, file['sha']) do
-          { 'content' => translations, 'encoding' => 'utf-8' }
-        end
+        receive(:download).with(file[:path]).and_return(file)
       )
     end
   end
@@ -56,19 +40,19 @@ describe ResourceUpdater do
     modified_files.each do |file|
       expect(transifex_api).to(
         receive(:create_or_update) do |resource, content|
-          expect(resource.source_file).to eq(file['path'])
+          expect(resource.source_file).to eq(file[:path])
           expect(content).to eq(translations)
         end
       )
     end
 
-    updater.update_resource(resource, commit_sha)
+    updater.update_resource(resource)
   end
 
   it 'fires the transifex.resource.updated event' do
     allow(transifex_api).to receive(:create_or_update)
 
-    expect { updater.update_resource(resource, commit_sha) }.to(
+    expect { updater.update_resource(resource) }.to(
       change { Txgh.events.published.size }.by(1)
     )
 
@@ -92,14 +76,14 @@ describe ResourceUpdater do
       modified_files.each do |file|
         expect(transifex_api).to(
           receive(:create) do |resource, content, categories|
-            expect(resource.source_file).to eq(file['path'])
+            expect(resource.source_file).to eq(file[:path])
             expect(content).to eq(translations)
             expect(categories).to include("branch:#{ref}")
           end
         )
       end
 
-      updater.update_resource(resource, commit_sha)
+      updater.update_resource(resource)
     end
 
     it 'adds categories when passed in' do
@@ -113,7 +97,7 @@ describe ResourceUpdater do
         )
       end
 
-      updater.update_resource(resource, commit_sha, { 'foo' => 'bar' })
+      updater.update_resource(resource, { 'foo' => 'bar' })
     end
   end
 
@@ -134,7 +118,7 @@ describe ResourceUpdater do
     it 'uploads a diff instead of the whole resource' do
       expect(github_api).to(
         receive(:download)
-          .with(repo_name, 'en.yml', diff_point)
+          .with('en.yml', diff_point)
           .and_return(YAML.load("|
             en:
               welcome: Hello
@@ -151,7 +135,7 @@ describe ResourceUpdater do
         receive(:upload_by_branch).with(resource, diff, anything)
       )
 
-      updater.update_resource(resource, commit_sha)
+      updater.update_resource(resource)
     end
 
     context 'when asked to upload the diff point' do
@@ -162,7 +146,7 @@ describe ResourceUpdater do
           receive(:upload_by_branch).with(resource, translations, anything)
         )
 
-        updater.update_resource(resource, commit_sha)
+        updater.update_resource(resource)
       end
     end
   end

data/spec/tx_resource_spec.rb

@@ -10,12 +10,6 @@ describe TxResource do
     )
   end
 
-  describe '#L10N_resource_slug' do
-    it 'appends L10N to the resource slug' do
-      expect(resource.L10N_resource_slug).to eq("L10Nresource_slug")
-    end
-  end
-
   describe '#lang_map' do
     it 'converts the given language if a mapping exists for it' do
       expect(resource.lang_map('ko-KR')).to eq('ko')

data/txgh.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  s.add_dependency 'abroad', '~> 4.0'
+  s.add_dependency 'abroad', '~> 4.1'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'json', '~> 1.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.md
-- lib/ext/zipline/output_stream.rb
 - lib/txgh.rb
 - lib/txgh/category_support.rb
 - lib/txgh/config.rb
@@ -188,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A library for syncing translation resources between Github and Transifex.