rpush 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb26cf5109afd2857d244091042f687898225e0ce0a44ea789bc3ae08aab585c
-  data.tar.gz: 6fb69b76b4ca8310c5a89292d86500df86cf36ff9222050b50e712fda3e84ac0
+  metadata.gz: 3abc70a76bc7de39565ab73f4eef2b2466ff4dec4fe20ef57e10a9c4e6ff41f3
+  data.tar.gz: 42eb70527bd235e7c30b1dab4413d9368f68c129254704bb5af7698cb8cd6c68
 SHA512:
-  metadata.gz: 67efc5af2f83e3d782d66bd9ff7674135a3d778bc9fe1669ab3fc11e19d68161839ad13b8265c8e8cac52ce8f68444d2617413d80eb16db95d329f5dfd9a1af1
-  data.tar.gz: b5d21c00c7cc72d56dff95bd33d2d7742024d84b4f5faa0b0a4187256ea578f6ae8ad423e4d2e29b1af8b32e9fbecec29e0422c7524d0a1ad83959a23ace9197
+  metadata.gz: 19b1eeb3bb0e71dd11cd26af20efdb610cdda31c720293578e57d19b82c406841fe33f8aa63d6e4dd5ecff8e18bbcc5a760159259cc78c37aa093a29a70d059a
+  data.tar.gz: 75a2fc1eb17241bbaa7fcf3577ef6ba27ac5701f3e4a5396b08f099097b9a686aae9b465c954272871ee33c6c65d4142b4183c5bb17f60e731a1f70e5328c97e

data/CHANGELOG.md

@@ -12,6 +12,14 @@
 
 - None
 
+## 3.3.1 (2018-11-14)
+
+When upgrading, don't forget to run `bundle exec rpush init` to get all the latest migrations.
+
+### Fixed
+
+- Remove validation of 64-characters length from `device_token`. [#463](https://github.com/rpush/rpush/pull/463) (by [@chrisokamoto](https://github.com/chrisokamoto)).
+
 ## 3.3.0 (2018-11-14)
 
 When upgrading, don't forget to run `bundle exec rpush init` to get all the latest migrations.

data/README.md

@@ -68,7 +68,7 @@ app.save!
 ```ruby
 n = Rpush::Apns::Notification.new
 n.app = Rpush::Apns::App.find_by_name("ios_app")
-n.device_token = "..." # 64-character hex string
+n.device_token = "..." # hex string
 n.alert = "hi mom!"
 n.data = { foo: :bar }
 n.save!
@@ -97,7 +97,7 @@ app.save!
 ```ruby
 n = Rpush::Apns::Notification.new
 n.app = Rpush::Apnsp8::App.find_by_name("ios_app")
-n.device_token = "..." # 64-character hex string
+n.device_token = "..." # hex string
 n.alert = "hi mom!"
 n.data = { foo: :bar }
 n.save!

data/lib/generators/rpush_migration_generator.rb

@@ -49,6 +49,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
     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')
+    add_rpush_migration('rpush_3_3_1_updates')
   end
 
   protected

data/lib/generators/templates/rpush_3_3_1_updates.rb

@@ -0,0 +1,11 @@
+class Rpush331Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  def self.up
+    change_column :rpush_notifications, :device_token, :string, null: true
+    change_column :rpush_feedback, :device_token, :string, null: true
+  end
+
+  def self.down
+    change_column :rpush_notifications, :device_token, :string, { null: true, limit: 64 }
+    change_column :rpush_feedback, :device_token, :string, { null: true, limit: 64 }
+  end
+end

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

@@ -4,7 +4,7 @@ module Rpush
       module Apns
         class DeviceTokenFormatValidator < ::ActiveModel::Validator
           def validate(record)
-            return if record.device_token =~ /^[a-z0-9]{64}$/i
+            return if record.device_token =~ /^[a-z0-9]\w+$/i
             record.errors[:device_token] << "is invalid"
           end
         end

data/lib/rpush/version.rb

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

data/spec/functional/apns2_spec.rb

@@ -11,7 +11,7 @@ describe 'APNs http2 adapter' do
     )
   }
   let(:app) { create_app }
