hey-you-fcm-push 0.1.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5106b508a9c987afbfb4597e104b975ce8cda559d255beb39955302352e76fa8
-  data.tar.gz: '085dc0e137957caa88c8e1678321b6f4307f6e7a4f3c07737764c7b496edd8d0'
+  metadata.gz: 9bab78f013de7f0d692033399b68f54e247a4419222ea6f588cf985dc5f295df
+  data.tar.gz: 481bdaa3790aa6a3ca84eb70d465967712939b3fc21512b99544a757e3ac14b0
 SHA512:
-  metadata.gz: 0dab0074971c66c4b6b69778e5f6488b34481ebbfb7b98099cc7fc4af77e91fa7a6dc9f42103d5896d7b92efca67ad0e4d9edafa5ee12fc84ad49cadcf119ed1
-  data.tar.gz: 1bdc0ecddf136907f145334ce58095dac3134ef486472e4ae55c34af26fdf44d830c613abf2c9e24ef2218266b6e517f2b8a7e9002488fb497e7e7018ddaa857
+  metadata.gz: 5451884e942afbf123af82cf6734ba8d7c4a34b461a9934bd903c72ea371a8a60cb5fd87476695be6ed29f312274ff9282f08550b19fdd1543b255fa1bb9a47b
+  data.tar.gz: ed7db9bf947e41d1fe84dc1f75a767c0cc857a46e8b6e37445fcd58d05d7e4c7304ac24672c26aa9275c482b05308608485f23388fd2b3081a2fde7af610516f

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 "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/config/fcm_push.rb

@@ -6,11 +6,11 @@ class HeyYou::Config::FcmPush
   REQUIRED_CONFIGS = %i[credentials_file project_id]
 
   def credentials_file=(filepath)
-    @credentials_file = filepath
-    ENV[Google::Auth::CredentialsLoader::ENV_VAR] = credentials_file
+    ENV[Google::Auth::CredentialsLoader::ENV_VAR] = filepath
   end
 
   def validate_config
+    @credentials_file = ENV[Google::Auth::CredentialsLoader::ENV_VAR]
     return if REQUIRED_CONFIGS.all? { |conf| send(conf) }
 
     raise(

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/message_object.rb

@@ -34,7 +34,7 @@ module HeyYouFcmPush
       @web_push_config = WebPushConfig.new(options[:webpush].transform_keys(&:to_sym)) if options[:web_push_config]
       @apns_config = ApnsConfig.new(options[:apns].transform_keys(&:to_sym)) if options[:apns_config]
       @fcm_options = FcmOptions.new(**options[:fcm_options].transform_keys(&:to_sym)) if options[:fcm_options]
-      @push_data = options[:data]
+      @push_data = { data: options[:data].to_json }
     end
 
     def to_h

data/lib/hey_you_fcm_push/version.rb

@@ -1,3 +1,3 @@
 module HeyYouFcmPush
-  VERSION = "0.1.2"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey-you-fcm-push
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hey-you
@@ -16,14 +16,14 @@ dependencies:
     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
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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