hey-you 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 755f8775f2918592a3faf297f7dbed8f5b7253d137ac47ffedae9a9106a5d44f
-  data.tar.gz: 17c927968d8fe27c6a5e8b2ace86af1bb30683f3cc968099aca19401c94cbcd7
+  metadata.gz: e45a6c6dcd683af58756e5bc3702ac92e0cd7e0f4fefb469f356002334f33fce
+  data.tar.gz: b8144f42b5cac765f8610ab05e046524e2ac9a4c5e47f08a7e6f4e7a409c309f
 SHA512:
-  metadata.gz: 592e4f17b2e26f26f04477150118a91d2cf68696bc17f3021617e554a14bddb19fd3fec5e2c8d2dc37342d045e6ca2c2c679969de645aa9269edf6cc139ea596
-  data.tar.gz: 83aa1a371cffa0efce33fb69e410abbe6d0eda85e019ab117f1e1ccb93cfee8d7ce92fb4b23d83a4b19d08615ccc0616c378ebd030801bc10b0773edb71e1596
+  metadata.gz: a96ab10f4b7dd0c0a07d6e16be547f2c97d2f51f7bf5be91386541fddde61f7739154d3867695ce7e814d6974b1377e4fa64e98239c4ab296ffff20dfe2602c8
+  data.tar.gz: e1cdb47a072bd632ea89ee6e072bc49afac86abaf570666ce92b2392b10787268552d1b599bdcb059da3488b7cc19c898b72dc3859730ab48514785291e44adf

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog for hey-you gem
 
-## 1.2.2
+### 1.2.3
+- Improvement: fix ruby 2.7 warnings
+- Fix: fix `NoMethodError` in `sender.rb` when channel must be ignored by `if` 
+
+### 1.2.2
 - Improvement: `if` condition for receiver (if condition `false` - sending will be skipped).
 - Improvement: `force` option - send message independent on `if` condition.
 

data/lib/hey_you/builder.rb

@@ -38,7 +38,7 @@ module HeyYou
       end
 
       ch_builder =
-        HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data[ch.to_s], key, options)
+        HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data[ch.to_s], key, **options)
       instance_variable_set("@#{ch}".to_sym, ch_builder)
 
       define_ch_method(ch)

data/lib/hey_you/channels/email.rb

@@ -7,13 +7,13 @@ module HeyYou
       class << self
         def send!(builder, to:, **options)
           method = config.email.use_default_mailing ? :send_via_mail : :send_via_custom_class
-          public_send(method, builder, to, options)
+          public_send(method, builder, to, **options)
         end
 
         # Send email via custom class instance.
         def send_via_custom_class(builder, to, **options)
-          mailer = mailer_class_from_builder(builder, options)
-          mailer_method = mailer_method_from_builder(mailer, builder, options)
+          mailer = mailer_class_from_builder(builder, **options)
+          mailer_method = mailer_method_from_builder(mailer, builder, **options)
           delivery_method = options[:delivery_method] ||
             builder.email.delivery_method ||
             config.email.default_delivery_method

data/lib/hey_you/config/data_source.rb

@@ -22,7 +22,7 @@ module HeyYou
           raise InvalidDataSourceError, 'You must pass `config.data_source.source_class` in configuration.'
         end
 
-        source_class.new(options).load_collections
+        source_class.new(**options).load_collections
       rescue ArgumentError => err
         problem_fields =
           err.message.gsub(/missing keyword(.?):\s/, '').split(', ').map { |f| "`#{f}`" }.join(', ')

data/lib/hey_you/sender.rb

@@ -42,14 +42,14 @@ module HeyYou
           }
         end
 
-        send_to_receive_info(notification_key, to_hash, options)
+        send_to_receive_info(notification_key, to_hash, **options)
       end
 
       def send_to_receive_info(notification_key, receive_info, **options)
-        builder = Builder.new(notification_key, options)
+        builder = Builder.new(notification_key, **options)
         response = {}
         config.registered_channels.each do |ch|
-          if channel_allowed?(ch, receive_info, builder, options) && builder.respond_to?(ch) && builder.public_send(ch)
+          if channel_allowed?(ch, receive_info, builder, **options) && builder.respond_to?(ch) && builder.public_send(ch)
             config.log(
               "Send #{ch}-message to `#{receive_info[ch][:subject]}` with data: #{builder.public_send(ch).data}" \
               " and options: #{receive_info[ch][:options]}"
@@ -68,7 +68,10 @@ module HeyYou
       private
 
       def channel_allowed?(ch, to, builder, **options)
-        condition = to[ch].is_a?(Hash) ? to[ch.to_sym][:subject] || to[ch.to_s][:subject] : to[ch.to_sym] || to[ch.to_s]
+        data_in_subject = to[ch.to_sym]&.fetch(:subject, nil) || to[ch.to_s]&.fetch(:subject, nil)
+        data_in_core = to[ch.to_sym] || to[ch.to_s]
+
+        condition = to[ch].is_a?(Hash) ? data_in_subject : data_in_core
         return false unless condition
         channel_allowed_by_only?(ch, options[:only]) && !builder.send(ch).nil?
       end

data/lib/hey_you/version.rb

@@ -1,3 +1,3 @@
 module HeyYou
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcm
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Send multichannel notification with one command.