unotifier 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaa686f0cd41483a94d0746b9538177adae345674774b7e7798cb507c9c2b61c
-  data.tar.gz: 5e61daf30bfe7dbbdd62a0edb5f2cad5c2383e5ad3dc83482ad1cec0b61781c1
+  metadata.gz: 8a81b0764d3f887d08ea60520f2905dc87582adb3ac6c7dd80a5b9b1008fd3f1
+  data.tar.gz: 0e1172c73283881a6e8a08c3006e2c28a4686f4a20631df6c0d759fcecf8aa35
 SHA512:
-  metadata.gz: 21fc2a10954d1a2c5e0fa1d6ae7eafc9ad199d02ec634b850c90393604669b5ee63e0d617985859507ed1eaf8787cbc1db227b7791e698308d8142d7b02d476a
-  data.tar.gz: e96f359477dde1299d359a646b0efda3c40fba6a42c546e4dc1758e7df8bd39f663b4a89f5b61778678130ba9ba0d349ea1ccd430de22fceda4f317729b6a167
+  metadata.gz: 0023a587bb451a35ee378fb14e00c3ec1a10b043c5160282aa2a404433cf9873adfaa850412d883d40903b44733e5c5415a3f44bfa5308ccae1c2f6578c09264
+  data.tar.gz: ea88fe2e2a0da27ed8967ad2d08de4e775afd5e1233516e65b81fe91b743a4f8a558ff06ae1dd5994b73dfa97cdfc5c08c4107e46693ca932854b1b0712a9190

data/Gemfile.lock

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

data/lib/settings.rb

@@ -12,7 +12,7 @@ module UNotifier
       )
     end
 
-    def self.filter_customizable(config)
+    def self.filter_user_customizable(config)
       customizable = config.map do |key, subkeys|
         filtered =
           subkeys
@@ -33,14 +33,37 @@ module UNotifier
       customizable.to_h.reject { |_, subkeys| subkeys.empty? }
     end
 
+    def self.filter_system_customizable(config)
+      customizable = config.map do |key, subkeys|
+        filtered =
+          subkeys
+          .select { |_, value| value.key?("system") }
+          .map { |subkey, value| [subkey, value["system"]] }
+          .select { |_, value| value["urgency"] == "regular" }
+          .each_with_object({}) do |(subkey, value), out|
+            out[subkey] = value["urgency"]
+          end
+
+        [key, filtered]
+      end
+
+      customizable.to_h.reject { |_, subkeys| subkeys.empty? }
+    end
+
     def self.keys_from(config)
-      flatten_keys filter_customizable(config)
+      {
+        "user" => flatten_keys(filter_user_customizable(config)),
+        "system" => flatten_keys(filter_system_customizable(config)),
+      }
     end
 
     def self.grouped_by_urgency_keys_from(config)
-      keys_from(config).each_with_object({}) do |(key, urgency), out|
-        out[urgency] ||= []
-        out[urgency] << key
+      keys_from(config).each_with_object({}) do |(channel, keys), obj|
+        obj[channel] =
+          keys.each_with_object({}) do |(key, urgency), out|
+            out[urgency] ||= []
+            out[urgency] << key
+          end
       end
     end
 

data/lib/unotifier.rb

@@ -110,10 +110,15 @@ module UNotifier
     user_settings = target.notification_settings
     Settings
       .grouped_by_urgency_keys_from(notifications_config)
-      .each_with_object({}) do |(urgency, keys), settings|
-        settings[urgency] = keys.each_with_object({}) do |(key, _), out|
-          out[key] = user_settings[key] || Settings::DEFAULT_URGENCY
-        end
+      .each_with_object({}) do |(level, grouped_keys), obj|
+        obj[level] =
+          grouped_keys.each_with_object({}) do |(urgency, keys), settings|
+            settings[urgency] = keys.each_with_object({}) do |(key, _), out|
+              out[key] =
+                user_settings.is_a?(Hash) && user_settings.dig(level, key) ||
+                Settings::DEFAULT_URGENCY
+            end
+          end
       end
   end
 

data/lib/unotifier/system_notifier.rb

@@ -8,6 +8,14 @@ module UNotifier
       # Raise only when we're sure that config has "system" block
       raise AttributeMissingError.new(key, "system") unless params
 
+      if config["system"]["urgency"] == "regular"
+        # Don't notify if user disabled the notification in settings
+        user_settings =
+          notification.target.notification_settings.is_a?(Hash) &&
+          notification.target.notification_settings.dig("system", notification.key)
+        return if user_settings == "off"
+      end
+
       data = config["system"]["keys"].each_with_object({}) do |(head, attributes), obj|
         head = head.to_sym
         attributes = attributes.map(&:to_sym)

data/lib/unotifier/user_notifier.rb

@@ -2,7 +2,10 @@ module UNotifier
   module UserNotifier
     def self.notify_user(notification, params = {})
       locale_key = UNotifier.locale_key_for(notification.key, params)
-      user_settings = notification.target.notification_settings[notification.key]
+
+      user_settings =
+        notification.target.notification_settings.is_a?(Hash) &&
+        notification.target.notification_settings.dig("user", notification.key)
       user_settings ||= Settings::DEFAULT_URGENCY
 
       notify_with = []

data/lib/unotifier/version.rb

@@ -1,3 +1,3 @@
 module UNotifier
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unotifier
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - mgpnd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,11 +97,7 @@ dependencies:
 description: 
 email:
 - stillintop@gmail.com
-executables:
-- console
-- rake
-- rspec
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,10 +108,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/rake
-- bin/rspec
-- bin/setup
 - lib/configuration.rb
 - lib/exceptions.rb
 - lib/hash.rb

data/bin/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "unotifier"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-require "pry"
-Pry.start(__FILE__)

data/bin/rake

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here