hey-you 0.1.7 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 679472ed713fc109350ef9fd2b48880822edf62bf6a53874eb2df9470de2b580
-  data.tar.gz: 4d4539b92cf5cf8a080b592bcc806a9ec7d51a5f2fbd2f7a66f9e9ae24d55fda
+  metadata.gz: a7b3080ba368db5d653caccc37a984f7700292a54ba90204c086bdd7b95b4b6d
+  data.tar.gz: c2f589b517e59fdda778d6b9f99074a7c2fc932bbf97052a395f1b3491260d74
 SHA512:
-  metadata.gz: 8f60580d1951c4a90463f9c8c51d28854e2b98ec7bed42a5fe5ae5a87a86f7f2321377cad70f2afefc7e24e3aa09c2aa9db46c88dd519d3099bc360eb72516ea
-  data.tar.gz: 06f1a99454e30a562cdf28eee7caa12d41ab133e57abe4d4fd437bc62149f33919c3dee81f8dd7045238c6c7f5df73055d95aa1711d3db04ceb421efe7ecef7e
+  metadata.gz: 3799695ed32d46f2aa0005346aa37d3b2288a373391900dedb575f90e5d71db4272d1d73edf3b5d5754066600bff886bc5e845271329bfead1dcc4f0208b3523
+  data.tar.gz: 29421836627cf3ba25e6731bca4e84830bef3f450ab5d400c85f7b80ef5a63b28c0492621e1edecb69ab2ae3506b1d178a88203ac34dec9a85a47d5171f0083a

data/.travis.yml

@@ -1,10 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
-  - 2.4.2
-  - 2.5.3
-  - 2.6.1
+  - 2.5.0
+  - 2.6.0
+  - 2.7.0
 before_install: gem install bundler
 scripts:
   - bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog for hey-you gem
+
+### 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! 

data/README.md

@@ -1,5 +1,6 @@
-# HeyYou [Alpha]
+# HeyYou
 [![Build Status](https://travis-ci.com/QNester/hey-you.svg?branch=master)](https://travis-ci.com/QNester/hey-you#)
+[![Gem Version](https://badge.fury.io/rb/hey-you.svg)](https://badge.fury.io/rb/hey-you)
 
 Send multichannel notifications with one command. 
 Сonvenient storage of notifications texts. Create your 
@@ -15,10 +16,11 @@ him easy.
     * [Send notification](#send-notification)
     * [Sender options](#sender-options)
     * [Create your own channels](#create-your-own-channels)    
+* [Extensions](#extensions)    
 
 
 ## Requirements
- * Ruby 2.3.0 min (rspec works with ruby 2.3.3, 2.4.2, 2.5.3)
+ * Ruby 2.5.0 min (rspec works with ruby 2.5.0, 2.6.0, 2.7.0)
  * FCM - Gem send push notification using [fcm gem](https://github.com/spacialdb/fcm).
  You need *fcm server key* to successful configure push notifications.
 
@@ -42,15 +44,20 @@ Or install it yourself as:
 First, you must configure HeyYou. Example:
 ```ruby
   HeyYou::Config.configure do
-    config.collection_files = ['config/notifications.yml']
+    config.data_source.options = { collection_files: ['config/notifications.yml'] }
     config.email.from = 'noreply@example-mail.com'
     config.push.fcm_token = 'fcm_server_key'
   end
 ```
 #### Required settings
 Options for gem base work.
-##### Base
-* __config.collection_files__ - File or files contained all your notifications texts.
+##### Data Source
+* __config.data_source.source_class__ - Class implemented instance method `load_collections` returning hash (by default `HeyYou::DataSource::Yaml`)
+* __config.data_source.options__ - Arguments for source_class. This options will be passed to init `source_class`
+OR
+* __config.data_source.source_instance__ - Instance of source class implemented `load_collections`
+
+Read more about data source in [data source](#data-source-1).d
 ##### Push
 * __config.push.fcm_token__ - Required setting for push channel. You can not send
 push messages if setting was not set. You should set it to equal your fcm server key.
@@ -60,20 +67,23 @@ push messages if setting was not set. You should set it to equal your fcm server
 #### Optional settings
 Additional options for configure your notifications.
 #### Base
-* __config.env_collection_file__ - File contained all your notifications texts for
-environment. You can set it like `notifications.#{ENV['APP_ENV]}.yml`
 * __config.splitter__ - Chars for split notification keys for 
 builder. Default: `.`
 * __config.registered_channels__ - Avialable channels for your
 applications. Default: `[:push, :email]`
+* __config.require_all_channels__ - Boolean. If true, when data for channel will not found in 
+file collection, error will be raised. Default: `false`
 * __config.localization__ - Boolean. If true, hey-you begin support I18n locales for notifications collection. Your
-notifications for build should be nested in `I18n.locale` key. For example:
+notifications for build should be nested in `I18n.locale` key. Default: `false`. For example:
 
 ```ruby
 # config/initializers/hey-you.rb
 HeyYou::Config.configure do
   ...
-  config.collection_files = I18n.available_locales.map { |locale| "config/notifications/#{locale}.yml" }
+  i18n_files = Rails.application.config.i18n.available_locales.map do |locale|
+    "config/notifications/#{locale}.yml" 
+  end 
+  config.data_source.options = { collection_files: i18n_files }
   ...
 end 
 ```
@@ -123,7 +133,7 @@ Default 60
 Default 30
 ##### Email
 * __config.email.layout__ - default layout for email letters.
-* __config.email.default_mailing__ - use default mail sending or use custom mailer classes
+* __config.email.use_default_mailing__ - use default mail sending or use custom mailer classes
 * __config.email.default_mailer_class__ - default mailer class for email notifications
 * __config.email.default_mailer_method__ - default mailer_method for mailer_class
 * __config.email.default_delivery_method__ - expects, that mailer_method will build message and delivery_method will send it.
@@ -181,7 +191,7 @@ for method? This is string key for builder. Read next to understand it.
 
 ### Build your notification
 HeyYou Notification Builder - good system for store your notifications in one place.
-You need create yml file with follow format:
+By default you need create yml file with follow format:
 ```yaml
 # config/notifications/collection.yml
 any_key:
@@ -208,6 +218,46 @@ notification will send for all available channels for receiver:
 1) Send push via fcm
 2) Send email
 
+#### Data Source
+Often we need store our notification text in another data source, not int yml files. HeyYou has flexible
+system for data source. All what you need - make your own provider source and pass it to config. For example:
+
+```ruby
+class NotificationText < ApplicationRecord
+  def self.load_collections
+    # load colelctions from database to hash
+    # THIS METHOD MUST returns hash! 
+  end
+end
+```
+
+```ruby
+HeyYou::Config.configure do
+  # NotificationText is a rails model
+  config.data_source.source_instance = NotificationText
+end
+```
+
+HeyYou will pull texts from database to memory with initialize your application after this configuration. Builder
+will build your texts successfully.
+
+HeyYou by default contains only two data sources:
+1. `HeyYou::DataSource::Yaml` - for store notifications collections in data. For example: 
+```ruby
+  HeyYou::Config.configure do
+    config.data_source.source_class = HeyYou::DataSource::Yaml
+    config.data_source.options = { collection_files: ['config/notifications.yml'] }
+  end
+```
+2. `HeyYou::DataSource::Hash` - store notification everywhere you want and pass to HeyYou only hash
+```ruby
+  config.data_source.source_class = HeyYou::DataSource::Yaml
+  config.data_source.options = { data: { welcome: { email: { ... }, push: { ... } } } }
+```
+
+__Pay attention__: for difference source we should pass difference options.
+
+
 ### Send notification
 Receiver not only one way to send notification. You can send it using `HeyYou::Sender`.
 Just use method `#send` for HeyYou::Sender and pass notification key and `to` options
@@ -357,6 +407,9 @@ in your channel config.
 
 Now, when you will send notification, it will be send with your channel too.
 
+## Extensions
+* [Slack channel](https://github.com/QNester/hey-you-slack) 
+[![Gem Version](https://badge.fury.io/rb/hey-you-slack.svg)](https://badge.fury.io/rb/hey-you-slack)
 
 ## Development
 

data/hey_you.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mail", '~> 2.7'
   spec.add_runtime_dependency "i18n", '~> 1.0'
 
-  spec.add_development_dependency "rake", '~> 10.5'
+  spec.add_development_dependency "rake", '~> 13.0'
   spec.add_development_dependency "rspec", '~> 3.7'
   spec.add_development_dependency "webmock", '~> 3.4'
   spec.add_development_dependency "ffaker", '~> 2.9'

data/lib/hey_you/builder.rb

@@ -1,31 +1,51 @@
 require 'i18n'
-require_relative 'builder/email'
-require_relative 'builder/push'
+require 'hey_you/helper'
+require 'hey_you/builder/email'
+require 'hey_you/builder/push'
 
 module HeyYou
   class Builder
-    attr_reader :data, :options
+    include HeyYou::Helper
+
+    attr_reader :data, :options, :keys
 
     # Load data from collection yaml via key and interpolate variables.
     # Define methods for each registered channel. After initialize you can use
     #   `instance.<ch_name>`. It will be return instance of HeyYou::Builder::<YOUR_CHANNEL_NAME>
     #
+    # Skip builder for excluded channels (not included in `only` option)
+    #
+    # @param [String] key - notification key for fetching notification data from collection
     def initialize(key, **options)
       @data = fetch_from_collection_by_key(key, options[:locale])
       @options = options
       config.registered_channels.each do |ch|
-        ch_builder =
-          HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data, key, options)
-        instance_variable_set("@#{ch}".to_sym, ch_builder)
-
-        define_ch_method(ch)
+        init_channel_builder(ch, key) if channel_allowed_by_only?(ch, options[:only])
       end
     end
 
     private
 
-    def define_ch_method(ch)
-      method_proc = -> { instance_variable_get("@#{ch}".to_sym) }
+    def init_channel_builder(ch, key)
+      if config.require_all_channels
+        unless data[ch.to_s]
+          raise RequiredChannelNotFound, "For key #{key} and channel #{ch} data not exists in collection."
+        end
+      end
+      unless data[ch.to_s]
+        define_ch_method(ch, true)
+        return
+      end
+
+      ch_builder =
+        HeyYou::Builder.const_get("#{ch.downcase.capitalize}").new(data, key, options)
+      instance_variable_set("@#{ch}".to_sym, ch_builder)
+
+      define_ch_method(ch)
+    end
+
+    def define_ch_method(ch, empty = false)
+      method_proc = empty ? -> { nil } : -> { instance_variable_get("@#{ch}".to_sym) }
       self.class.send(:define_method, ch, method_proc)
     end
 
@@ -37,15 +57,21 @@ module HeyYou
         keys << locale
       end
       keys = keys + key.to_s.split(config.splitter)
-      keys.reduce(config.collection) do |memo, nested_key|
+      data = keys.reduce(config.collection) do |memo, nested_key|
         memo[nested_key.to_s] if memo
       end
+      return data if data
+      raise DataNotFound, "collection data not found for `#{keys.join(config.splitter)}`"
     end
 
-    def config
-      Config.config
+    def channel_allowed_by_only?(ch, only)
+      return true unless only
+      return only.map(&:to_sym).include?(ch.to_sym) if only.is_a?(Array)
+      only.to_sym == ch.to_sym
     end
 
     class UnknownLocale < StandardError; end
+    class DataNotFound < StandardError; end
+    class RequiredChannelNotFound < StandardError; end
   end
 end

data/lib/hey_you/builder/_base.rb

@@ -10,6 +10,11 @@ module HeyYou
         build
       end
 
+      def to_hash
+        raise NotImplementedError, 'Builder not implemented #to_hash method'
+      end
+      alias_method :to_h, :to_hash
+
       private
 
       def interpolate(notification_string, options)

data/lib/hey_you/builder/email.rb

@@ -12,6 +12,10 @@ module HeyYou
         @body = interpolate(ch_data.fetch('body'), options)
         @subject = interpolate(ch_data.fetch('subject'), options)
       end
+
+      def to_hash
+        { body: body, subject: subject }
+      end
     end
   end
 end

data/lib/hey_you/builder/push.rb

@@ -10,6 +10,10 @@ module HeyYou
         @body = interpolate(ch_data.fetch('body'), options)
         @data = options[:data] || {}
       end
+
+      def to_hash
+        { title: title, body: body, data: data }
+      end
     end
   end
 end

data/lib/hey_you/channels/_base.rb

@@ -1,6 +1,10 @@
+require 'hey_you/helper'
 module HeyYou
   module Channels
     class Base
+      include HeyYou::Helper
+      extend HeyYou::Helper
+
       class << self
         def send!
           raise NotImplementedError, 'You should define #send! method in your channel.'
@@ -25,10 +29,6 @@ module HeyYou
           []
         end
 
-        def config
-          Config.config
-        end
-
         def ch_name
           self.class.name.split('::').last.downcase
         end

data/lib/hey_you/channels/email.rb

@@ -6,31 +6,31 @@ module HeyYou
     class Email < Base
       class << self
         def send!(builder, to:, **options)
-          raise CredentialsNotExists unless credentials_present?
-
-          method = config.email.default_mailing ? :send_via_mail : :send_via_custom_class
+          method = config.email.use_default_mailing ? :send_via_mail : :send_via_custom_class
           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 = options[:mailer_method] ||
-            builder.email.mailer_method ||
-            config.email.default_mailer_method
-
+          mailer_method = mailer_method_from_builder(mailer, builder, options)
           delivery_method = options[:delivery_method] ||
             builder.email.delivery_method ||
             config.email.default_delivery_method
 
           log("Build mail via #{mailer}##{mailer_method}. Delivery with #{delivery_method}")
-          mailer_msg = mailer.public_send(mailer_method, data: builder.email, to: to)
-          mailer_msg.public_send(delivery_method)
+          mailer_msg = mailer.public_send(mailer_method, data: builder.email.to_hash, to: to)
+          return mailer_msg.public_send(delivery_method) if mailer_msg.respond_to?(delivery_method)
+          raise(
+            DeliveryMethodNotDefined,
+            "Instance of mailer #{mailer} with method #{mailer_method} not respond to #{delivery_method}"
+          )
         end
 
         # Send email with standard mail (gem 'mail')
         def send_via_mail(builder, to, **_)
+          raise CredentialsNotExists unless credentials_present?
+
           context = self
           mail = Mail.new do
             from HeyYou::Config.instance.email.from
@@ -74,14 +74,29 @@ module HeyYou
 
           mailer
         end
-      end
 
-      class CredentialsNotExists < StandardError;
-      end
-      class ActionMailerClassNotDefined < StandardError;
-      end
-      class MailerClassNotDefined < StandardError;
+        def mailer_method_from_builder(mailer_class, builder, **options)
+          mailer_method = options[:mailer_method] ||
+            builder.email.mailer_method ||
+            config.email.default_mailer_method
+          unless mailer_method
+            raise(
+              MailerMethodNotDefined,
+              'You must set mailer_method in notifications collection or pass :mailer_method option.'
+            )
+          end
+
+          return mailer_method if mailer_class.respond_to?(mailer_method)
+          raise MailerMethodNotDefined, "Method ##{mailer_method} not defined for #{mailer_class}."
+        end
       end
+
+      class CredentialsNotExists < StandardError; end
+      class ActionMailerClassNotDefined < StandardError; end
+      class MailerClassNotDefined < StandardError; end
+      class MailerMethodNotDefined < StandardError; end
+      class DeliveryMethodNotDefined < StandardError; end
+
     end
   end
 end

data/lib/hey_you/config.rb

@@ -1,7 +1,8 @@
 require 'yaml'
-require_relative 'config/conigurable'
-require_relative 'config/push'
-require_relative 'config/email'
+require 'hey_you/config/conigurable'
+require 'hey_you/config/push'
+require 'hey_you/config/email'
+require 'hey_you/config/data_source'
 
 #
 # @config REQUIRED collection_file [String] - File path for general notifications file
@@ -17,7 +18,15 @@ module HeyYou
   class Config
     extend Configurable
 
-    DEFAULT_REGISTERED_CHANNELS = %i[email push]
+    DEFAULTS = {
+      registered_channels: %i[email push],
+      splitter: '.',
+      log_tag: 'HeyYou',
+      localization: false,
+      require_all_channels: false
+    }
+
+    DEFAULT_REGISTERED_CHANNELS =
     DEFAULT_SPLITTER = '.'
     DEFAULT_GLOBAL_LOG_TAG = 'HeyYou'
     DEFAULT_LOCALIZATION_FLAG = false
@@ -26,26 +35,20 @@ module HeyYou
 
     attr_reader   :collection, :env_collection, :configured, :registered_receivers
     attr_accessor(
-      :collection_files, :env_collection_file, :splitter,
-      :registered_channels, :localization, :logger, :log_tag
+      :splitter, :registered_channels, :localization, :logger, :log_tag,
+      :require_all_channels, :data_source
     )
 
     def initialize
-      @registered_channels ||= DEFAULT_REGISTERED_CHANNELS
-      @splitter ||= DEFAULT_SPLITTER
+      @registered_channels ||= DEFAULTS[:registered_channels]
+      @splitter ||= DEFAULTS[:splitter]
       @registered_receivers = []
-      @log_tag ||= DEFAULT_GLOBAL_LOG_TAG
-      @localization ||= DEFAULT_LOCALIZATION_FLAG
+      @log_tag ||= DEFAULTS[:log_tag]
+      @localization ||= DEFAULTS[:localization]
+      @require_all_channels = DEFAULTS[:require_all_channels]
       define_ch_config_methods
     end
 
-    def collection_file
-      @collection_files || raise(
-        CollectionFileNotDefined,
-        'You must define HeyYou::Config.collection_files'
-      )
-    end
-
     def collection
       @collection ||= load_collection
     end
@@ -74,6 +77,10 @@ module HeyYou
       logger&.info("[#{log_tag}] #{msg} ")
     end
 
+    def data_source
+      DataSource.instance
+    end
+
     private
 
     def define_ch_config_methods
@@ -91,21 +98,8 @@ module HeyYou
       self.class.send(:define_method, ch, method_proc)
     end
 
-    # Load yaml from collection_file and merge it with yaml from env_collection_file
     def load_collection
-      @collection_files = [collection_files] if collection_files.is_a?(String)
-      notification_collection = {}
-      collection_files.each do |file|
-        notification_collection.merge!(YAML.load_file(file))
-      end
-      notification_collection.merge!(env_collection)
-    end
-
-    def load_env_collection
-      if env_collection_file
-        return YAML.load_file(env_collection_file) rescue { }
-      end
-      {}
+      data_source.load_data
     end
   end
 end

data/lib/hey_you/config/conigurable.rb

@@ -11,14 +11,15 @@ module HeyYou
       end
 
       def configure(&block)
-        # TODO: log warn "Already configured" instead nil
-        @configured ? nil : instance_eval(&block)
+        @configured ? raise(AlreadyConfiguredError, 'You already configure HeyYou') : instance_eval(&block)
         @configured = true
       end
 
       def config
         @config ||= self.instance
       end
+
+      class AlreadyConfiguredError < StandardError; end
     end
   end
 end

data/lib/hey_you/config/data_source.rb

@@ -0,0 +1,38 @@
+require 'hey_you/config/conigurable'
+require 'hey_you/data_source/yaml'
+require 'hey_you/data_source/hash'
+
+module HeyYou
+  class Config
+    class DataSource
+      extend Configurable
+
+      attr_accessor :source_class, :options, :source_instance
+
+      def initialize
+        @type = DEFAULTS[:type]
+        @options = DEFAULTS[:options]
+        @source_class = HeyYou::DataSource::Yaml
+      end
+
+      def load_data
+        return source_instance.load_collections if source_instance
+
+        if source_class.nil?
+          raise InvalidDataSourceError, 'You must pass `config.data_source.source_class` in configuration.'
+        end
+
+        source_class.new(options).load_collections
+      rescue ArgumentError => err
+        problem_fields =
+          err.message.gsub(/missing keyword(.?):\s/, '').split(', ').map { |f| "`#{f}`" }.join(', ')
+        field_word = problem_fields.split(', ').size > 1 ? 'fields' : 'field'
+        msg = "You must pass #{field_word} #{problem_fields} for `config.data_source.options` in configuration"
+
+        raise InvalidOptionsError, msg
+      end
+
+      class InvalidOptionsError < StandardError; end
+    end
+  end
+end

data/lib/hey_you/config/email.rb

@@ -1,4 +1,4 @@
-require_relative 'conigurable'
+require 'hey_you/config/conigurable'
 require 'mail'
 
 module HeyYou
@@ -13,7 +13,7 @@ module HeyYou
       attr_accessor(
         :from,
         :mail_delivery_method,
-        :default_mailing,
+        :use_default_mailing,
         :default_delivery_method,
         :default_mailer_class,
         :default_mailer_method
@@ -21,7 +21,7 @@ module HeyYou
 
       def initialize
         @mail_delivery_method ||= MAIL_DELIVERY_METHOD
-        @default_mailing ||= !default_mailer_class.nil?
+        @use_default_mailing ||= !default_mailer_class.nil?
         @async ||= true
         @default_mailer_method ||= DEFAULT_ACTION_MAILER_METHOD
         @default_delivery_method ||= DEFAULT_DELIVERY_METHOD

data/lib/hey_you/config/push.rb

@@ -1,4 +1,4 @@
-require_relative 'conigurable'
+require 'hey_you/config/conigurable'
 require 'fcm'
 
 module HeyYou

data/lib/hey_you/data_source/_base.rb

@@ -0,0 +1,9 @@
+module HeyYou
+  module DataSource
+    class Base
+      def load_notifications
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/hey_you/data_source/hash.rb

@@ -0,0 +1,17 @@
+require 'hey_you/data_source/_base'
+
+module HeyYou
+  module DataSource
+    class Hash < Base
+      attr_reader :data
+
+      def initialize(data:)
+        @data = data
+      end
+
+      def load_collections
+        data
+      end
+    end
+  end
+end

data/lib/hey_you/data_source/yaml.rb

@@ -0,0 +1,37 @@
+require 'hey_you/data_source/_base'
+
+module HeyYou
+  module DataSource
+    class Yaml < Base
+      attr_reader :collection_files, :env_collection_file
+
+      def initialize(collection_files:, env_collection_file: nil)
+        @collection_files = collection_files
+        @collection_files = [collection_files] if collection_files.is_a?(String)
+        @env_collection_file = env_collection_file
+      end
+
+      # Load yaml from collection_file and merge it with yaml from env_collection_file
+      def load_collections
+        notification_collection = {}
+        collection_files.each do |file|
+          notification_collection.merge!(YAML.load_file(file))
+        end
+        notification_collection.merge!(env_collection)
+      end
+
+      def env_collection
+        @env_collection ||= load_env_collection
+      end
+
+      private
+
+      def load_env_collection
+        if env_collection_file
+          return YAML.load_file(env_collection_file) rescue { }
+        end
+        {}
+      end
+    end
+  end
+end

data/lib/hey_you/helper.rb

@@ -0,0 +1,7 @@
+module HeyYou
+  module Helper
+    def config
+      Config.instance
+    end
+  end
+end

data/lib/hey_you/receiver.rb

@@ -1,7 +1,10 @@
-require_relative 'sender'
+require 'hey_you/sender'
+require 'hey_you/helper'
 
 module HeyYou
   module Receiver
+    include HeyYou::Helper
+
     attr_reader :receiver_channels, :receiver_data
 
     def self.extended klass
@@ -48,7 +51,7 @@ module HeyYou
 
       @receiver_data = receiver_data
       @receiver_channels = receiver_data.keys
-      hey_you_config.registrate_receiver(self)
+      config.registrate_receiver(self)
 
       define_receive_info_methods
     end
@@ -57,10 +60,10 @@ module HeyYou
 
     def check_channels(channels)
       channels.all? do |ch|
-        next if hey_you_config.registered_channels.include?(ch.to_sym)
+        next if config.registered_channels.include?(ch.to_sym)
         raise(
           NotRegisteredChannel,
-          "Channel #{ch} not registered. Registered channels: #{hey_you_config.registered_channels}"
+          "Channel #{ch} not registered. Registered channels: #{config.registered_channels}"
         )
       end
       @received_channels = channels
@@ -79,10 +82,6 @@ module HeyYou
       end
     end
 
-    def hey_you_config
-      Config.config
-    end
-
     class NotRegisteredChannel < StandardError;
     end
   end

data/lib/hey_you/sender.rb

@@ -1,10 +1,13 @@
-require_relative 'builder'
-
-require_relative 'channels/push'
-require_relative 'channels/email'
+require 'hey_you/helper'
+require 'hey_you/builder'
+require 'hey_you/channels/push'
+require 'hey_you/channels/email'
 
 module HeyYou
   class Sender
+    include HeyYou::Helper
+    extend HeyYou::Helper
+
     class << self
       # Send notifications for receiver
       #
@@ -41,13 +44,14 @@ module HeyYou
         builder = Builder.new(notification_key, options)
         response = {}
         config.registered_channels.each do |ch|
-          if channel_allowed?(ch, receive_info, builder, options)
+          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.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, {}) || {}
             response[ch] = Channels.const_get(ch.to_s.capitalize).send!(
-              builder, to: receive_info[ch][:subject], **receive_info[ch][:options]
+              builder, to: receive_info[ch][:subject], **receive_options
             )
           else
             config.log("Channel #{ch} not allowed.")
@@ -59,9 +63,8 @@ module HeyYou
       private
 
       def channel_allowed?(ch, to, builder, **options)
-        unless to[ch].is_a?(Hash) ? to[ch.to_sym][:subject] || to[ch.to_s][:subject] : to[ch.to_sym] || to[ch.to_s]
-          return false
-        end
+        condition = to[ch].is_a?(Hash) ? to[ch.to_sym][:subject] || to[ch.to_s][:subject] : to[ch.to_sym] || to[ch.to_s]
+        return false unless condition
         channel_allowed_by_only?(ch, options[:only]) && !builder.send(ch).nil?
       end
 
@@ -74,10 +77,6 @@ module HeyYou
         return only.map(&:to_sym).include?(ch.to_sym) if only.is_a?(Array)
         only.to_sym == ch.to_sym
       end
-
-      def config
-        Config.config
-      end
     end
 
     class NotRegisteredReceiver < StandardError; end

data/lib/hey_you/version.rb

@@ -1,3 +1,3 @@
 module HeyYou
-  VERSION = "0.1.7"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.2.1
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcm
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -137,8 +138,13 @@ files:
 - lib/hey_you/channels/push.rb
 - lib/hey_you/config.rb
 - lib/hey_you/config/conigurable.rb
+- lib/hey_you/config/data_source.rb
 - lib/hey_you/config/email.rb
 - lib/hey_you/config/push.rb
+- lib/hey_you/data_source/_base.rb
+- lib/hey_you/data_source/hash.rb
+- lib/hey_you/data_source/yaml.rb
+- lib/hey_you/helper.rb
 - lib/hey_you/receiver.rb
 - lib/hey_you/sender.rb
 - lib/hey_you/version.rb
@@ -160,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Send multichannel notification with one command.