fcmpush 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 327bff9a6b09181d0051f314ba3fc9216c71ffc8
-  data.tar.gz: b2e7fcea6ba6f0af379309d6071faca78d20f482
+SHA256:
+  metadata.gz: aec3e5ccc93c7aa90c5a47c29c86666f97a4c64b6c4699b2343b954c6167d4f9
+  data.tar.gz: 30ca2b1ebae21c4d5b1719a74bf7b53c19caaf35c0af8cd9407a8a8fde5d174d
 SHA512:
-  metadata.gz: 828348d829eb7f3e18f351bbc33937ab4b5d7a767376ae27f6e2b46e2b0b38d9fa40d19323157f8ef1453f1f5b04ddda6f8c4bfe7025b6bf537f38452b85ae8c
-  data.tar.gz: c2801903d5651c554cb11e076cd3d0c71088f88be0671d2d06f2c6b5f6b9c6aa7b2f4a544cbcc7e90c3ab5bbe0fc0b5bb3f3bc423954a7855ebddd4cf966987f
+  metadata.gz: 35aa9a63da743fd31d7ef83b24846cd2dbaf69f0a35edccfd27aa5bfddaebe0da2e4e95e7e0600a799ab220f1953ef8c18fcd92765a5bebb8bc0abc58ec684b3
+  data.tar.gz: f367ae2d0a2807a22d6efc6e5241540c8f05e894ad47dcd58735809f45d07f5c347eb571e86dcd33b992e5aa801f9004f4d440cfd377735b8de6c750a75c9ce5

data/fcmpush.gemspec

@@ -22,12 +22,12 @@ 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.3', '< 2.8'
+  spec.required_ruby_version = '>= 2.4', '<= 3.0'
 
   spec.add_dependency 'googleauth', '>= 0.9.0'
-  spec.add_dependency 'net-http-persistent', '>= 3.1.0'
+  spec.add_dependency 'net-http-persistent', '~> 4.0.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/fcmpush/batch.rb

@@ -0,0 +1,37 @@
+module Fcmpush
+  module Batch
+    PART_BOUNDRY = '__END_OF_PART__'.freeze
+
+    def make_batch_payload(messages, headers)
+      uri = URI.join(domain, path)
+      subrequests = messages.map do |payload|
+        req = Net::HTTP::Post.new(uri, headers)
+        req.body = payload
+        req
+      end
+      subrequests.map.with_index { |req, idx| create_part(req, PART_BOUNDRY, idx) }.join + "--#{PART_BOUNDRY}\r\n"
+    end
+
+    def create_part(request, part_boundry, idx)
+      serialized_request = serialize_sub_request(request)
+      "--#{part_boundry}\r\n" \
+        "Content-Length: #{serialized_request.length}\r\n" \
+        "Content-Type: application/http\r\n" \
+        "Content-Id: #{idx + 1}\r\n" \
+        "Content-Transfer-Encoding: binary\r\n" \
+        "\r\n" \
+        "#{serialized_request}\r\n"
+    end
+
+    def serialize_sub_request(request)
+      body_str = request.body.is_a?(String) ? request.body : request.body.to_json
+      subreqest = "POST #{request.path} HTTP/1.1\r\n" \
+                  "Content-Length: #{body_str.length}\r\n"
+      request.to_hash.each do |k, v|
+        subreqest += "#{k}: #{v.join(';')}\r\n"
+      end
+      subreqest += "\r\n" \
+                   "#{body_str}\r\n"
+    end
+  end
+end

data/lib/fcmpush/batch_response.rb

@@ -0,0 +1,39 @@
+require 'delegate' if RUBY_VERSION >= '2.7'
+
+module Fcmpush
+  class BatchResponse < DelegateClass(Net::HTTPResponse)
+    alias response __getobj__
+    alias headers to_hash
+    HAS_SYMBOL_GC = RUBY_VERSION > '2.2.0'
+
+    def json
+      parsable? ? @parsed ||= parse_body(body) : nil
+    end
+
+    def inspect
+      "#<BatchResponse response: #{response.inspect}, json: #{json}>"
+    end
+    alias to_s inspect
+
+    def parsable?
+      !body.nil? && !body.empty?
+    end
+
+    def success_count
+      @success_count ||= json.length - failure_count
+    end
+
+    def failure_count
+      @failure_count ||= json.select { |i| i[:error] }.size
+    end
+
+    private
+
+      def parse_body(raw_body)
+        devider = raw_body.match(/(\r\n--batch_.*)\r\n/)[1]
+        raw_body.split(devider)[1..-2].map do |response|
+          JSON.parse(response.split("\r\n\r\n")[2], symbolize_names: HAS_SYMBOL_GC)
+        end
+      end
+  end
+end

data/lib/fcmpush/client.rb

@@ -1,13 +1,17 @@
 require 'fcmpush/exceptions'
+require 'fcmpush/batch'
 require 'fcmpush/json_response'
+require 'fcmpush/batch_response'
 
 module Fcmpush
   V1_ENDPOINT_PREFIX = '/v1/projects/'.freeze
   V1_ENDPOINT_SUFFIX = '/messages:send'.freeze
   TOPIC_DOMAIN = 'https://iid.googleapis.com'.freeze
   TOPIC_ENDPOINT_PREFIX = '/iid/v1'.freeze
+  BATCH_ENDPOINT = '/batch'.freeze
 
   class Client
+    include Batch
     attr_reader :domain, :path, :connection, :configuration, :server_key, :access_token, :access_token_expiry
 
     def initialize(domain, project_id, configuration, **options)
@@ -15,7 +19,7 @@ module Fcmpush
       @project_id = project_id
       @path = V1_ENDPOINT_PREFIX + project_id.to_s + V1_ENDPOINT_SUFFIX
       @options = {}.merge(options)
-      @configuration = configuration
+      @configuration = configuration.dup
       access_token_response = v1_authorize
       @access_token = access_token_response['access_token']
       @access_token_expiry = Time.now.utc + access_token_response['expires_in']
@@ -25,8 +29,13 @@ module Fcmpush
 
     def v1_authorize
       @auth ||= if configuration.json_key_io
+                  io = if configuration.json_key_io.respond_to?(:read)
+                         configuration.json_key_io
+                       else
+                         File.open(configuration.json_key_io)
+                       end
                   Google::Auth::ServiceAccountCredentials.make_creds(
-                    json_key_io: File.open(configuration.json_key_io),
+                    json_key_io: io,
                     scope: configuration.scope
                   )
                 else
@@ -60,6 +69,14 @@ module Fcmpush
       raise NetworkError, "A network error occurred: #{e.class} (#{e.message})"
     end
 
+    def batch_push(messages, query: {}, headers: {})
+      uri, request = make_batch_request(messages, query, headers)
+      response = exception_handler(connection.request(uri, request))
+      BatchResponse.new(response)
+    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+      raise NetworkError, "A network error occurred: #{e.class} (#{e.message})"
+    end
+
     private
 
       def make_push_request(body, query, headers)
@@ -121,5 +138,18 @@ module Fcmpush
           registration_tokens: instance_ids
         }.to_json
       end
+
+      def make_batch_request(messages, query, headers)
+        uri = URI.join(domain, BATCH_ENDPOINT)
+        uri.query = URI.encode_www_form(query) unless query.empty?
+
+        access_token_refresh
+        headers = v1_authorized_header(headers)
+        post = Net::HTTP::Post.new(uri, headers)
+        post['Content-Type'] = "multipart/mixed; boundary=#{::Fcmpush::Batch::PART_BOUNDRY}"
+        post.body = make_batch_payload(messages, headers)
+
+        [uri, post]
+      end
   end
 end

data/lib/fcmpush/version.rb

@@ -1,3 +1,3 @@
 module Fcmpush
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcmpush
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - miyataka
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -28,16 +28,16 @@ dependencies:
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - voyager.3taka28@gmail.com
 executables: []
@@ -89,6 +89,8 @@ extra_rdoc_files: []
 files:
 - fcmpush.gemspec
 - lib/fcmpush.rb
+- lib/fcmpush/batch.rb
+- lib/fcmpush/batch_response.rb
 - lib/fcmpush/client.rb
 - lib/fcmpush/configuration.rb
 - lib/fcmpush/exceptions.rb
@@ -100,7 +102,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/miyataka/fcmpush
   source_code_uri: https://github.com/miyataka/fcmpush
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,19 +110,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
-  - - "<"
+      version: '2.4'
+  - - "<="
     - !ruby/object:Gem::Version
-      version: '2.8'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Firebase Cloud Messaging API wrapper for ruby, supports HTTP v1. And including
   access_token Auto Refresh feature!