itrp-client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTE5ZTY5ZDBkMWRhMDdkNjI5N2Q3MzY2NzQ1MTcwMTQ0NTljMzY5MA==
+    NDBlZmJiM2E5MjRkOGE4NWQ1YmQ3YTM0Njg1Nzk1ZmI4ZGI4YWY2YQ==
   data.tar.gz: !binary |-
-    YTUwY2ZhOTc3OTU1ZjFlNmQyOGQ3Y2RjNDAxZDlkOGU1NmRmNmUxNQ==
+    ZDEyYThlYjgyZDkxZTAxZTA3Y2ExMTc5ZWYyZWM2YzQyNmQ1MThkMw==
 SHA512:
   metadata.gz: !binary |-
-    MWU1YjY1OWI0NWY2ODRlZWE1N2U1NjUwMWE3NzI0NDg5MTM1MDU0ZmQ0OTNh
-    YTIwMzY0NDhiZDBiYzhiMjU5M2M5MmFkZDUwODY5MjhkNDM5Y2U3NDlmODA4
-    YzhhOTVhZWU2YjI3ODQyY2YyNjI1YTE0M2ZkNTZkZmU1NzQwYjY=
+    NjllNDM3ODZkODU5OWI4NTliZDQxNzg4N2QwODM1MDJhN2I2MTNkY2EzM2Y0
+    ODZkMDVhYjhmYTMzMDkyNTJlMGViMzM1MDE1M2Y2ZDFkNTQyYzBlMjJlNzdi
+    MDUzYjc4ZTdkNTMzZGI2OTIyMzM5NTU3N2YzOWEzYjZmZmVkYWI=
   data.tar.gz: !binary |-
-    MjdjNTc3NjIzYWY2M2Y0OWZmNzgzZTU2ZTQ3ZjNjMjVkZjQ0NjE2MWFhMWNm
-    ZmQwNTk3MWQyOGY3NjQxZWI3YWYwMTkwZDA0NTk1ODIwMjdjZjYyMDdmZDFk
-    NDE5ZmQzMDBhMTljMmE1Yjc3M2FkMjZjNDE3MjNkNGQzZTRmNDM=
+    NzFkYzY5OTEzMzJlNzE3MGYwOTdlYjAyMWMxMTE3M2YwYjMxN2IyNGJmMDBj
+    MzYyYjgxMDhkYjI0ZjQyMTBjNTllNWFlNjY0YTY5OWIxZWZjZTIwODhiNWJl
+    N2RjMjExZTJkMjJmOTI0MjA2ZjRjMzllMDljYzY4OGJmYmEzYTk=

data/itrp-client.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |spec|
   spec.homepage              = %q{http://github.com/itrp/itrp-client}
   spec.license               = "MIT"
 
-  spec.files = Dir.glob("lib/**/*") + [
-      "LICENSE.txt",
-      "README.md",
-      "Gemfile",
-      "Gemfile.lock",
-      "itrp-client.gemspec"
-  ]
+  spec.files = Dir.glob("lib/**/*") + %w(
+    LICENSE.txt
+    README.md
+    Gemfile
+    Gemfile.lock
+    itrp-client.gemspec
+  )
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   spec.require_paths = ["lib"]

data/lib/itrp/client.rb

@@ -146,7 +146,13 @@ module Itrp
       data = {type: [types].flatten.join(',')}
       data[:from] = from unless from.blank?
       response = post('/export', data)
-      @logger.info { "Export for '#{data[:type]}' successfully queued with token '#{response[:token]}'." } if response.valid?
+      if response.valid?
+        if response.raw.code.to_s == '204'
+          @logger.info { "No changed records for '#{data[:type]}' since #{data[:from]}." }
+          return response
+        end
+        @logger.info { "Export for '#{data[:type]}' successfully queued with token '#{response[:token]}'." }
+      end
 
       if block_until_completed
         raise ::Itrp::UploadFailed.new("Failed to queue '#{data[:type]}' export. #{response.message}") unless response.valid?

data/lib/itrp/client/attachments.rb

@@ -19,11 +19,22 @@ module Itrp
       report_error("Attachments not allowed for #{path}", raise_exceptions) and return unless storage
 
       # upload each attachment and store the {key, filesize} has in the note_attachments parameter
-      data[:note_attachments] = attachments.map {|attachment| upload_attachment(storage, attachment, raise_exceptions) }.compact.to_json
+      data[attachments_field(path)] = attachments.map {|attachment| upload_attachment(storage, attachment, raise_exceptions) }.compact.to_json
     end
 
     private
 
+    def attachments_field(path)
+      case path
+      when /cis/, /contracts/, /flsas/, /service_instances/, /slas/
+        :remarks_attachments
+      when /service_offerings/
+        :summary_attachments
+      else
+        :note_attachments
+      end
+    end
+
     def report_error(message, raise_exceptions)
       if raise_exceptions
         raise Itrp::UploadFailed.new(message)
@@ -96,4 +107,4 @@ module Itrp
     end
 
   end
-end
+end

data/lib/itrp/client/response.rb

@@ -22,8 +22,13 @@ module Itrp
     # If the response is not +valid?+ it is a Hash with 'message' and optionally 'errors'
     def json
       return @json if defined?(@json)
-      # no body, no json
-      data = {message: @response.message.blank? ? 'empty body' : @response.message.strip} if @response.body.blank?
+      # no content, no JSON
+      if @response.code.to_s == '204'
+        data = {}
+      elsif @response.body.blank?
+        # no body, no json
+        data = {message: @response.message.blank? ? 'empty body' : @response.message.strip}
+      end
       begin
         data ||= JSON.parse(@response.body)
       rescue ::Exception => e

data/lib/itrp/client/version.rb

@@ -1,5 +1,5 @@
 module Itrp
   class Client
-    VERSION = "1.0.1"
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itrp-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ITRP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config