usd 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8341a6edac193e671ccde850088a693d452bd571e7685bdba3ed59b6a10dc9c7
-  data.tar.gz: f9688b4546873b2b0d1ae35555080d0c965a2897e69823dc633131df4f6ecd63
+  metadata.gz: f324bd2fb86597239321dad232f442527502773a66fda4cf5096e9ebec7d30b1
+  data.tar.gz: 8376aa51f4e5ec5be644c452d93bb7b975c02368121cb7be2c80baa2ae14dac9
 SHA512:
-  metadata.gz: ab1cede636c31e94a3b5d4834c894db2d655638c5582e737e00c372617620dce66dc11839ff5d9ce22da4c378b5a91b027591a68d59ef41e0898fe1d1a6961ef
-  data.tar.gz: ea878deaa14d2ed86591b67b54851584055e11e80b46bf104572f4784b90f16616e154ef779da4d10fdf339cab5550f53a8f48e0165a75396bc128a2097ae807
+  metadata.gz: 03c0822a8e18840e2beda5b720fd9bb81fb64c8bf3bd17f6ee10db9af77c9bb97157fa5faad5ff31c7cd3976c64bf0f3d98994b6878e9527b6b986cebc3ff67a
+  data.tar.gz: bb0df905af199fa12e3abaa0e83debde076e9bc40a204dd75dd5c07d930f592ce2b4c34cf510dc4402592dc770ed898560ce628f34280a996e1b82a4b24ad4ca

data/README.md

@@ -40,8 +40,6 @@ If you use the `rusdc find` command with `--format mlr` option then you need `ml
 
 Place the `mlr`-binary in a path, which is in your PATH-Environment. Download-Url for mlr-releases: [https://github.com/johnkerl/miller/releases](https://github.com/johnkerl/miller/releases).
 
-For uloading attachments `unix2dos` and `base64` is used. 
-
 # functions from the commandline-tool `rusdc`
 
 ```

data/bin/rusdc

@@ -9,7 +9,7 @@ class Rusdc < Thor
 
   desc "chg_add_attachment <co> <file>", "attach the file to co"
   def chg_add_attachment(co, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     template = ERB.new <<-EOF
@@ -242,7 +242,7 @@ class Rusdc < Thor
   #lrel_attachments_requests",{'fields' => "attmnt","wc" => "cr.ref_num
   desc "in_add_attachment <in> <file>", "attach the file to incident"
   def in_add_attachment(incident, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     template = ERB.new <<-EOF
@@ -302,7 +302,7 @@ class Rusdc < Thor
 
   desc "nr_add_attachment <nr> <file>", "attach the file to nr"
   def nr_add_attachment(nr, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     nr_id = loadcon.search("nr",{'fields' => "@id","wc" => "name = '#{nr}'"})[0]["@id"]
@@ -569,26 +569,6 @@ END:VCARD
     end
   end
 
-  def upload_attachment(file, baseurl, ak)
-    baseurl =~ /^([^:]+):/
-    server = $1
-    filename = File.basename(file)
-    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename}"
-    url = URI("#{baseurl}#{uri}")
-    http = Net::HTTP.new(url.host, url.port);
-    request = Net::HTTP::Post.new(url)
-    request["X-AccessKey"] = ak
-    request["Content-Type"] = "multipart/form-data; BOUNDARY=*****MessageBoundary*****"
-    request["accept"] = "application/json"
-    request["Cache-Control"] = "no-cache"
-    fileObj = File.open(file, "rb")
-    fileContent = fileObj.read
-    fileObj.close
-    request.body = "--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"payload\" \r\nContent-Type: application/xml; CHARACTERSET=UTF-8 \r\n\r\n \r\n<attmnt> \r\n<repository id=\"1002\"></repository> \r\n<orig_file_name>#{filename}</orig_file_name> \r\n<attmnt_name>#{filename}</attmnt_name> \r\n<description>Uploaded with rusdc from rubygem usd</description> \r\n</attmnt> \r\n\r\n \r\n--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"#{filename}\"; filename=\"#{filename}\" \r\nContent-Type: application/octet-stream \r\nContent-Transfer-Encoding: base64\r\n\r\n#{Base64.encode64(fileContent)}\r\n\r\n \r\n--*****MessageBoundary*****--\r\n"
-    response = http.request(request)
-    response.read_body
-  end
-
 end
 
 Rusdc.start(ARGV)

data/change_log.md

@@ -1,8 +1,12 @@
 # rusdc changelog
 
+## 1.3.4
+
+- move function `upload_attachment` from `bin/rusdc` to `lib/usd`.
+
 ## 1.3.3
 
-- private `Usd` Class funktion changed. Instead using `base64` and `unix2dos` binaries, we use Base64-Ruby-Class now. It is already required by usd.
+- private `rusdc`-funktion `upload_attachment` changed. Instead using `base64` and `unix2dos` binaries, we use Base64-Ruby-Class now. It is already required by usd.
 
 ## 1.3.2
 

data/lib/usd.rb

@@ -279,6 +279,26 @@ class Usd
     end
   end
 
+  def upload_attachment(file, baseurl = @base_url, ak = @access_key)
+    baseurl =~ /^([^:]+):/
+    server = $1
+    filename = File.basename(file)
+    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename}"
+    url = URI("#{baseurl}#{uri}")
+    http = Net::HTTP.new(url.host, url.port);
+    request = Net::HTTP::Post.new(url)
+    request["X-AccessKey"] = ak
+    request["Content-Type"] = "multipart/form-data; BOUNDARY=*****MessageBoundary*****"
+    request["accept"] = "application/json"
+    request["Cache-Control"] = "no-cache"
+    fileObj = File.open(file, "rb")
+    fileContent = fileObj.read
+    fileObj.close
+    request.body = "--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"payload\" \r\nContent-Type: application/xml; CHARACTERSET=UTF-8 \r\n\r\n \r\n<attmnt> \r\n<repository id=\"1002\"></repository> \r\n<orig_file_name>#{filename}</orig_file_name> \r\n<attmnt_name>#{filename}</attmnt_name> \r\n<description>Uploaded with rusdc from rubygem usd</description> \r\n</attmnt> \r\n\r\n \r\n--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"#{filename}\"; filename=\"#{filename}\" \r\nContent-Type: application/octet-stream \r\nContent-Transfer-Encoding: base64\r\n\r\n#{Base64.encode64(fileContent)}\r\n\r\n \r\n--*****MessageBoundary*****--\r\n"
+    response = http.request(request)
+    response.read_body
+  end
+
 end
 
 module Jsonpretty

data/usd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'usd'
-  spec.version = '1.3.3'
+  spec.version = '1.3.4'
   spec.date = '2020-09-11'
   spec.summary = "SDM REST-API-Calls"
   spec.description = "a Ruby class and a commandlinetool for SDM REST-API-Calls"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usd
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Oliver Gaida
@@ -82,6 +82,7 @@ files:
 - bin/rusdc
 - bin/set_env
 - change_log.md
+- images/vcard.png
 - lib/usd.rb
 - usd.gemspec
 homepage: https://github.com/ogaida/usd