slack_message 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b476b987543e7a38fd316de55186ddee859dfc1bd71817b14ddd13b2cb79f59
-  data.tar.gz: 80932a2d8e1bcac51239ea7724cd42f419dadfb7061fd939f359c2f4a5743777
+  metadata.gz: 25b5670dec5c6c5d2ba870180aa636f192cce3c9d899936337f553bc18108b7d
+  data.tar.gz: 47bd6ff799803ce186cdd01057dfa47a852422c715a2d1c550a6d41fc484ba18
 SHA512:
-  metadata.gz: c6273ff440e4aa2fd9c4dba40c7e45e4c3840d02d7619dafb11d516f9a3541172499e0e81f1966103a89332bb3911fb96818984fadc0195faa27c9b5e1692fcb
-  data.tar.gz: fc1a7df622d0cfd0c10311a70478cba43b893d7cde189d4f55dd997196e544145f8ce855a4b82af920f4320314907a6fe91bb39fddf3ba5e9460d4b8a4cbb33a
+  metadata.gz: 022ca4f2ffb28a3976be37d7104fd59e3ed296d406bf90176b4745c36880a159306112eb444ca1a1151720ad1cdb6a08e2b2779ad1ff2151e837fbee925c5808
+  data.tar.gz: a3f3d4c889e7c4036c2063f0ef038c54f515779526c6d4a9b0858e5e812bf2ba6667e08298b63988a074f82066c8d7eb9494b3d02d6c4785ff291cbfc7824f75

data/.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby-version: [3.0, 2.7, 2.6]
+        ruby-version: [3.0, 2.7, 2.6, 2.5]
     runs-on: ${{ matrix.os }}
 
     steps:

data/.gitignore

@@ -1 +1,2 @@
+Gemfile.lock
 slack_message*.gem

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.3.1] - 2021-11-30
+- Adjust that minimum version by changing some syntax to older styles. Given
+  support for ruby 2.4 ended almost 2 years ago, going to go ahead and leave
+  it behind.
+- Remove lockfile from repo
+
 ## [2.3.0] - 2021-11-30
 - Formally require minimum version of ruby. It wouldn't have worked anyway,
   but worth actually specifying.

data/lib/slack_message/dsl.rb

@@ -111,12 +111,14 @@ class SlackMessage::Dsl
   # replace emails w/ real user IDs
   def enrich_text(text_body)
     text_body.scan(SlackMessage::EMAIL_TAG_PATTERN).each do |email_tag|
-      raw_email = email_tag.gsub(/[><]/, '')
-      user_id   = SlackMessage::Api::user_id_for(raw_email, profile)
+      begin
+        raw_email = email_tag.gsub(/[><]/, '')
+        user_id   = SlackMessage::Api::user_id_for(raw_email, profile)
 
-      text_body.gsub!(email_tag, "<@#{user_id}>") if user_id
-    rescue SlackMessage::ApiError => e
-      # swallow errors for not-found users
+        text_body.gsub!(email_tag, "<@#{user_id}>") if user_id
+      rescue SlackMessage::ApiError => e
+        # swallow errors for not-found users
+      end
     end
 
     text_body

data/lib/slack_message/rspec.rb

@@ -206,11 +206,11 @@ module SlackMessage::RSpec
       SlackMessage::RSpec.unregister_expectation_listener(self)
 
       @captured_calls
-        .filter { |call| !@channel || call[:channel] == @channel }
-        .filter { |call| !@profile || [call[:profile][:handle], call[:username]].include?(@profile) }
-        .filter { |call| !@content || call.fetch(:blocks).to_s =~ @content }
-        .filter { |call| !@icon || call.fetch(:icon_emoji, call.fetch(:icon_url, '')) == @icon }
-        .filter { |call| !@icon_matching || call.fetch(:icon_emoji, call.fetch(:icon_url, '')) =~ @icon_matching }
+        .select { |call| !@channel || call[:channel] == @channel }
+        .select { |call| !@profile || [call[:profile][:handle], call[:username]].include?(@profile) }
+        .select { |call| !@content || call.fetch(:blocks).to_s =~ @content }
+        .select { |call| !@icon || call.fetch(:icon_emoji, call.fetch(:icon_url, '')) == @icon }
+        .select { |call| !@icon_matching || call.fetch(:icon_emoji, call.fetch(:icon_url, '')) =~ @icon_matching }
         .any?
     end
 

data/slack_message.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'slack_message'
-  gem.version     = "2.3.0"
+  gem.version     = "2.3.1"
   gem.summary     = "A nice DSL for composing rich messages in Slack"
   gem.authors     = ["Joe Mastey"]
   gem.email       = 'hello@joemastey.com'
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
     "source_code_uri" => "http://github.com/jmmastey/slack_message",
   }
 
-  gem.required_ruby_version = '>= 2.6.0'
+  gem.required_ruby_version = '>= 2.5.0'
 
   gem.add_development_dependency "rspec", "3.10.0"
   gem.add_development_dependency "pry", "0.14.1"

data/spec/slack_message_spec.rb

@@ -142,13 +142,19 @@ RSpec.describe SlackMessage do
       expect {
         SlackMessage.post_to('#general') { text("Not Tagged: hello@joemastey.com ") }
       }.to post_to_slack.with_content_matching(/hello@joemastey.com/)
+    end
 
-
-      allow(SlackMessage::Api).to receive(:user_id_for).and_raise(SlackMessage::ApiError)
+    it "is graceful about those failures" do
+      allow(SlackMessage::Api).to receive(:user_id_for).with('nuffin@nuffin.nuffin', any_args).and_raise(SlackMessage::ApiError)
+      allow(SlackMessage::Api).to receive(:user_id_for).with('hello@joemastey.com', any_args).and_return('ABC123')
 
       expect {
         SlackMessage.post_to('#general') { text("Not User: <nuffin@nuffin.nuffin>") }
       }.to post_to_slack.with_content_matching(/\<nuffin@nuffin.nuffin\>/)
+
+      expect {
+        SlackMessage.post_to('#general') { text("Not User: <nuffin@nuffin.nuffin>, User: <hello@joemastey.com>") }
+      }.to post_to_slack.with_content_matching(/ABC123/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack_message
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Joe Mastey
@@ -64,7 +64,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - lib/slack_message.rb
@@ -90,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    slack_message (2.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.3)
-    diff-lcs (1.4.4)
-    method_source (1.0.0)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rb-readline (0.5.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    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-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pry (= 0.14.1)
-  rb-readline (= 0.5.5)
-  rspec (= 3.10.0)
-  slack_message!
-
-BUNDLED WITH
-   2.1.4