samanage 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e46107af1beae0b563cc233e9d69c6727feca40
-  data.tar.gz: 045c5ebd2cfc9103a696af0e7439a17a795c2eb5
+  metadata.gz: 480aed4373e288637af7d4d8e37670d0c0070360
+  data.tar.gz: 90dbe235e460d83d7eb1974a2e1d87327f82fc86
 SHA512:
-  metadata.gz: 02ad1751605e323200930b5a15e19c6fc1ebea3e863a28234dad15a1ff18b10cba47ca152fbf2e9deb1bed845314ca4c295008839eeb8c2f15d13f03b8b89f89
-  data.tar.gz: fe6872d3e228a4f04084786b8ccf9a39e5a3ded0168226d755bd22625bde462c5fffddbe1b052fd065eaf948f34adb727c65c78a1f55f24faa069f5ab9f1bfcf
+  metadata.gz: 4abdd3d92377d533be3f7adc1b6123c5fbd9ab9fa62defc032acd5490ea9d4395b1b6d87e220d1501522b4827d3049c2099243d614a0da3c9833cf044cc1968c
+  data.tar.gz: 14748f57baeed30c1806bef946df196c334dea40c472874efd17c3eddf11c676cc8aa26dfb1b18d4b0f58757c97a4194030c907ef8428094a0f45a02c1bc033e

data/changelog.md

@@ -1,5 +1,9 @@
+### 2.1.14
+- Swap header merging
+
 ### 2.1.13
 - Pass Query params separate from Body
+- Add coverage for `{add_calbacks: true}` option
 - Add Release support
 
 ### 2.1.12

data/lib/samanage/api.rb

@@ -74,11 +74,11 @@ module Samanage
         verbose = '?layout=long'
       end
 
-      headers = headers.merge({
+      headers = {
         'Accept' => "application/vnd.samanage.v2.1+#{self.content_type}#{verbose}",
         'Content-Type'  => "application/#{self.content_type}",
         'X-Samanage-Authorization' => 'Bearer ' + self.token
-      })
+      }.merge(headers)
       options = options.except(:verbose)
       full_path = self.base_url + path
       retries = 0

data/lib/samanage/version.rb

@@ -1,3 +1,3 @@
 module Samanage
-  VERSION = '2.1.13'
+  VERSION = '2.1.14'
 end

data/spec/api/samanage_incident_spec.rb

@@ -112,6 +112,7 @@ describe Samanage::Api do
         initial_email_audits = audits_req.dig(:data,'audits').select{|audit| audit['message'].match(/was sent./) }.count
         incident_json = {
           :incident => {
+            state: 'New',
             due_at: Date.new(2019,rand(11) + 1, rand(27) + 1), # need to configure email notifications for due date change
             assignee: {email: @users.find{|u| u.dig('role','name') == 'Administrator'}.dig('email')}
           }
@@ -123,6 +124,11 @@ describe Samanage::Api do
         final_email_audits = final_audits_req.dig(:data,'audits').select{|audit| audit['message'].match(/was sent./) }.count
         expect(initial_email_audits).to be < final_email_audits
       end
+      it 'Finds incident origin in v2.0 layout=long header' do
+        sample_id = @samanage.get_incidents[:data].sample['id']
+        origin_req = @samanage.execute(path: "incidents/#{sample_id}.json", verbose: true, headers: {'Accept' => "application/vnd.samanage.v2.0+json?layout=long"})
+        expect(origin_req[:data]).to have_key('origin')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samanage
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Chris Walls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty