asana_exception_notifier 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a170f37a6fd2fb5b9b425575e3a57b66c5b59d03
-  data.tar.gz: 9442fd0a1ec8c08d44bb1cdc37779a5710bacfe6
+  metadata.gz: d49c3e2401adece7dbc4761eaacf9e40b5bd7cf4
+  data.tar.gz: 3ac6129faa6145a09c70c019550ab6f018c92460
 SHA512:
-  metadata.gz: 3b25485c8d9c9ca896b708ed9784ba214028670550584391aa12fdd083b441ba72357ce5bf9a8faf68f7618b74dc827ec89ce1a7daf6ea05366cd05ec6fb56c0
-  data.tar.gz: 3591d5bb1dc40e135437045ae8e38dc78a1e9349a47cc3b493578e3ed777d26182639544c9d51f671f6e6b4d3313770ecc5573dccdd7bd05b0db5cdb861bd9dc
+  metadata.gz: 5c1cdaccb5e3ac31b60fae42eb0f1822df3c2631b86899824b0c06fbe5d2fc663b75fc2e9d1f73a4f41f60d3c4812808f52fd37d624e1c9a3eea18d70e3ef234
+  data.tar.gz: 93756e13405772450fe88f912170b1ec599a2d4fe021f5c6ce0f74ef8ed97204aff6bffb4ef3ef8f04979f8905538f3425dd4522a4464d4654b2ef9cdfbbac98

data/asana_exception_notifier.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   }
 
   s.add_runtime_dependency 'activesupport', '>= 4.0', '< 5'
-  s.add_runtime_dependency 'em-http-request', '~> 1.1', '>= 1.1.2'
-  s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.7'
+  s.add_runtime_dependency 'asana', '~> 0.5', '>= 0.5.0'
+  s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'exception_notification', '~> 4.1', '>= 4.1.4'
   s.add_runtime_dependency 'multipart_body', '~> 0.2', '>= 0.2.1'
   s.add_runtime_dependency 'tilt', '>= 1.4', '< 3'

data/lib/asana_exception_notifier/classes/asana.rb

@@ -1,6 +1,4 @@
 require_relative '../helpers/application_helper'
-require_relative '../request/client'
-require_relative '../request/middleware'
 # class used for connecting to github api and retrieves information about repository
 #
 # @!attribute callback
@@ -18,8 +16,21 @@ module ExceptionNotifier
       parse_options(@initial_options)
     end
 
+
+    def asana_client
+      @asana_client = Asana::Client.new do |c|
+        c.authentication :access_token, asana_api_key
+        c.debug_mode
+        c.faraday_adapter :typhoeus
+        c.configure_faraday do |conn|
+          conn.request  :url_encoded
+          conn.response :logger
+        end
+      end
+    end
+
     def call(exception, options = {})
-      ensure_eventmachine_running do
+      ensure_thread_running do
         execute_with_rescue do
           EM::HttpRequest.use AsanaExceptionNotifier::Request::Middleware if ENV['DEBUG_ASANA_EXCEPTION_NOTIFIER']
           error_page = AsanaExceptionNotifier::ErrorPage.new(template_path, exception, options)
@@ -83,37 +94,24 @@ module ExceptionNotifier
     #
     # @return [void]
     def create_asana_task(error_page)
-      AsanaExceptionNotifier::Request::Client.new(@default_options.fetch(:asana_api_key, nil),
-                                                  'https://app.asana.com/api/1.0/tasks',
-                                                  'http_method' => 'post',
-                                                  'em_request' => { body: build_request_options(error_page) },
-                                                  'action' => 'creation'
-                                                 ) do |http_response|
-        ensure_eventmachine_running do
-          upload_log_file_to_task(error_page, http_response.fetch('data', {}))
-        end
+      task = asana_client.tasks.create(build_request_options(error_page))
+      ensure_thread_running do
+        upload_log_file_to_task(error_page, task)
       end
     end
 
-    def upload_log_file_to_task(error_page, task_data)
+    def upload_log_file_to_task(error_page, task)
       archives = error_page.fetch_all_archives
       archives.each do |zip|
-        upload_archive(zip, task_data)
+        upload_archive(zip, task)
       end
     end
 