-  let(:fake_device_token) { 'a' * 64 }
+  let(:fake_device_token) { 'a' * 108 }
   let(:fake_http2_request) { double }
   let(:fake_http_resp_headers) {
     {

data/spec/functional/apns_spec.rb

@@ -27,7 +27,7 @@ describe 'APNs' do
     notification = Rpush::Apns::Notification.new
     notification.app = app
     notification.alert = 'test'
-    notification.device_token = 'a' * 64
+    notification.device_token = 'a' * 108
     notification.save!
     notification
   end

data/spec/functional/embed_spec.rb

@@ -16,7 +16,7 @@ describe 'embedding' do
 
     notification.app = app
     notification.alert = 'test'
-    notification.device_token = 'a' * 64
+    notification.device_token = 'a' * 108
     notification.save!
 
     stub_tcp_connection

data/spec/functional/new_app_spec.rb

@@ -24,7 +24,7 @@ describe 'New app loading' do
     notification = Rpush::Apns::Notification.new
     notification.app = app
     notification.alert = 'test'
-    notification.device_token = 'a' * 64
+    notification.device_token = 'a' * 108
     notification.save!
     notification
   end

data/spec/support/active_record_setup.rb

@@ -38,6 +38,7 @@ 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'
+require 'generators/templates/rpush_3_3_1_updates'
 
 migrations = [
   AddRpush,
@@ -51,7 +52,8 @@ migrations = [
   Rpush311Updates,
   Rpush320AddApnsP8,
   Rpush324Updates,
-  Rpush330Updates
+  Rpush330Updates,
+  Rpush331Updates
 ]
 
 unless ENV['TRAVIS']

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

@@ -17,7 +17,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
   end
 
   it "should validate the length of the binary conversion of the notification" do
-    notification.device_token = "a" * 64
+    notification.device_token = "a" * 108
     notification.alert = "way too long!" * 200
     expect(notification.valid?).to be_falsey
     expect(notification.errors[:base].include?("APN notification cannot be larger than 2048 bytes. Try condensing your alert and device attributes.")).to be_truthy
@@ -25,7 +25,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
 
   it "should store long alerts" do
     notification.app = app
-    notification.device_token = "a" * 64
+    notification.device_token = "a" * 108
     notification.alert = "*" * 300
     expect(notification.valid?).to be_truthy
 
@@ -110,7 +110,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'MDM' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
 
   before do
-    notification.device_token = "a" * 64
+    notification.device_token = "a" * 108
     notification.id = 1234
   end
 
@@ -225,7 +225,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'to_binary' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
 
   before do
-    notification.device_token = "a" * 64
+    notification.device_token = "a" * 108
     notification.id = 1234
   end
 
@@ -259,7 +259,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'to_binary' do
     notification.app = Rpush::Client::ActiveRecord::Apns::App.new(name: 'my_app', environment: 'development', certificate: TEST_CERT)
     now = Time.now
     allow(Time).to receive_messages(now: now)
-    expect(notification.to_binary).to eq "\x02\x00\x00\x00\x99\x01\x00 \xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\x02\x00a{\"aps\":{\"alert\":\"Don't panic Mr Mainwaring, don't panic!\",\"badge\":3,\"sound\":\"1.aiff\"},\"hi\":\"mom\"}\x03\x00\x04\x00\x00\x04\xD2\x04\x00\x04#{[now.to_i + 86_400].pack('N')}\x05\x00\x01\n"
+    expect(notification.to_binary).to eq "\x02\x00\x00\x00\xAF\x01\x00 \xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\x02\x00a{\"aps\":{\"alert\":\"Don't panic Mr Mainwaring, don't panic!\",\"badge\":3,\"sound\":\"1.aiff\"},\"hi\":\"mom\"}\x03\x00\x04\x00\x00\x04\xD2\x04\x00\x04#{[now.to_i + 86_400].pack('N')}\x05\x00\x01\n"
   end
 end if active_record?
 
@@ -281,7 +281,7 @@ end if active_record?
 describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #35" do
   it "should limit payload size to 256 bytes but not the entire packet" do
     notification = Rpush::Client::ActiveRecord::Apns::Notification.new do |n|
-      n.device_token = "a" * 64
+      n.device_token = "a" * 108
       n.alert = "a" * 210
       n.app = Rpush::Client::ActiveRecord::Apns::App.create!(name: 'my_app', environment: 'development', certificate: TEST_CERT)
     end

data/spec/unit/daemon/feeder_spec.rb

@@ -2,7 +2,7 @@ require "unit_spec_helper"
 
 describe Rpush::Daemon::Feeder do
   let!(:app) { Rpush::Apns::App.create!(name: 'my_app', environment: 'development', certificate: TEST_CERT) }
-  let(:notification) { Rpush::Apns::Notification.create!(device_token: "a" * 64, app: app) }
+  let(:notification) { Rpush::Apns::Notification.create!(device_token: "a" * 108, app: app) }
   let(:logger) { double }
   let(:interruptible_sleeper) { double(sleep: nil, stop: nil) }
   let(:store) { double(Rpush::Daemon::Store::ActiveRecord, deliverable_notifications: [notification], release_connection: nil) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Ian Leitch
@@ -389,6 +389,7 @@ files:
 - 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/generators/templates/rpush_3_3_1_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb