hertz-fcm 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 859e232d238d12c21c1911f615d789e9bc036a9f02b18660a5aa0182428ff0fb
-  data.tar.gz: f92fc84be1f2591116651996780179e91cbaeb318faf80a557e236c2cb0704ee
+  metadata.gz: 4e3ef88d00fea84a7810a4dc447cf178e974b9a7d3029ae892bf75fc8f0d5a68
+  data.tar.gz: 6990becdaea4e7b545ecf1acd7a7c5333946d0c695efbb78069a9db40207a363
 SHA512:
-  metadata.gz: 3976f3512e83746eae546c59900d770ac02be3c190c07626ac13cf3551cbff7ba47c49f92926dfefd993da3ad07d66144656969e7347ee14b25b751946ede6c6
-  data.tar.gz: efb3813adf10419a4424196a8f53df9f06629eb9db139fec89b2376b328f39ec3db5ea7b8b46d4e61b1b2769b32cc3d2bfef73b6b75f38d122031efffd0f57e0
+  metadata.gz: 521ebd821c8f7b24083f7a6374b5deaee9eee2ce413ee6379f1c9f5eb3f03a897f3248727a5e30bc8c6b88dda39e369651291818cd4f692e7f183329003825ad
+  data.tar.gz: 17180a9f0c8517d9ca942b8d4a8b11259451d50b4c2bd43769cec740075786120ebcb694a67a3521595244ade2ea33cd07cb300fb8ed1892e0b93054e9ade820

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    hertz-fcm (1.0.1)
-      fcm (>= 0.0.2, < 1)
+    hertz-fcm (1.1.0)
+      firebase_cloud_messenger (>= 0.4.0, < 1)
       hertz (~> 2.0)
       rails (>= 4.0.0, < 6)
 
@@ -50,6 +50,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
@@ -69,40 +71,54 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    fcm (0.0.2)
-      httparty
-      json
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
+    firebase_cloud_messenger (0.4.0)
+      googleauth (~> 0.6)
+      json-schema (~> 2.8)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    googleauth (0.6.6)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
     hertz (2.0.0)
       rails (>= 4.0.0, < 6.0.0)
-    httparty (0.16.2)
-      multi_xml (>= 0.5.2)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     json (2.1.0)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    jwt (2.1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    memoist (0.16.0)
     method_source (0.9.0)
     mimemagic (0.3.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_xml (0.6.0)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    os (1.0.0)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
     pg (1.1.3)
     powerpack (0.1.2)
+    public_suffix (3.0.3)
     rack (2.0.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -163,6 +179,11 @@ GEM
     rubocop-rspec (1.29.1)
       rubocop (>= 0.58.0)
     ruby-progressbar (1.10.0)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)

data/app/services/push_notification_sender.rb

@@ -15,10 +15,9 @@ class PushNotificationSender
     return if notification.delivered_with?(:fcm)
     return unless REQUIRED_KEYS.all? { |key| notification.respond_to?(key) }
 
-    fcm_client.send(
-      notification.receiver.device_ids,
-      options
-    )
+    notification.receiver.device_ids.each do |device_id|
+      fcm_client.send(message: message(device_id))
+    end
 
     notification.mark_delivered_with(:fcm)
   end
@@ -26,19 +25,30 @@ class PushNotificationSender
   private
 
   def fcm_client
-    @fcm_client ||= ::FCM.new(
-      Hertz::Fcm.server_key
-    )
+    @fcm_client ||= FirebaseCloudMessenger
   end
 
   def keys
     REQUIRED_KEYS + OPTIONAL_KEYS.select { |key| notification.respond_to?(key) }
   end
 
-  def options
+  def message(token)
     {
-      notification: keys.map { |key| [key, notification.send(key)] }.to_h,
-      data: notification.send(:data)
+      data: keys.map { |key| [key, notification.send(key)] }.to_h
+                .merge!(notification.send(:data)),
+      apns: {
+        payload: {
+          aps: {
+            alert: {
+              title: notification.send(:title),
+              body: notification.send(:body)
+            },
+            sound: notification.send(:sound),
+            category: notification.send(:click_action)
+          }
+        }
+      },
+      token: token
     }
   end
 end

data/hertz-fcm.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'fcm', '>= 0.0.2', '< 1'
+  spec.add_dependency 'firebase_cloud_messenger', '>= 0.4.0', '< 1'
   spec.add_dependency 'hertz', '~> 2.0'
   spec.add_dependency 'rails', '>= 4.0.0', '< 6'
 

data/lib/generators/hertz/fcm/templates/initializer.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Hertz::Fcm.configure do |config|
-  # Your Firebase Cloud Messaging server key.
-  config.server_key = 'my_server_key'
+  # Your Firebase Cloud Messaging configuration.
+  config.project_id = 'project_id'
+  config.google_private_key = 'private_key'
+  config.google_client_email = 'email'
 end

data/lib/hertz/fcm/version.rb

@@ -2,6 +2,6 @@
 
 module Hertz
   module Fcm
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/lib/hertz/fcm.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fcm'
+require 'firebase_cloud_messenger'
 require 'hertz'
 
 require 'hertz/fcm/engine'
@@ -8,11 +8,15 @@ require 'hertz/fcm/version'
 
 module Hertz
   module Fcm
-    mattr_accessor :server_key
+    mattr_accessor :project_id, :google_private_key, :google_client_email
 
     class << self
       def configure
         yield(self)
+
+        FirebaseCloudMessenger.project_id = project_id
+        ENV['GOOGLE_PRIVATE_KEY'] = google_private_key
+        ENV['GOOGLE_CLIENT_EMAIL'] = google_client_email
       end
 
       def deliver_notification(notification)

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: hertz-fcm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Igor Petkovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fcm
+  name: firebase_cloud_messenger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'