lorkhan 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337e54646581dcc1694dd56be3c7e12450053f5aa1e08bb1fc0b051cbd91df7d
-  data.tar.gz: 6ff5e452f8de466346a8ec80c3909f6f5dd217f684d4a4b14f233d8c2d8ec9a1
+  metadata.gz: 579c8aa0126f3be8b33931db4c47f1ed6c63b9da86d5005f06cb382394da4ebc
+  data.tar.gz: 588b4a5c011f1d4bba98cd8379a61cf9ea8e8e75eea45765ba88236b1e54d630
 SHA512:
-  metadata.gz: 8bc105281afb3a49260743d65b683da32744b0b15f1af0f9d75973116e8552392ce001782b18cc19f766aa42785d80d5faf2ce0f6cbd460059f1188c20cdd897
-  data.tar.gz: 2573918a34e7fae7089bcf14f569ef2556729e402f5fe115c4690b4ba38610e646ba219b228df69e2dc5e0d62430089c2c41b85da896dd1b51e2b7b8d799f09a
+  metadata.gz: 964f0a78fac49b85c180fea4364c10ac61aa8df8654d2ec61826cfc8a4334006ac1e6927339983cb5005a45a3fcf2e5f1526315e667332eb0c44854acec3c479
+  data.tar.gz: 46453f5186c7f347bda2397c2a34c534fbf2943556eaeff5427abc12076571a9a301cfedd279e0ea45a8bf13f2bae21327238dae0c2842943cf2c1743a7b12e6

data/lib/lorkhan/notification.rb

@@ -49,18 +49,20 @@ module Lorkhan
 
     DEFAULT_SOUND_NAME = 'default'.freeze
 
-    attr_reader :token, :apns_id, :priority, :alert, :content_available
+    attr_reader :token, :apns_id, :priority, :alert, :content_available, :topic
     attr_accessor :custom_payload, :badge, :sound, :category, :url_args, :mutable_content
-    attr_accessor :expiration, :topic, :collapse_id
+    attr_accessor :expiration, :collapse_id
 
     ##
     # Create a new notification
     #
     # token: The Device token that the notification will be delivered to
     ##
-    def initialize(token)
+    def initialize(id, topic, token)
+      @id = id
       @token = token
-      @apns_id = SecureRandom.uuid
+      @topic = topic
+      @apns_id = id || SecureRandom.uuid
       @expiration = 0
       @content_available = false
       @priority = PRIORITY_DELIVER_IMMEDIATELY
@@ -78,33 +80,24 @@ module Lorkhan
 
     def alert=(alert)
       @alert = alert
-      if @alert
-        @content_available = false
-        @priority = PRIORITY_DELIVER_IMMEDIATELY
-      end
+      @priority = PRIORITY_DELIVER_IMMEDIATELY if @alert
     end
 
     def content_available=(content_available)
       @content_available = content_available
-      if content_available == true
-        @alert = nil
-        @priority = PRIORITY_DELIVER_BACKGROUND
-      end
+      @priority = PRIORITY_DELIVER_BACKGROUND if content_available == true
     end
 
     def to_h
       {}.tap do |root|
         root[:aps] = {}.tap do |aps|
-          if content_available
-            aps['content-available'] = 1
-          else
-            aps[:alert] = alert if alert
-            aps[:badge] = badge if badge
-            aps[:sound] = sound if sound
-          end
+          aps[:alert] = alert if alert
+          aps[:badge] = badge if badge
+          aps[:sound] = sound if sound
           aps[:category] = category if category
           aps['url-args'] = url_args if url_args
           aps['mutable-content'] = 1 if mutable_content
+          aps['content-available'] = 1 if content_available
         end
         root.merge!(custom_payload) if custom_payload
       end

data/lib/lorkhan/request.rb

@@ -1,4 +1,6 @@
 module Lorkhan
+  ##
+  # @private
   class Request
     attr_reader :path, :headers, :body
 

data/lib/lorkhan/version.rb

@@ -1,3 +1,3 @@
 module Lorkhan
-  VERSION = '2.0.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorkhan
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Maddie Schipper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool