redmine_remotes 0.9.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3b9ae54d882f36e34f1ff7a0e76d75f8bf601730101584fc0ee6bd3026ae59
-  data.tar.gz: dada38afebcf9b89d454a7163b637b658834178561d48260aff831c507a6337d
+  metadata.gz: e499a582893530c8e53c6174e5bbe89dbff261899ce3c48ff5002176c07fd051
+  data.tar.gz: 923f63c7df6752559d627378db5db04e1abfb5d943701359e12ab5ce6adde310
 SHA512:
-  metadata.gz: 335421b0f747cc7db893a74e7c351760cafb4d9a360473abbc7f362e0b6b6be663f87ef801738b72d32a59a3b107d7816a09aaf3036c506d55b6a79bca6d2e74
-  data.tar.gz: 3ebc5ee52fc4a9dd4b7ee67b3cb3ffbeb65bee168a86a9533a376643a4d16647c0798a9ecd1e2608fdc7ac6935a6cfc346eade934db098e26195e54f4a801c27
+  metadata.gz: 21f2d90dea92f674f3ae6c9eccbfcc79af983ea24c77f30b7e9dffb7be035eb68057c54f6480b7e64da023794510828d1ec4c37d03b6473dbc6a5f6cb5c5f1b9
+  data.tar.gz: 05acaabae871c31d996a739d1875aa2896cb4ae1d53199ea93b0bfa645fb6e1f7bd351de295416030db25100e74a0dd26bc4ea9b79675d48ee587a1e8982fcb3

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac/model'
+require 'eac_rails_utils/models/fetch_errors'
 require 'eac_ruby_utils/core_ext'
 
 module RedmineRemotes
   module Tableless
     module RemoteIssueFetch
-      class Base < ::EacRailsUtils::TablelessModel
+      class Base < ::EacRailsUtils::Models::Tableless
         enable_simple_cache
         require_sub __FILE__
-        include ::Eac::Model
+        include ::EacRailsUtils::Models::FetchErrors
 
         validates :local_tracker, presence: true
         validates :remote_tracker, presence: true

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

@@ -3,7 +3,7 @@
 module RedmineRemotes
   module Tableless
     module RemoteIssueFetch
-      class Base < ::EacRailsUtils::TablelessModel
+      class Base < ::EacRailsUtils::Models::Tableless
         private
 
         def save_local_issue
@@ -48,24 +48,14 @@ module RedmineRemotes
 
           ::RemoteUser.find_local_user(
             provider_issue.author_login,
-            remote_tracker
-          )
-        end
-
-        def local_issue_status
-          local_issue_status_from_remote_tracker || local_issue_status_from_local_tracker
-        end
-
-        def local_issue_status_from_remote_tracker
-          ::RemoteIssueStatus.find_local_issue_status(
-            provider_issue.status_name,
             remote_tracker,
-            local_tracker
+            true
           )
         end
 
-        def local_issue_status_from_local_tracker
-          local_tracker.default_status
+        def local_issue_status
+          remote_tracker.try(:find_local_issue_status, local_tracker, provider_issue.status_name,
+                             true)
         end
 
         def local_issue_description

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

@@ -3,7 +3,7 @@
 module RedmineRemotes
   module Tableless
     module RemoteIssueFetch
-      class Base < ::EacRailsUtils::TablelessModel
+      class Base < ::EacRailsUtils::Models::Tableless
         private
 
         def provider_issue_uncached

data/app/models/redmine_remotes/tableless/remote_issue_fetch/update.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac/model'
 
 module RedmineRemotes
   module Tableless

data/app/models/remote_issue_status.rb

@@ -13,15 +13,4 @@ class RemoteIssueStatus < ActiveRecord::Base
   validates :remote_tracker, presence: true
   validates :local_tracker, presence: true
   validates :local_issue_status, presence: true
-
-  class << self
-    def find_local_issue_status(remote_name, remote_tracker, local_tracker)
-      record = ::RemoteIssueStatus.where(
-        remote_name: remote_name_sanitize(remote_name),
-        remote_tracker: remote_tracker,
-        local_tracker: local_tracker
-      ).first
-      record ? record.local_issue_status : nil
-    end
-  end
 end

data/app/models/remote_tracker.rb

@@ -27,6 +27,11 @@ class RemoteTracker < ActiveRecord::Base
   validates :password, presence: true
   validates :default_local_user, presence: true
 
+  def find_local_issue_status(local_tracker, remote_status_name, register_not_found = false)
+    ::RemoteTracker::FindIssueLocalStatus.new(self, local_tracker, remote_status_name,
+                                              register_not_found).result
+  end
+
   def to_s
     "#{root_url} [#{profile_label}, #{username}]"
   end

data/app/models/remote_tracker/find_issue_local_status.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteTracker < ActiveRecord::Base
+  class FindIssueLocalStatus
+    common_constructor :remote_tracker, :local_tracker, :remote_status_name, :register_not_found
+
+    # @return [Tracker]
+    def result
+      result_by_remote_issue_status || result_by_register_not_found || result_by_local_issue_status
+    end
+
+    private
+
+    def result_by_register_not_found
+      return nil unless register_not_found
+
+      ::RemoteIssueStatus.create!(
+        remote_issue_status_find_attributes.merge(local_issue_status: result_by_local_issue_status)
+      ).local_issue_status
+    end
+
+    def result_by_remote_issue_status
+      ::RemoteIssueStatus.where(remote_issue_status_find_attributes).first.try(:local_issue_status)
+    end
+
+    def result_by_local_issue_status
+      local_tracker.default_status
+    end
+
+    def remote_issue_status_find_attributes
+      {
+        remote_name: ::RemoteIssueStatus.remote_name_sanitize(remote_status_name),
+        remote_tracker: remote_tracker,
+        local_tracker: local_tracker
+      }
+    end
+  end
+end

data/app/models/remote_user.rb

@@ -11,18 +11,7 @@ class RemoteUser < ActiveRecord::Base
   validates :remote_login, presence: true, uniqueness: { scope: [:remote_tracker] }
   validates :local_user, presence: true
 
-  class << self
-    def find_local_user(remote_login, remote_tracker = nil)
-      [remote_tracker, nil].each do |tracker|
-        remote_user = ::RemoteUser.where(
-          remote_tracker: tracker,
-          remote_login: remote_login_sanitize(remote_login)
-        ).first
-        return remote_user.local_user if remote_user
-      end
-      return remote_tracker.default_local_user if remote_tracker.present?
-
-      nil
-    end
+  def self.find_local_user(remote_login, remote_tracker = nil, register_not_found = false)
+    ::RemoteUser::FindLocalUser.new(remote_login, remote_tracker, register_not_found).result
   end
 end

data/app/models/remote_user/find_local_user.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteUser < ActiveRecord::Base
+  class FindLocalUser
+    common_constructor :remote_login, :remote_tracker, :register_not_found do
+      self.remote_login = ::RemoteUser.remote_login_sanitize(remote_login)
+    end
+
+    def result
+      result_by_local_user || result_by_remote_user || result_by_register_not_found ||
+        result_by_remote_tracker_default
+    end
+
+    private
+
+    def result_by_local_user
+      result_by_local_user_login || result_by_local_user_mail_address
+    end
+
+    def result_by_local_user_login
+      ::User.find_by(login: remote_login)
+    end
+
+    def result_by_local_user_mail_address
+      condition = ::EmailAddress.arel_table[:address].matches("#{remote_login}@%")
+      ::EmailAddress.where(condition).first.try(:user)
+    end
+
+    def result_by_register_not_found
+      return nil unless register_not_found
+      return nil if remote_tracker.blank?
+
+      ::RemoteUser.create!(remote_login: remote_login, remote_tracker: remote_tracker,
+                           local_user: remote_tracker.default_local_user).local_user
+    end
+
+    def result_by_remote_user
+      remote_trackers_to_search
+        .map { |tracker| remote_tracker_result(tracker) }
+        .find(&:present?)
+    end
+
+    def result_by_remote_tracker_default
+      remote_tracker.try(:default_local_user)
+    end
+
+    def remote_tracker_result(remote_tracker)
+      ::RemoteUser.where(
+        remote_tracker: remote_tracker,
+        remote_login: remote_login
+      ).first.try(:local_user)
+    end
+
+    def remote_trackers_to_search
+      remote_tracker.if_present([]) { |v| [v] } + [nil]
+    end
+  end
+end

data/lib/redmine_remotes/esosti.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module Esosti
+    class << self
+      RICH_TEXT_COMMENT = /<!--\s*RICH\s+TEXT\s-->/i.freeze
+
+      def remote_text_to_local(remote_text)
+        ::Redmine::WikiFormatting.html_parser.to_text(
+          remote_text.gsub(RICH_TEXT_COMMENT, '').each_line.map(&:strip).join(" \n")
+        ).each_line.map(&:strip).join("\n").gsub(/\n+/, "\n")
+      end
+    end
+  end
+end

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

@@ -23,7 +23,9 @@ module RedmineRemotes
         end
 
         def description
-          related_mbos.fetch('LONGDESCRIPTION').first.fetch('Attributes').fetch('LDTEXT')
+          ::RedmineRemotes::Esosti.remote_text_to_local(
+            related_mbos.fetch('LONGDESCRIPTION').first.fetch('Attributes').fetch('LDTEXT')
+          )
         end
 
         def related_mbos

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.9.0'
+  VERSION = '0.11.1'
   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.9.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -70,34 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: validate_url
   requirement: !ruby/object:Gem::Requirement
@@ -145,9 +133,11 @@ files:
 - app/models/remote_issue.rb
 - app/models/remote_issue_status.rb
 - app/models/remote_tracker.rb
+- app/models/remote_tracker/find_issue_local_status.rb
 - app/models/remote_tracker/remote.rb
 - app/models/remote_tracker_setting.rb
 - app/models/remote_user.rb
+- app/models/remote_user/find_local_user.rb
 - app/views/project_remote_issues/_issues.html.erb
 - app/views/project_remote_issues/_trackers.html.erb
 - app/views/project_remote_issues/index.html.erb
@@ -170,6 +160,7 @@ files:
 - db/migrate/20200505161002_add_timestamps_to_remote_users.rb
 - init.rb
 - lib/redmine_remotes.rb
+- lib/redmine_remotes/esosti.rb
 - lib/redmine_remotes/esosti/entities/issue.rb
 - lib/redmine_remotes/esosti/instance.rb
 - lib/redmine_remotes/jira/entities/issue.rb