pheme 4.0.14 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122b36a8426c4735d9af6332bd7d72b60e6f874a9c908e3873a1fa406c0daaa3
-  data.tar.gz: eb87161a6735af495fa3856ff86ed4ad0a34e409f4aa09bce67d9b9b10e1f39d
+  metadata.gz: 77aa7f2b7491323470cd9f9703b253281144ef680a474bd41dbc0b502f4f34cb
+  data.tar.gz: fa195a4334ea0b05e9a366411ae404802783423b12997af34d31d1438b8785e8
 SHA512:
-  metadata.gz: b6f4116b22157714bcae5b11f4352376476674bd694470648ad1c48678c5849f8b3cc5a8ad62ccc6892d1076cb155ea946ea1aba4b570879ef41aa202ed0770e
-  data.tar.gz: 2eb6a9aef8a1b46bf3ad64a20d9a1432d47e81509960357f6a0e2499b6d7f2367b9d488cddce2da8c7517fb0b8d3ec40154e1bf481d4bdf6b6049524d73c7cb8
+  metadata.gz: 417c01bd6811da7e393508c7b1fbb98dbdff0ab415854e3f08074dd63ae896a54c53d6c970b0f7b42eceb150e13eec4d099fc7688abb4c60136ef9155f765ae5
+  data.tar.gz: e7ad5f758ee7f699c45c2f7abd0fe4d18a1ff5bd4d6472d5fed4d6c8a25c92c5758720853f7191307ffd4a23c76eaad67820eba2363f547e4105000e015a7b7e

data/.github/workflows/main.yml

@@ -2,23 +2,47 @@
 name: Pipeline
 on:
   push:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby-version: [2.7.5, 3.0.3, 3.1.0]
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: ruby/setup-ruby@v1
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+          ruby-version: ${{ matrix.ruby-version }}
       - name: Lint
         run: bundle exec rubocop
       - name: Test
         run: bundle exec rspec
+
+  # Separate `release` job from `build`, as we only want release to be run once
+  # and not run for each ruby version in the matrix:
+  release:
+    name: Release
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
+    needs: build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Release the gem
-        if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           mkdir -p ~/.gem
           cat << EOF > ~/.gem/credentials

data/.github/workflows/stale.yml

@@ -0,0 +1,20 @@
+name: 'Close stale PRs'
+on:
+  schedule:
+    - cron: '30 6 * * *' # 6:30 am UTC: 1:30 am EST
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          days-before-stale: 30
+          days-before-close: 60
+          stale-pr-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs.
+          close-pr-message: >
+            This issue has been automatically closed because it has had no activity
+            for over 90 days. Please re-open if you feel this was done in error.
+          exempt-pr-labels: 'dependabot,depfu,dependencies,security'

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+2.7.5

data/CHANGELOG.md

@@ -4,6 +4,22 @@ 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).
 
+## 5.0.0 - 2022-01-04
+### Changed
+- Remove RecusiveOpenStruct in favor of ResourceStruct::FlexStruct
+
+## 4.1.1 - 2022-01-04
+### Changed
+- Updated dependencies
+
+## 4.1.0 - 2021-12-31
+### Changed
+- Add Ruby 3 support
+
+## 4.0.15 - 2021-12-03
+### Changed
+- Updated dependencies
+
 ## 4.0.14 - 2021-11-05
 ### Changed
 - Update dependencies

data/Gemfile.lock

@@ -1,35 +1,34 @@
 PATH
   remote: .
   specs:
-    pheme (4.0.14)
+    pheme (5.0.0)
       activesupport (>= 4)
       aws-sdk-sns (~> 1.1)
       aws-sdk-sqs (~> 1.3)
-      recursive-open-struct (~> 1)
+      resource-struct (~> 0.4)
       smarter_csv (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.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.2.0)
-    aws-partitions (1.525.0)
-    aws-sdk-core (3.122.0)
+    aws-partitions (1.547.0)
+    aws-sdk-core (3.125.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sns (1.47.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-sns (1.50.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.46.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-sqs (1.49.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -37,23 +36,23 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    git (1.9.1)
+    git (1.10.2)
       rchardet (~> 1.8)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.6)
     rchardet (1.8.0)
-    recursive-open-struct (1.1.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
+    resource-struct (0.4.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -73,29 +72,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rspec_junit_formatter (0.4.1)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.22.3)
+    rubocop (1.24.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.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.12.0)
+    rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.4)
+    rubocop-rails (2.13.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.5.0)
+    rubocop-rspec (2.7.0)
       rubocop (~> 1.19)
-    rubocop-vendor (0.6.1)
+    rubocop-vendor (0.8.0)
       rubocop (>= 0.53.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -104,18 +103,17 @@ GEM
       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)
+    smarter_csv (1.2.9)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    ws-style (6.11.0)
-      rubocop (>= 1.12.1)
+    ws-style (6.13.1)
+      rubocop (>= 1.23)
       rubocop-performance (>= 1.10.2)
       rubocop-rails (>= 2.9.1)
       rubocop-rspec (>= 2.2.0)
       rubocop-vendor (>= 0.6.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -134,4 +132,4 @@ DEPENDENCIES
   ws-style
 
 BUNDLED WITH
-   2.2.30
+   2.2.33

data/Rakefile

@@ -6,7 +6,9 @@ end
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task default: :spec
+task default: %i[spec rubocop]

data/lib/pheme/message_type/aws_event.rb

@@ -19,7 +19,7 @@ module Pheme
       end
 
       def parse_aws_event(message_contents)
-        RecursiveOpenStruct.new({ wrapper: message_contents }, recurse_over_arrays: true).wrapper
+        ResourceStruct::FlexStruct.new({ wrapper: message_contents }).wrapper
       end
     end
   end

data/lib/pheme/queue_poller.rb

@@ -127,12 +127,12 @@ module Pheme
 
     def parse_csv(message_contents)
       parsed_body = SmarterCSV.process(StringIO.new(message_contents))
-      parsed_body.map { |item| RecursiveOpenStruct.new(item, recurse_over_arrays: true) }
+      parsed_body.map { |item| ResourceStruct::FlexStruct.new(item) }
     end
 
     def parse_json(message_contents)
       parsed_body = JSON.parse(message_contents)
-      RecursiveOpenStruct.new({ wrapper: parsed_body }, recurse_over_arrays: true).wrapper
+      ResourceStruct::FlexStruct.new({ wrapper: parsed_body }).wrapper
     end
 
     def handle(message, metadata, message_attributes)

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = '4.0.14'.freeze
+  VERSION = '5.0.0'.freeze
 end

data/lib/pheme.rb

@@ -1,5 +1,5 @@
 require 'active_support/all'
-require 'recursive-open-struct'
+require 'resource-struct'
 require 'aws-sdk-sns'
 require 'aws-sdk-sqs'
 require 'securerandom'

data/pheme.gemspec

@@ -1,32 +1,32 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "pheme/version"
+require 'pheme/version'
 
 Gem::Specification.new do |s|
   raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless s.respond_to?(:metadata)
 
-  s.name          = "pheme"
+  s.name          = 'pheme'
   s.version       = Pheme::VERSION
-  s.authors       = ["Peter Graham"]
-  s.email         = ["peter@wealthsimple.com"]
+  s.authors       = ['Peter Graham']
+  s.email         = ['peter@wealthsimple.com']
   s.description   = 'Ruby AWS SNS publisher + SQS poller & message handler'
   s.summary       = 'Ruby SNS publisher + SQS poller & message handler'
-  s.homepage      = "https://github.com/wealthsimple/pheme"
+  s.homepage      = 'https://github.com/wealthsimple/pheme'
 
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-  s.license       = "MIT"
+  s.require_paths = ['lib']
+  s.license       = 'MIT'
 
   s.required_ruby_version = '>= 2.7.3'
 
-  s.add_dependency "activesupport", ">= 4"
-  s.add_dependency "aws-sdk-sns", "~> 1.1"
-  s.add_dependency "aws-sdk-sqs", "~> 1.3"
-  s.add_dependency "recursive-open-struct", "~> 1"
-  s.add_dependency "smarter_csv", "~> 1"
+  s.add_dependency 'activesupport', '>= 4'
+  s.add_dependency 'aws-sdk-sns', '~> 1.1'
+  s.add_dependency 'aws-sdk-sqs', '~> 1.3'
+  s.add_dependency 'resource-struct', '~> 0.4'
+  s.add_dependency 'smarter_csv', '~> 1'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'git'

data/spec/message_handler_spec.rb

@@ -3,7 +3,7 @@ describe Pheme::MessageHandler do
 
   before { use_default_configuration! }
 
-  let(:message) { RecursiveOpenStruct.new(status: status) }
+  let(:message) { ResourceStruct::FlexStruct.new(status: status) }
   let(:timestamp) { '2018-04-17T21:45:05.915Z' }
 
   describe "#handle" do

data/spec/message_type/aws_event_spec.rb

@@ -3,7 +3,8 @@ describe Pheme::MessageType::AwsEvent do
   let(:message_id) { SecureRandom.uuid }
   let(:queue_url) { 'http://queue_url' }
   let(:queue_message) do
-    OpenStruct.new(
+    instance_double(
+      Aws::SQS::Message,
       message_id: message_id,
       body: { 'Records' => records }.to_json,
       queue_url: queue_url,

data/spec/message_type/sns_message_spec.rb

@@ -22,7 +22,7 @@ describe Pheme::MessageType::SnsMessage do
 
   describe "#parse_message" do
     context "with JSON message" do
-      let!(:message) { OpenStruct.new({ body: '{"Message":"{\"test\":\"test\"}"}' }) }
+      let!(:message) { ResourceStruct::FlexStruct.new({ body: '{"Message":"{\"test\":\"test\"}"}' }) }
 
       it 'parses the message correctly' do
         expect(subject.parse_body(message).test).to eq("test")

data/spec/queue_poller_spec.rb

@@ -5,7 +5,7 @@ describe Pheme::QueuePoller do
   let(:topic_arn) { 'arn:topic:test' }
 
   let!(:queue_message) do
-    OpenStruct.new(
+    ResourceStruct::FlexStruct.new(
       body: { Message: message }.to_json,
       message_id: message_id,
     )
@@ -57,7 +57,7 @@ describe Pheme::QueuePoller do
 
       before do
         allow(Aws::SQS::QueuePoller).to receive(:new).and_return(aws_poller)
-        allow(aws_poller).to receive(:before_request).and_yield(OpenStruct.new(received_message_count: max_messages))
+        allow(aws_poller).to receive(:before_request).and_yield(ResourceStruct::FlexStruct.new(received_message_count: max_messages))
       end
 
       it 'throws error' do
@@ -145,7 +145,7 @@ describe Pheme::QueuePoller do
 
     context 'when message attributes' do
       let(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: {
             Message: message,
             MessageAttributes: {
@@ -222,7 +222,7 @@ describe Pheme::QueuePoller do
       end
 
       it { is_expected.to have(2).items }
-      it { is_expected.to eq(RecursiveOpenStruct.new({ wrapper: expected_message }, recurse_over_arrays: true).wrapper) }
+      it { is_expected.to eq(ResourceStruct::FlexStruct.new({ wrapper: expected_message }).wrapper) }
     end
 
     context "with unknown message format" do
@@ -240,7 +240,7 @@ describe Pheme::QueuePoller do
 
       it { is_expected.to be_a(Array) }
       its(:first) { is_expected.to be_a(Array) }
-      its('first.first') { is_expected.to be_a(RecursiveOpenStruct) }
+      its('first.first') { is_expected.to be_a(ResourceStruct::FlexStruct) }
 
       it "parses the nested object" do
         expect(subject.first.first.test).to eq('test')
@@ -284,7 +284,7 @@ describe Pheme::QueuePoller do
         }
       }
       let!(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: notification.to_json,
           message_id: message_id,
         )
@@ -317,7 +317,7 @@ describe Pheme::QueuePoller do
         }
       }
       let!(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: notification.to_json,
           message_id: message_id,
         )
@@ -348,7 +348,7 @@ describe Pheme::QueuePoller do
         }
       end
       let!(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: notification.to_json,
           message_id: message_id,
         )
@@ -361,7 +361,7 @@ describe Pheme::QueuePoller do
 
       it "handles the message" do
         expect(ExampleMessageHandler).to receive(:new).with(
-          message: RecursiveOpenStruct.new(message),
+          message: ResourceStruct::FlexStruct.new(message),
           metadata: { timestamp: timestamp, topic_arn: topic_arn },
           message_attributes: {},
         )
@@ -387,7 +387,7 @@ describe Pheme::QueuePoller do
         }
       end
       let!(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: notification.to_json,
           message_id: message_id,
         )
@@ -416,7 +416,7 @@ describe Pheme::QueuePoller do
     context "AWS-event message" do
       subject { ExampleAwsEventQueuePoller.new(queue_url: queue_url) }
 
-      let(:queue_message) { OpenStruct.new(body: { 'Records' => records }.to_json) }
+      let(:queue_message) { ResourceStruct::FlexStruct.new(body: { 'Records' => records }.to_json) }
       let(:records) do
         [{ 'eventVersion' => '2.0', eventSource: 'aws:s3' }]
       end
@@ -437,7 +437,7 @@ describe Pheme::QueuePoller do
       let(:message) { { status: 'complete' } }
       let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp } }
       let!(:queue_message) do
-        OpenStruct.new(
+        ResourceStruct::FlexStruct.new(
           body: notification.to_json,
           message_id: message_id,
         )

data/spec/version_spec.rb

@@ -4,8 +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 { |version_string| parse_version(version_string) }.
-      reject(&:nil?).
+      filter_map { |version_string| parse_version(version_string) }.
       first
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 4.0.14
+  version: 5.0.0
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: recursive-open-struct
+  name: resource-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: smarter_csv
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +216,7 @@ files:
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/main.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"