pheme 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00c2ac8b1b0c53223f919385d56d28d28a69e359
-  data.tar.gz: ac3c0acb319ba0837408608c7816df99318ca572
+SHA256:
+  metadata.gz: 89a8338f64d87daa837b51db3c2420f7a58b1c90145d269cd4bdf64d95e0e116
+  data.tar.gz: 4fd2cde4cc7738eaaa9c0f53b4372a9be5ff1dfc156667da3254023d3d2211f7
 SHA512:
-  metadata.gz: a8270f91d5f1d157332f757d0cff23c333ffc8215e4c359b35f25f1313d2f647c0ccc22ac93759d59ae70669e56ce3ff896bda11191e9b49d5e053ef293486d9
-  data.tar.gz: 52766f23041b4281452779480fe1bd4c3f748131e41f362b2a52f19c10b23863d3b82e015daf3be1d6d712d845cdf9ada0064a0827c15a1ec00c9964a76669c0
+  metadata.gz: 293ff87ae4c74c81100cfffe3e45c62357f33ca48e29c65916e8e4f88026102c9c7caf85ff1599e9362f188d172d955091ac069634de806fb05b68d3f1b7fa58
+  data.tar.gz: 2cae0f28474ab6f5fa1ad7c89662423a0e1c8782d782b1e1e42a0da421d283316518de2eda9d0779f169a295cd777ea7986012be87af2cee1b39e679edc77d3e

data/.circleci/config.yml

@@ -20,7 +20,7 @@ references:
                           --out test_results/rspec.xml \
                           --format documentation \
                           $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-  
+
   bundle_audit: &bundle_audit
     run:
       name: Bundle audit
@@ -28,20 +28,20 @@ references:
 
 version: 2
 jobs:
-  build_2_3_5:
+  build_2_3_8:
     working_directory: ~/repo
     docker:
-      - image: wealthsimple/ruby:2.3.5-node-docker
+      - image: wealthsimple/ruby:2.3.8-node-docker
         environment:
           RAILS_ENV: test
     steps:
       - checkout
       - *which_bundler
       - restore_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_3-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
       - *bundle_install
       - save_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_3-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
       - *run_rspec
@@ -49,20 +49,20 @@ jobs:
       - store_test_results:
           path: test_results
 
-  build_2_4_2:
+  build_2_4_5:
     working_directory: ~/repo
     docker:
-      - image: wealthsimple/ruby:2.4.2-node-docker
+      - image: wealthsimple/ruby:2.4.5-node-docker
         environment:
           RAILS_ENV: test
     steps:
       - checkout
       - *which_bundler
       - restore_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_4-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
       - *bundle_install
       - save_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_4-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
       - *run_rspec
@@ -70,20 +70,20 @@ jobs:
       - store_test_results:
           path: test_results
 
-  build_2_5_1:
+  build_2_5_3:
     working_directory: ~/repo
     docker:
-      - image: wealthsimple/ruby:2.5.1-node-docker
+      - image: wealthsimple/ruby:2.5.3-node-docker
         environment:
           RAILS_ENV: test
     steps:
       - checkout
       - *which_bundler
       - restore_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_5--{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
       - *bundle_install
       - save_cache:
-          key: rails-demo-bundle-v2-{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-ruby-2_5--{{ checksum "pheme.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
       - *run_rspec
@@ -95,6 +95,6 @@ workflows:
   version: 2
   build:
     jobs:
-      - build_2_3_5
-      - build_2_4_2
-      - build_2_5_1
+      - build_2_3_8
+      - build_2_4_5
+      - build_2_5_3

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @wealthsimple/developer-tools

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+#### Why <!-- A short description of why this change is required -->
+
+
+
+#### What changed <!-- Summary of changes when modifying hundreds of lines -->
+
+
+
+<!--
+Consider adding the following sections:
+
+#### How I tested [ Bullets for test cases covered ]
+#### Next steps [ If your PR is part of a few or a WIP, give context to reviewers ]
+#### Screenshot [ An image is worth a thousand words ]
+#### Bug/Ticket tracker [ Unnecessary when prefixing branch with JIRA ticket, e.g. SECURITY-123-human-readable-thing ]
+-->

data/.rubocop.yml

@@ -11,7 +11,7 @@ AllCops:
     - 'db/**/*'
     - 'lib/tasks/circle_0.rake' # Ignore circleci code:
     - 'node_modules/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.3
 
 Lint/AmbiguousOperator:
   Enabled: false
@@ -74,7 +74,7 @@ Style/Documentation:
 Layout/TrailingBlankLines:
   EnforcedStyle: final_newline
 
-Style/VariableName:
+Naming/VariableName:
   EnforcedStyle: snake_case
 
 Style/MethodDefParentheses:
@@ -83,7 +83,7 @@ Style/MethodDefParentheses:
 Style/Semicolon:
   AllowAsExpressionSeparator: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/Alias:

data/lib/pheme/compression.rb

@@ -11,6 +11,7 @@ module Pheme
 
     def decompress(body)
       return Zlib::GzipReader.new(StringIO.new(Base64.decode64(body))).read if gzip?(body)
+
       body
     end
 

data/lib/pheme/message_handler.rb

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

data/lib/pheme/queue_poller.rb

@@ -8,6 +8,7 @@ module Pheme
 
     def initialize(queue_url:, connection_pool_block: false, max_messages: nil, format: :json, poller_configuration: {}, sqs_client: nil)
       raise ArgumentError, "must specify non-nil queue_url" unless queue_url.present?
+
       @queue_url = queue_url
       @queue_poller = Aws::SQS::QueuePoller.new(queue_url, client: sqs_client)
       @connection_pool_block = connection_pool_block
@@ -70,6 +71,7 @@ module Pheme
       else
         method_name = "parse_#{format}".to_sym
         raise ArgumentError, "Unknown format #{format}" unless respond_to?(method_name)
+
         parsed_content = __send__(method_name, raw_content)
         body['Records'] = parsed_content
       end
@@ -146,7 +148,7 @@ module Pheme
     end
 
     def log_delete(queue_message)
-      Pheme.logger.info({
+      Pheme.logger.debug({
         message: "#{self.class} deleted message #{queue_message.message_id}",
         message_id: queue_message.message_id,
         queue_poller: self.class.to_s,
@@ -155,7 +157,7 @@ module Pheme
     end
 
     def log_message_received(queue_message, body)
-      Pheme.logger.info({
+      Pheme.logger.debug({
         message: "#{self.class} received message #{queue_message.message_id}",
         queue_poller: self.class.to_s,
         message_id: queue_message.message_id,

data/lib/pheme/rollbar.rb

@@ -1,6 +1,7 @@
 module Pheme
   def self.rollbar(exception, message, data={})
     return  if configuration.rollbar.nil?
+
     configuration.rollbar.error(exception, message, data)
   end
 end

data/lib/pheme/topic_publisher.rb

@@ -15,12 +15,20 @@ module Pheme
     EXPECTED_METADATA_SIZE = 1.kilobyte
     MESSAGE_SIZE_LIMIT = SNS_SIZE_LIMIT - EXPECTED_METADATA_SIZE
 
-    attr_accessor :topic_arn
+    class << self
+      attr_reader :_topic_arn
+
+      def topic_arn(topic_arn)
+        @_topic_arn = topic_arn
+      end
+    end
 
-    def initialize(topic_arn:)
+    def initialize(topic_arn: self.class._topic_arn)
       raise ArgumentError, "must specify non-nil topic_arn" unless topic_arn.present?
+
       @topic_arn = topic_arn
     end
+    attr_accessor :topic_arn
 
     def publish_events
       raise NotImplementedError

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
 end

data/pheme.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "pheme/version"
@@ -18,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.licenses      = ["MIT"]
-  gem.required_ruby_version = ">= 2.1.0"
+  gem.required_ruby_version = ">= 2.3.0"
 
   gem.add_dependency "activesupport", ">= 4"
   gem.add_dependency "aws-sdk-sns", "~> 1.1"

data/spec/queue_poller_spec.rb

@@ -55,14 +55,14 @@ describe Pheme::QueuePoller do
       let(:expected_message) do
         [
           { test1: 'value1', test2: 'value2' },
-          { test1: 'value3', test2: 'value4' },
+          { test1: 'value3', test2: 'value4' }
         ]
       end
       let(:message) do
         [
           %w[test1 test2].join(','),
           %w[value1 value2].join(','),
-          %w[value3 value4].join(','),
+          %w[value3 value4].join(',')
         ].join("\n")
       end
 
@@ -116,7 +116,7 @@ describe Pheme::QueuePoller do
       let(:mock_connection_pool) { double }
       subject { ExampleQueuePoller.new(queue_url: queue_url, connection_pool_block: true) }
       let(:message) { { status: 'complete' } }
-      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp, } }
+      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp } }
       let!(:queue_message) do
         OpenStruct.new(
           body: notification.to_json,
@@ -140,7 +140,7 @@ describe Pheme::QueuePoller do
     context "without connection pool block" do
       subject { ExampleQueuePoller.new(queue_url: queue_url) }
       let(:message) { { status: 'complete' } }
-      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp, } }
+      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp } }
       let!(:queue_message) do
         OpenStruct.new(
           body: notification.to_json,

data/spec/support/example_with_arn_publisher.rb

@@ -0,0 +1,3 @@
+class ExampleWithArnPublisher < Pheme::TopicPublisher
+  topic_arn "arn:aws:sns:whatever"
+end

data/spec/topic_publisher_spec.rb

@@ -13,6 +13,12 @@ describe Pheme::TopicPublisher do
         expect { ExamplePublisher.new(topic_arn: nil) }.to raise_error(ArgumentError)
       end
     end
+
+    context "when topic_arn set via class setter" do
+      it "does not raise an error" do
+        expect { ExampleWithArnPublisher.new }.not_to raise_error
+      end
+    end
   end
 
   describe "#publish_events" do
@@ -59,11 +65,12 @@ describe Pheme::TopicPublisher do
 
       it "publishes gzipped, base64 encoded message" do
         expect(Pheme.configuration.sns_client).to(
-          receive(:publish)
-            .with({
-                    topic_arn: topic_arn,
-                    message: compressed_message,
-                  }))
+          receive(:publish).
+            with({
+              topic_arn: topic_arn,
+              message: compressed_message,
+            }),
+        )
 
         subject
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CODEOWNERS"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -221,6 +223,7 @@ files:
 - spec/support/example_message_handler.rb
 - spec/support/example_publisher.rb
 - spec/support/example_queue_poller.rb
+- spec/support/example_with_arn_publisher.rb
 - spec/topic_publisher_spec.rb
 - spec/version_spec.rb
 homepage: https://github.com/wealthsimple/pheme
@@ -235,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -243,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby SNS publisher + SQS poller & message handler
@@ -258,5 +261,6 @@ test_files:
 - spec/support/example_message_handler.rb
 - spec/support/example_publisher.rb
 - spec/support/example_queue_poller.rb
+- spec/support/example_with_arn_publisher.rb
 - spec/topic_publisher_spec.rb
 - spec/version_spec.rb