R3c 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e019a10262dc43a59ee5a07f6bc09f3a07db27
-  data.tar.gz: 77db92f428df6417afcbc0fef1f808a311bbda7b
+  metadata.gz: 891785aca6c9373f5d616109a1dd8671fe54a82b
+  data.tar.gz: 3db7c2db12dc86c51e5723451b96a646d79f4161
 SHA512:
-  metadata.gz: 701b5de884c5adad1de2e1dcaf64942e3dbcfd6632b51b01fd7524c2fc40a8dc6dc9ac2e8c4088a77b3a6b5e9ff86d612443befcad881014101c819483824b28
-  data.tar.gz: 93d055d1f42d9b3f60c21ad6ad9e8f44693d9ae229f8d49d961527a52ad709ef3e914098a4415a8bc9e2927dd203e48fafa42998f9542a409f0e95d53d4c5b9d
+  metadata.gz: c51fc0d15f1a1f08709a2d60ca3010a28022a8578b2261daee222edb3f65b0d71db4ed126495d84e4a9c5371cac9fb9158becb9be439fabc1a7d2e7f155c5573
+  data.tar.gz: fba8dbf911b4050dcf246627cca98972d6a5a79eda331241fbef262584d03800a372a17a8fde0e5a4d09acef35dff4c7f925da4a13239a59ef2b4d56b2105f31

data/lib/r3c.rb

@@ -21,7 +21,20 @@ module R3c
   def self.auth auth
     R3c::BaseEntity.auth auth
   end
+  
+  def self.ssl ssl_options
+    if R3c::BaseEntity.include?("https") 
+     return R3c::BaseEntity.set_ssl ssl_options
+    end
+  end
 
+  def self.verify_ssl?
+     if R3c::BaseEntity.self.ssl_options[:verify_mode] == OpenSSL::SSL::VERIFY_NONE
+	return false
+     else 
+	return true
+     end
+  end
  
  private
  

data/lib/r3c/r3c.rb

@@ -8,6 +8,10 @@ class BaseEntity < ActiveResource::Base
   self.format = :xml
 
   def self.set_site(url)
+   if !self.ssl_options	and url.include?("https")  
+    self.ssl_options ={} 
+    self.ssl_options[:verify_mode] =OpenSSL::SSL::VERIFY_PEER
+  end    
     self.site= url
   end
   
@@ -25,6 +29,14 @@ class BaseEntity < ActiveResource::Base
     end
   end
   
+  def  self.set_ssl(ssl_options)
+      self.ssl_options = {:cert         => ssl_options[:cert],
+				   :key          => ssl_options[:key],
+				   :ca_path      => ssl_options[:ca_path],
+                                   :verify_mode  => ssl_options[:verify_mode]
+				   }   
+  end
+  
   private 
   def self.api_key(api_key)
     self.headers['X-Redmine-API-Key'] = api_key

data/lib/r3c/rest_helper.rb

@@ -3,18 +3,23 @@ require "rest-client"
 
 module R3c
 
+
+
+
   def self.upload(file, format="xml")
-    response = RestClient.post("#{R3c::BaseEntity.site}/uploads.#{format}?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}", file, {:multipart => true, :content_type => 'application/octet-stream'})
+    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']
   end
 
 
+
+
 #Note: see r3c.rb for example about how to retrieve watchers on an issue 
 #Example: 
 # R3c.add_watcher(1, 1)
   def self.add_watcher(issue_id, user_id, format="xml")
     #POST /issues/[id]/watchers.[format]
-    response = RestClient.post("#{R3c::BaseEntity.site}/issues/#{issue_id}/watchers.#{format}?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}", {user_id: user_id})
+    response = execute(method: :post, url: "#{R3c::BaseEntity.site}/issues/#{issue_id}/watchers.#{format}", headers: {params: {user_id: user_id}})
     return JSON.parse(response) if format == "json"
     response
   end
@@ -23,7 +28,7 @@ module R3c
 # R3c.remove_watcher(1, 1)
   def self.remove_watcher(issue_id, user_id, format="xml")
    #DELETE /issues/[id]/watchers/[user_id].[format]
-    response = RestClient.delete("#{R3c::BaseEntity.site}/issues/#{issue_id}/watchers/#{user_id}.#{format}?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}")
+    response =  execute(method: :delete, url: "#{R3c::BaseEntity.site}/issues/#{issue_id}/watchers/#{user_id}.#{format}")
     return JSON.parse(response) if format == "json"
     response
   end
@@ -32,18 +37,37 @@ module R3c
   # R3c.enumerations("issue_priorities")  
   def self.enumerations(enumeration, format="xml")
     #GET /enumerations/<enumeration>.[format]   #enumeration= "issue_priorities" OR  "time_entry_activities"
-    response = RestClient.get("#{R3c::BaseEntity.site}/enumerations/#{enumeration}.#{format}?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}")   
+    response =  self.execute(method: :get, url: "#{R3c::BaseEntity.site}/enumerations/#{enumeration}.#{format}")   
     return JSON.parse(response) if format == "json"
     response
   end
   
+
+  
   #Example:
   # R3c.search("sometext")  
   def self.search(q, format = "xml")
   # GET  '/search.xml', :q => 'recipe subproject commit', :all_words => ''
-  response = RestClient.get("#{R3c::BaseEntity.site}/search.#{format}/?key=#{R3c::BaseEntity.headers['X-Redmine-API-Key']}", {all_words: '', q: q})   
+  response = execute(method: :get, url: "#{R3c::BaseEntity.site}/search.#{format}",  headers: {params: {all_words: "", q: q}} )  
   return JSON.parse(response) if format == "json"
   response
   end
 
+ private
+  def self.execute(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
+   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)
+  end
+
 end

data/lib/r3c/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: R3c
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Paolo Freuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -109,3 +109,4 @@ signing_key:
 specification_version: 4
 summary: Rest Redmine Ruby Client
 test_files: []
+has_rdoc: false