hey-you 1.2.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e45a6c6dcd683af58756e5bc3702ac92e0cd7e0f4fefb469f356002334f33fce
-  data.tar.gz: b8144f42b5cac765f8610ab05e046524e2ac9a4c5e47f08a7e6f4e7a409c309f
+  metadata.gz: 8ff8d80c94827be9c828c5be13e40a7a00168af78da71b0d9f45f661ea7e9077
+  data.tar.gz: 2722f48830d9c5dcba439630b7bd3a94925a8f45308d90754407bb0a5cb603f2
 SHA512:
-  metadata.gz: a96ab10f4b7dd0c0a07d6e16be547f2c97d2f51f7bf5be91386541fddde61f7739154d3867695ce7e814d6974b1377e4fa64e98239c4ab296ffff20dfe2602c8
-  data.tar.gz: e1cdb47a072bd632ea89ee6e072bc49afac86abaf570666ce92b2392b10787268552d1b599bdcb059da3488b7cc19c898b72dc3859730ab48514785291e44adf
+  metadata.gz: 1e28d3c2be0df2136d905cb0bf1cfafaa080032cc01a7f0653e87d4eaa42691f10ff9d83daf7bc6dcc959f5a7a39350619d90ed533913fe513938c3caba1512e
+  data.tar.gz: 33b895c3264b71c87a2c5647f265be8ce34f46f6ecf0ab2e718eb8635c5b5d25591d90fc32ae12b2924f74d664fc7ddb30fcc363c60f61efcc14e03610a60e2e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog for hey-you gem
 
+# 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` 
@@ -14,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/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/sender.rb

@@ -38,7 +38,7 @@ 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
 
@@ -55,7 +55,8 @@ module HeyYou
               " and options: #{receive_info[ch][:options]}"
             )
             receive_options = receive_info[ch].fetch(:options, {}) || {}
-            response[ch] = Channels.const_get(ch.to_s.capitalize).send!(
+            klass_name = ch.to_s.downcase.split('_').map(&:capitalize).join
+            response[ch] = Channels.const_get(klass_name).send!(
               builder, to: receive_info[ch][:subject], **receive_options
             )
           else
@@ -89,4 +90,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.3"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.4.1
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcm