Make ActiveRecord validations work with Apns2 client (rpush#601)

lib/rpush/client/active_model.rb

@@ -3,6 +3,7 @@
 require 'rpush/client/active_model/notification'
 require 'rpush/client/active_model/payload_data_size_validator'
 require 'rpush/client/active_model/registration_ids_count_validator'
+require 'rpush/client/active_model/certificate_private_key_validator'
 
 require 'rpush/client/active_model/apns/device_token_format_validator'
 require 'rpush/client/active_model/apns/app'

lib/rpush/client/active_model/apns/app.rb

@@ -7,29 +7,13 @@ def self.included(base)
             base.instance_eval do
               validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
               validates :certificate, presence: true
-              validate :certificate_has_matching_private_key
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
             end
           end
 
           def service_name
             'apns'
           end
-
-          private
-
-          def certificate_has_matching_private_key
-            result = false
-            if certificate.present?
-              begin
-                x509 = OpenSSL::X509::Certificate.new(certificate)
-                pkey = OpenSSL::PKey::RSA.new(certificate, password)
-                result = x509 && pkey
-              rescue OpenSSL::OpenSSLError
-                errors.add :certificate, 'value must contain a certificate and a private key.'
-              end
-            end
-            result
-          end
         end
       end
     end

lib/rpush/client/active_model/apns2/app.rb

@@ -3,7 +3,13 @@ module Client
     module ActiveModel
       module Apns2
         module App
-          extend Rpush::Client::ActiveModel::Apns::App
+          def self.included(base)
+            base.instance_eval do
+              validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
+              validates :certificate, presence: true
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
+            end
+          end
 
           def service_name
             'apns2'

lib/rpush/client/active_model/certificate_private_key_validator.rb

@@ -0,0 +1,19 @@
+module Rpush
+  module Client
+    module ActiveModel
+      class CertificatePrivateKeyValidator < ::ActiveModel::Validator
+        def validate(record)
+          if record.certificate.present?
+            begin
+              x509 = OpenSSL::X509::Certificate.new(record.certificate)
+              pkey = OpenSSL::PKey::RSA.new(record.certificate, record.password)
+              x509 && pkey
+            rescue OpenSSL::OpenSSLError
+              record.errors.add :certificate, 'value must contain a certificate and a private key.'
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

spec/unit/client/active_record/apns2/app_spec.rb

@@ -1,4 +1,5 @@
 require 'unit_spec_helper'
 
 describe Rpush::Client::ActiveRecord::Apns2::App do
+  it_behaves_like 'Rpush::Client::Apns::App'
 end if active_record?

spec/unit/client/active_record/apns2/notification_spec.rb

@@ -8,7 +8,7 @@
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

spec/unit/client/redis/apns/notification_spec.rb

@@ -7,7 +7,7 @@
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

spec/unit/client/redis/apns2/notification_spec.rb

@@ -7,7 +7,7 @@
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""