unotifier 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed6bbfeff3bef2d52c7595a47b48858fc22e09e212ddebce377a2330140936c
-  data.tar.gz: 875927c0296145d3b1c3a0ac2da3c2db85173efd2784607993abb2a7fac9456f
+  metadata.gz: 7e36c94a2ad43b15907fd815bdd1cbcf1ac57ccbaa74669a0679c047cad57cd7
+  data.tar.gz: 1f8b421d296c6cecd822a0dffa3570d7da90258e01ba1e8d17d8a01575c3a40e
 SHA512:
-  metadata.gz: 6ae210ee39d61e74bad88908a5e9f662f73b73356c5607e80c6869da4f8c82339526887f8411b368c1cc831af4fd4f77965353ad71176628b9b8f88be9fee235
-  data.tar.gz: 2949be7620780143fbcdbb04957dc70fdfcf63bb37bfb09b84d5cf1b69e7e367a29df3488eb258dc4827ed811d4bf69019633f85e3831ff8b38ae2cb582b78b6
+  metadata.gz: 849372e46b95eabf123e16a3be07a61b9b99842defaad61779294df947a89a09ee57b902efe1aab3f1af6e7d6a2b35a8251b25808b517de3cd56639db2ec8ab5
+  data.tar.gz: cac003f129456229908890a3bb42e8a0b29910ad7e2f36933c8ff64997d8c09fc9ff6170103f8c20da5944d56328879fe8b723966181a737179dc8b982bca399

data/Gemfile.lock

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

data/README.md

@@ -1,7 +1,5 @@
 # UNotifier
 
-[![Build Status](https://travis-ci.com/mgpnd/unotifier.svg?branch=master)](https://travis-ci.com/mgpnd/unotifier)
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -37,7 +35,7 @@ To store your notifications in database UNotifier uses provided ActiveRecord mod
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/mgpnd/unotifier.
+Bug reports and pull requests are welcome on GitLab at https://gitlab.com/hodlhodl/unotifier.
 
 ## License
 

data/lib/settings.rb

@@ -13,18 +13,37 @@ module UNotifier
           (value.has_key?("target") && value["target"].values.any? { |subvalue| customizable?(subvalue) })
         end
 
-        [key, filtered.keys]
-      end.to_h.select { |_, subkeys| subkeys.any?  }
+        filtered = filtered.each_with_object({}) do |(subkey, value), out|
+          out[subkey] = value["urgency"] ||
+                        value["target"]
+                          .select { |_, subvalue| customizable?(subvalue) }
+                          .map { |_, subvalue| subvalue["urgency"] }
+                          .first
+        end
+
+        [key, filtered]
+      end.to_h.select { |_, subkeys| !subkeys.empty?  }
     end
 
     def self.keys_from(config)
       flatten_keys filter_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
+      end
+    end
+
     private
 
     def self.flatten_keys(keys)
-      keys.map { |key, subkeys| subkeys.map { |s| "#{key}.#{s}" } }.flatten
+      keys.map do |key, subkeys|
+        subkeys.map do |subkey, urgency|
+          { "#{key}.#{subkey}" => urgency }
+        end
+      end.flatten.reduce({}, :merge)
     end
   end
 end

data/lib/unotifier/version.rb

@@ -1,3 +1,3 @@
 module UNotifier
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/unotifier.rb

@@ -100,9 +100,11 @@ module UNotifier
   def self.notification_settings_for(target)
     user_settings = target.notification_settings
     Settings
-      .keys_from(notifications_config)
-      .each_with_object({}) do |key, settings|
-        settings[key] = user_settings[key] || Settings::DEFAULT_URGENCY
+      .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
       end
   end
 

data/unotifier.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.email         = ["stillintop@gmail.com"]
 
   spec.summary       = "Ultimate user notification tool for web apps"
-  spec.homepage      = "https://github.com/mgpnd/unotifier"
+  spec.homepage      = "https://gitlab.com/hodlhodl/unotifier"
   spec.license       = "MIT"
 
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["sourc_code_uri"] = "https://github.com/mgpnd/unotifier"
+    spec.metadata["sourc_code_uri"] = "https://gitlab.com/hodlhodl/unotifier"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -24,7 +24,7 @@ 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
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(%r{^(\.rspec|\.travis\.yml)}) }
+    `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) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unotifier
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Artem Rashev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,12 +124,12 @@ files:
 - lib/unotifier.rb
 - lib/unotifier/version.rb
 - unotifier.gemspec
-homepage: https://github.com/mgpnd/unotifier
+homepage: https://gitlab.com/hodlhodl/unotifier
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/mgpnd/unotifier
-  sourc_code_uri: https://github.com/mgpnd/unotifier
+  homepage_uri: https://gitlab.com/hodlhodl/unotifier
+  sourc_code_uri: https://gitlab.com/hodlhodl/unotifier
 post_install_message: 
 rdoc_options: []
 require_paths: