txgh 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea46b3b937fb4d5204da813883825b88962d76c
-  data.tar.gz: 4328a0e1e98e36b47d043ab626de14bf2844cb94
+  metadata.gz: abf79e14e41fd8e48b6e4243491b6f7d167ea173
+  data.tar.gz: a53bb4779937d8b42fc4d24c4476d2b40e152d0b
 SHA512:
-  metadata.gz: 8636abb2938a9e2443c01ec34693a9bb7cc2804d3f4eb787940b88fcd785c3e1e98fecae75384a30d165c0dbd2ffd13551de4187a1dd78bd8d57f4d55c1a6276
-  data.tar.gz: f5b82b93eee9af4116fafaccd66fe2c3837c358677e620a5b99637192ca1f016496c3b3efca463631ee175ce70124f8d0a69f1d34e102331f26d7ec325692de3
+  metadata.gz: 544945c0b37aa982633d86d2925cbe458d4788a54db2b7a0d614a020befb8dfabda7e1b4dbb367c73a63d214e5ec1de2a1c21a80364384e0b5042ee16f2608c9
+  data.tar.gz: 795f05ae83fd6fd2fcf52a0a11f8613a29e05c42c50ee2a8b29ca8124c5355fe6f216588cc4cafc176b53c68b3cd2574c883d79fefd760b30cf9afb553b2f139

data/lib/txgh.rb

@@ -19,7 +19,6 @@ module Txgh
   autoload :ResourceDeleter,       'txgh/resource_deleter'
   autoload :ResourceDownloader,    'txgh/resource_downloader'
   autoload :ResourceUpdater,       'txgh/resource_updater'
-  autoload :ResponseHelpers,       'txgh/response_helpers'
   autoload :TransifexApi,          'txgh/transifex_api'
   autoload :TransifexProject,      'txgh/transifex_project'
   autoload :TxBranchResource,      'txgh/tx_branch_resource'

data/lib/txgh/errors.rb

@@ -2,9 +2,26 @@ module Txgh
   class TxghError < StandardError; end
   class TxghInternalError < TxghError; end
 
-  class TransifexApiError < StandardError; end
-  class TransifexNotFoundError < TransifexApiError; end
-  class TransifexUnauthorizedError < TransifexApiError; end
+  class TransifexApiError < StandardError
+    attr_reader :status_code
+
+    def initialize(message, status_code)
+      super(message)
+      @status_code = status_code
+    end
+  end
+
+  class TransifexNotFoundError < TransifexApiError
+    def initialize(message = 'Not found')
+      super(message, 404)
+    end
+  end
+
+  class TransifexUnauthorizedError < TransifexApiError
+    def initialize(message = 'Unauthorized')
+      super(message, 401)
+    end
+  end
 
   class InvalidProviderError < StandardError; end
 

data/lib/txgh/events.rb

@@ -17,17 +17,22 @@ module Txgh
         callback.call(options)
       end
     rescue => e
-      publish_error(e)
+      publish_error!(e)
     end
 
     def channels
       channel_hash.keys
     end
 
-    def publish_error(e)
+    def publish_error(e, params = {})
+      callbacks = channel_hash.fetch(ERROR_CHANNEL) { [] }
+      callbacks.map { |callback| callback.call(e, params) }
+    end
+
+    def publish_error!(e, params = {})
       # if nobody has subscribed to error events, raise original error
       callbacks = channel_hash.fetch(ERROR_CHANNEL) { raise e }
-      callbacks.each { |callback| callback.call(e) }
+      callbacks.map { |callback| callback.call(e, params) }
     end
   end
 end

data/lib/txgh/github_api.rb

@@ -34,17 +34,24 @@ module Txgh
       client.create_ref(repo_name, branch, sha) rescue false
     end
 
-    def update_contents(branch, content_map, message)
-      content_map.each do |path, new_contents|
+    def update_contents(branch, content_list, message)
+      content_list.each do |file_params|
+        path = file_params.fetch(:path)
+        new_contents = file_params.fetch(:contents)
         branch = Utils.relative_branch(branch)
 
-        file = begin
-          client.contents(repo_name, { path: path, ref: branch })
-        rescue Octokit::NotFound
-          nil
+        file_sha = file_params.fetch(:sha) do
+          begin
+            client.contents(repo_name, { path: path, ref: branch })[:sha]
+          rescue Octokit::NotFound
+            nil
+          end
         end
 
-        current_sha = file ? file[:sha] : '0' * 40
+        # If the file doesnt exist, then it isn't tracked by git and file_sha
+        # will be nil. In git land, a SHA of all zeroes means create a new file
+        # instead of updating an existing one.
+        current_sha = file_sha || '0' * 40
         new_sha = Utils.git_hash_blob(new_contents)
         options = { branch: branch }
 
@@ -81,6 +88,5 @@ module Txgh
     def create_status(sha, state, options = {})
       client.create_status(repo_name, sha, state, options)
     end
-
   end
 end

data/lib/txgh/resource_committer.rb

@@ -19,7 +19,7 @@ module Txgh
 
         if translations
           repo.api.update_contents(
-            branch, { file_name => translations }, message
+            branch, { path: file_name, contents: translations }, message
           )
 
           fire_event_for(tx_resource, branch, language)

data/lib/txgh/resource_updater.rb

@@ -24,15 +24,20 @@ module Txgh
         upload_whole(tx_resource, file, categories)
       end
 
-      fire_event_for(tx_resource, file)
+      fire_event_for(tx_resource, branch)
     end
 
     private
 
-    def fire_event_for(tx_resource, file)
+    def fire_event_for(tx_resource, branch)
+      ref = repo.api.get_ref(branch)
+
       Txgh.events.publish(
         'transifex.resource.updated', {
-          project: project, repo: repo, resource: tx_resource, sha: file[:sha]
+          project: project,
+          repo: repo,
+          resource: tx_resource,
+          sha: ref[:object][:sha]
         }
       )
     end

data/lib/txgh/transifex_api.rb

@@ -180,8 +180,10 @@ module Txgh
           raise TransifexNotFoundError, "404 Not Found: #{response.env.url}"
         else
           if (response.status / 100) != 2
-            raise TransifexApiError,
-              "HTTP #{response.status}: #{response.env.url}, body: #{response.body}"
+            raise TransifexApiError.new(
+              "HTTP #{response.status}: #{response.env.url}, body: #{response.body}",
+              response.status
+            )
           end
       end
     end

data/lib/txgh/utils.rb

@@ -64,6 +64,23 @@ module Txgh
           obj
       end
     end
+
+    def deep_symbolize_keys(obj)
+      case obj
+        when Hash
+          obj.each_with_object({}) do |(k, v), ret|
+            ret[k.to_sym] = deep_symbolize_keys(v)
+          end
+
+        when Array
+          obj.map do |elem|
+            deep_symbolize_keys(elem)
+          end
+
+        else
+          obj
+      end
+    end
   end
 
   Utils.extend(Utils)

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '6.0.3'
+  VERSION = '6.0.4'
 end

data/spec/events_spec.rb

@@ -43,13 +43,51 @@ describe Events do
     end
   end
 
-  describe '#publish_error' do
+  shared_examples 'an error publisher' do |options = {}|
+    let(:error) do
+      begin; raise 'foo'; rescue => e; e; end
+    end
+
     it 'publishes the given error over the error channel' do
       errors = []
       events.subscribe('errors') { |e| errors << e }
-      events.publish_error(begin; raise 'foo'; rescue => e; e; end)
+      events.send(options.fetch(:method_sym), error)
       expect(errors.size).to eq(1)
       expect(errors.first.message).to eq('foo')
     end
+
+    it 'includes additional params' do
+      errors = []
+      events.subscribe('errors') { |e, params| errors << { error: e, params: params } }
+      events.send(options.fetch(:method_sym), error, { foo: 'bar' })
+      expect(errors.size).to eq(1)
+
+      error = errors.first
+      expect(error[:error].message).to eq('foo')
+      expect(error[:params]).to eq(foo: 'bar')
+    end
+
+    it 'returns an array of the callback return values' do
+      events.subscribe('errors') { |e| 'abc' }
+      events.subscribe('errors') { |e| 'def' }
+      callback_return_values = events.send(options.fetch(:method_sym), error)
+      expect(callback_return_values).to eq(%w(abc def))
+    end
+  end
+
+  describe '#publish_error' do
+    it_behaves_like 'an error publisher', method_sym: :publish_error
+
+    it 'does not raise errors if no error subscribers are configured' do
+      expect { events.publish_error(StandardError.new) }.to_not raise_error
+    end
+  end
+
+  describe '#publish_error!' do
+    it_behaves_like 'an error publisher', method_sym: :publish_error!
+
+    it 'raises errors if no error subscribers are configured' do
+      expect { events.publish_error!(StandardError.new) }.to raise_error(StandardError)
+    end
   end
 end

data/spec/github_api_spec.rb

@@ -55,7 +55,7 @@ describe GithubApi do
           .with(repo, path, 'message', old_sha, new_contents, { branch: branch })
       )
 
-      api.update_contents(branch, { path => new_contents }, 'message')
+      api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
     end
 
     it "doesn't update the file contents if the file hasn't changed" do
@@ -67,7 +67,7 @@ describe GithubApi do
 
       expect(client).to_not receive(:update_contents)
 
-      api.update_contents(branch, { path => old_contents }, 'message')
+      api.update_contents(branch, [{ path: path, contents: old_contents }], 'message')
     end
 
     it "creates the file if it doesn't already exist" do
@@ -81,7 +81,7 @@ describe GithubApi do
           .with(repo, path, 'message', '0' * 40, new_contents, { branch: branch })
       )
 
-      api.update_contents(branch, { path => new_contents }, 'message')
+      api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
     end
   end
 

data/spec/resource_committer_spec.rb

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

data/spec/resource_updater_spec.rb

@@ -14,6 +14,7 @@ describe ResourceUpdater do
   let(:ref) { 'heads/master' }
   let(:resource) { tx_config.resource(resource_slug, ref) }
   let(:commit_sha) { '8765309' }
+  let(:file_sha) { 'abc123' }
 
   let(:translations) do
     YAML.load("|
@@ -25,7 +26,7 @@ describe ResourceUpdater do
   end
 
   let(:modified_files) do
-    [{ path: resource.source_file, content: translations, sha: commit_sha }]
+    [{ path: resource.source_file, content: translations, sha: file_sha }]
   end
 
   before(:each) do
@@ -34,6 +35,10 @@ describe ResourceUpdater do
         receive(:download).with(file[:path], ref).and_return(file)
       )
     end
+
+    allow(github_api).to receive(:get_ref).with(ref).and_return(
+      { object: { sha: commit_sha } }
+    )
   end
 
   it 'correctly uploads modified files to transifex' do

data/spec/transifex_api_spec.rb

@@ -132,7 +132,9 @@ describe TransifexApi do
       end
 
       expect { api.create(resource, 'new_content') }.to(
-        raise_error(TransifexApiError)
+        raise_error(TransifexNotFoundError) do |e|
+          expect(e.status_code).to eq(404)
+        end
       )
     end
 
@@ -286,7 +288,9 @@ describe TransifexApi do
       end
 
       expect { api.download(resource, language) }.to(
-        raise_error(TransifexApiError)
+        raise_error(TransifexUnauthorizedError) do |e|
+          expect(e.status_code).to eq(401)
+        end
       )
     end
 

data/spec/utils_spec.rb

@@ -98,4 +98,48 @@ 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.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -133,7 +133,6 @@ files:
 - lib/txgh/resource_deleter.rb
 - lib/txgh/resource_downloader.rb
 - lib/txgh/resource_updater.rb
-- lib/txgh/response_helpers.rb
 - lib/txgh/transifex_api.rb
 - lib/txgh/transifex_project.rb
 - lib/txgh/tx_branch_resource.rb

data/lib/txgh/response_helpers.rb

@@ -1,26 +0,0 @@
-module Txgh
-  module ResponseHelpers
-    private
-
-    def respond_with(status, body, e = nil)
-      Txgh::Handlers::Response.new(status, body, e)
-    end
-
-    def respond_with_error(status, message, e = nil)
-      respond_with(status, error(message), e)
-    end
-
-    def error(message)
-      [{ error: message }]
-    end
-
-    def data(body)
-      { data: body }
-    end
-
-    # includes these methods in the singleton class as well
-    def self.included(base)
-      base.extend(self)
-    end
-  end
-end