redmine_remotes 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58582fa98456cc3680589a4484b45bda211d8db71b78a47418b2bd3208ca6997
-  data.tar.gz: 17d859506c16a9a5529bca6dcec6d5b200e1a0aed24b712b048ae4c254be1671
+  metadata.gz: 8b69ffeb75da1b7cdee13641076954cbbab68343584a359b213a607918eb619e
+  data.tar.gz: 890479aa66e8d40a76809386d34f56d823c644d0a21aade8e9aaa5308fe05046
 SHA512:
-  metadata.gz: 654d4c3c6cf0db58ba7bd17c672dbd2bb88b936496d541f08282f5c09dd859f3b79ef000e8b9e71c834a82cbc73149596597c0d061021711fba933a7d2420925
-  data.tar.gz: 8d30c37a42a67e84b1db2d1ba74d1c75008014315d9871935e94059d7ec0ce6018a0b374df03a34941ef8bdb858913b38df002670a5307c1cb2fee811165a253
+  metadata.gz: ea705a044abece2d36ea6332ec1b11d28020195c7779e6ca4dc98b5f0d127f97763689bba612e28f281a2fd65522cfcf4adc5b8784e12d896604f0a8e02bef21
+  data.tar.gz: ce32ae83e8430cef00ed296e67a0fa905adf33583ffee1869e09a4582ac265c8a7660cad52a0f00868966338bb61ef636cf26c7d31abad2107ddb2e9930a3497

data/app/models/redmine_remotes/tableless/remote_issue_fetch/base/_provider_issue.rb

@@ -10,7 +10,7 @@ module RedmineRemotes
           return nil if [remote_tracker, issue_remote_code].any?(&:blank?)
 
           remote_tracker.find_remote_issue(issue_remote_code)
-        rescue ::RedmineRemotes::RestProvider::HttpResponse => e
+        rescue ::Avmtrf1::RestProvider::Response => e
           errors.add(default_error_column,
                      "Requisição a \"#{e.url}\" retornou com status #{e.status}")
           ::Rails.logger.warn(e.body)

data/app/models/remote_tracker/remote.rb

@@ -30,7 +30,9 @@ class RemoteTracker < ActiveRecord::Base
       end
 
       def remote_instance
-        remote_instance_class.new(self, root_url, username, password)
+        r = remote_instance_class.new(root_url, username, password)
+        r.send('remote_tracker=', self)
+        r
       end
 
       def remote_instance_class

data/config/initializers/001_patches.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'redmine_remotes/patches/avmtrf1_rest_provider_instance'
 require 'redmine_remotes/patches/issue'
 require 'redmine_remotes/patches/issue_status'
 require 'redmine_remotes/patches/project'

data/lib/redmine_remotes/esosti/instance.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/esosti/instance'
 require 'avmtrf1/esosti/raw_data_sanitizer'
 
 module RedmineRemotes
   module Esosti
-    class Instance < ::RedmineRemotes::RestProvider::Instance
+    class Instance < ::Avmtrf1::Esosti::Instance
       ISSUE_ID_PATTERN = /\A(?:ss|in)[0-9]+\z/i.freeze
 
       class << self
@@ -16,39 +17,12 @@ module RedmineRemotes
         end
       end
 
-      def build_service_url(service_url_suffix)
-        "#{root_url}/maxrest/rest#{service_url_suffix}"
-      end
-
-      def issue_get_url_suffix(provider_issue_id)
-        "/os/MS_RMTICKET/?ticketid=#{provider_issue_id}"
-      end
-
       def issue_human_view_url(ticket_uid)
-        "#{root_url}/itsm/ui/maximo.jsp?event=loadapp&value=ms_viewsr&uniqueid=#{ticket_uid}"
+        "#{root_url}/itsm/ui/?event=loadapp&value=ms_sr&uniqueid=#{ticket_uid}"
       end
 
       def fetch_issues_changed(start_time, _end_time)
-        changed_parse_result(request(changed_url_suffix(start_time)))
-      end
-
-      private
-
-      def changed_parse_result(raw_data)
-        ::Avmtrf1::Esosti::RawDataSanitizer.sanitize(
-          raw_data.fetch('TICKETMboSet').fetch('TICKET')
-        ).map do |ticket|
-          ::RemoteIssue.remote_code_sanitize(ticket.fetch('Attributes').fetch('TICKETID'))
-        end
-      end
-
-      def changed_url_suffix(since)
-        '/mbo/ticket?_includecols=ticketid&changedate=~gt~' +
-          ::CGI.escape(formatted_time(since))
-      end
-
-      def formatted_time(time)
-        time.strftime('%FT%T%:z')
+        changed(start_time)
       end
     end
   end

data/lib/redmine_remotes/jira/entities/issue.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/rest_provider/entity'
+require 'avmtrf1/jira/entities/issue'
 
 module RedmineRemotes
   module Jira
     module Entities
-      class Issue < ::Avmtrf1::RestProvider::Entity
+      class Issue < ::Avmtrf1::Jira::Entities::Issue
         def human_view_url
           instance.issue_human_view_url(code)
         end

data/lib/redmine_remotes/jira/instance.rb

@@ -1,35 +1,18 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/jira/instance'
 
 module RedmineRemotes
   module Jira
-    class Instance < ::RedmineRemotes::RestProvider::Instance
-      ISSUE_ID_PATTERN = /\A([a-z][a-z0-9]+)\-(\d+)\z/i.freeze
+    class Instance < ::Avmtrf1::Jira::Instance
       DEFAULT_DESCRIPTION_FIELD = 'description'
 
-      class << self
-        def parse_issue_id(global_issue_id)
-          m = ISSUE_ID_PATTERN.match(global_issue_id)
-          return nil unless m
-
-          ::OpenStruct.new(provider_issue_id: m[0], project_id: m[1], project_issue_id: m[2])
-        end
-      end
-
-      def build_service_url(service_url_suffix)
-        "#{root_url}/rest/api/latest#{service_url_suffix}"
-      end
-
       def description_field
         remote_tracker.setting_value(::RemoteTrackerSetting::NAME_FIELD_DESCRIPTION)
                       .if_present(DEFAULT_DESCRIPTION_FIELD)
       end
 
-      def issue_get_url_suffix(provider_issue_id)
-        "/issue/#{provider_issue_id}"
-      end
-
       def issue_human_view_url(issue_code)
         "#{root_url}/browse/#{issue_code.to_s.upcase}"
       end

data/lib/redmine_remotes/patches/avmtrf1_rest_provider_instance.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/instance'
+require 'eac_ruby_utils/core_ext'
+
+module RedmineRemotes
+  module Patches
+    module Avmtrf1RestProviderInstance
+      common_concern
+
+      module InstanceMethods
+        attr_reader :remote_tracker
+
+        private
+
+        attr_writer :remote_tracker
+      end
+    end
+  end
+end
+
+::Avmtrf1::RestProvider::Instance.patch(::RedmineRemotes::Patches::Avmtrf1RestProviderInstance)

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
   AUTHOR = 'Eduardo Henrique Bogoni'
   SUMMARY = 'Integração do Redmine com trackers diversos.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_remotes
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -175,13 +175,12 @@ files:
 - lib/redmine_remotes/jira/instance.rb
 - lib/redmine_remotes/jobs/fetch_issues.rb
 - lib/redmine_remotes/jobs/fetch_trackers.rb
+- lib/redmine_remotes/patches/avmtrf1_rest_provider_instance.rb
 - lib/redmine_remotes/patches/issue.rb
 - lib/redmine_remotes/patches/issue_status.rb
 - lib/redmine_remotes/patches/project.rb
 - lib/redmine_remotes/patches/tracker.rb
 - lib/redmine_remotes/patches/user.rb
-- lib/redmine_remotes/rest_provider/http_response.rb
-- lib/redmine_remotes/rest_provider/instance.rb
 - lib/redmine_remotes/sanitizer.rb
 - lib/redmine_remotes/version.rb
 - lib/tasks/redmine_remotes.rake
@@ -203,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Integração do Redmine com trackers diversos.

data/lib/redmine_remotes/rest_provider/http_response.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module RedmineRemotes
-  module RestProvider
-    class HttpResponse < ::StandardError
-      class << self
-        def new_from_curl_easy(curl_easy)
-          new(
-            curl_easy.url,
-            curl_easy.status.to_i,
-            curl_easy.body_str
-          )
-        end
-      end
-
-      attr_reader :url, :status, :body
-
-      def initialize(url, status, body)
-        @url = url
-        @status = status
-        @body = body
-      end
-
-      def body_or_raise
-        return body if status == 200
-
-        raise self
-      end
-    end
-  end
-end

data/lib/redmine_remotes/rest_provider/instance.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'avmtrf1/rest_provider/instance'
-require 'curb'
-require 'json'
-
-module RedmineRemotes
-  module RestProvider
-    # Abstract methods
-    #   * parse_issue_id(global_issue_id)
-    #   * self.build_service_url(service_url_suffix)
-    #   * self.issue_get_url_suffix(provider_issue_id)
-    class Instance < ::Avmtrf1::RestProvider::Instance
-      attr_reader :remote_tracker
-
-      def initialize(remote_tracker, root_url, username, password)
-        @remote_tracker = remote_tracker
-        super(root_url, username, password)
-      end
-
-      def request(service_url_suffix)
-        JSON.parse(super(service_url_suffix).body_or_raise)
-      end
-
-      private
-
-      # @return [RedmineRemotes::RestProvider::HttpResponse]
-      def curl_perform(curl)
-        return ::RedmineRemotes::RestProvider::HttpResponse.new_from_curl_easy(curl) if curl.perform
-
-        raise 'Curl failed'
-      end
-    end
-  end
-end