rpush 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034d8de0f4696f840692ef88e5646af49cd424603ef0417be06312a58a61a640
-  data.tar.gz: 3bcadf28d715b047c1f1b0f6b60326b58d365eded8ddaf1e1d78c5b5f81c39a8
+  metadata.gz: fb26cf5109afd2857d244091042f687898225e0ce0a44ea789bc3ae08aab585c
+  data.tar.gz: 6fb69b76b4ca8310c5a89292d86500df86cf36ff9222050b50e712fda3e84ac0
 SHA512:
-  metadata.gz: 937b1b6b68cc949bf6b28f10ca4c3ca78ec0811a87f4ff3bd926a6318d26042bea787ab067cb4c04801b35c7183180dafc474e1df22d64636035f8c0d7e8d047
-  data.tar.gz: 971f4544764419a4a08b8cdea97d58126d759deb145cc76567c4465bbf4db1154ef6bc46da04c729cc5bd3cedf709c71b93ee6269311179f32c4034780ab2f5a
+  metadata.gz: 67efc5af2f83e3d782d66bd9ff7674135a3d778bc9fe1669ab3fc11e19d68161839ad13b8265c8e8cac52ce8f68444d2617413d80eb16db95d329f5dfd9a1af1
+  data.tar.gz: b5d21c00c7cc72d56dff95bd33d2d7742024d84b4f5faa0b0a4187256ea578f6ae8ad423e4d2e29b1af8b32e9fbecec29e0422c7524d0a1ad83959a23ace9197

data/CHANGELOG.md

@@ -12,6 +12,18 @@
 
 - None
 
+## 3.3.0 (2018-11-14)
+
+When upgrading, don't forget to run `bundle exec rpush init` to get all the latest migrations.
+
+### Added
+
+- Added support for Apple Push Notification service `thread-id` field [#460](https://github.com/rpush/rpush/pull/460) (by [@gerard-morera](https://github.com/gerard-morera)).
+
+### Changes
+
+- Remove unused class `ConfigurationWithoutDefaults` [#461](https://github.com/rpush/rpush/pull/461) (by [@adis-io](https://github.com/adis-io)).
+
 ## 3.2.4 (2018-10-25)
 
 When upgrading, don't forget to run `bundle exec rpush init` to get all the latest migrations.

data/lib/generators/rpush_migration_generator.rb

@@ -48,6 +48,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
     add_rpush_migration('rpush_3_1_1_updates')
     add_rpush_migration('rpush_3_2_0_add_apns_p8')
     add_rpush_migration('rpush_3_2_4_updates')
+    add_rpush_migration('rpush_3_3_0_updates')
   end
 
   protected

data/lib/generators/templates/rpush_3_3_0_updates.rb

@@ -0,0 +1,9 @@
+class Rpush330Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  def self.up
+    add_column :rpush_notifications, :thread_id, :string, null: true
+  end
+
+  def self.down
+    remove_column :rpush_notifications, :thread_id
+  end
+end

data/lib/rpush/client/active_model/apns/notification.rb

@@ -56,6 +56,7 @@ module Rpush
               json['aps']['sound'] = sound if sound
               json['aps']['category'] = category if category
               json['aps']['url-args'] = url_args if url_args
+              json['aps']['thread-id'] = thread_id if thread_id
 
               if data && data[MUTABLE_CONTENT_KEY]
                 json['aps']['mutable-content'] = 1

data/lib/rpush/client/redis/notification.rb

@@ -45,6 +45,7 @@ module Rpush
         attribute :content_available, :boolean, default: false
         attribute :mutable_content, :boolean, default: false
         attribute :notification, :hash
+        attribute :thread_id, :string
 
         def app
           return nil unless app_id

data/lib/rpush/configuration.rb

@@ -21,7 +21,6 @@ module Rpush
   CONFIG_ATTRS = CURRENT_ATTRS + DEPRECATED_ATTRS
 
   class ConfigurationError < StandardError; end
-  class ConfigurationWithoutDefaults < Struct.new(*CONFIG_ATTRS); end # rubocop:disable Style/StructInheritance
 
   class ApnsFeedbackReceiverConfiguration < Struct.new(:frequency, :enabled) # rubocop:disable Style/StructInheritance
     def initialize

data/lib/rpush/version.rb

@@ -1,8 +1,8 @@
 module Rpush
   module VERSION
     MAJOR = 3
-    MINOR = 2
-    TINY = 4
+    MINOR = 3
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/spec/support/active_record_setup.rb

@@ -37,6 +37,7 @@ require 'generators/templates/rpush_3_1_0_add_pushy'
 require 'generators/templates/rpush_3_1_1_updates'
 require 'generators/templates/rpush_3_2_0_add_apns_p8'
 require 'generators/templates/rpush_3_2_4_updates'
+require 'generators/templates/rpush_3_3_0_updates'
 
 migrations = [
   AddRpush,
@@ -49,7 +50,8 @@ migrations = [
   Rpush310AddPushy,
   Rpush311Updates,
   Rpush320AddApnsP8,
-  Rpush324Updates
+  Rpush324Updates,
+  Rpush330Updates
 ]
 
 unless ENV['TRAVIS']

data/spec/unit/client/active_record/apns/notification_spec.rb

@@ -309,3 +309,16 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "multi_json usage" do
     end
   end
 end if active_record?
+
+describe Rpush::Client::ActiveRecord::Apns::Notification, 'thread-id' do
+  let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
+
+  it 'includes thread-id in the payload' do
+    notification.thread_id = 'THREAD-ID'
+    expect(notification.as_json['aps']['thread-id']).to eq 'THREAD-ID'
+  end
+
+  it 'does not include thread-id in the payload if not set' do
+    expect(notification.as_json['aps']).to_not have_key('thread-id')
+  end
+end if active_record?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -388,6 +388,7 @@ files:
 - lib/generators/templates/rpush_3_1_1_updates.rb
 - lib/generators/templates/rpush_3_2_0_add_apns_p8.rb
 - lib/generators/templates/rpush_3_2_4_updates.rb
+- lib/generators/templates/rpush_3_3_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb