Merge branch 'develop' into standalone_develop

app/libs/notice.rb

@@ -7,7 +7,7 @@ module Notice
         config = Rails.application.config_for(:configuration).symbolize_keys!
         notice_config = config[:notice].symbolize_keys!
         raise 'notice config missing' if notice_config.blank?
-      rescue => exception
+      rescue => ex
         raise ex if Rails.env.production?
 
         puts %Q{\033[33m [warning] gitea config or configuration.yml missing,

app/libs/trace.rb

@@ -7,7 +7,7 @@ module Trace
         config = Rails.application.config_for(:configuration).symbolize_keys!
         trace_config = config[:trace].symbolize_keys!
         raise 'trace config missing' if trace_config.blank?
-      rescue => exception
+      rescue => ex
         raise ex if Rails.env.production?
 
         puts %Q{\033[33m [warning] gitea config or configuration.yml missing,

app/services/trace/client_service.rb

@@ -2,20 +2,14 @@ class Trace::ClientService < ApplicationService
 
   def post(url, params={})
     puts "[trace][POST] request params: #{params}"
-    conn.post do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json 
-    end
+    conn.post(full_url(url), params[:data]) 
   end
 
   def authed_post(token, url, params={})
     puts "[trace][POST] request params: #{params}"
     puts "[trace][POST] request token: #{token}"
-    conn.post do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json 
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.post(full_url(url), params[:data]) 
   end
 
   def get(url, params={})
@@ -42,67 +36,43 @@ class Trace::ClientService < ApplicationService
 
   def delete(url, params={})
     puts "[trace][DELETE] request params: #{params}"
-    conn.delete do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.delete(full_url(url), params[:data])
   end
 
   def authed_delete(token, url, params={})
     puts "[trace][DELETE] request params: #{params}"
     puts "[trace][DELETE] request token: #{token}"
-    conn.delete do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.delete(full_url(url), params[:data])
   end
 
   def patch(url, params={})
     puts "[trace][PATCH] request params: #{params}"
-    conn.patch do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.patch(full_url(url), params[:data])
   end
 
   def authed_patch(token, url, params={})
     puts "[trace][PATCH] request params: #{params}"
     puts "[trace][PATCH] request token: #{token}"
-    conn.patch do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.patch(full_url(url), params[:data])
   end
 
   def put(url, params={})
     puts "[trace][PUT] request params: #{params}"
-    conn.put do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-    end
+    conn.put(full_url(url), params[:data])
   end
 
   def authed_put(token, url, params={})
     puts "[trace][PUT] request params: #{params}"
     puts "[trace][PUT] request token: #{token}"
-    conn.put do |req|
-      req.url full_url(url)
-      req.body = params[:data].to_json
-      req.headers['Authorization'] = token
-    end
+    conn.headers['Authorization'] = token
+    conn.put(full_url(url), params[:data])
   end
 
   private 
   def conn 
-    @client ||= begin
-      Faraday.new(url: domain) do |req|
-        req.request :url_encoded
-        req.headers['Content-Type'] = 'application/json'
-        req.adapter Faraday.default_adapter
-      end
-    end
+    @client ||= Faraday.new(url: domain)
 
     @client
   end