rpush 8.0.0 → 9.0.0

data/spec/functional/retry_spec.rb

@@ -1,10 +1,12 @@
 require 'functional_spec_helper'
 
 describe 'Retries' do
-  let(:app) { Rpush::Gcm::App.new }
-  let(:notification) { Rpush::Gcm::Notification.new }
+  let(:app) { Rpush::Fcm::App.new }
+  let(:notification) { Rpush::Fcm::Notification.new }
   let(:response) { double(Net::HTTPResponse, code: 200) }
   let(:http) { double(Net::HTTP::Persistent, request: response, shutdown: nil) }
+  let(:fake_device_token) { 'a' * 108 }
+  let(:creds) {double(Google::Auth::UserRefreshCredentials)}
 
   before do
     Rpush::Daemon.common_init
@@ -14,7 +16,7 @@ describe 'Retries' do
     app.save!
 
     notification.app_id = app.id
-    notification.registration_ids = ['foo']
+    notification.device_token = 'foo'
     notification.data = { message: 'test' }
     notification.save!
 
@@ -23,7 +25,22 @@ describe 'Retries' do
     end
 
     allow(Net::HTTP::Persistent).to receive_messages(new: http)
-    allow(response).to receive_messages(body: JSON.dump(results: [{ message_id: notification.registration_ids.first.to_s }]))
+    allow(creds).to receive(:fetch_access_token).and_return({'access_token': 'face_access_token'})
+
+    allow(::Google::Auth::ServiceAccountCredentials).to receive(:fetch_access_token).and_return({access_token: 'bbbbbb'})
+    allow(::Google::Auth::ServiceAccountCredentials).to receive(:make_creds).and_return(creds)
+    allow_any_instance_of(::Rpush::Daemon::Fcm::Delivery).to receive(:necessary_data_exists?).and_return(true)
+
+    example_success_body = {
+      "multicast_id": 108,
+      "success": 1,
+      "failure": 0,
+      "canonical_ids": 0,
+      "results": [
+        { "message_id": "1:08" }
+      ]
+    }.to_json
+    allow(response).to receive_messages(body: example_success_body)
   end
 
   it 'delivers a notification due to be retried' do

data/spec/functional/synchronization_spec.rb

@@ -2,7 +2,7 @@ require 'functional_spec_helper'
 
 describe 'Synchronization' do
   let(:timeout) { 10 }
-  let(:app) { Rpush::Gcm::App.new }
+  let(:app) { Rpush::Fcm::App.new }
 
   def wait_for_num_dispatchers(num)
     Timeout.timeout(timeout) do

data/spec/functional_spec_helper.rb

@@ -11,12 +11,6 @@ def timeout(&blk)
   Timeout.timeout(10, &blk)
 end
 
-def stub_tcp_connection(tcp_socket, ssl_socket, io_double)
-  allow_any_instance_of(Rpush::Daemon::TcpConnection).to receive_messages(connect_socket: [tcp_socket, ssl_socket])
-  allow_any_instance_of(Rpush::Daemon::TcpConnection).to receive_messages(setup_ssl_context: double.as_null_object)
-  stub_const('Rpush::Daemon::TcpConnection::IO', io_double)
-end
-
 RSpec.configure do |config|
   config.before(:each) do
     Modis.with_connection do |redis|

data/spec/spec_helper.rb

@@ -58,6 +58,8 @@ def after_example_cleanup
   end
   Rpush.plugins.values.each(&:unload)
   Rpush.instance_variable_set('@plugins', {})
+  Rpush.reflection_stack.clear
+  Rpush.reflection_stack.push(Rpush::ReflectionCollection.new)
 end
 
 RSpec.configure do |config|

data/spec/unit/client/active_record/shared/app.rb

@@ -8,7 +8,7 @@ shared_examples_for 'Rpush::Client::ActiveRecord::App' do
     app = Rpush::Apns::App.new(name: 'test', environment: 'development', certificate: TEST_CERT)
     expect(app.valid?).to eq(true)
 
