houston 2.2.4 → 2.4.0

data/lib/houston/client.rb

@@ -50,10 +50,10 @@ module Houston
           connection.write(notification.message)
           notification.mark_as_sent!
 
-          read_socket, write_socket = IO.select([ssl], [ssl], [ssl], nil)
+          read_socket, _write_socket = IO.select([ssl], [ssl], [ssl], nil)
           if (read_socket && read_socket[0])
             if error = connection.read(6)
-              command, status, index = error.unpack('ccN')
+              _command, status, index = error.unpack('ccN')
               notification.apns_error_code = status
               notification.mark_as_unsent!
             end

data/lib/houston/connection.rb

@@ -26,8 +26,8 @@ module Houston
 
     def initialize(uri, certificate, passphrase)
       @uri = URI(uri)
-      @certificate = certificate
-      @passphrase = passphrase
+      @certificate = certificate.to_s
+      @passphrase = passphrase.to_s unless passphrase.nil?              
     end
 
     def open

data/lib/houston/notification.rb

@@ -30,7 +30,7 @@ module Houston
     MAXIMUM_PAYLOAD_SIZE = 2048
 
     attr_accessor :token, :alert, :badge, :sound, :category, :content_available, :mutable_content,
-                  :custom_data, :id, :expiry, :priority
+                  :custom_data, :id, :expiry, :priority, :url_args, :thread_id
     attr_reader :sent_at
     attr_writer :apns_error_code
 
@@ -48,8 +48,13 @@ module Houston
       @priority = options.delete(:priority)
       @content_available = options.delete(:content_available)
       @mutable_content = options.delete(:mutable_content)
+      @url_args = options.delete(:url_args)
+      @thread_id = options.delete(:thread_id)
 
       @custom_data = options
+
+      @sent_at = nil
+      @apns_error_code = nil
     end
 
     def payload
@@ -62,6 +67,8 @@ module Houston
       json['aps']['category'] = @category if @category
       json['aps']['content-available'] = 1 if @content_available
       json['aps']['mutable-content'] = 1 if @mutable_content
+      json['aps']['url-args'] = @url_args if @url_args
+      json['aps']['thread-id'] = @thread_id if @thread_id
 
       json
     end

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = '2.2.4'
+  VERSION = '2.4.0'
 end

data/spec/notification_spec.rb

@@ -13,7 +13,9 @@ describe Houston::Notification do
       priority: 10,
       content_available: true,
       key1: 1,
-      key2: 'abc'
+      key2: 'abc',
+      url_args: %w[boarding A998],
+      thread_id: 'notify-team-ios'
     }
   }
 
@@ -69,6 +71,16 @@ describe Houston::Notification do
     it { should == { key1: 1, key2: 'abc' } }
   end
 
+  describe '#url_args' do
+    subject { super().url_args }
+    it { should == %w[boarding A998] }
+  end
+
+  describe '#thread_id' do
+    subject { super().thread_id }
+    it { should == 'notify-team-ios' }
+  end
+
   context 'using :device instead of :token' do
     subject do
       notification_options[:device] = notification_options[:token]
@@ -84,12 +96,15 @@ describe Houston::Notification do
 
   describe '#payload' do
     it 'should create a compliant dictionary' do
-      expect(subject.payload).to eq(        'aps' => {
+      expect(subject.payload).to eq(
+        'aps' => {
           'alert' => 'Houston, we have a problem.',
           'badge' => 2701,
           'sound' => 'sosumi.aiff',
           'category' => 'INVITE_CATEGORY',
-          'content-available' => 1
+          'content-available' => 1,
+          'url-args' => %w[boarding A998],
+          'thread-id' => 'notify-team-ios'
         },
         'key1' => 1,
         'key2' => 'abc')
@@ -139,6 +154,12 @@ describe Houston::Notification do
         )
     end
 
+    it 'should create a dictionary only with thread-id' do
+      expect(Houston::Notification.new(thread_id: 'notify-ios-team').payload).to eq(
+          'aps' => { 'thread-id' => 'notify-ios-team' }
+       )
+    end
+
     it 'should allow custom data inside aps key' do
       notification_options = { :badge => 567, 'aps' => { 'loc-key' => 'my-key' } }
       expect(Houston::Notification.new(notification_options).payload).to eq(
@@ -179,7 +200,7 @@ describe Houston::Notification do
 
     it 'should create a message with correct frame length' do
       _1, length, _2 = subject.message.unpack('cNa*')
-      expect(length).to eq(211)
+      expect(length).to eq(272)
     end
 
     def parse_items(items_stream)
@@ -206,7 +227,7 @@ describe Houston::Notification do
     it 'should include an item #2 with the payload as JSON' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      expect(items).to include([2, 155, '{"key1":1,"key2":"abc","aps":{"alert":"Houston, we have a problem.","badge":2701,"sound":"sosumi.aiff","category":"INVITE_CATEGORY","content-available":1}}'])
+      expect(items).to include([2, 216, '{"key1":1,"key2":"abc","aps":{"alert":"Houston, we have a problem.","badge":2701,"sound":"sosumi.aiff","category":"INVITE_CATEGORY","content-available":1,"url-args":["boarding","A998"],"thread-id":"notify-team-ios"}}'])
     end
 
     it 'should include an item #3 with the identifier' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -93,31 +93,73 @@ files:
 - "./LICENSE"
 - "./README.md"
 - "./Rakefile"
-- "./coverage/assets/0.10.0/application.css"
-- "./coverage/assets/0.10.0/application.js"
-- "./coverage/assets/0.10.0/colorbox/border.png"
-- "./coverage/assets/0.10.0/colorbox/controls.png"
-- "./coverage/assets/0.10.0/colorbox/loading.gif"
-- "./coverage/assets/0.10.0/colorbox/loading_background.png"
-- "./coverage/assets/0.10.0/favicon_green.png"
-- "./coverage/assets/0.10.0/favicon_red.png"
-- "./coverage/assets/0.10.0/favicon_yellow.png"
-- "./coverage/assets/0.10.0/loading.gif"
-- "./coverage/assets/0.10.0/magnify.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png"
-- "./coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png"
+- "./coverage/assets/0.7.1/application.css"
+- "./coverage/assets/0.7.1/application.js"
+- "./coverage/assets/0.7.1/fancybox/blank.gif"
+- "./coverage/assets/0.7.1/fancybox/fancy_close.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_loading.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_nav_left.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_nav_right.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_e.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_n.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_s.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_se.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_shadow_w.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_title_left.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_title_main.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_title_over.png"
+- "./coverage/assets/0.7.1/fancybox/fancy_title_right.png"
+- "./coverage/assets/0.7.1/fancybox/fancybox-x.png"
+- "./coverage/assets/0.7.1/fancybox/fancybox-y.png"
+- "./coverage/assets/0.7.1/fancybox/fancybox.png"
+- "./coverage/assets/0.7.1/favicon_green.png"
+- "./coverage/assets/0.7.1/favicon_red.png"
+- "./coverage/assets/0.7.1/favicon_yellow.png"
+- "./coverage/assets/0.7.1/loading.gif"
+- "./coverage/assets/0.7.1/magnify.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png"
+- "./coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png"
+- "./coverage/assets/0.8.0/application.css"
+- "./coverage/assets/0.8.0/application.js"
+- "./coverage/assets/0.8.0/colorbox/border.png"
+- "./coverage/assets/0.8.0/colorbox/controls.png"
+- "./coverage/assets/0.8.0/colorbox/loading.gif"
+- "./coverage/assets/0.8.0/colorbox/loading_background.png"
+- "./coverage/assets/0.8.0/favicon_green.png"
+- "./coverage/assets/0.8.0/favicon_red.png"
+- "./coverage/assets/0.8.0/favicon_yellow.png"
+- "./coverage/assets/0.8.0/loading.gif"
+- "./coverage/assets/0.8.0/magnify.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png"
+- "./coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png"
 - "./coverage/index.html"
+- "./houston-2.2.2.gem"
+- "./houston-2.2.3.gem"
 - "./houston.gemspec"
 - "./lib/houston.rb"
 - "./lib/houston/client.rb"
@@ -148,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Send Apple Push Notifications