hey-you-fcm-push 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bffeca01ef07a68e7e23b6a8bd60b685223c00e33db1f6e3b153e509841fb8c
-  data.tar.gz: 562002a2673a27b9711f531b8ea3af2211b8f45fafaff5d23a9c1099e474d168
+  metadata.gz: 2c0257aa8ade1be78f29df6848c00715173d2ae5c78c970a2a09dc1e5e886b2a
+  data.tar.gz: b95b7df61da1e685c59f0053ec009d66c0a077ca17a2eb8b46248b8d280ac8c9
 SHA512:
-  metadata.gz: 831603025086b5b21fe8ee5d527394b59b8c9acc78ed132b718eb631ff501c61e9d086d815fd7914da17233eb6cdd187bda687350a031ffa13dafcf2a9675d48
-  data.tar.gz: 87adaa77047e75ff3ddee26c5e08abf9a681c9322ccaf49055d293323c12b823e166fe5395a13ec89aa02c09e6798050d9c9a79fec0bcb52c685caa26608b796
+  metadata.gz: 72eeb800201406306b2ab9364cfb1bdf4e60275af08ff74821d678f57d4e67b504202619bd3a8508ff6dc5ff5ecffafa267d618dbcdf29004859b6512d45f587
+  data.tar.gz: 2141a92b76a82232de92dfa2e313137458d222fc61f0ed1148ead0dbf428a0ef79d580879d7f46d845298794f3f01b4d46964172ff6ee64769b9bd9782d1d43a

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/README.md

@@ -1,5 +1,5 @@
 # Hey, You, FCM!
