apnotic 1.4.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e07860f9233dc0f123731853e0a42d899497109
-  data.tar.gz: 6f484d9d537511e2d7a5cd0a8ef75e58dfa87514
+SHA256:
+  metadata.gz: 5ae71d53585d79f023006333f32688ff88ccf7ae92c3c639831ece42a05a2de3
+  data.tar.gz: a4b9ba46513dfb766c303d9ba72ad99e0db0122258967414f34e7c0236aa53bc
 SHA512:
-  metadata.gz: 7acc4f79fb3fa12b3ebb98c2cecafb5cb17d12ce70fb649a2a20d0736d5c2cab7068d6ab466f23c03aaa5ba64c2b4a7502090c5f09b73c07c62ec78e5373a697
-  data.tar.gz: d1930a1051eff9affaf1ad619d55165cf92e92689892a0d2e41453d75bad9f714eeeeb18be612f519433b285368d8272f9f37bb8c9bbbc4921f49ca7444fa6d9
+  metadata.gz: 55d81b9a2d59f19f6725cc1f7f163769123b91bfe84a4b1517810d6c8f3f6b533a12e66c535f9337a81356957c426388eb361551075b646d6b1ac34e61145e89
+  data.tar.gz: 6ee59aada3067fc897c259d9a8c41c6fd94c6ac68e3d1e2e7bed402aa7284bdf51fe67dad7a428f4583fe82257b85e06bf680320d3c57e8bd2d12cca8da172b1

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.1

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+  - 2.7
 
 branches:
   only:
     - master
+
+before_install:
+  - gem install bundler

data/README.md

@@ -86,7 +86,7 @@ end
 connection.push_async(push)
 
 # wait for all requests to be completed
-connection.join
+connection.join(timeout: 5)
 
 # close the connection
 connection.close
@@ -207,6 +207,10 @@ Apnotic::Connection.new(options)
 | :cert_pass | Optional. The certificate's password.
 | :url | Optional. Defaults to https://api.push.apple.com:443.
 | :connect_timeout | Optional. Expressed in seconds, defaults to 30.
+| :proxy_addr | Optional.  Proxy server. e.g. http://proxy.example.com
+| :proxy_port | Optional.  Proxy port. e.g. 8080
+| :proxy_user | Optional.  User name for proxy authentication. e.g. user_name
+| :proxy_pass | Optional.  Password for proxy authentication. e.g. pass_word
 
 Note that since `:cert_path` can be any object that responds to `:read`, it is possible to pass in a certificate string directly by wrapping it up in a `StringIO` object:
 
@@ -311,6 +315,9 @@ These are all Accessor attributes.
 | `category` | "
 | `custom_payload` | "
 | `thread_id` | "
+| `target_content_id` | "
+| `interruption_level` | Refer to [Payload Key Reference](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/generating_a_remote_notification#2943363) for details. iOS 15+
+| `relevance_score` | Refer to [Payload Key Reference](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/generating_a_remote_notification#2943363) for details. iOS 15+
 | `apns_id` | Refer to [Communicating with APNs](https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html) for details.
 | `expiration` | "
 | `priority` | "

data/apnotic.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "net-http2", ">= 0.18", "< 2"
-  spec.add_dependency "connection_pool", "~> 2.0"
+  spec.add_dependency "net-http2", ">= 0.18.3", "< 2"
+  spec.add_dependency "connection_pool", "~> 2"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/apnotic/abstract_notification.rb

@@ -26,6 +26,10 @@ module Apnotic
       authorization ? "bearer #{authorization}" : nil
     end
 
+    def background_notification?
+      false
+    end
+
     private
 
     def to_hash

data/lib/apnotic/connection.rb

@@ -5,6 +5,7 @@ module Apnotic
 
   APPLE_DEVELOPMENT_SERVER_URL = "https://api.sandbox.push.apple.com:443"
   APPLE_PRODUCTION_SERVER_URL  = "https://api.push.apple.com:443"
+  PROXY_SETTINGS_KEYS = [:proxy_addr, :proxy_port, :proxy_user, :proxy_pass]
 
   class Connection
     attr_reader :url, :cert_path
@@ -28,7 +29,15 @@ module Apnotic
 
       raise "Cert file not found: #{@cert_path}" unless @cert_path && (@cert_path.respond_to?(:read) || File.exist?(@cert_path))
 
-      @client = NetHttp2::Client.new(@url, ssl_context: ssl_context, connect_timeout: @connect_timeout)
+      http2_options = {
+        ssl_context: ssl_context,
+        connect_timeout: @connect_timeout
+      }
+      PROXY_SETTINGS_KEYS.each do |key|
+        http2_options[key] = options[key] if options[key]
+      end
+
+      @client = NetHttp2::Client.new(@url, http2_options)
     end
 
     def push(notification, options={})
@@ -63,8 +72,8 @@ module Apnotic
       @client.close
     end
 
-    def join
-      @client.join
+    def join(timeout: nil)
+      @client.join(timeout: timeout)
     end
 
     def on(event, &block)
@@ -92,7 +101,7 @@ module Apnotic
     def remote_max_concurrent_streams
       # 0x7fffffff is the default value from http-2 gem (2^31)
       if @client.remote_settings[:settings_max_concurrent_streams] == 0x7fffffff
-        0
+        1
       else
         @client.remote_settings[:settings_max_concurrent_streams]
       end

data/lib/apnotic/notification.rb

@@ -4,6 +4,11 @@ module Apnotic
 
   class Notification < AbstractNotification
     attr_accessor :alert, :badge, :sound, :content_available, :category, :custom_payload, :url_args, :mutable_content, :thread_id
+    attr_accessor :target_content_id, :interruption_level, :relevance_score
+    
+    def background_notification?
+      aps.count == 1 && aps.key?('content-available') && aps['content-available'] == 1
+    end
 
     private
 
@@ -17,6 +22,9 @@ module Apnotic
         result.merge!('url-args' => url_args) if url_args
         result.merge!('mutable-content' => mutable_content) if mutable_content
         result.merge!('thread-id' => thread_id) if thread_id
+        result.merge!('target-content-id' => target_content_id) if target_content_id
+        result.merge!('interruption-level' => interruption_level) if interruption_level
+        result.merge!('relevance-score' => relevance_score) if relevance_score
       end
     end
 

data/lib/apnotic/request.rb

@@ -16,6 +16,7 @@ module Apnotic
       h.merge!('apns-id' => notification.apns_id) if notification.apns_id
       h.merge!('apns-expiration' => notification.expiration) if notification.expiration
       h.merge!('apns-priority' => notification.priority) if notification.priority
+      h.merge!('apns-push-type' => notification.background_notification? ? 'background' : 'alert' )
       h.merge!('apns-topic' => notification.topic) if notification.topic
       h.merge!('apns-collapse-id' => notification.apns_collapse_id) if notification.apns_collapse_id
       h.merge!('authorization' => notification.authorization_header) if notification.authorization_header

data/lib/apnotic/version.rb

@@ -1,3 +1,3 @@
 module Apnotic
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apnotic
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Roberto Ostinelli
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http2
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -36,42 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - roberto@ostinelli.net
 executables: []
@@ -95,8 +95,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
@@ -121,7 +120,7 @@ homepage: http://github.com/ostinelli/apnotic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Apnotic is an Apple Push Notification gem able to provide instant feedback.
 test_files: []

data/.ruby-gemset

@@ -1 +0,0 @@
-apnotic

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.3.1