unotifier 0.2.3 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d0d6e9fbcd78989dedfe9692b6995501e6dda0dccfc46c01e8a0d013a568d4
-  data.tar.gz: bda785e4df5defce86a8741753825b5cfe2d0c8e0bfcdd1025fcb245892f74d9
+  metadata.gz: 5ec61a1237c2bdcf5f22b0f272805090d1a82f4e83dee871c3daa01bef627d5c
+  data.tar.gz: 8d0c39f00d10c01a8b452c2b1a29c7f995f144993e491102004f73f65488426e
 SHA512:
-  metadata.gz: 82eaf6528bd654344a4927624d694a824f1e2832a0a251b5e760d8a3f38bcafdab6978c18405499a8994c78a7defbfda64986105d45e8843a33f3594edd31a4a
-  data.tar.gz: 4f0d4e2f18c0d501334cc046fd501d4588e7dcf1578f44c5b8a11ae4232aeb89d14faf1381cf291e3eecd11798f293b6a17e1a2472498638a7391c1c9b7f0ed6
+  metadata.gz: 6d5bce4be79ee89ca014fdde94eb48ba55829dddefd86a8250d90e2c94ee244c49a70dcabf7fe8ff09b24d8e31c5cd92b2ef4dcb019fed6c4b8accbfda851f35
+  data.tar.gz: e087624c1ccfc08495ea06e2e8c53993c16f2c30f4fcfa017d51279da0f6f2a5bead5f7146d36c6543207edb1c41de155db8f3257d80498f1ac7643a22a8d07a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unotifier (0.2.3)
+    unotifier (0.2.10)
 
 GEM
   remote: https://rubygems.org/

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Artem Rashev
+Copyright (c) 2018
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -35,8 +35,4 @@ To store your notifications in database UNotifier uses provided ActiveRecord mod
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitLab at https://gitlab.com/hodlhodl/unotifier.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+Bug reports and pull requests are welcome on GitLab at https://gitlab.com/hodlhodl-public/unotifier.

data/lib/hash.rb

@@ -0,0 +1,6 @@
+class ::Hash
+  def deep_merge!(second)
+      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+      self.merge!(second.to_h, &merger)
+  end
+end

data/lib/provider/action_mailer.rb

@@ -9,7 +9,12 @@ module UNotifier
 
       def notify(notification)
         return unless can_notify?(notification)
-        @mailer.public_send(@sending_method, notification).deliver
+        sending_method = if @sending_method.kind_of?(Array)
+          @sending_method.map { |m| m.call(notification) }&.first
+        else
+          @sending_method
+        end
+        @mailer.public_send(sending_method, notification).deliver
       end
     end
   end

data/lib/unotifier/version.rb

@@ -1,3 +1,3 @@
 module UNotifier
-  VERSION = "0.2.3"
+  VERSION = "0.2.10"
 end

data/lib/unotifier.rb

@@ -1,5 +1,6 @@
 require "yaml"
 
+require_relative "hash"
 require_relative "unotifier/version"
 require_relative "exceptions"
 require_relative "provider"
@@ -20,7 +21,13 @@ module UNotifier
   end
 
   def self.notifications_config
-    @notifications_config ||= YAML.load_file(configuration.notifications_path)
+    @notifications_config ||= if configuration.notifications_path.kind_of?(Array)
+                                configuration.notifications_path.each_with_object({}) do |path, config|
+                                  config.deep_merge!(YAML.load_file(path))
+                                end
+                              else
+                                YAML.load_file(configuration.notifications_path)
+                              end
   rescue Errno::ENOENT
     raise NotificationsConfigNotFoundError.new(configuration.notifications_path)
   end
@@ -75,8 +82,8 @@ module UNotifier
     notification = configuration.resource_class.new(
       key: key,
       target: target,
-      title: configuration.localization_provider.t("#{locale_key}.title", params.merge(locale: target.locale, default: "")),
-      body: configuration.localization_provider.t("#{locale_key}.title", params.merge(locale: target.locale, default: "")),
+      title: configuration.localization_provider.t("#{locale_key}.title", params.merge(locale: target.locale)),
+      body: configuration.localization_provider.t("#{locale_key}.body", params.merge(locale: target.locale, default: "")),
       link: params[:link],
       autohide_delay: params[:autohide_delay],
       urgency: urgency
@@ -86,7 +93,13 @@ module UNotifier
     notify_with = []
     notify_with += configuration.site_providers if !params[:external_only] && notify_onsite?(notification, user_settings)
     notify_with += configuration.external_providers if !params[:onsite_only] && notify_external?(notification, user_settings)
-    notify_with.each { |p| p.notify(notification) }
+    notify_with.each do |provider|
+      title_provider_key = "#{locale_key}.#{provider.class.to_s.split("::").last}.title"
+      body_provider_key  = "#{locale_key}.#{provider.class.to_s.split("::").last}.body"
+      notification.title = configuration.localization_provider.t(title_provider_key, params.merge(locale: target.locale)) if configuration.localization_provider.exists?(title_provider_key)
+      notification.body  = configuration.localization_provider.t(body_provider_key, params.merge(locale: target.locale, default: "")) if configuration.localization_provider.exists?(body_provider_key)
+      provider.notify(notification)
+    end
   end
 
   def self.notify_onsite(key, target, params)

data/unotifier.gemspec

@@ -6,16 +6,18 @@ require "unotifier/version"
 Gem::Specification.new do |spec|
   spec.name          = "unotifier"
   spec.version       = UNotifier::VERSION
-  spec.authors       = ["Artem Rashev"]
+  spec.authors       = ["mgpnd"]
   spec.email         = ["stillintop@gmail.com"]
 
   spec.summary       = "Ultimate user notification tool for web apps"
-  spec.homepage      = "https://gitlab.com/hodlhodl/unotifier"
+  spec.homepage      = "https://gitlab.com/hodlhodl-public/unotifier"
   spec.license       = "MIT"
 
   if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["sourc_code_uri"] = "https://gitlab.com/hodlhodl/unotifier"
+    spec.metadata["sourc_code_uri"] = "https://gitlab.com/hodlhodl-public/unotifier"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -23,17 +25,18 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(%r{^\.rspec}) }
   end
+
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "i18n"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unotifier
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.10
 platform: ruby
 authors:
-- Artem Rashev
+- mgpnd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 
 email:
 - stillintop@gmail.com
@@ -117,6 +117,7 @@ files:
 - bin/setup
 - lib/configuration.rb
 - lib/exceptions.rb
+- lib/hash.rb
 - lib/provider.rb
 - lib/provider/action_cable.rb
 - lib/provider/action_mailer.rb
@@ -125,12 +126,13 @@ files:
 - lib/unotifier.rb
 - lib/unotifier/version.rb
 - unotifier.gemspec
-homepage: https://gitlab.com/hodlhodl/unotifier
+homepage: https://gitlab.com/hodlhodl-public/unotifier
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://gitlab.com/hodlhodl/unotifier
-  sourc_code_uri: https://gitlab.com/hodlhodl/unotifier
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://gitlab.com/hodlhodl-public/unotifier
+  sourc_code_uri: https://gitlab.com/hodlhodl-public/unotifier
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -146,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ultimate user notification tool for web apps