gitlab-mail_room 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eee8d42a23b577564cf4f77e6601c8a8711f1a65477dacebf3e4d7055ceb916
-  data.tar.gz: d30ffb51bc19e4ee57b6e62f5095241690230492fd95d45345faed9ed9cb6949
+  metadata.gz: b83e39da2869147d1086529b11cfb371446aa616323dbc5c5212330d12f8fe9f
+  data.tar.gz: 96840ed2fb7347df81ba7c139f02d0613b0041979b28a9ae52c5879452898133
 SHA512:
-  metadata.gz: 865f72774e011d86267bb45c0b0509c5b81734516dad6ee63bfa51b4d377800a139bfc8c2cca1d559471b4342f144f3ffa63be99cf6a25d1ca320a11bbd1d7fe
-  data.tar.gz: 7cb2bb12298f3394062890eb59ccfc6d1fc1e08394bbc60887e554b2076044af96a637ee004b596753f62feee4f3439e162342c5502f7c66a6fb089af587c0fc
+  metadata.gz: 6aff0a7be49b42b0d645414385988805d9fc283528876c7605b90c6535a364b40c09b2e2ca8909413238bc20e4a01e55b730c7361cee6db537a72fa60f38f422
+  data.tar.gz: dc9bf6c5edd55071cc512a30fc56981a50119d2f3dc0a02d18a7dfed5ac90160a7500404418ec80ddcc39db3947a091ede405132453312a145ac8886ce8d543a

data/.gitlab-ci.yml

@@ -6,6 +6,7 @@ services:
 
 .test-template: &test
   cache:
+    key: ruby-$RUBY_VERSION
     paths:
       - vendor/ruby
   variables:
@@ -22,7 +23,7 @@ services:
 rspec:
   parallel:
     matrix:
-      - RUBY_VERSION: [ "2.5", "2.6", "2.7", "3.0" ]
+      - RUBY_VERSION: [ "2.6", "2.7", "3.0", "3.1", "3.2" ]
   <<: *test
 
 include:

data/lib/mail_room/delivery/que.rb

@@ -1,5 +1,6 @@
 require 'pg'
 require 'json'
+require 'charlock_holmes'
 
 module MailRoom
   module Delivery
@@ -34,7 +35,7 @@ module MailRoom
       # deliver the message by pushing it onto the configured Sidekiq queue
       # @param message [String] the email message as a string, RFC822 format
       def deliver(message)
-        queue_job(message)
+        queue_job(utf8_encode_message(message))
         @options.logger.info({ delivery_method: 'Que', action: 'message pushed' })
       end
 
@@ -58,6 +59,19 @@ module MailRoom
 
         connection.exec(sql, [options.priority, options.job_class, options.queue, JSON.dump(args)])
       end
+
+      def utf8_encode_message(message)
+        message = message.dup
+
+        message.force_encoding("UTF-8")
+        return message if message.valid_encoding?
+
+        detection = CharlockHolmes::EncodingDetector.detect(message)
+        return message unless detection && detection[:encoding]
+
+        # Convert non-UTF-8 body UTF-8 so it can be dumped as JSON.
+        CharlockHolmes::Converter.convert(message, detection[:encoding], 'UTF-8')
+      end
     end
   end
 end

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/mail_room.gemspec

@@ -18,12 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency             "net-imap", ">= 0.2.1"
-  gem.add_dependency             "oauth2", [">= 1.4.4", "< 3"]
+  gem.add_dependency             "oauth2", "~> 1.4.4"
   gem.add_dependency             "jwt", ">= 2.0"
 
-  # Pinning io-wait to 0.1.0, which is the last version to support Ruby < 3
-  gem.add_dependency              "io-wait", "~> 0.1.0"
-
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.9"
   gem.add_development_dependency "rubocop", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Tony Pitale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -28,22 +28,16 @@ dependencies:
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: io-wait
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or