hey-you 1.2.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 755f8775f2918592a3faf297f7dbed8f5b7253d137ac47ffedae9a9106a5d44f
-  data.tar.gz: 17c927968d8fe27c6a5e8b2ace86af1bb30683f3cc968099aca19401c94cbcd7
+  metadata.gz: a02aef783a1b2fa450d1c420595f9c7df0a06eefa7a877c0e3e97fe072449f20
+  data.tar.gz: b4ff049fe645dab2263b0ffb2c947c537a3fcdde985b6a228e2daa455f4c38da
 SHA512:
-  metadata.gz: 592e4f17b2e26f26f04477150118a91d2cf68696bc17f3021617e554a14bddb19fd3fec5e2c8d2dc37342d045e6ca2c2c679969de645aa9269edf6cc139ea596
-  data.tar.gz: 83aa1a371cffa0efce33fb69e410abbe6d0eda85e019ab117f1e1ccb93cfee8d7ce92fb4b23d83a4b19d08615ccc0616c378ebd030801bc10b0773edb71e1596
+  metadata.gz: a1b41481fdc55fe9463a5e017dae21ec53cf490c04925bfd43d350f717acdb4a9a20eeb2908666f28ab8e3db02daef420a0edf6922c25779168bdbc58ba8a864
+  data.tar.gz: 650584118b560468f1c428e9e203eadd11571b3c5576b64dcc5e3322bfbcc237ab571ace0af62c079fc988278879aac332b812e2e6e82ceea680868670b6aab2

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog for hey-you gem
 
-## 1.2.2
+# 1.4.0
+- Improvement: configs validations for custom classes
+- Improvement: allow custom classes with '_' in name
+
+## 1.3.0 - 1.3.4
+- Feature: `body_part` in email builder.
+- Fixes
+
+### 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.
 
@@ -10,4 +22,4 @@
 
 ### 1.2.0
 - Feature: data source extensions (check readme for more information). 
-__Attention__: You should rewrite your configuration for use yaml data source! 
+__Attention__: You should rewrite your configuration for use yaml data source! 

data/lib/hey_you/builder.rb

@@ -37,8 +37,8 @@ module HeyYou
         return
       end
 
-      ch_builder =
-        HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data[ch.to_s], key, options)
+      klass_name = ch.to_s.downcase.split('_').map(&:capitalize).join
+      ch_builder = HeyYou::Builder.const_get(klass_name).new(data[ch.to_s], key, **options)
       instance_variable_set("@#{ch}".to_sym, ch_builder)
 
       define_ch_method(ch)
@@ -74,4 +74,4 @@ module HeyYou
     class DataNotFound < StandardError; end
     class RequiredChannelNotFound < StandardError; end
   end
-end
+end

data/lib/hey_you/builder/email.rb

@@ -3,19 +3,36 @@ require_relative '_base'
 module HeyYou
   class Builder
     class Email < Base
-      attr_reader :subject, :body, :layout, :mailer_class, :mailer_method, :delivery_method
+      attr_reader :subject, :body, :layout, :mailer_class, :mailer_method, :delivery_method, :body_parts
 
       def build
         @mailer_class = ch_data.fetch('mailer_class', nil)
         @mailer_method = ch_data.fetch('mailer_method', nil)
         @delivery_method = ch_data.fetch('delivery_method', nil)
-        @body = interpolate(ch_data.fetch('body'), options)
+        @body = interpolate(ch_data['body'], options) if ch_data['body']
+        @body_parts = interpolate_each(ch_data.fetch('body_parts', nil)&.deep_dup, options)
         @subject = interpolate(ch_data.fetch('subject'), options)
       end
 
       def to_hash
-        { body: body, subject: subject }
+        { body: body, subject: subject, body_parts: body_parts }
+      end
+
+      private
+
+      def interpolate_each(notification_hash, options)
+        return notification_hash unless notification_hash.is_a?(Hash)
+
+        notification_hash.each do |k, v|
+          next interpolate_each(v, options) if v.is_a?(Hash)
+
+          begin
+            notification_hash[k] = v % options
+          rescue KeyError => err
+            raise InterpolationError, "Failed build notification string `#{v}`: #{err.message}"
+          end
+        end
       end
     end
   end
-end
+end

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.rb

@@ -62,6 +62,13 @@ module HeyYou
       @registered_receivers << receiver_class
     end
 
+    def validate_config
+      registered_channels.each do |ch|
+        ch_config = send(ch)
+        ch_config.validate_config if ch_config.respond_to?(:validate_config)
+      end
+    end
+
     # Registrate new custom channel.
     # For successful registration, in application must be exists:
     # 1. HeyYou::Channels::<YOUR_CHANNEL_NAME> < HeyYou::Channels::Base
@@ -94,7 +101,8 @@ module HeyYou
     # For example, if ch == 'push' will define method #push for class instance.
     # New method will return instance of channel config instance
     def define_ch_config_method(ch)
-      method_proc = -> { self.class.const_get(ch.capitalize).config }
+      klass_name = ch.to_s.split('_').map(&:capitalize).join
+      method_proc = -> { self.class.const_get(klass_name).config }
       self.class.send(:define_method, ch, method_proc)
     end
 
@@ -102,4 +110,4 @@ module HeyYou
       data_source.load_data
     end
   end
-end
+end

data/lib/hey_you/config/conigurable.rb

@@ -13,6 +13,7 @@ module HeyYou
       def configure(&block)
         @configured ? raise(AlreadyConfiguredError, 'You already configure HeyYou') : instance_eval(&block)
         @configured = true
+        instance.validate_config if instance.respond_to?(:validate_config)
       end
 
       def config
@@ -20,6 +21,7 @@ module HeyYou
       end
 
       class AlreadyConfiguredError < StandardError; end
+      class RequiredConfigsNotPassed < StandardError; end
     end
   end
-end
+end

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

@@ -38,18 +38,18 @@ module HeyYou
             # Fetch receiver's info for sending: phone_number, email, etc
             subject: receiver.public_send("#{ch}_ch_receive_info"),
             # Fetch receiver's options like :mailer_class
-            options: receiver.public_send("#{ch}_ch_receive_options") || {}
+            options: receiver.public_send("#{ch}_ch_receive_options").merge(options) || {}
           }
         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
@@ -86,4 +89,4 @@ module HeyYou
 
     class NotRegisteredReceiver < StandardError; end
   end
-end
+end

data/lib/hey_you/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-12-26 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.