hey-you 1.2.1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b3080ba368db5d653caccc37a984f7700292a54ba90204c086bdd7b95b4b6d
-  data.tar.gz: c2f589b517e59fdda778d6b9f99074a7c2fc932bbf97052a395f1b3491260d74
+  metadata.gz: af4fe24304e8d627f618c3cc5b6e93695a2be2f4d2207034f59feb0a7ad0d906
+  data.tar.gz: b60aa9ec6a472bc008d57e472406cb00e49b2f3d5827a5a3119a494fc83cfcbb
 SHA512:
-  metadata.gz: 3799695ed32d46f2aa0005346aa37d3b2288a373391900dedb575f90e5d71db4272d1d73edf3b5d5754066600bff886bc5e845271329bfead1dcc4f0208b3523
-  data.tar.gz: 29421836627cf3ba25e6731bca4e84830bef3f450ab5d400c85f7b80ef5a63b28c0492621e1edecb69ab2ae3506b1d178a88203ac34dec9a85a47d5171f0083a
+  metadata.gz: d1cf816831a4962b2f795621585156447cb837256773f4663da7009e6d404be2488e017ab2d96944b205764416f5bd4ee3b6c4bf28c399fbe6463abdcbbe65df
+  data.tar.gz: 165f7490a9a3eb749b2c966adf412a95027995bbcdb257c86b91c02484982ad56e48a99189157abcccf07cb88081bda0af3aa8673429c599ad336d14441a1709

data/CHANGELOG.md

@@ -1,8 +1,22 @@
 # Changelog for hey-you gem
+## 1.3.1/1.3.2/1.3.3/1.3.4
+Fixing bugs
+
+## 1.3.0
+- Feature: `body_part` in email builder.
+
+### 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.
+
 
 ### 1.2.1
 - Improvement: Builder will not make channel builder if it skipped by only option
 
 ### 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/README.md

@@ -163,8 +163,8 @@ fetching values required to send notification. For push channel
 expected that proc will return receiver's fcm registration id. For
 email expected that proc will return receiver's email address.
 
-You can pass options for receiver channels. You must pass proc with receive_data to `:subject` key and options 
-pass to `:options` key:
+You can pass options and sending condition for receiver channels. You must pass proc with receive_data to `:subject` key and options 
+pass to `:options` key. `if` key should be passed for sending condition:
 
 ```ruby
 class User < Model
@@ -172,7 +172,11 @@ class User < Model
   
   receive(
     push: -> { push_token.value }, 
-    email: { subject: -> { email }, options: { mailer_class: UserMailer, mailer_method: :notify! } }
+    email: { 
+      subject: -> { email }, 
+      if: -> { email_notifications? },
+      options: { mailer_class: UserMailer, mailer_method: :notify! } 
+    }
   )
 end
 ``` 
@@ -189,6 +193,15 @@ Last command will fetch notifications credentials for user instance
 and will try to send SMS, Push and Email for it. What argument we pass
 for method? This is string key for builder. Read next to understand it.
 
+Sometimes you need send notification independent on user's notification settings. For this case you can use
+`force` option in `#send_notification`:
+```ruby
+user = User.find(1)
+user.settings.update!(email_notifications: false)
+user.send_notification('for_users.hello') #=> will not send notification
+user.send_notification('for_users.hello', force: true) #=> will send notification
+```
+
 ### Build your notification
 HeyYou Notification Builder - good system for store your notifications in one place.
 By default you need create yml file with follow format:

data/lib/hey_you/builder.rb

@@ -38,7 +38,7 @@ module HeyYou
       end
 
       ch_builder =
-        HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data, 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/builder/_base.rb

@@ -23,10 +23,8 @@ module HeyYou
         raise InterpolationError, "Failed build notification string `#{notification_string}`: #{err.message}"
       end
 
-      def ch_data
-        data.fetch(current_builder_name)
-      end
 
+      alias ch_data data
       alias channel_data ch_data
 
       def ch_options

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

@@ -74,9 +74,11 @@ module HeyYou
         if receiver_data[ch].is_a?(Hash)
           me = self
           self.send(:define_method, "#{ch}_ch_receive_info", receiver_data[ch].fetch(:subject))
+          self.send(:define_method, "#{ch}_ch_receive_condition", receiver_data[ch].fetch(:if, -> { true }))
           self.send(:define_method, "#{ch}_ch_receive_options", -> { me.receiver_data[ch].fetch(:options, {}) })
         else
           self.send(:define_method, "#{ch}_ch_receive_info", receiver_data[ch])
+          self.send(:define_method, "#{ch}_ch_receive_condition", -> { true })
           self.send(:define_method, "#{ch}_ch_receive_options", -> { {} })
         end
       end

data/lib/hey_you/sender.rb

@@ -15,6 +15,7 @@ module HeyYou
       # @input notification_key [String] - key for notification builder
       # @input options [Hash]
       #   @option only [String/Array[String]] - whitelist for using channels
+      #   @option force [Boolean] - ignore `if` for receiver
       #
       def send_to(receiver, notification_key, **options)
         unless receiver_valid?(receiver)
@@ -29,24 +30,28 @@ module HeyYou
       def send!(notification_key, receiver, **options)
         to_hash = {}
         receiver.class.receiver_channels.each do |ch|
+          if !options[:force] && !receiver.public_send("#{ch}_ch_receive_condition")
+            next
+          end
+
           to_hash[ch] = {
             # 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}" \
+              "Send #{ch}-message to `#{receive_info[ch][:subject]}` with data: #{builder.public_send(ch).data}" \
               " and options: #{receive_info[ch][:options]}"
             )
             receive_options = receive_info[ch].fetch(:options, {}) || {}
@@ -54,7 +59,7 @@ module HeyYou
               builder, to: receive_info[ch][:subject], **receive_options
             )
           else
-            config.log("Channel #{ch} not allowed.")
+            config.log("Channel #{ch} not allowed or sending condition doesn't return truthy result.")
           end
         end
         response
@@ -63,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
@@ -81,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.1"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.4
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-10-30 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.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Send multichannel notification with one command.