hey-you 1.3.2 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc4f5a3d663c2e8496f01efec20e020f02b03088d4a83c182cf1a673deb2886
-  data.tar.gz: d442018540664c329f346ebaabd4c558d4da11b39763a703b990dd09d6e8a1dd
+  metadata.gz: 3679941e8f2ff22ed129c4fdbb90c8d8c27f860e2aa1f8514855afec34c86852
+  data.tar.gz: 6a1b5bb70850f69a7a017ac5c29125138ba22ec722d192666360daf9bbb2b1ad
 SHA512:
-  metadata.gz: 7cfad0eac54d8256b0347bffeff673e938e265c16ca4adf724390588e77046449bc62cab904171fb8baf114d47e5255cef60fa0d19b6a79f5d7fbcdf6085c113
-  data.tar.gz: 64b3e74fb8269048f2fc3dccd3fd49824c4d905ba0dec1376d1c8a7ab659d4af91805a7699c9d4f05e398e6e4aba212fb6bae774d38c30abc4e679b8b47b7f25
+  metadata.gz: a6a8430acbcc2c0399c87b899cd61e42915c2d7a5b9d06fac81df719b55bfa59716245ce6c50d12056d4707ceb6c4881017d06d1f444e728df2be6e71b504d02
+  data.tar.gz: 52412155756eaed0bd09aed322cbf34ce933d9a99965327264096834bcf1f70b7c6e5eb2d2d7f36cc8653d7183b0c7d893e94866cd5a2481ba3e0d1696e043a1

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog for hey-you gem
-## 1.3.0
+
+## 1.4.2
+- Improvement: Freeze loaded collection to prevent changes notification templates in memory
+
+## 1.4.1
+- Improvement: custom complex classes in Sender
+
+## 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

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

@@ -10,7 +10,7 @@ module HeyYou
         @mailer_method = ch_data.fetch('mailer_method', nil)
         @delivery_method = ch_data.fetch('delivery_method', nil)
         @body = interpolate(ch_data['body'], options) if ch_data['body']
-        @body_parts = interpolate_each(ch_data.fetch('body_parts', nil), options)
+        @body_parts = interpolate_each(ch_data.fetch('body_parts', nil)&.deep_dup, options)
         @subject = interpolate(ch_data.fetch('subject'), options)
       end
 
@@ -28,7 +28,7 @@ module HeyYou
 
           begin
             notification_hash[k] = v % options
-          rescue KeyError
+          rescue KeyError => err
             raise InterpolationError, "Failed build notification string `#{v}`: #{err.message}"
           end
         end

data/lib/hey_you/config.rb

@@ -50,11 +50,11 @@ module HeyYou
     end
 
     def collection
-      @collection ||= load_collection
+      @collection ||= deep_freeze(load_collection)
     end
 
     def env_collection
-      @env_collection ||= load_env_collection
+      @env_collection ||= deep_freeze(load_env_collection)
     end
 
     def registrate_receiver(receiver_class)
@@ -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,12 +101,21 @@ 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
 
     def load_collection
       data_source.load_data
     end
+
+    def deep_freeze(val)
+      if val.respond_to? :each
+        val.class == Hash ? val.each { |_, val| deep_freeze(val) } : val.each { |val| deep_freeze(val) }
+      end
+
+      val.freeze unless val.frozen?
+    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.3.2"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.2
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcm