pheme 3.4.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04243d79c91d1f19e0e2e2e9d04290a3a9dafa5acd907eec7e2dc0d80c99e21c
-  data.tar.gz: 9229a8eb9e453971f4b780954b7be9e770e784ffc6a129fbf331c232e9471247
+  metadata.gz: 2800b7391329c041eb8ab2e0253e3708f18cacb21458bbc210aa83e9b886685d
+  data.tar.gz: c3115082962233b0ae03a3b9f1ed6d67dd82e18d52417d1959b615f8ad074569
 SHA512:
-  metadata.gz: bf5242abbfcc3b4ae522cbc0479c597d59a69835c33a1de2afe5e0a0eb70ef2afec4d73765367bb28c9c765ed702137f1d35117c5837e4eb3858a036ce5d6b5f
-  data.tar.gz: 773072b1e6c9ab9ae6437ae5ff61effca1ac3a3a389c933df8970acc35dc7bae26af6af9e030d5ab371080f12c4d140ad5ce1e161d4bd98d6e71015449dc3781
+  metadata.gz: 185617f33efa34f653fd9aa203ebf83d2f68ec5e9ce30d841eff1e47b5a7ae001af60a8b686b1793cebcb456e4630d566b55a6f6f3ed2cc79e5d292ffc8404b7
+  data.tar.gz: 7c86ed02c4efd79e1fac0464eaffe1b7ac891d9d5b842b8ae38a0e8b17ca8934acf9ff12a8cb53ff156999c83dd63ce55bdf71c70d384bc9312f726782e29ea4

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+---
+name: Pipeline
+on:
+  push:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Lint
+        run: bundle exec rubocop
+      - name: Test
+        run: bundle exec rspec
+      - name: Release the gem
+        if: ${{ github.ref == 'refs/heads/main' }}
+        run: |
+          mkdir -p ~/.gem
+          cat << EOF > ~/.gem/credentials
+          ---
+          :github: Bearer ${GITHUB_TOKEN}
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+          chmod 0600 ~/.gem/credentials
+          git config user.email "noreply@wealthsimple.com"
+          git config user.name "Wolfbot"
+          bundle exec rake release
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}

data/.gitignore

@@ -28,7 +28,6 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-Gemfile.lock
 .ruby-version
 .ruby-gemset
 

data/.rubocop.yml

@@ -6,4 +6,4 @@ inherit_gem:
 
 AllCops:
   # Specify your target Ruby version here (only major/minor versions):
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7

data/.rubocop_todo.yml

@@ -1,42 +1,42 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-07-09 13:48:32 -0400 using RuboCop version 0.72.0.
+# on 2021-01-07 16:23:09 UTC using RuboCop version 1.6.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 19
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 147
+
 # Offense count: 2
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 22
 
 # Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 164
-
-# Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 147
-
 # Offense count: 3
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended, extended
 Metrics/MethodLength:
   Max: 28
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 11
 
-# Offense count: 5
-# Configuration parameters: CustomTransform, IgnoreMethods.
+# Offense count: 9
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/configuration_spec.rb'
@@ -45,8 +45,8 @@ RSpec/FilePath:
     - 'spec/message_type/aws_event_spec.rb'
     - 'spec/message_type/sns_message_spec.rb'
     - 'spec/queue_poller_spec.rb'
-    - 'spec/topic_publisher_spec.rb'
     - 'spec/rollbar_spec.rb'
+    - 'spec/topic_publisher_spec.rb'
     - 'spec/version_spec.rb'
 
 # Offense count: 14
@@ -70,3 +70,10 @@ RSpec/VerifiedDoubles:
 Style/GuardClause:
   Exclude:
     - 'lib/pheme/queue_poller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/pheme/queue_poller.rb'
+    - 'pheme.gemspec'

data/CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 4.0.5 - 2021-04-20
+### Changed
+- Update dependencies
+
+## 4.0.4 - 2021-04-16
+### Changed
+- Migrate CI from CircleCI to GitHub Actions
+
+## 4.0.3 - 2021-03-08
+- Update documentation to include instructions on directly publishing to SQS
+
+## 4.0.2 - 2020-12-17
+- Bump local dev version, rubocop fixes, add backstage catalog file + sonarqube project settings
+
+## 4.0.1 - 2020-03-23
+### Fixes
+- Fixes 4.0.0. Instead of expecting message attributes in the message from `poll`, retrieves them from the right place.
+
+## 4.0.0 - 2020-03-18
+### Breaking Changes
+- Add the ability for SQS to receive message attributes
+- `handle` function of `QueuePoller` now takes a third parameter `message_attributes`
+- blocks or `MessageHandler`s passed to `QueuePoller` can use this `message_attributes`
+
 ## 3.4.0 - 2020-03-17
 ### Added
 - Add the ability to pass message attributes to SNS

data/Gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: .
+  specs:
+    pheme (4.0.5)
+      activesupport (>= 4)
+      aws-sdk-sns (~> 1.1)
+      aws-sdk-sqs (~> 1.3)
+      recursive-open-struct (~> 1)
+      smarter_csv (~> 1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.446.0)
+    aws-sdk-core (3.114.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-sns (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.38.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.3)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bundler-audit (0.8.0)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
+    json (2.5.1)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    recursive-open-struct (1.1.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-collection_matchers (1.2.0)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.12.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-vendor (0.6.0)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    smarter_csv (1.2.8)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    ws-style (6.9.0)
+      rubocop (>= 1.12.1)
+      rubocop-performance (>= 1.10.2)
+      rubocop-rails (>= 2.9.1)
+      rubocop-rspec (>= 2.2.0)
+      rubocop-vendor (>= 0.6.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  bundler-audit
+  git
+  pheme!
+  rake
+  rspec
+  rspec-collection_matchers
+  rspec-its
+  rspec_junit_formatter (~> 0.2)
+  simplecov
+  ws-style
+
+BUNDLED WITH
+   2.2.16

data/README.md

@@ -1,4 +1,7 @@
-# pheme [![CircleCI](https://circleci.com/gh/wealthsimple/pheme.svg?style=svg&circle-token=76942be0b1712ac066627be264886ee18039ad11)](https://circleci.com/gh/wealthsimple/pheme) [![Coverage Status](https://coveralls.io/repos/github/wealthsimple/pheme/badge.svg)](https://coveralls.io/github/wealthsimple/pheme)
+# pheme
+[![Github Actions Badge](https://github.com/wealthsimple/pheme/actions/workflows/main.yml/badge.svg)](https://github.com/wealthsimple/pheme/actions)
+
+[![GitHub Actions Workflow Badge](https://github.com/wealthsimple/pheme/actions/workflows/master-workflow.yml/badge.svg)](https://github.com/wealthsimple/pheme/actions)
 
 Ruby SNS publisher + SQS poller & message handler
 
@@ -39,3 +42,9 @@ end
 See https://github.com/wealthsimple/pheme/tree/master/spec/support for example implementations of each class.
 
 TODO: write better usage instructions.
+
+### Handling SQS messages
+
+Pheme expects that the SQS messages it is handling will have first been published to an SNS topic
+before being sent to the SQS queue. This means if the service publishing messages is publishing them
+**directly** to the SQS queue, that service must nest the message payload underneath a `Message` property.

data/catalog-info.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: pheme
+  description: Ruby SNS publisher + SQS message handler
+  tags:
+    - ruby
+    - open-source
+spec:
+  type: library
+  lifecycle: production

data/lib/pheme/configuration.rb

@@ -19,8 +19,7 @@ module Pheme
     ATTRIBUTES = %i[sns_client sqs_client logger].freeze
     OPTIONAL_ATTRIBUTES = %i[rollbar].freeze
 
-    attr_accessor(*ATTRIBUTES)
-    attr_accessor(*OPTIONAL_ATTRIBUTES)
+    attr_accessor(*ATTRIBUTES, *OPTIONAL_ATTRIBUTES)
 
     def initialize
       @logger ||= Logger.new(STDOUT) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor

data/lib/pheme/message_handler.rb

@@ -1,10 +1,11 @@
 module Pheme
   class MessageHandler
-    attr_reader :message, :metadata, :timestamp
+    attr_reader :message, :metadata, :message_attributes, :timestamp
 
-    def initialize(message:, metadata: {})
+    def initialize(message:, metadata: {}, message_attributes: {})
       @message = message
       @metadata = metadata
+      @message_attributes = message_attributes
     end
 
     def handle

data/lib/pheme/queue_poller.rb

@@ -1,6 +1,7 @@
 require_relative 'compression'
 
 module Pheme
+  # rubocop:disable Metrics/ClassLength
   class QueuePoller
     include Compression
 
@@ -51,28 +52,29 @@ module Pheme
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
     def poll
       time_start = log_polling_start
       queue_poller.poll(poller_configuration) do |queue_message|
         @messages_received += 1
         Pheme.logger.tagged(queue_message.message_id) do
-          begin
-            content = parse_body(queue_message)
-            metadata = parse_metadata(queue_message)
-            with_optional_connection_pool_block { handle(content, metadata) }
-            queue_poller.delete_message(queue_message)
-            log_delete(queue_message)
-            @messages_processed += 1
-          rescue SignalException
-            throw :stop_polling
-          rescue StandardError => e
-            Pheme.logger.error(e)
-            Pheme.rollbar(e, "#{self.class} failed to process message", { message: content })
-          end
+          content = parse_body(queue_message)
+          metadata = parse_metadata(queue_message)
+          message_attributes = parse_message_attributes(queue_message)
+          with_optional_connection_pool_block { handle(content, metadata, message_attributes) }
+          queue_poller.delete_message(queue_message)
+          log_delete(queue_message)
+          @messages_processed += 1
+        rescue SignalException
+          throw :stop_polling
+        rescue StandardError => e
+          Pheme.logger.error(e)
+          Pheme.rollbar(e, "#{self.class} failed to process message", { message: content })
         end
       end
       log_polling_end(time_start)
     end
+    # rubocop:enable Metrics/AbcSize
 
     # returns queue_message.body as hash,
     # stores and parses get_content to body[:content]
@@ -105,6 +107,16 @@ module Pheme
       { timestamp: message_body['Timestamp'], topic_arn: message_body['TopicArn'] }
     end
 
+    def parse_message_attributes(queue_message)
+      message_body = JSON.parse(queue_message.body)
+      message_attributes = {}
+      message_body['MessageAttributes']&.each do |key, value|
+        message_attributes[key.to_sym] = coerce_message_attribute(value)
+      end
+
+      message_attributes
+    end
+
     def get_metadata(message_body)
       message_body.except('Message', 'Records')
     end
@@ -123,11 +135,11 @@ module Pheme
       RecursiveOpenStruct.new({ wrapper: parsed_body }, recurse_over_arrays: true).wrapper
     end
 
-    def handle(message, metadata)
+    def handle(message, metadata, message_attributes)
       if @message_handler
-        @message_handler.new(message: message, metadata: metadata).handle
+        @message_handler.new(message: message, metadata: metadata, message_attributes: message_attributes).handle
       elsif @block_message_handler
-        @block_message_handler.call(message, metadata)
+        @block_message_handler.call(message, metadata, message_attributes)
       else
         raise NotImplementedError
       end
@@ -135,9 +147,21 @@ module Pheme
 
     private
 
-    def with_optional_connection_pool_block
+    def coerce_message_attribute(value)
+      case value['Type']
+      when 'Binary', 'String'
+        value['Value']
+      when 'Number', 'String.Array'
+        JSON.parse(value['Value'])
+      else
+        Pheme.logger.info("Unsupported custom data type")
+        value["Value"]
+      end
+    end
+
+    def with_optional_connection_pool_block(&block)
       if connection_pool_block
-        ActiveRecord::Base.connection_pool.with_connection { yield }
+        ActiveRecord::Base.connection_pool.with_connection(&block)
       else
         yield
       end
@@ -192,4 +216,5 @@ module Pheme
       }.to_json)
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = '3.4.0'.freeze
+  VERSION = '4.0.5'.freeze
 end

data/pheme.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = "MIT"
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.7.3'
 
   s.add_dependency "activesupport", ">= 4"
   s.add_dependency "aws-sdk-sns", "~> 1.1"
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency "smarter_csv", "~> 1"
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'coveralls'
   s.add_development_dependency 'git'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/sonar-project.properties

@@ -0,0 +1,4 @@
+sonar.projectKey=pheme
+sonar.ruby.coverage.reportPaths=coverage/.resultset.json
+sonar.sources=lib
+sonar.tests=spec

data/spec/queue_poller_spec.rb

@@ -14,7 +14,7 @@ describe Pheme::QueuePoller do
   let(:message_id) { SecureRandom.uuid }
 
   context 'base poller' do
-    subject { described_class.new(queue_url: queue_url).handle(nil, nil) }
+    subject { described_class.new(queue_url: queue_url).handle(nil, nil, nil) }
 
     it 'does not implement handle' do
       expect { subject }.to raise_error(NotImplementedError)
@@ -90,13 +90,13 @@ describe Pheme::QueuePoller do
     context 'when handling messages' do
       context 'when doing it the old way, via the handle function' do
         it 'uses the handle function by default' do
-          expect { described_class.new(queue_url: queue_url).handle(nil, nil) }.to raise_error(NotImplementedError)
+          expect { described_class.new(queue_url: queue_url).handle(nil, nil, nil) }.to raise_error(NotImplementedError)
         end
       end
 
       context 'when given a message_handler as parameter' do
         it 'uses default when given nil' do
-          expect { described_class.new(queue_url: queue_url, message_handler: nil).handle(nil, nil) }.to raise_error(NotImplementedError)
+          expect { described_class.new(queue_url: queue_url, message_handler: nil).handle(nil, nil, nil) }.to raise_error(NotImplementedError)
         end
 
         it 'uses default when given invalid message_handler' do
@@ -106,9 +106,11 @@ describe Pheme::QueuePoller do
         it 'uses handler when given one' do
           mock_handler = double('MessageHandler')
           allow(mock_handler).to receive(:handle)
-          allow(ExampleMessageHandler).to receive(:new).with(message: 'message', metadata: 'metadata').and_return(mock_handler)
+          allow(ExampleMessageHandler).to receive(:new).
+            with(message: 'message', metadata: 'metadata', message_attributes: 'message_attributes').
+            and_return(mock_handler)
 
-          described_class.new(queue_url: queue_url, message_handler: ExampleMessageHandler).handle('message', 'metadata')
+          described_class.new(queue_url: queue_url, message_handler: ExampleMessageHandler).handle('message', 'metadata', 'message_attributes')
           expect(mock_handler).to have_received(:handle).once
         end
       end
@@ -117,12 +119,12 @@ describe Pheme::QueuePoller do
         it 'uses handler when given one' do
           mock_handler = spy('MessageHandler')
 
-          poller = described_class.new(queue_url: queue_url) do |message, metadata|
-            mock_handler.process(message, metadata)
+          poller = described_class.new(queue_url: queue_url) do |message, metadata, message_attributes|
+            mock_handler.process(message, metadata, message_attributes)
           end
-          poller.handle('message', 'metadata')
+          poller.handle('message', 'metadata', 'message_attributes')
 
-          expect(mock_handler).to have_received(:process).with('message', 'metadata').once
+          expect(mock_handler).to have_received(:process).with('message', 'metadata', 'message_attributes').once
         end
 
         it 'fails on invalid handler' do
@@ -134,6 +136,62 @@ describe Pheme::QueuePoller do
     end
   end
 
+  describe '#parse_message_attributes' do
+    subject { described_class.new(queue_url: queue_url).parse_message_attributes(queue_message) }
+
+    context 'when no message_attributes' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when message attributes' do
+      let(:queue_message) do
+        OpenStruct.new(
+          body: {
+            Message: message,
+            MessageAttributes: {
+              key: { Type: data_type, Value: string_value },
+            },
+          }.to_json,
+          message_id: message_id,
+        )
+      end
+
+      context 'when data_type is String' do
+        let(:data_type) { 'String' }
+        let(:string_value) { 'some-string-value' }
+        let(:expected_value) { 'some-string-value' }
+
+        its([:key]) { is_expected.to eq(expected_value) }
+      end
+
+      context 'when data_type is Number' do
+        let(:data_type) { 'Number' }
+
+        context 'and it is an int' do
+          let(:string_value) { '1' }
+          let(:expected_value) { 1 }
+
+          its([:key]) { is_expected.to eq(expected_value) }
+        end
+
+        context 'and it is a float' do
+          let(:string_value) { '1.5' }
+          let(:expected_value) { 1.5 }
+
+          its([:key]) { is_expected.to eq(expected_value) }
+        end
+      end
+
+      context 'when data_type is String.array' do
+        let(:data_type) { 'String.Array' }
+        let(:string_value) { '["sdfsdf",1,2,null,true,false]' }
+        let(:expected_value) { ["sdfsdf", 1, 2, nil, true, false] }
+
+        its([:key]) { is_expected.to eq(expected_value) }
+      end
+    end
+  end
+
   describe "#parse_body" do
     subject { poller.parse_body(queue_message) }
 
@@ -305,6 +363,7 @@ describe Pheme::QueuePoller do
         expect(ExampleMessageHandler).to receive(:new).with(
           message: RecursiveOpenStruct.new(message),
           metadata: { timestamp: timestamp, topic_arn: topic_arn },
+          message_attributes: {},
         )
         subject.poll
       end
@@ -359,7 +418,7 @@ describe Pheme::QueuePoller do
 
       let(:queue_message) { OpenStruct.new(body: { 'Records' => records }.to_json) }
       let(:records) do
-        [{ 'eventVersion' => '2.0', 'eventSource': 'aws:s3' }]
+        [{ 'eventVersion' => '2.0', eventSource: 'aws:s3' }]
       end
 
       before do

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 require 'simplecov'
-require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter,
-])
 SimpleCov.start do
   add_filter 'spec'
 end

data/spec/support/example_queue_poller.rb

@@ -3,10 +3,10 @@ class ExampleQueuePoller < Pheme::QueuePoller
     super(queue_url: queue_url, **kwargs)
   end
 
-  def handle(message, metadata)
+  def handle(message, metadata, message_attributes)
     case message.status
     when 'complete', 'rejected'
-      ExampleMessageHandler.new(message: message, metadata: metadata).handle
+      ExampleMessageHandler.new(message: message, metadata: metadata, message_attributes: message_attributes).handle
     else
       raise ArgumentError, "Unknown message status: #{message.status}"
     end

data/spec/support/example_queue_poller_with_inlined_handler.rb

@@ -1,5 +1,6 @@
-Pheme::QueuePoller.new(queue_url: 'http://mock_url.test') do |message, metadata|
+Pheme::QueuePoller.new(queue_url: 'http://mock_url.test') do |message, metadata, message_attributes|
   # handle the message
   pp message
   pp metadata
+  pp message_attributes
 end

data/spec/version_spec.rb

@@ -4,7 +4,7 @@ describe Pheme do
   def get_version(git, branch = 'HEAD')
     git.grep('VERSION = ', 'lib/*/version.rb', { object: branch }).
       map { |_sha, matches| matches.first[1] }.
-      map(&method(:parse_version)).
+      map { |version_string| parse_version(version_string) }.
       reject(&:nil?).
       first
   end
@@ -21,14 +21,12 @@ describe Pheme do
 
   it 'has a bumped version' do
     git = Git.open('.')
-    skip('already on master branch, no need to compare versions') if git.current_branch == 'master'
+    main_version = get_version(git, 'origin/main')
+    skip('first time publishing, no need to compare versions') if main_version.nil?
 
-    head_version = get_version(git, 'HEAD')
-    master_version = get_version(git, 'origin/master')
-
-    raise 'no version.rb file found on the current branch' if head_version.nil?
-    raise 'no version.rb file found on the master branch' if master_version.nil?
+    is_main_branch = git.current_branch == 'main'
+    skip('already on main branch, no need to compare versions') if is_main_branch
 
-    expect(Gem::Version.new(head_version)).to be > Gem::Version.new(master_version)
+    expect(Gem::Version.new(head_version)).to be > Gem::Version.new(main_version)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.5
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -227,9 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -237,9 +223,11 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- catalog-info.yaml
 - lib/pheme.rb
 - lib/pheme/compression.rb
 - lib/pheme/configuration.rb
@@ -252,6 +240,7 @@ files:
 - lib/pheme/topic_publisher.rb
 - lib/pheme/version.rb
 - pheme.gemspec
+- sonar-project.properties
 - spec/configuration_spec.rb
 - spec/logger_spec.rb
 - spec/message_handler_spec.rb
@@ -281,15 +270,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby SNS publisher + SQS poller & message handler

data/.circleci/config.yml

@@ -1,149 +0,0 @@
-version: 2
-
-references:
-  defaults:
-    2_4_5: &defaults_2_4_5
-      working_directory: ~/wealthsimple
-      docker:
-        - image: circleci/ruby:2.4.5
-          environment:
-            RAILS_ENV: test
-
-    2_5_3: &defaults
-      working_directory: ~/wealthsimple
-      docker:
-        - image: circleci/ruby:2.5.3
-          environment:
-            RAILS_ENV: test
-
-  which_bundler: &which_bundler
-    run:
-      name: Which bundler?
-      command: bundle -v
-
-  bundle_install: &bundle_install
-    run:
-      name: Bundle Install
-      command: bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-  attach_code_workspace: &attach_code_workspace
-    attach_workspace:
-      at: ~/wealthsimple
-
-  restore_bundle_dependencies: &restore_bundle_dependencies
-    run:
-      name: Restore bundle dependencies from workspace
-      command: bundle --path vendor/bundle
-
-  run_rspec: &run_rspec
-    run:
-      name: Run rspec
-      command: |
-        bundle exec rspec \
-          --require spec_helper \
-          --format RspecJunitFormatter \
-          --out test_results/rspec.xml \
-          --format documentation
-
-jobs:
-  checkout_and_bundle_2_4_5:
-    <<: *defaults_2_4_5
-    environment:
-      COVERALLS_REPO_TOKEN: ''
-    steps:
-      - checkout
-      - *which_bundler
-      - *bundle_install
-      - *run_rspec
-      - store_test_results:
-          path: test_results
-
-  checkout_and_bundle:
-    <<: *defaults
-    steps:
-      - checkout
-      - *which_bundler
-      - *bundle_install
-      - persist_to_workspace:
-          root: .
-          paths: .
-
-  rspec:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - *run_rspec
-      - store_test_results:
-          path: test_results
-
-  lint_check:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run: bundle exec rubocop
-
-  vulnerability_check:
-    <<: *defaults
-    steps:
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run: bundle exec bundle-audit update && bundle exec bundle-audit check
-
-  release:
-    <<: *defaults
-    steps:
-      - checkout
-      - *attach_code_workspace
-      - *restore_bundle_dependencies
-      - run:
-          name: Release to rubygems.org
-          command: |
-            mkdir ~/.gem
-            echo ":rubygems_api_key: ${RUBYGEMS_API_KEY}" >> ~/.gem/credentials
-            chmod 600 ~/.gem/credentials
-            bundle exec rake release
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - checkout_and_bundle_2_4_5:
-          context: wealthsimple
-      - checkout_and_bundle:
-          context: wealthsimple
-      - rspec:
-          requires:
-            - checkout_and_bundle
-      - lint_check:
-          requires:
-            - checkout_and_bundle
-      - vulnerability_check:
-          requires:
-            - checkout_and_bundle
-      - release:
-          context: wealthsimple
-          filters:
-            branches:
-              only: master
-          requires:
-          - checkout_and_bundle_2_4_5
-          - rspec
-          - lint_check
-          - vulnerability_check
-
-  security-audit:
-    triggers:
-      - schedule:
-          # 11:05 am UTC: 6:05 am EST / 7:05 am EDT
-          cron: "5 11 * * *"
-          filters:
-            branches:
-              only: master
-    jobs:
-      - checkout_and_bundle:
-          context: wealthsimple
-      - vulnerability_check:
-          requires:
-            - checkout_and_bundle