-    def upload_archive(zip, task_data)
-      return if task_data.blank?
-      body = multipart_file_upload_details(zip)
-      AsanaExceptionNotifier::Request::Client.new(@default_options.fetch(:asana_api_key, nil),
-                                                  "https://app.asana.com/api/1.0/tasks/#{task_data['id']}/attachments",
-                                                  'http_method' => 'post',
-                                                  'em_request' => body,
-                                                  'request_name' => zip,
-                                                  'action' => 'upload'
-                                                 ) do |_http_response|
+    def upload_archive(zip, task)
+      return if task.blank?
+      attachment = task.attach(filename: zip,
+                         mime: 'application/zip')
         FileUtils.rm_rf([zip])
-      end
     end
   end
 end

data/lib/asana_exception_notifier/helpers/application_helper.rb

@@ -77,17 +77,9 @@ module AsanaExceptionNotifier
       Rails.logger
     end
 
-    def ensure_eventmachine_running(&block)
+    def ensure_thread_running(&block)
       Thread.abort_on_exception = true
-      register_em_error_handler
-      run_em_reactor(&block)
-    end
-
-    def register_em_error_handler
-      EM.error_handler do |error|
-        logger.debug '[AsanaExceptionNotifier]: Error during event loop :'
-        logger.debug "[AsanaExceptionNotifier]: #{log_exception(error)}"
-      end
+      run_new_thread(&block)
     end
 
     def log_exception(exception)
@@ -113,11 +105,9 @@ module AsanaExceptionNotifier
       puts "\n Command was cancelled due to an Interrupt error."
     end
 
-    def run_em_reactor
+    def run_new_thread
       Thread.new do
-        EM.run do
-          EM.defer proc { yield if block_given? }
-        end
+        yield if block_given?
       end.join
     end
 
@@ -202,46 +192,6 @@ module AsanaExceptionNotifier
       }
     end
 
-    def setup_em_options(options)
-      options.symbolize_keys!
-      options[:em_request] ||= {}
-      options
-    end
-
-    def create_upload_file_part(file)
-      Part.new(name: 'file',
-               body: force_utf8_encoding(File.read(file)),
-               filename:  file,
-               content_type: 'application/zip'
-              )
-    end
-
-    def multipart_file_upload_details(file)
-      boundary = "---------------------------#{rand(10_000_000_000_000_000_000)}"
-      body = MultipartBody.new([create_upload_file_part(file)], boundary)
-      file_upload_request_options(boundary, body, file)
-    end
-
-    def file_upload_request_options(boundary, body, file)
-      {
-        body: body.to_s,
-        head:
-        {
-          'Content-Type' => "multipart/form-data;boundary=#{boundary}",
-          'Content-Length' => File.size(file),
-          'Expect' => '100-continue'
-        }
-      }
-    end
-
-    def get_response_from_request(http, _options)
-      http.respond_to?(:response) ? http.response : http.responses
-    end
-
-    def get_multi_request_values(http_response, key)
-      response_method = key.to_s == 'callback' ? 'response' : 'error'
-      http_response[key.to_sym].values.map { |request| request.send(response_method) }.reject(&:blank?)
-    end
 
     def split_archive(archive, partial_name, segment_size)
       indexes = Zip::File.split(archive, segment_size, true, partial_name)

data/lib/asana_exception_notifier/version.rb

@@ -15,9 +15,9 @@ module AsanaExceptionNotifier
     # major release version
     MAJOR = 0
     # minor release version
-    MINOR = 2
+    MINOR = 3
     # tiny release version
-    TINY = 2
+    TINY = 1
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

data/lib/asana_exception_notifier.rb

@@ -18,8 +18,9 @@ if defined?(Sidekiq)
 end
 require 'exception_notification'
 
-require 'em-http-request'
-require 'eventmachine'
+require 'asana'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 
 require 'multipart_body'
 require 'rack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asana_exception_notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,27 +31,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: asana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,7 +59,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: exception_notification
   requirement: !ruby/object:Gem::Requirement
@@ -428,9 +428,6 @@ files:
 - lib/asana_exception_notifier/helpers/heredoc_helper.rb
 - lib/asana_exception_notifier/initializers/hash.rb
 - lib/asana_exception_notifier/initializers/zip.rb
-- lib/asana_exception_notifier/request/client.rb
-- lib/asana_exception_notifier/request/core.rb
-- lib/asana_exception_notifier/request/middleware.rb
 - lib/asana_exception_notifier/templates/exception_details.html.erb
 - lib/asana_exception_notifier/templates/notes.text.erb
 - lib/asana_exception_notifier/version.rb
@@ -461,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.5'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Simple ruby implementation to send notifications to Asana when a exception

data/lib/asana_exception_notifier/request/client.rb

@@ -1,85 +0,0 @@
-require_relative './core'
-module AsanaExceptionNotifier
-  module Request
-    # class used to make request in deferrable way
-    class Client
-      include AsanaExceptionNotifier::Request::Core
-      include EM::Deferrable
-
-      attr_reader :url, :options, :api_key, :request_name, :request_final, :action
-
-      def initialize(api_key, url, options, &callback)
-        @api_key = api_key
-        @url = url
-
-        @options = options.symbolize_keys
-        @request_name = @options.fetch(:request_name, '')
-        @request_final = @options.fetch(:request_final, false)
-        @action = @options.fetch(:action, '')
-
-        self.callback(&callback)
-
-        send_request_and_rescue
-      end
-
-      def multi_manager
-        @multi_manager ||= options.fetch(:multi_manager, nil)
-      end
-
-      def em_request_options
-        request = setup_em_options(@options).delete(:em_request)
-        params = {
-          head: (request[:head] || {}).merge(
-            'Authorization' => "Bearer #{@api_key}"
-          ),
-          body: request[:body]
-        }
-        super(params)
-      end
-
-      def send_request_and_rescue
-        @http = em_request(@url, @options)
-        send_request
-      rescue => exception
-        log_exception(exception)
-        fail(result: { message: exception })
-      end
-
-      def send_request
-        fetch_data(@options) do |http_response|
-          handle_all_responses(http_response)
-        end
-      end
-
-      def handle_all_responses(http_response)
-        @multi_manager.requests.delete(@http) if @multi_manager.present?
-        if http_response.is_a?(Hash) && %i(callback errback).all? { |key| http_response.symbolize_keys.keys.include?(key) }
-          handle_multi_response(http_response)
-        else
-          handle_response(http_response, @options.fetch(:request_name, ''))
-        end
-      end
-
-      def handle_multi_response(http_response)
-        logger.debug('[AsanaExceptionNotifier]: Handling multi responses')
-        get_multi_request_values(http_response, :callback).each { |request_name, response| handle_response(response, request_name) }
-        get_multi_request_values(http_response, :errback).each { |request_name, response| handle_error(response, request_name) }
-      end
-
-      def handle_error(error, key = '')
-        logger.debug("[AsanaExceptionNotifier]: Task #{key} #{@action} returned:  #{error}")
-        fail(error)
-      end
-
-      def handle_response(http_response, key = '')
-        logger.debug("[AsanaExceptionNotifier]: Task #{key} #{@action} returned:  #{http_response}")
-        data = JSON.parse(http_response)
-        callback_task_creation(data)
-      end
-
-      def callback_task_creation(data)
-        data.fetch('errors', {}).present? ? handle_error(data) : succeed(data)
-      end
-    end
-  end
-end

data/lib/asana_exception_notifier/request/core.rb

@@ -1,132 +0,0 @@
-require_relative '../helpers/application_helper'
-module AsanaExceptionNotifier
-  module Request
-    # module that is used for formatting numbers using metrics
-    #
-    # @!attribute params
-    #   @return [Hash] THe params received from URL
-    # @!attribute hostname
-    #   @return [String] THe hostname from where the badges are fetched from
-    # @!attribute base_url
-    #   @return [String] THe base_url of the API
-    module Core
-      include AsanaExceptionNotifier::ApplicationHelper
-
-      # Returns the connection options used for connecting to API's
-      #
-      # @return [Hash] Returns the connection options used for connecting to API's
-      def em_connection_options
-        {
-          connect_timeout: 1200, # default connection setup timeout
-          inactivity_timeout: 120, # default connection inactivity (post-setup) timeout
-          ssl: {
-            verify_peer: false
-          },
-          head: {
-            'ACCEPT' => '*/*',
-            'Connection' => 'keep-alive'
-          }
-        }
-      end
-
-      # Returns the request options used for connecting to API's
-      #
-      # @return [Hash] Returns the request options used for connecting to API's
-      def em_request_options(params = {})
-        {
-          redirects: 5, # follow 3XX redirects up to depth 5
-          keepalive: true, # enable keep-alive (don't send Connection:close header)
-          head: (params[:head] || {}).merge(
-            'ACCEPT' => '*/*',
-            'Connection' => 'keep-alive'
-          ),
-          body: (params[:body] || {})
-        }
-      end
-
-      # instantiates an eventmachine http request object that will be used to make the htpp request
-      # @see EventMachine::HttpRequest#initialize
-      #
-      # @param [String] url The URL that will be used in the HTTP request
-      # @return [EventMachine::HttpRequest] Returns an http request object
-      def em_request(url, options)
-        uri = Addressable::URI.parse(url)
-        conn_options = em_connection_options.merge(ssl: { sni_hostname: uri.host })
-        em_request = EventMachine::HttpRequest.new(url, conn_options)
-        em_request.send(options.fetch(:http_method, 'get'), em_request_options)
-      end
-
-      # Method that fetch the data from a URL and registers the error and success callback to the HTTP object
-      # @see #em_request
-      # @see #register_error_callback
-      # @see #register_success_callback
-      #
-      # @param [url] url The URL that is used to fetch data from
-      # @param [Lambda] callback The callback that will be called if the response is blank
-      # @param [Proc] block If the response is not blank, the block will receive the response
-      # @return [void]
-      def fetch_data(options = {}, &block)
-        options = options.symbolize_keys
-        if options[:multi_request] && multi_manager.present?
-          multi_fetch_data(options, &block)
-        else
-          register_error_callback(@http)
-          register_success_callback(@http, options, &block)
-        end
-      end
-
-      def multi_fetch_data(options = {}, &block)
-        multi_manager.add options[:request_name], @http
-        return unless options[:request_final]
-        register_error_callback(multi_manager)
-        register_success_callback(multi_manager, options, &block)
-      end
-
-      # Method that is used to register a success callback to a http object
-      # @see #callback_before_success
-      # @see #dispatch_http_response
-      #
-      # @param [EventMachine::HttpRequest] http The HTTP object that will be used for registering the success callback
-      # @param [Lambda] callback The callback that will be called if the response is blank
-      # @param [Proc] block If the response is not blank, the block will receive the response
-      # @return [void]
-      def register_success_callback(http, options)
-        http.callback do
-          res = callback_before_success(get_response_from_request(http, options))
-          callback = options.fetch('callback', nil)
-          block_given? ? yield(res) : callback.call(res)
-        end
-      end
-
-      # Callback that is used before returning the response the the instance
-      #
-      # @param [String] response The response that will be dispatched to the instance class that made the request
-      # @return [String] Returns the response
-      def callback_before_success(response)
-        response
-      end
-
-      # This method is used to reqister a error callback to a HTTP request object
-      # @see #callback_error
-      # @param [EventMachine::HttpRequest] http The HTTP object that will be used for reqisteringt the error callback
-      # @return [void]
-      def register_error_callback(http)
-        http.errback { |error| callback_error(error) }
-      end
-
-      def get_error_from_request(http, options)
-        http_response = http.respond_to?(:response) ? http.response : http.responses[:errback]
-        options[:multi_request].present? && http_response.is_a?(Hash) ? http_response.values.map(&:response) : http_response
-      end
-
-      # Method that is used to react when an error happens in a HTTP request
-      # and prints out an error message
-      #
-      # @param [Object] error The error that was raised by the HTTP request
-      # @return [void]
-      def callback_error(error)
-        log_exception(error)
-      end
-    end
-  end
-end

data/lib/asana_exception_notifier/request/middleware.rb

@@ -1,41 +0,0 @@
-require_relative '../helpers/application_helper'
-module AsanaExceptionNotifier
-  module Request
-    # middleware used only in development for testing purpose
-    class Middleware
-      include AsanaExceptionNotifier::ApplicationHelper
-      # Method that is used to debug requests to API's
-      # The method receives the request object and prints it content to console
-      #
-      # @param [EventMachine::HttpRequest] client The Http request made to an API
-      # @param [Hash] head The http headers sent to API
-      # @param [String, nil] body The body sent to API
-      # @return [Array<Hash,String>] Returns the http headers and the body
-      def request(client, head, body)
-        puts "############## HTTP REQUEST  #####################\n"
-        puts JSON.pretty_generate(
-          headers: head,
-          url: client.req.uri,
-          body: force_utf8_encoding(body.to_s.inspect)
-        )
-        [head, body]
-      end
-
-      # Method that is used to debug responses from API's
-      # The method receives the response object and prints it content to console
-      #
-      # @param [EventMachine::HttpResponse] resp The Http response received from API
-      # @return [EventMachine::HttpResponse]
-      def response(resp)
-        puts "############## HTTP RESPONSE  #####################\n"
-        headers = resp.response_header
-        puts JSON.pretty_generate(
-          headers: headers,
-          status: headers.status,
-          body: force_utf8_encoding(resp.response.to_s.inspect)
-        )
-        resp
-      end
-    end
-  end
-end