-    app = Rpush::Gcm::App.new(name: 'test', environment: 'production', auth_key: TEST_CERT)
+    app = Rpush::Fcm::App.new(name: 'test', environment: 'production', json_key: TEST_CERT)
     expect(app.valid?).to eq(true)
   end
 end

data/spec/unit/daemon/shared/store.rb

@@ -233,48 +233,6 @@ shared_examples 'Rpush::Daemon::Store' do
     end
   end
 
-  describe 'create_apns_feedback' do
-    it 'creates the Feedback record' do
-      expect(Rpush::Apns::Feedback).to receive(:create!).with(
-        failed_at: time, device_token: 'ab' * 32, app_id: app.id
-      )
-      store.create_apns_feedback(time, 'ab' * 32, app)
-    end
-  end
-
-  describe 'create_gcm_notification' do
-    let(:data) { { 'data' => true } }
-    let(:attributes) { { device_token: 'ab' * 32 } }
-    let(:registration_ids) { %w[123 456] }
-    let(:deliver_after) { time + 10.seconds }
-    let(:args) { [attributes, data, registration_ids, deliver_after, app] }
-
-    it 'sets the given attributes' do
-      new_notification = store.create_gcm_notification(*args)
-      expect(new_notification.device_token).to eq 'ab' * 32
-    end
-
-    it 'sets the given data' do
-      new_notification = store.create_gcm_notification(*args)
-      expect(new_notification.data['data']).to be_truthy
-    end
-
-    it 'sets the given registration IDs' do
-      new_notification = store.create_gcm_notification(*args)
-      expect(new_notification.registration_ids).to eq registration_ids
-    end
-
-    it 'sets the deliver_after timestamp' do
-      new_notification = store.create_gcm_notification(*args)
-      expect(new_notification.deliver_after).to eq deliver_after
-    end
-
-    it 'saves the new notification' do
-      new_notification = store.create_gcm_notification(*args)
-      expect(new_notification.new_record?).to be_falsey
-    end
-  end
-
   describe 'create_adm_notification' do
     let(:data) { { 'data' => true } }
     let(:attributes) { { app_id: app.id, collapse_key: 'ckey', delay_while_idle: true } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -78,7 +78,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -88,7 +88,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -328,14 +328,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.66'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.66'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -350,6 +350,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -449,7 +491,6 @@ files:
 - lib/generators/templates/rpush_4_2_0_updates.rb
 - lib/generators/templates/rpush_7_1_0_updates.rb
 - lib/rpush.rb
-- lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb
 - lib/rpush/client/active_model.rb
 - lib/rpush/client/active_model/adm/app.rb
@@ -468,9 +509,6 @@ files:
 - lib/rpush/client/active_model/fcm/expiry_collapse_key_mutual_inclusion_validator.rb
 - lib/rpush/client/active_model/fcm/notification.rb
 - lib/rpush/client/active_model/fcm/notification_keys_in_allowed_list_validator.rb
-- lib/rpush/client/active_model/gcm/app.rb
-- lib/rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
-- lib/rpush/client/active_model/gcm/notification.rb
 - lib/rpush/client/active_model/notification.rb
 - lib/rpush/client/active_model/payload_data_size_validator.rb
 - lib/rpush/client/active_model/pushy/app.rb
@@ -497,8 +535,6 @@ files:
 - lib/rpush/client/active_record/app.rb
 - lib/rpush/client/active_record/fcm/app.rb
 - lib/rpush/client/active_record/fcm/notification.rb
-- lib/rpush/client/active_record/gcm/app.rb
-- lib/rpush/client/active_record/gcm/notification.rb
 - lib/rpush/client/active_record/notification.rb
 - lib/rpush/client/active_record/pushy/app.rb
 - lib/rpush/client/active_record/pushy/notification.rb
@@ -523,8 +559,6 @@ files:
 - lib/rpush/client/redis/app.rb
 - lib/rpush/client/redis/fcm/app.rb
 - lib/rpush/client/redis/fcm/notification.rb
-- lib/rpush/client/redis/gcm/app.rb
-- lib/rpush/client/redis/gcm/notification.rb
 - lib/rpush/client/redis/notification.rb
 - lib/rpush/client/redis/pushy/app.rb
 - lib/rpush/client/redis/pushy/notification.rb
@@ -540,9 +574,6 @@ files:
 - lib/rpush/daemon.rb
 - lib/rpush/daemon/adm.rb
 - lib/rpush/daemon/adm/delivery.rb
-- lib/rpush/daemon/apns.rb
-- lib/rpush/daemon/apns/delivery.rb
-- lib/rpush/daemon/apns/feedback_receiver.rb
 - lib/rpush/daemon/apns2.rb
 - lib/rpush/daemon/apns2/delivery.rb
 - lib/rpush/daemon/apnsp8.rb
@@ -554,17 +585,13 @@ files:
 - lib/rpush/daemon/delivery.rb
 - lib/rpush/daemon/delivery_error.rb
 - lib/rpush/daemon/dispatcher/apns_http2.rb
-- lib/rpush/daemon/dispatcher/apns_tcp.rb
 - lib/rpush/daemon/dispatcher/apnsp8_http2.rb
 - lib/rpush/daemon/dispatcher/http.rb
-- lib/rpush/daemon/dispatcher/tcp.rb
 - lib/rpush/daemon/dispatcher_loop.rb
 - lib/rpush/daemon/errors.rb
 - lib/rpush/daemon/fcm.rb
 - lib/rpush/daemon/fcm/delivery.rb
 - lib/rpush/daemon/feeder.rb
-- lib/rpush/daemon/gcm.rb
-- lib/rpush/daemon/gcm/delivery.rb
 - lib/rpush/daemon/google_credential_cache.rb
 - lib/rpush/daemon/interruptible_sleep.rb
 - lib/rpush/daemon/loggable.rb
@@ -586,7 +613,6 @@ files:
 - lib/rpush/daemon/store/redis.rb
 - lib/rpush/daemon/string_helpers.rb
 - lib/rpush/daemon/synchronizer.rb
-- lib/rpush/daemon/tcp_connection.rb
 - lib/rpush/daemon/webpush.rb
 - lib/rpush/daemon/webpush/delivery.rb
 - lib/rpush/daemon/wns.rb
@@ -612,14 +638,10 @@ files:
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns2_spec.rb
-- spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
 - spec/functional/fcm_priority_spec.rb
 - spec/functional/fcm_spec.rb
-- spec/functional/gcm_priority_spec.rb
-- spec/functional/gcm_spec.rb
-- spec/functional/new_app_spec.rb
 - spec/functional/pushy_spec.rb
 - spec/functional/retry_spec.rb
 - spec/functional/synchronization_spec.rb
@@ -634,7 +656,6 @@ files:
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/apns_feedback_spec.rb
 - spec/unit/client/active_record/adm/app_spec.rb
 - spec/unit/client/active_record/adm/notification_spec.rb
 - spec/unit/client/active_record/apns/app_spec.rb
@@ -646,8 +667,6 @@ files:
 - spec/unit/client/active_record/app_spec.rb
 - spec/unit/client/active_record/fcm/app_spec.rb
 - spec/unit/client/active_record/fcm/notification_spec.rb
-- spec/unit/client/active_record/gcm/app_spec.rb
-- spec/unit/client/active_record/gcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
@@ -670,8 +689,6 @@ files:
 - spec/unit/client/redis/app_spec.rb
 - spec/unit/client/redis/fcm/app_spec.rb
 - spec/unit/client/redis/fcm/notification_spec.rb
-- spec/unit/client/redis/gcm/app_spec.rb
-- spec/unit/client/redis/gcm/notification_spec.rb
 - spec/unit/client/redis/notification_spec.rb
 - spec/unit/client/redis/pushy/app_spec.rb
 - spec/unit/client/redis/pushy/notification_spec.rb
@@ -689,8 +706,6 @@ files:
 - spec/unit/client/shared/app.rb
 - spec/unit/client/shared/fcm/app.rb
 - spec/unit/client/shared/fcm/notification.rb
-- spec/unit/client/shared/gcm/app.rb
-- spec/unit/client/shared/gcm/notification.rb
 - spec/unit/client/shared/notification.rb
 - spec/unit/client/shared/pushy/app.rb
 - spec/unit/client/shared/pushy/notification.rb
@@ -703,19 +718,15 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
-- spec/unit/daemon/apns/delivery_spec.rb
-- spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
 - spec/unit/daemon/delivery_spec.rb
 - spec/unit/daemon/dispatcher/http_spec.rb
-- spec/unit/daemon/dispatcher/tcp_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/fcm/delivery_spec.rb
 - spec/unit/daemon/feeder_spec.rb
-- spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
@@ -725,7 +736,6 @@ files:
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
-- spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/webpush/delivery_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
 - spec/unit/daemon/wns/post_request_spec.rb
@@ -761,7 +771,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -776,14 +786,10 @@ test_files:
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns2_spec.rb
-- spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
 - spec/functional/fcm_priority_spec.rb
 - spec/functional/fcm_spec.rb
-- spec/functional/gcm_priority_spec.rb
-- spec/functional/gcm_spec.rb
-- spec/functional/new_app_spec.rb
 - spec/functional/pushy_spec.rb
 - spec/functional/retry_spec.rb
 - spec/functional/synchronization_spec.rb
@@ -798,7 +804,6 @@ test_files:
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/apns_feedback_spec.rb
 - spec/unit/client/active_record/adm/app_spec.rb
 - spec/unit/client/active_record/adm/notification_spec.rb
 - spec/unit/client/active_record/apns/app_spec.rb
@@ -810,8 +815,6 @@ test_files:
 - spec/unit/client/active_record/app_spec.rb
 - spec/unit/client/active_record/fcm/app_spec.rb
 - spec/unit/client/active_record/fcm/notification_spec.rb
-- spec/unit/client/active_record/gcm/app_spec.rb
-- spec/unit/client/active_record/gcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
@@ -834,8 +837,6 @@ test_files:
 - spec/unit/client/redis/app_spec.rb
 - spec/unit/client/redis/fcm/app_spec.rb
 - spec/unit/client/redis/fcm/notification_spec.rb
-- spec/unit/client/redis/gcm/app_spec.rb
-- spec/unit/client/redis/gcm/notification_spec.rb
 - spec/unit/client/redis/notification_spec.rb
 - spec/unit/client/redis/pushy/app_spec.rb
 - spec/unit/client/redis/pushy/notification_spec.rb
@@ -853,8 +854,6 @@ test_files:
 - spec/unit/client/shared/app.rb
 - spec/unit/client/shared/fcm/app.rb
 - spec/unit/client/shared/fcm/notification.rb
-- spec/unit/client/shared/gcm/app.rb
-- spec/unit/client/shared/gcm/notification.rb
 - spec/unit/client/shared/notification.rb
 - spec/unit/client/shared/pushy/app.rb
 - spec/unit/client/shared/pushy/notification.rb
@@ -867,19 +866,15 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
-- spec/unit/daemon/apns/delivery_spec.rb
-- spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
 - spec/unit/daemon/delivery_spec.rb
 - spec/unit/daemon/dispatcher/http_spec.rb
-- spec/unit/daemon/dispatcher/tcp_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/fcm/delivery_spec.rb
 - spec/unit/daemon/feeder_spec.rb
-- spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
@@ -889,7 +884,6 @@ test_files:
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
-- spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/webpush/delivery_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
 - spec/unit/daemon/wns/post_request_spec.rb

data/lib/rpush/apns_feedback.rb

@@ -1,18 +0,0 @@
-module Rpush
-  def self.apns_feedback
-    require 'rpush/daemon'
-    Rpush::Daemon.common_init
-
-    Rpush::Apns::App.all.each do |app|
-      # Redis stores every App type on the same namespace, hence the
-      # additional filtering
-      next unless app.service_name == 'apns'
-      next unless app.feedback_enabled
-
-      receiver = Rpush::Daemon::Apns::FeedbackReceiver.new(app)
-      receiver.check_for_feedback
-    end
-
-    nil
-  end
-end

data/lib/rpush/client/active_model/gcm/app.rb

@@ -1,19 +0,0 @@
-module Rpush
-  module Client
-    module ActiveModel
-      module Gcm
-        module App
-          def self.included(base)
-            base.instance_eval do
-              validates :auth_key, presence: true
-            end
-          end
-
-          def service_name
-            'gcm'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator.rb

@@ -1,14 +0,0 @@
-module Rpush
-  module Client
-    module ActiveModel
-      module Gcm
-        class ExpiryCollapseKeyMutualInclusionValidator < ::ActiveModel::Validator
-          def validate(record)
-            return unless record.collapse_key && !record.expiry
-            record.errors.add :expiry, 'must be set when using a collapse_key'
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,62 +0,0 @@
-module Rpush
-  module Client
-    module ActiveModel
-      module Gcm
-        module Notification
-          GCM_PRIORITY_HIGH = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_IMMEDIATE
-          GCM_PRIORITY_NORMAL = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_CONSERVE_POWER
-          GCM_PRIORITIES = [GCM_PRIORITY_HIGH, GCM_PRIORITY_NORMAL]
-
-          def self.included(base)
-            base.instance_eval do
-              validates :registration_ids, presence: true
-              validates :priority, inclusion: { in: GCM_PRIORITIES }, allow_nil: true
-              validates :dry_run, inclusion: { in: [true, false] }
-
-              validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator, limit: 4096
-              validates_with Rpush::Client::ActiveModel::RegistrationIdsCountValidator, limit: 1000
-
-              validates_with Rpush::Client::ActiveModel::Gcm::ExpiryCollapseKeyMutualInclusionValidator
-            end
-          end
-
-          # This is a hack. The schema defines `priority` to be an integer, but GCM expects a string.
-          # But for users of rpush to have an API they might expect (setting priority to `high`, not 10)
-          # we do a little conversion here.
-          # I'm not happy about it, but this will have to do until I can take a further look.
-          def priority=(priority)
-            case priority
-              when 'high', GCM_PRIORITY_HIGH
-                super(GCM_PRIORITY_HIGH)
-              when 'normal', GCM_PRIORITY_NORMAL
-                super(GCM_PRIORITY_NORMAL)
-              else
-                errors.add(:priority, 'must be one of either "normal" or "high"')
-            end
-          end
-
-          def as_json(options = nil) # rubocop:disable Metrics/PerceivedComplexity
-            json = {
-                'registration_ids' => registration_ids,
-                'delay_while_idle' => delay_while_idle,
-                'data' => data
-            }
-            json['collapse_key'] = collapse_key if collapse_key
-            json['content_available'] = content_available if content_available
-            json['mutable_content'] = mutable_content if mutable_content
-            json['dry_run'] = dry_run if dry_run
-            json['notification'] = notification if notification
-            json['priority'] = priority_for_notification if priority
-            json['time_to_live'] = expiry if expiry
-            json
-          end
-
-          def priority_for_notification
-            return 'high' if priority == GCM_PRIORITY_HIGH
-            'normal' if priority == GCM_PRIORITY_NORMAL
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rpush/client/active_record/gcm/app.rb

@@ -1,11 +0,0 @@
-module Rpush
-  module Client
-    module ActiveRecord
-      module Gcm
-        class App < Rpush::Client::ActiveRecord::App
-          include Rpush::Client::ActiveModel::Gcm::App
-        end
-      end
-    end
-  end
-end

data/lib/rpush/client/active_record/gcm/notification.rb

@@ -1,11 +0,0 @@
-module Rpush
-  module Client
-    module ActiveRecord
-      module Gcm
-        class Notification < Rpush::Client::ActiveRecord::Notification
-          include Rpush::Client::ActiveModel::Gcm::Notification
-        end
-      end
-    end
-  end
-end

data/lib/rpush/client/redis/gcm/app.rb

@@ -1,11 +0,0 @@
-module Rpush
-  module Client
-    module Redis
-      module Gcm
-        class App < Rpush::Client::Redis::App
-          include Rpush::Client::ActiveModel::Gcm::App
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Rpush
-  module Client
-    module Redis
-      module Gcm
-        class Notification < Rpush::Client::Redis::Notification
-          include Rpush::Client::ActiveModel::Gcm::Notification
-        end
-      end
-    end
-  end
-end