pheme 4.0.2 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d24eb669b4e507e93aca15a084c375d9dd5d9d6a734d6e7c0ca3336d216f2e
-  data.tar.gz: f3e87e1c473b1f8ec4b7adfc4c94891026f29ad4fc4d192d982d207233993601
+  metadata.gz: 7cc67cd71113bbb6a3d299370e99da9cfac8a298db103cb70f7aa5a2f28eea34
+  data.tar.gz: 007d0ca65bb280a49d69a3ea0217b9df943b9e8b657b88de1621fcdb5ac42f23
 SHA512:
-  metadata.gz: ccdd560c4cb055cd877804f57b73bbab6a2d95d7a8e4140d3b38e4d6e6c9d5cee6dbd8d632a9c8d4e6651d295317d55ffdb3e4cbbd689f65344f6dcf21d2fbd4
-  data.tar.gz: 4069eea7b5d377d3e245d4e4596abd18d7fe9534112967eadb1597eb225f048f97d9324b1de1a20683c9f1991ef508ae06786d63893cbdf78796d8091f01468b
+  metadata.gz: 3fed1fa7b147ffaa5701c3eddcbe89c5324ada77e73932eed9c8559088a23a03b110e552fcc22d39f350328263796678e4dedf4734e1caa0720f93f132f08cad
+  data.tar.gz: 8fead635a7f32d0f6b3df929e6331e4533ab68ad0b3ecf37c0243d27c8de3d90ec94f26928fe4837e18e0362c907dcf1d2c264e32c01c4a1e86c4228527e3dfa

data/.github/workflows/main.yml

@@ -0,0 +1,34 @@
+---
+name: Pipeline
+on:
+  push:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - 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/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.7.3

data/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.8 - 2021-07-12
+### Changed
+- Update dependencies
+
+## 4.0.7 - 2021-06-28
+### Changed
+- Update dependencies
+
+## 4.0.6 - 2021-06-28
+### Changed
+- Update dependencies
+
+## 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
 

data/Gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: .
+  specs:
+    pheme (4.0.8)
+      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.4)
+      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.477.0)
+    aws-sdk-core (3.117.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-sns (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.40.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.4)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bundler-audit (0.8.0)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      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.18.2)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.7.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.11.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-vendor (0.6.1)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    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.2)
+      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.21

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/lib/pheme/queue_poller.rb

@@ -58,20 +58,18 @@ module Pheme
       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)
-            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
+          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)
@@ -151,14 +149,10 @@ module Pheme
 
     def coerce_message_attribute(value)
       case value['Type']
-      when 'String'
+      when 'Binary', 'String'
         value['Value']
-      when 'Number'
+      when 'Number', 'String.Array'
         JSON.parse(value['Value'])
-      when 'String.Array'
-        JSON.parse(value['Value'])
-      when 'Binary'
-        value['Value']
       else
         Pheme.logger.info("Unsupported custom data type")
         value["Value"]

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = '4.0.2'.freeze
+  VERSION = '4.0.8'.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', "~> 0.8"
   s.add_development_dependency 'git'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/spec/queue_poller_spec.rb

@@ -418,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/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,15 @@ 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')
+    is_main_branch = git.current_branch == 'main'
+    skip('already on main branch, no need to compare versions') if is_main_branch
 
+    head_version = get_version(git, 'HEAD')
     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?
 
-    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: 4.0.2
+  version: 4.0.8
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-07-13 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.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !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,6 +223,7 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -283,14 +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: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby SNS publisher + SQS poller & message handler

data/.circleci/config.yml

@@ -1,153 +0,0 @@
-version: 2
-
-references:
-  defaults:
-    2_4_10: &defaults_2_4_10
-      working_directory: ~/wealthsimple
-      docker:
-        - image: circleci/ruby:2.4.10
-          environment:
-            RAILS_ENV: test
-
-    2_5_8: &defaults
-      working_directory: ~/wealthsimple
-      docker:
-        - image: circleci/ruby:2.5.8
-          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_10:
-    <<: *defaults_2_4_10
-    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_10:
-          context: wealthsimple
-      - checkout_and_bundle:
-          context: wealthsimple
-      - rspec:
-          context: wealthsimple
-          requires:
-            - checkout_and_bundle
-      - lint_check:
-          context: wealthsimple
-          requires:
-            - checkout_and_bundle
-      - vulnerability_check:
-          context: wealthsimple
-          requires:
-            - checkout_and_bundle
-      - release:
-          context: wealthsimple
-          filters:
-            branches:
-              only: master
-          requires:
-            - checkout_and_bundle_2_4_10
-            - 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:
-          context: wealthsimple
-          requires:
-            - checkout_and_bundle