unotifier 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828e3ced7eb245219ec46c4460658554399522dd3224994b73f325f5ac824b22
-  data.tar.gz: 29ede3c4f8a0d673088be8372b22aa45df78c275306d629531c95c7fac7233a2
+  metadata.gz: 8f1f5e629d8d72498909aa0362e3731b5e1fa8ca2f80db9d0fae1625ff015239
+  data.tar.gz: c1965f64e2948c7a9e654d6dd5a7426ee4059bd0a87f98f18ccad02cc50f2011
 SHA512:
-  metadata.gz: f82c08b892b61a740c7e28110f3a780fe7db32dd4a463306822e9319d2a407c39923b25e8aae12ea647e4699b1e3dd2a3381ce8b28245bbd7a89be69218b3a3a
-  data.tar.gz: 678f461b2a396118ce9476e4e8a3eb5c59c67c894d3c3d05db6a36058a5bce7dd9e181a26f1dce786d868db7e02f065ab1c3a9adbb541ae70fc232604ce6c56b
+  metadata.gz: cfd76b2dd66a398b8dc75fe85971ee14f716c2df8e9abf0d05d2f1786a9bc583a8e615bea830a168103b8f88934a883ee725a3a283aab028b93efd0c585802f0
+  data.tar.gz: 61bbd5b17d968f46efd3685f7d12e6a21ed771c11b24f6ee1ab1c44aabbedfd01eeebf5b04ed9e85fc7c3d71bbe156fa24f97ae777041c715b53fcb10678328d

data/Gemfile.lock

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

data/lib/provider/system/action_cable.rb

@@ -16,6 +16,10 @@ module UNotifier
 
           server.broadcast channel_name.call(notification), data
         end
+
+        def sensitive?
+          false
+        end
       end
     end
   end

data/lib/provider/user/action_cable.rb

@@ -18,6 +18,10 @@ module UNotifier
           server.broadcast channel_name.call(notification), serialize_notification(notification)
         end
 
+        def sensitive?
+          false
+        end
+
         def serialize_notification(notification)
           {
             id: notification.id,

data/lib/provider/user/action_mailer.rb

@@ -20,6 +20,10 @@ module UNotifier
 
           @mailer.public_send(sending_method, notification).deliver
         end
+
+        def sensitive?
+          true
+        end
       end
     end
   end

data/lib/unotifier.rb

@@ -94,8 +94,8 @@ module UNotifier
 
     notification.save!
 
-    UserNotifier.notify_user(notification, params)
-    SystemNotifier.notify_system(notification, params[:system])
+    UserNotifier.call(notification, params)
+    SystemNotifier.call(notification, params[:system])
   end
 
   def self.notify_onsite(key, target, params)
@@ -120,6 +120,11 @@ module UNotifier
             end
           end
       end
+      .merge("options" => user_settings["options"])
+  end
+
+  def self.hide_sensitive_for?(target)
+    !!target.notification_settings.dig("options", "hide_sensitive")
   end
 
   def self.urgency_for(key, params = {})

data/lib/unotifier/system_notifier.rb

@@ -1,6 +1,6 @@
 module UNotifier
   module SystemNotifier
-    def self.notify_system(notification, params = {})
+    def self.call(notification, params = {})
       key = notification.key
       config = UNotifier.load_notification!(key)
       return if config["system"].nil?

data/lib/unotifier/user_notifier.rb

@@ -1,52 +1,53 @@
 module UNotifier
   module UserNotifier
-    def self.notify_user(notification, params = {})
-      locale_key = UNotifier.locale_key_for(notification.key, params)
+    def self.call(notification, params = {})
+      config = UNotifier.load_notification!(notification.key)["user"]
+      user_settings = _load_user_settings(notification)
+      providers = _load_providers(notification, user_settings, params)
 
-      user_settings =
-        notification.target.notification_settings.is_a?(Hash) &&
-        notification.target.notification_settings.dig("user", notification.key)
-      user_settings ||= Settings::DEFAULT_URGENCY
+      # By default we assume that notification is sensitive
+      is_sensitive = !config.has_key?("sensitive") || config["sensitive"]
 
-      notify_with = []
+      providers.each do |provider|
+        is_private = is_sensitive &&
+                     provider.sensitive? &&
+                     UNotifier.hide_sensitive_for?(notification.target)
 
-      if !params[:external_only] && notify_onsite?(notification, user_settings)
-        notify_with += UNotifier.configuration.site_providers
-      end
+        if is_private
+          notification.title = _translate(provider, notification, "title_private", params)
+          notification.body = ""
+        else
+          notification.title = _translate(provider, notification, "title", params)
+          notification.body = _translate(provider, notification, "body", params)
+        end
 
-      if !params[:onsite_only] && notify_external?(notification, user_settings)
-        notify_with += UNotifier.configuration.external_providers
+        provider.notify(notification)
       end
+    end
 
-      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"
+    def self._load_providers(notification, user_settings, params)
+      providers = []
 
-        if UNotifier.configuration.localization_provider.exists?(title_provider_key)
-          notification.title =
-            UNotifier.configuration.localization_provider.t(
-              title_provider_key, params.merge(locale: notification.target.locale)
-            )
-        end
-
-        if UNotifier.configuration.localization_provider.exists?(body_provider_key)
-          notification.body =
-            UNotifier.configuration.localization_provider.t(
-              body_provider_key, params.merge(locale: notification.target.locale, default: "")
-            )
-        end
+      if !params[:external_only] && _notify_onsite?(notification, user_settings)
+        providers += UNotifier.configuration.site_providers
+      end
 
-        provider.notify(notification)
+      if !params[:onsite_only] && _notify_external?(notification, user_settings)
+        providers += UNotifier.configuration.external_providers
       end
-    end
 
-    def self.notify_onsite?(notification, user_settings)
-      return false if notification.urgency == "optional" && user_settings == "off"
+      providers
+    end
 
-      notification.target.online?
+    def self._load_user_settings(notification)
+      (
+        notification.target.notification_settings.is_a?(Hash) &&
+        notification.target.notification_settings.dig("user", notification.key)
+      ) ||
+        Settings::DEFAULT_URGENCY
     end
 
-    def self.notify_external?(notification, user_settings)
+    def self._notify_external?(notification, user_settings)
       case notification.urgency
       when "immediate"
         true
@@ -58,5 +59,30 @@ module UNotifier
         false
       end
     end
+
+    def self._notify_onsite?(notification, user_settings)
+      return false if notification.urgency == "optional" && user_settings == "off"
+
+      notification.target.online?
+    end
+
+    def self._translate(provider, notification, part, params)
+      locale_key = UNotifier.locale_key_for(notification.key, params)
+      locale_provider = UNotifier.configuration.localization_provider
+
+      plain_key = "#{locale_key}.#{part}"
+      provider_key = "#{locale_key}.#{provider.class.to_s.split("::").last}.#{part}"
+
+      key =
+        if locale_provider.exists?(provider_key)
+          provider_key
+        elsif locale_provider.exists?(plain_key)
+          plain_key
+        else
+          "notifications.default.#{part}"
+        end
+
+      locale_provider.t(key, params.merge(locale: notification.target.locale))
+    end
   end
 end

data/lib/unotifier/version.rb

@@ -1,3 +1,3 @@
 module UNotifier
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unotifier
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - mgpnd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler