fcmpush 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3714d506bf65564e121b6fd6bb0506fae7d66073c025706c0df7f76cf344e844
-  data.tar.gz: 420f914249d68ec2c79acffa75134b670de15c3e7ed1b6e37f6d15647c5a7ff9
+  metadata.gz: 1d98bbee5a1f8daeb92bc80eb99e47900fbdb1dd1b02f94ccf336438acca4309
+  data.tar.gz: e0c867579f0b8a9f36bdb1072eac2260c402ca1bb9a7651f991c039d453d6f90
 SHA512:
-  metadata.gz: 1f539713154ab861b9a4d52ebfaec315ccd7ea4e927629620e8efb3efa7d7a6af1f49b103d20f72c5abb72fd1cb5c1921b01dd4af8566940d4dd082c543c2eee
-  data.tar.gz: b37505f28fff5fa3debc9449c9ba1cdbb3ab8f836d9a2202744b5a75e18a51e82d40c9467fc9214b7f8f05a8b4429d1be9f625eb4dc453863dcbc591145975ef
+  metadata.gz: 6955bdd01edff13812527e4c3b0e559d8fbf50d264ef27ac9f7bfb86cf9aa7b37e99ab05f6a7d3e4086c0a8ae13a91bd0198ac44d3ce4d2f3d1dcc6b38c56e64
+  data.tar.gz: 0ad35b0fcf345715f4a6bc307a14f087961315803c0916e0032115cde3b8c3659fe18c108e22d822e2b4be9dbee41e6f9d1cd8a8804f76b370e6682881a2f4cf

data/fcmpush.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6', '< 3.3'
+  spec.required_ruby_version = '>= 2.6', '< 3.4'
 
   spec.add_dependency 'google-apis-identitytoolkit_v3'
   spec.add_dependency 'net-http-persistent', '~> 4.0.1'

data/lib/fcmpush/client.rb

@@ -25,6 +25,20 @@ module Fcmpush
       @access_token_expiry = Time.now.utc + access_token_response['expires_in']
       @server_key = configuration.server_key
       @connection = Net::HTTP::Persistent.new
+
+      if !configuration.proxy
+        # do nothing
+      elsif configuration.proxy == :ENV
+        @connection.proxy = :ENV
+      elsif configuration.proxy && configuration.proxy[:uri]
+        uri = URI(configuration.proxy[:uri])
+        # user name must not be a empty string, password can
+        if configuration.proxy[:user] && configuration.proxy[:user].strip != ''
+          uri.user = configuration.proxy[:user]
+          uri.password = configuration.proxy[:password] if configuration.proxy[:password]
+        end
+        @connection.proxy = uri
+      end
     end
 
     def v1_authorize
@@ -122,12 +136,12 @@ module Fcmpush
       def legacy_authorized_header(headers)
         headers.merge('Content-Type' => 'application/json',
                       'Accept' => 'application/json',
-                      'Authorization' => "Bearer key=#{server_key}")
+                      'Authorization' => "Bearer #{server_key}")
       end
 
       def exception_handler(response)
         error = STATUS_TO_EXCEPTION_MAPPING[response.code]
-        raise error.new("Receieved an error response #{response.code} #{error.to_s.split('::').last}: #{response.body}", response) if error
+        raise error.new("Received an error response #{response.code} #{error.to_s.split('::').last}: #{response.body}", response) if error
 
         response
       end

data/lib/fcmpush/configuration.rb

@@ -1,6 +1,6 @@
 module Fcmpush
   class Configuration
-    attr_accessor :scope, :json_key_io, :server_key
+    attr_accessor :scope, :json_key_io, :server_key, :proxy
 
     def initialize
       @scope = ['https://www.googleapis.com/auth/firebase.messaging']
@@ -16,6 +16,12 @@ module Fcmpush
 
       # regacy auth
       @server_key = ENV['FCM_SERVER_KEY']
+
+      # THIS IS EXPERIMENTAL
+      # NOT support `HTTPS_PROXY` environment variable. This feature not tested well on CI.
+      # cf. https://github.com/miyataka/fcmpush/pull/39#issuecomment-1722533622
+      # proxy
+      @proxy = :ENV
     end
   end
 end

data/lib/fcmpush/version.rb

@@ -1,3 +1,3 @@
 module Fcmpush
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcmpush
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - miyataka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-identitytoolkit_v3
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="