-[![Build Status](https://travis-ci.com/QNester/hey-you-fcm-push.svg?branch=master)](https://travis-ci.com/QNester/hey-you-fcm-push#)[![Gem Version](https://badge.fury.io/rb/hey-you-fcm-push.svg)](https://badge.fury.io/rb/hey-you-fcm-push)
+[![Build Status](https://travis-ci.com/QNester/hey-you-fcm-push.svg?branch=main)](https://travis-ci.com/QNester/hey-you-fcm-push#)[![Gem Version](https://badge.fury.io/rb/hey-you-fcm-push.svg)](https://badge.fury.io/rb/hey-you-fcm-push)
 
 Send fcm pushes via [hey-you gem](https://github.com/QNester/hey-you) using [google fcm protocol](https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages/send)
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "hey_you_fcm_push"
+require "hey-you-fcm-push"
 
 # 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.

data/hey-you-fcm-push.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "hey-you", '~> 1.4'
-  spec.add_runtime_dependency "googleauth", '~> 0.10.0'
-  spec.add_runtime_dependency "httparty", '~> 0.18.0'
+  spec.add_runtime_dependency "hey-you", '>= 1.4.2'
+  spec.add_runtime_dependency "googleauth", '~> 0.14'
+  spec.add_runtime_dependency "httparty", '~> 0.18'
+  spec.add_runtime_dependency "activesupport", '>= 5'
 
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/hey_you/builder/fcm_push.rb

@@ -1,4 +1,5 @@
 require 'hey_you_fcm_push/message_object'
+require 'active_support/core_ext/object/deep_dup'
 
 module HeyYou
   class Builder
@@ -12,15 +13,17 @@ module HeyYou
         @condition = ch_data.fetch('condition', nil)
         @name = ch_data.fetch('name', nil)
 
-        @notification = interpolate_notification(ch_data.fetch('notification', nil))
+        @notification = interpolate_notification(ch_data.fetch('notification', nil)&.deep_dup)
 
-        @android = interpolate_notification(ch_data.fetch('android', nil))
-        @webpush = interpolate_notification(ch_data.fetch('webpush', nil))
-        @apns = interpolate_notification(ch_data.fetch('apns', nil))
-        @fcm_options = interpolate_notification(ch_data.fetch('fcm_options', nil))
-        @push_data = ch_data.fetch('push_data', nil)
+        @android = interpolate_notification(ch_data.fetch('android', nil)&.deep_dup)
+        @webpush = interpolate_notification(ch_data.fetch('webpush', nil)&.deep_dup)
+        @apns = interpolate_notification(ch_data.fetch('apns', nil)&.deep_dup)
+        @fcm_options = interpolate_notification(ch_data.fetch('fcm_options', nil)&.deep_dup)
+        @push_data = ch_data.fetch('push_data', nil)&.deep_dup
       end
 
+      private
+
       def interpolate_notification(data)
         return unless data
 

data/lib/hey_you/channels/fcm_push.rb

@@ -10,6 +10,7 @@ module HeyYou
         # @param [HeyYou::Builder] builder - builder with notifications texts and settings
         # @option [String] name - Output Only. The identifier of the message sent
         # @option [String] token - Registration token to send a message to.
+        # @option [String] to - Alias for `token`. `token` in high priority.
         # @option [String] topic - Topic name to send a message to, e.g. "weather".
         # @option [String] condition - Condition to send a message to, e.g. "'foo' in topics && 'bar' in topics".
         # @option [Hash] notification - Basic notification template to use across all platforms.
@@ -19,12 +20,24 @@ module HeyYou
         # @option [Hash] fcm_options - Platform independent options for features provided by the FCM SDKs.
         # @option [Hash] push_data - Input only. Arbitrary key/value payload. The key should not be a reserved word ("from", "message_type", or any word starting with "google" or "gcm").
         #
-        # @return [Hash] - FCM response
+        # @return [Array{Hash}] - FCM responses
         #
         # @see: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#resource:-message
         def send!(builder, **options)
-          message = build_message(builder, **options)
-          HeyYouFcmPush::Connection.instance.send_notification(message, validate_only: options[:validate_only])
+          options[:token] ||= options[:to]
+
+          if options[:token].is_a?(Array)
+            messages = options[:token].map { |token| build_message(builder, **options.merge(token: token)) }
+          end
+
+          messages ||= [build_message(builder, **options)]
+
+          messages.map do |message|
+            {
+              receiver: message.receiver_hash,
+              response: HeyYouFcmPush::Connection.instance.send_notification(message.to_h, validate_only: options[:validate_only])
+            }
+          end
         end
 
         private
@@ -41,7 +54,7 @@ module HeyYou
             apns: options[:apns] || builder.fcm_push.apns,
             fcm_options: options[:fcm_options]|| builder.fcm_push.fcm_options,
             data: options[:push_data] || builder.fcm_push.push_data
-          ).to_h
+          )
         end
       end
     end

data/lib/hey_you_fcm_push/connection.rb

@@ -10,7 +10,7 @@ module HeyYouFcmPush
     RETRY_COUNT = 1
     HTTP_CODES = {
       not_auth: 401,
-      success: 200
+      server_error: 500
     }
 
     attr_reader :authorization, :options, :project_id, :uri
@@ -44,13 +44,15 @@ module HeyYouFcmPush
     private
 
     def make_request(request_options)
+      HeyYou::Config.instance.logger&.debug("Send request to #{uri} with options #{request_options}")
       response = HTTParty.post(uri, request_options)
+      HeyYou::Config.instance.logger&.debug("Response: #{response}")
       process_response(response)
     end
 
     def process_response(response)
       raise AuthError if response.code == HTTP_CODES[:not_auth]
-      return response.to_hash if response.code == HTTP_CODES[:success]
+      return response.to_hash if response.code <= HTTP_CODES[:server_error]
 
       raise ResponseError, "response code: #{response.code}"
     end

data/lib/hey_you_fcm_push/version.rb

@@ -1,3 +1,3 @@
 module HeyYouFcmPush
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: hey-you-fcm-push
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hey-you
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +135,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Makefile
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,89 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hey-you-fcm-push (0.1.0)
-      googleauth (~> 0.10.0)
-      hey-you (~> 1.4)
-      httparty (~> 0.18.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    diff-lcs (1.4.4)
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
-    fcm (0.0.6)
-      httparty (~> 0.10, >= 0.10.0)
-    ffaker (2.17.0)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.12)
-    hashdiff (1.0.1)
-    hey-you (1.4.0)
-      fcm (~> 0.0.2)
-      i18n (~> 1.0)
-      mail (~> 2.7)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    memoist (0.16.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mini_mime (1.0.2)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    os (1.1.1)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    webmock (3.11.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug
-  ffaker (~> 2.15)
-  hey-you-fcm-push!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  webmock (~> 3.4)
-
-BUNDLED WITH
-   2.1.4