avmtrf1-tools 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deffef9fed701fdd895529665042b9e0d4ff93932eef2f51e66d5bcf82ede6b2
-  data.tar.gz: 882cd5b9a5a0397bfde0c6e0bece1120e260374cf45205cb649257145201814f
+  metadata.gz: b61967bd7fdee216edfc174a67a238cb5f09fd625ae19c5bc029f0e13fc319ce
+  data.tar.gz: 4ecf717af9a51d39bda3ef107a5536ad97a27c4839cae2ff4255f89bccffa47e
 SHA512:
-  metadata.gz: 3e724ff217082ef2242ab23d1ea6246e3a72f67248ea53418c9eb6b293ce3d11f8a1eebaa5bda4b3bac4e0bd5ea99afc96c33d77e2d7e25e080c8f7fbbd590a2
-  data.tar.gz: '09c35fc0433617d22eb1efce1d9ff57ba7b100002b0b1d9f49a7875ae24ea3a5a927b59f6cdd2ac01ccd1b2fb331602d20113f3b7094d35e76e7242ef68e34a4'
+  metadata.gz: f4dcd615dec9efc8824e9307a8673a409ef411e27c41e0b52b4df8f2bf613a66425fda3c13fe7550dc5347088d83b6e097360fb033e78ee100d84ed779715aa2
+  data.tar.gz: 788d8843f20252d25d86e79e327f16e71f2aa9a9de370e754b65a99eb7043dbbbc2a40ba02bfc244f0287af4bd96daf579ea7849dfcc61e61966122419f9f368

data/lib/avmtrf1/esosti/instance/changed.rb

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/esosti/raw_data_sanitizer'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Esosti
     class Instance < ::Avmtrf1::RestProvider::Instance
       module Changed
         def changed(since)
-          changed_parse_result(request(changed_url_suffix(since)))
+          changed_request(since).response.body_data_or_raise
         end
 
-        def changed_parse_result(raw_data)
-          ::Avmtrf1::Esosti::RawDataSanitizer.sanitize(
-            raw_data.fetch('TICKETMboSet').fetch('TICKET')
-          ).map { |ticket| ticket.fetch('Attributes').fetch('TICKETID').downcase }
+        def changed_request(since)
+          request_json(changed_url_suffix(since)) do |data|
+            ::Avmtrf1::Esosti::RawDataSanitizer.sanitize(
+              data.fetch('TICKETMboSet').fetch('TICKET')
+            ).map { |ticket| ticket.fetch('Attributes').fetch('TICKETID').downcase }
+          end
         end
 
         def changed_url_suffix(since)

data/lib/avmtrf1/redmine/instance.rb

@@ -31,7 +31,8 @@ module Avmtrf1
       private
 
       def issue_statuses
-        request('/issue_statuses').fetch('issue_statuses').map do |data|
+        request_json('/issue_statuses').response.body_data_or_raise.fetch('issue_statuses')
+                                       .map do |data|
           ::Avmtrf1::Redmine::Entities::IssueStatus.new(self, data)
         end
       end

data/lib/avmtrf1/rest_provider/instance.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/rest_provider/request'
 require 'curb'
-require 'json'
-require 'avmtrf1/jira/entities/issue'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module RestProvider
@@ -12,60 +11,19 @@ module Avmtrf1
     #   * self.build_service_url(service_url_suffix)
     #   * self.issue_get_url_suffix(provider_issue_id)
     class Instance
-      include ::EacRubyUtils::Console::Speaker
-
-      attr_reader :root_url, :username, :password
-
-      def initialize(root_url, username, password)
-        @root_url = root_url
-        @username = username
-        @password = password
-      end
-
-      def find_issue(global_issue_id)
-        parsed = self.class.parse_issue_id(global_issue_id)
-        parsed.present? ? issue(parsed.provider_issue_id) : nil
-      end
-
-      def issue(provider_issue_id)
-        data = request(issue_get_url_suffix(provider_issue_id))
-        data = issue_class.parse_data(data) if issue_class.respond_to?(:parse_data)
-        data.present? ? issue_class.new(self, data) : nil
-      end
-
-      def request(service_url_suffix)
-        url = build_service_url(service_url_suffix)
-        infov 'URL', url
-        c = ::Curl::Easy.new(url)
-        c.http_auth_types = :basic
-        c.username = username
-        c.password = password
-        c.headers['Accept'] = 'application/json'
-        curl_perform(c)
-      end
-
-      def issue_class
-        "#{self.class.name.deconstantize}::Entities::Issue".constantize
-      end
-
-      private
-
-      def curl_perform(curl)
-        raise 'Curl failed' unless curl.perform
-
-        infov 'Return status', curl.status
-        return JSON.parse(curl.body_str) if curl.status.to_i == 200
-
-        raise curl_raise_message(curl)
+      require_sub __FILE__, include_modules: true
+      common_constructor :root_url, :username, :password
+
+      def request(service_url_suffix, headers = {}, &body_data_proc)
+        r = Avmtrf1::RestProvider::Request.new(build_service_url(service_url_suffix),
+                                               body_data_proc)
+        headers.each { |name, value| r.header(name, value) }
+        r.autenticate(username, password)
+        r
       end
 
-      def curl_raise_message(curl)
-        raise <<~MESSAGE
-          "#{curl.url} returned #{curl.status.to_i}:
-          #{'=' * 10}
-          #{curl.body_str}
-          #{'=' * 10}"
-        MESSAGE
+      def request_json(service_url_suffix, headers = {}, &body_data_proc)
+        request(service_url_suffix, headers.merge('Accept' => 'application/json'), &body_data_proc)
       end
     end
   end

data/lib/avmtrf1/rest_provider/instance/issues.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module RestProvider
+    class Instance
+      module Issues
+        def find_issue(global_issue_id)
+          parsed = self.class.parse_issue_id(global_issue_id)
+          parsed.present? ? issue(parsed.provider_issue_id) : nil
+        end
+
+        def issue(provider_issue_id)
+          issue_request(provider_issue_id).response.body_data_or_raise
+        end
+
+        # @return [Avmtrf1::RestProvider::Request]
+        def issue_request(provider_issue_id)
+          request_json(issue_get_url_suffix(provider_issue_id)) do |data|
+            data = issue_class.parse_data(data) if issue_class.respond_to?(:parse_data)
+            data.present? ? issue_class.new(self, data) : nil
+          end
+        end
+
+        def issue_class
+          "#{self.class.name.deconstantize}::Entities::Issue".constantize
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider/request.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/response'
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module Avmtrf1
+  module RestProvider
+    class Request
+      common_constructor :url, :body_data_proc, default: [nil]
+
+      def autenticate(username, password)
+        self.auth = ::OpenStruct.new(username: username, password: password)
+      end
+
+      def header(name, value)
+        headers[name.to_s] = value
+      end
+
+      def response
+        ::Avmtrf1::RestProvider::Response.new(build_curl, body_data_proc)
+      end
+
+      private
+
+      attr_accessor :auth
+
+      def build_curl
+        r = ::Curl::Easy.new(url)
+        auth.if_present do |a|
+          r.http_auth_types = :basic
+          r.username = a.username
+          r.password = a.password
+        end
+        r.headers.merge!(headers)
+        r
+      end
+
+      def headers
+        @headers ||= {}
+      end
+    end
+  end
+end

data/lib/avmtrf1/rest_provider/response.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/conversions'
+require 'eac_ruby_utils/core_ext'
+require 'json'
+
+module Avmtrf1
+  module RestProvider
+    class Response < ::StandardError
+      common_constructor :curl, :body_data_proc
+
+      def body_data
+        r = performed_curl.headers['Accept'].if_present(body_str) do |v|
+          send("body_data_from_#{v.parameterize.underscore}")
+        end
+        r = body_data_proc.call(r) if body_data_proc.present?
+        r
+      end
+
+      def body_data_or_raise
+        raise_unless_200
+
+        body_data
+      end
+
+      def body_str
+        performed_curl.body_str
+      end
+
+      def body_str_or_raise
+        raise_unless_200
+
+        body_str
+      end
+
+      def raise_unless_200
+        return nil if status == 200
+
+        raise self
+      end
+
+      def status
+        performed_curl.status.to_i
+      end
+
+      def url
+        curl.url
+      end
+
+      def to_s
+        "URL: #{url}\nStatus: #{status}\nBody:\n\n#{body_str}"
+      end
+
+      private
+
+      def body_data_from_application_json
+        ::JSON.parse(body_str)
+      end
+
+      def body_data_from_application_xml
+        Hash.from_xml(body_str)
+      end
+
+      def perform
+        @perform ||= begin
+          curl.perform || raise("CURL perform failed for #{url}")
+          true
+        end
+      end
+
+      def performed_curl
+        perform
+        curl
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/esosti/changed.rb

@@ -27,6 +27,7 @@ module Avmtrf1
 
           def run
             infov 'Time', time
+            infov 'URL', request.url
             out data.to_yaml
           end
 
@@ -34,7 +35,11 @@ module Avmtrf1
 
           def data_uncached
             infom 'Recuperando informações...'
-            context(:esosti_instance).changed(time)
+            request.response.body_data_or_raise
+          end
+
+          def request_uncached
+            context(:esosti_instance).changed_request(time)
           end
 
           def time

data/lib/avmtrf1/tools/runner/esosti/fetch.rb

@@ -26,15 +26,20 @@ module Avmtrf1
           DOCOPT
 
           def run
+            infov 'URL', request.url
             fatal_error("Issue não encontrado: #{solicitacao_id}") unless issue
             out issue.data.to_yaml
           end
 
           private
 
+          def request_uncached
+            context(:esosti_instance).issue_request(solicitacao_id)
+          end
+
           def issue_uncached
             infom "Recuperando informações de #{solicitacao_id}..."
-            context(:esosti_instance).issue(solicitacao_id)
+            request.response.body_data_or_raise
           end
 
           def solicitacao_id

data/lib/avmtrf1/tools/runner/esosti/request.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/default_esosti'
+require 'avmtrf1/ini'
+require 'avmtrf1/red/profile'
+
+module Avmtrf1
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Esosti < ::EacRubyUtils::Console::DocoptRunner
+        class Request < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+          enable_simple_cache
+
+          DOC = <<~DOCOPT
+            Requisições genéricas para e-Sosti (Control Desk).
+
+              Usage:
+              __PROGRAM__ [options] <url-suffix>
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help       Mostra esta ajuda.
+              -d --default    Opções --json e --yaml.
+              -j --json       Solicita resposta em JSON.
+              -x --xml        Solicita resposta em XML.
+              -y --yaml       Imprime saída em YAML.
+          DOCOPT
+
+          def run
+            start_banner
+            output_data
+          end
+
+          private
+
+          def json?
+            options.fetch('--json') || options.fetch('--default')
+          end
+
+          def start_banner
+            infov 'URL', request.url
+            infom 'Recuperando informações...'
+            infov 'Response status', response.status
+          end
+
+          def output_data
+            if yaml?
+              out ::YAML.dump(response.body_data)
+            else
+              out response.body_str
+            end
+          end
+
+          def request_uncached
+            context(:esosti_instance).request(url_suffix, request_headers)
+          end
+
+          def request_headers
+            r = {}
+            %w[json xml].each do |format|
+              r['Accept'] = "application/#{format}" if send("#{format}?")
+            end
+            r
+          end
+
+          def response_uncached
+            request.response
+          end
+
+          def url_suffix
+            options.fetch('<url-suffix>')
+          end
+
+          def xml?
+            options.fetch('--xml')
+          end
+
+          def yaml?
+            options.fetch('--yaml') || options.fetch('--default')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.29.0'
+    VERSION = '0.30.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -299,6 +299,9 @@ files:
 - lib/avmtrf1/rest_provider.rb
 - lib/avmtrf1/rest_provider/entity.rb
 - lib/avmtrf1/rest_provider/instance.rb
+- lib/avmtrf1/rest_provider/instance/issues.rb
+- lib/avmtrf1/rest_provider/request.rb
+- lib/avmtrf1/rest_provider/response.rb
 - lib/avmtrf1/result.rb
 - lib/avmtrf1/ruby.rb
 - lib/avmtrf1/ruby/gems.rb
@@ -312,6 +315,7 @@ files:
 - lib/avmtrf1/tools/runner/esosti.rb
 - lib/avmtrf1/tools/runner/esosti/changed.rb
 - lib/avmtrf1/tools/runner/esosti/fetch.rb
+- lib/avmtrf1/tools/runner/esosti/request.rb
 - lib/avmtrf1/tools/runner/forponto.rb
 - lib/avmtrf1/tools/runner/forponto/espelho.rb
 - lib/avmtrf1/tools/runner/forponto/marcacoes.rb