gitlab-mail_room 0.0.20 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d67e38380fdc5833ee32a9cacee0894a2f9533b869ada45847156a7d49e0130b
-  data.tar.gz: 51c4d4449a80f38d06b99d3fd0f62c9ddf3760f3f55ec7611887ab9e583dc77a
+  metadata.gz: 1fa8e5569da85c3fa57acd7d2729af8f67429f281f13cc87fdbfdd8d533f3ee9
+  data.tar.gz: 50d4dccc94549ff477922d7318115e1992a87566e6d159d50f046015cf875e10
 SHA512:
-  metadata.gz: d52fb679aa2b3395e91d4d0f055fc5fb7e709495c5172148a1439d2472ea45a47115824dcf2717aaaa7312679ef48614007ffd4d8d4358e671bb40b037177d72
-  data.tar.gz: a4e43c65a7bd5561e2731a0056299f4c2f68c31c4854a91291f3d47874bccbefe9048f4872aef7a82750a3e4afdad4c7ac59e0c79c667bbc1b83006c35f2440a
+  metadata.gz: 2e4d8fe88a968459036de06624cd917b3e68a6f4bf5a5cd1bcbb9e0d466dcff8608cead170a8e813f45bcccc2b5c342d603732b9520314d8792c23e4523d91ff
+  data.tar.gz: 5de2450bbd78041a19c4996ebaa74b2497af0e7362c4e6e5338ccc10a740bc4cc13a508bd3cc7cea55a7eabd7da25365b544d7baa0e33dd134c40b0bd1a0f577

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/README.md

@@ -379,8 +379,8 @@ And finally, configure MailRoom to use the postback configuration with the optio
 :delivery_method: postback
 :delivery_options:
   :delivery_url: https://example.com/rails/action_mailbox/relay/inbound_emails
-  :delivery_username: actionmailbox
-  :delivery_password: <INGRESS_PASSWORD>
+  :username: actionmailbox
+  :password: <INGRESS_PASSWORD>
 ```
 
 ## Receiving `postback` in Rails ##

data/lib/mail_room/delivery/postback.rb

@@ -20,8 +20,12 @@ module MailRoom
 
           jwt = initialize_jwt(mailbox.delivery_options)
 
-          username = mailbox.delivery_options[:username]
-          password = mailbox.delivery_options[:password]
+          username = 
+            mailbox.delivery_options[:username] ||
+            mailbox.delivery_options[:delivery_username]
+          password = 
+            mailbox.delivery_options[:password] ||
+            mailbox.delivery_options[:delivery_password]
 
           logger = mailbox.logger
 

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.20"
+  VERSION = "0.0.23"
 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"
+  gem.add_dependency             "oauth2", [">= 1.4.4", "< 3"]
   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"

data/spec/lib/delivery/letter_opener_spec.rb

@@ -4,12 +4,13 @@ require 'mail_room/delivery/letter_opener'
 describe MailRoom::Delivery::LetterOpener do
   describe '#deliver' do
     let(:mailbox) {build_mailbox(location: '/tmp/somewhere')}
-    let(:delivery_method) {stub(:deliver!)}
+    let(:delivery_method) {stub}
     let(:mail) {stub}
 
     before :each do
       Mail.stubs(:read_from_string).returns(mail)
       ::LetterOpener::DeliveryMethod.stubs(:new).returns(delivery_method)
+      delivery_method.stubs(:deliver!)
     end
 
     it 'creates a new LetterOpener::DeliveryMethod' do

data/spec/lib/delivery/logger_spec.rb

@@ -19,7 +19,8 @@ describe MailRoom::Delivery::Logger do
       let(:mailbox) {build_mailbox(log_path: '/var/log/mail-room.log')}
 
       it 'creates a new file to append to' do
-        file = stub(:sync=)
+        file = stub
+        file.stubs(:sync=)
 
         File.expects(:open).with('/var/log/mail-room.log', 'a').returns(file)
         ::Logger.stubs(:new).with(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.23
 platform: ruby
 authors:
 - Tony Pitale
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -28,16 +28,22 @@ 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
@@ -52,20 +58,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
@@ -341,7 +333,7 @@ files:
 homepage: http://github.com/tpitale/mail_room
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,8 +348,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+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
   letter_opener