ruby-lokalise-api 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731873c8db739c3d8dfb50acdf3a953df1d5aeeebfae374abecef9a82a6768e2
-  data.tar.gz: 8c9c3cd03e0044afb2c7b35c13f2a76639313808752a0646a7038563ea9bb80d
+  metadata.gz: 8e19a20b1d025fd711703a9176f3379e9434b91715db88098a6c25aff8e24fa3
+  data.tar.gz: afbe4d805b7d97b19fb0105e34815e5a8ce49e36d1fe7b497bea8405d826d44e
 SHA512:
-  metadata.gz: c366018086577a01348cb54c46c28637be5132b3139e4226a2a21e28e75fe8d271db4c54f59b5e7c540aff9c70199c6d928abfd3fa4e8a26eb05ad56cd176653
-  data.tar.gz: a4dc54cefa1e39df9cc26cca452e4210c9f7d4288b9d083da6fd52194760efec083b0a7bfbca19ab315d7072161b2d01c3712ea8b15b1022b880a21bfd863a99
+  metadata.gz: 60df98ac6b8065743bd760e4979b94264da22eeebde08f8b199889dada4d591e7491becb64f09684371a97e7da4a4bb7dfa2cdefb590eca754c2bf7ed1684e1a
+  data.tar.gz: a22de056ac53851456ac434cd3ecec0c8622d19d5a18b37a658c9d6bb71108ae41106868b54297fc569d8f517b4759156d48ccdea93df3abd43a389ab3e3a9f5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.8.0 (13-Nov-19)
+
+* Added methods to [merge branches](https://lokalise.com/api2docs/curl/#transition-merge-a-branch-post):
+  + `branch.merge params`
+  + `client.merge_branch project_id, branch_id, params`
+
 ## 2.7.0 (30-Oct-19)
 
 * Added [`Branch` endpoint](https://lokalise.co/api2docs/curl/#resource-branches)

data/README.md

@@ -206,6 +206,13 @@ If you are using [project branching feature](https://docs.lokalise.com/en/articl
                                                         ## Updated branch
 ```
 
+Alternatively:
+
+```ruby
+branch = @client.branch('project_id', 'branch_id')
+branch.update params
+```
+
 #### Delete branch
 
 [Doc](https://lokalise.com/api2docs/curl/#transition-delete-a-branch-delete)
@@ -218,6 +225,33 @@ If you are using [project branching feature](https://docs.lokalise.com/en/articl
                                                 ## Hash with the project's id and "branch_deleted"=>true
 ```
 
+Alternatively:
+
+```ruby
+branch = @client.branch('project_id', 'branch_id')
+branch.destroy
+```
+
+#### Merge branch
+
+[Doc](https://lokalise.com/api2docs/curl/#transition-merge-a-branch-post)
+
+```ruby
+@client.merge_branch(project_id, branch_id, params) # Input:
+                                                    ## project_id (string, required)
+                                                    ## branch_id (string or integer, required) 
+                                                    ## params (hash) 
+                                                    # Output:
+                                                    ## Hash with the project's id, "branch_merged"=>true, and branch attributes
+```
+
+Alternatively:
+
+```ruby
+branch = @client.branch('project_id', 'branch_id')
+branch.merge params
+```
+
 ### Comments
 
 [Comments attributes](https://lokalise.com/api2docs/curl/#resource-comments)

data/lib/ruby-lokalise-api/resources/branch.rb

@@ -3,10 +3,22 @@ module Lokalise
     class Branch < Base
       supports :update, :destroy
 
+      def merge(params = {})
+        self.class.merge @client, self.class.endpoint(project_id, branch_id, :merge), params
+      end
+
       class << self
-        def endpoint(project_id, branch_id = nil)
-          path_from projects: project_id,
-                    branches: branch_id
+        def merge(client, path, params, *_args)
+          post(path, client, params)['content']
+        end
+
+        def endpoint(project_id, branch_id = nil, action = nil)
+          params = {projects: project_id,
+                    branches: branch_id}
+
+          params[:merge] = '' if action == :merge
+
+          path_from params
         end
       end
     end

data/lib/ruby-lokalise-api/rest/branches.rb

@@ -50,5 +50,16 @@ module Lokalise
     def destroy_branch(project_id, branch_id)
       c_r Lokalise::Resources::Branch, :destroy, [project_id, branch_id]
     end
+
+    # Merges a branch in the project
+    #
+    # @see https://lokalise.com/api2docs/curl/#transition-merge-a-branch-post
+    # @return [Hash]
+    # @param project_id [String]
+    # @param branch_id [String, Integer]
+    # @param params [Hash]
+    def merge_branch(project_id, branch_id, params = {})
+      c_r Lokalise::Resources::Branch, :merge, [project_id, branch_id, :merge], params
+    end
   end
 end

data/lib/ruby-lokalise-api/version.rb

@@ -1,3 +1,3 @@
 module Lokalise
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.0'.freeze
 end

data/spec/lib/ruby-lokalise-api/rest/branches_spec.rb

@@ -63,7 +63,45 @@ RSpec.describe Lokalise::Client do
     expect(response['branch_deleted']).to eq(true)
   end
 
+  specify '#merge_branch' do
+    branch = VCR.use_cassette('create_branch_to_merge') do
+      test_client.create_branch project_id, name: 'merge-me'
+    end
+
+    expect(branch.name).to eq('merge-me')
+
+    branch_id = branch.branch_id
+
+    response = VCR.use_cassette('merge_branch') do
+      test_client.merge_branch project_id, branch_id, force_conflict_resolve_using: 'master'
+    end
+
+    expect(response['project_id']).to eq(project_id)
+    expect(response['branch_merged']).to eq(true)
+    expect(response['branch']['branch_id']).to eq(branch_id)
+    expect(response['branch']['name']).to eq(branch.name)
+  end
+
   context 'branch chained methods' do
+    it 'should support merge' do
+      branch = VCR.use_cassette('create_branch_to_merge2') do
+        test_client.create_branch project_id, name: 'merge-me-plz'
+      end
+
+      expect(branch.name).to eq('merge-me-plz')
+
+      branch_id = branch.branch_id
+
+      response = VCR.use_cassette('merge_branch_chained') do
+        branch.merge force_conflict_resolve_using: 'master'
+      end
+
+      expect(response['project_id']).to eq(project_id)
+      expect(response['branch_merged']).to eq(true)
+      expect(response['branch']['branch_id']).to eq(branch_id)
+      expect(response['branch']['name']).to eq(branch.name)
+    end
+
     it 'should support update and destroy' do
       branch = VCR.use_cassette('create_another_branch') do
         test_client.create_branch project_id, name: 'ruby-second-branch'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lokalise-api
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable