R3c 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891785aca6c9373f5d616109a1dd8671fe54a82b
-  data.tar.gz: 3db7c2db12dc86c51e5723451b96a646d79f4161
+  metadata.gz: d5fe51ccd80003667c2ad3dc0abadddab02b00b3
+  data.tar.gz: 959e3978652765704fb4870e599602b52d5ff4c2
 SHA512:
-  metadata.gz: c51fc0d15f1a1f08709a2d60ca3010a28022a8578b2261daee222edb3f65b0d71db4ed126495d84e4a9c5371cac9fb9158becb9be439fabc1a7d2e7f155c5573
-  data.tar.gz: fba8dbf911b4050dcf246627cca98972d6a5a79eda331241fbef262584d03800a372a17a8fde0e5a4d09acef35dff4c7f925da4a13239a59ef2b4d56b2105f31
+  metadata.gz: d178c2e801af962c6c294a03626236bf400c7355d7feca2cab6f8348c402c73c70825260600bf06ee030cd5a3df5b8d38fc4a0ff239695d96a0aa30636d2efa0
+  data.tar.gz: 7ea9e1b6f36030f2e08218cbacc0606602608c0db9e6eaea5a720459311b81816a088c722bd66935c5130164b594f6b090f2e11f3c24e1dd757fadc339711c3f

data/lib/r3c/rest_helper.rb

@@ -6,9 +6,18 @@ module R3c
 
 
 
-  def self.upload(file, format="xml")
-    response = execute(method: :post, url: "#{R3c::BaseEntity.site}/uploads.#{format}", file: file, :multipart => true, :content_type => 'application/octet-stream')
-    token = JSON.parse(response)['upload']['token']
+  def self.upload(file)
+    response = nil
+    params= {:multipart => true, :content_type => 'application/octet-stream'}
+    params= set_ssl_params(params)
+    if !R3c::BaseEntity.user
+      #response = RestClient.post("#{R3c::BaseEntity.site}/uploads.json?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}", file, {:multipart => true, :content_type => 'application/octet-stream'})
+       response = RestClient.post("#{R3c::BaseEntity.site}/uploads.json?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}", file, params)
+    else
+      params = add_auth(params)	    
+      response = RestClient.post("#{R3c::BaseEntity.site}/uploads.json", file, params)
+    end
+      JSON.parse(response)['upload']['token'] 
   end
 
 
@@ -55,19 +64,29 @@ module R3c
 
  private
   def self.execute(params)
+   params = add_basic_auth(params)
+   params= set_ssl_params(params)
+   puts "rest-helper.rb->execute: params="+params.inspect.to_s
+   RestClient::Request.execute(params)
+  end
+  
+  def self.add_auth(params)
    if R3c::BaseEntity.user
      params[:user]= R3c::BaseEntity.user
      params[:password]=R3c::BaseEntity.password
    else
      params[:url]= params[:url]+"?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}"
    end
-   puts "rest-helper.rb->execute: params="+params.inspect.to_s
+    return params
+  end
+
+  def self.set_ssl_params(params)
    if R3c::BaseEntity.site.to_s.include?("https") 
      params[:verify_ssl]=R3c::BaseEntity.ssl_options[:verify_mode]
      params= params.merge(R3c::BaseEntity.ssl_options)
-     puts "rest-helper.rb->execute: params="+params.inspect.to_s
    end
-   RestClient::Request.execute(params)
+    return params
   end
 
+
 end

data/lib/r3c/version.rb

@@ -1,5 +1,5 @@
 module R3c
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: R3c
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Paolo Freuli