rpush 1.0.0-java → 2.0.0-java

data/spec/unit_spec_helper.rb

@@ -1,101 +1,46 @@
-ENV['RAILS_ENV'] = 'test'
+require 'spec_helper'
+require 'rails'
 
-require 'bundler'
-Bundler.require(:default)
-
-require 'active_record'
-
-unless ENV['TRAVIS'] && ENV['QUALITY'] == 'false'
-  begin
-    require './spec/support/simplecov_helper'
-    include SimpleCovHelper
-    start_simple_cov("unit-#{RUBY_VERSION}")
-  rescue LoadError
-    puts "Coverage disabled."
-  end
+def unit_example?(example)
+  path = example.metadata[:example_group][:file_path]
+  path =~ /spec\/unit/
 end
 
-jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-
-$adapter = ENV['ADAPTER'] || 'postgresql'
-$adapter = 'jdbc' + $adapter if jruby
-
-DATABASE_CONFIG = YAML.load_file(File.expand_path("../config/database.yml", File.dirname(__FILE__)))
-
-if DATABASE_CONFIG[$adapter].nil?
-  puts "No such adapter '#{$adapter}'. Valid adapters are #{DATABASE_CONFIG.keys.join(', ')}."
-  exit 1
-end
-
-if ENV['TRAVIS']
-  DATABASE_CONFIG[$adapter]['username'] = 'postgres'
-else
-  require 'etc'
-  username = $adapter =~ /mysql/ ? 'root' : Etc.getlogin
-  DATABASE_CONFIG[$adapter]['username'] = username
-end
-
-puts "Using #{$adapter} adapter."
-
-ActiveRecord::Base.configurations = {"test" => DATABASE_CONFIG[$adapter]}
-ActiveRecord::Base.establish_connection(DATABASE_CONFIG[$adapter])
-
-require 'generators/templates/add_rpush'
-
-migrations = [AddRpush]
-
-migrations.reverse.each do |m|
-  begin
-    m.down
-  rescue ActiveRecord::StatementInvalid => e
-    p e
-  end
+def rails4?
+  ::Rails::VERSION::STRING >= '4'
 end
 
-migrations.each(&:up)
-
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
-
-require 'rpush'
-require 'rpush/daemon'
-
-Rpush::Daemon.initialize_store
-Rpush::Notification.reset_column_information
-Rpush::App.reset_column_information
-Rpush::Apns::Feedback.reset_column_information
-
 RSpec.configure do |config|
-  # config.before :suite do
-  #   PerfTools::CpuProfiler.start('/tmp/rpush_profile')
-  # end
-  # config.after :suite do
-  #   PerfTools::CpuProfiler.stop
-  # end
-
   config.before(:each) do
-    DatabaseCleaner.clean
+    Modis.with_connection do |redis|
+      redis.keys('rpush:*').each { |key| redis.del(key) }
+    end
+
+    if unit_example?(example)
+      connection = ActiveRecord::Base.connection
+
+      if rails4?
+        connection.begin_transaction joinable: false
+      else
+        connection.increment_open_transactions
+        connection.transaction_joinable = false
+        connection.begin_db_transaction
+      end
+    end
   end
 
   config.after(:each) do
-    Rpush.logger = nil
-    Rpush::Daemon.store = nil
-    Rpush::Deprecation.muted do
-      Rpush.config.set_defaults if Rpush.config.kind_of?(Rpush::Configuration)
+    if unit_example?(example)
+      connection = ActiveRecord::Base.connection
+
+      if rails4?
+        connection.rollback_transaction if connection.transaction_open?
+      else
+        if connection.open_transactions != 0
+          connection.rollback_db_transaction
+          connection.decrement_open_transactions
+        end
+      end
     end
   end
 end
-
-# a test certificate that contains both an X509 certificate and
-# a private key, similar to those used for connecting to Apple
-# push notification servers.
-#
-# Note that we cannot validate the certificate and private key
-# because we are missing the certificate chain used to validate
-# the certificate, and this is private to Apple. So if the app
-# has a certificate and a private key in it, the only way to find
-# out if it really is valid is to connect to Apple's servers.
-
-path = File.join(File.dirname(__FILE__), 'support')
-TEST_CERT = File.read(File.join(path, 'cert_without_password.pem'))
-TEST_CERT_WITH_PASSWORD = File.read(File.join(path, 'cert_with_password.pem'))

metadata

@@ -1,72 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
-  prerelease: false
-  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: net-http-persistent
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Professional grade APNs and GCM for Ruby
+  prerelease: false
+  type: :runtime
+description: The push notification service for Ruby.
 email:
 - port001@gmail.com
 executables:
@@ -77,8 +91,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- bin/rpush
-- config/database.yml
 - lib/generators/rpush_generator.rb
 - lib/generators/templates/add_adm.rb
 - lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb
@@ -92,95 +104,135 @@ files:
 - lib/generators/templates/create_rapns_notifications.rb
 - lib/generators/templates/rename_rapns_to_rpush.rb
 - lib/generators/templates/rpush.rb
+- lib/generators/templates/rpush_2_0_0_updates.rb
 - lib/rpush.rb
-- lib/rpush/TODO
-- lib/rpush/adm/app.rb
-- lib/rpush/adm/data_validator.rb
-- lib/rpush/adm/notification.rb
-- lib/rpush/apns/app.rb
-- lib/rpush/apns/binary_notification_validator.rb
-- lib/rpush/apns/device_token_format_validator.rb
-- lib/rpush/apns/feedback.rb
-- lib/rpush/apns/notification.rb
 - lib/rpush/apns_feedback.rb
-- lib/rpush/app.rb
+- lib/rpush/client/active_model.rb
+- lib/rpush/client/active_model/adm/app.rb
+- lib/rpush/client/active_model/adm/data_validator.rb
+- lib/rpush/client/active_model/adm/notification.rb
+- lib/rpush/client/active_model/apns/app.rb
+- lib/rpush/client/active_model/apns/binary_notification_validator.rb
+- lib/rpush/client/active_model/apns/device_token_format_validator.rb
+- lib/rpush/client/active_model/apns/notification.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/registration_ids_count_validator.rb
+- lib/rpush/client/active_model/wpns/app.rb
+- lib/rpush/client/active_model/wpns/notification.rb
+- lib/rpush/client/active_record.rb
+- lib/rpush/client/active_record/adm/app.rb
+- lib/rpush/client/active_record/adm/notification.rb
+- lib/rpush/client/active_record/apns/app.rb
+- lib/rpush/client/active_record/apns/feedback.rb
+- lib/rpush/client/active_record/apns/notification.rb
+- lib/rpush/client/active_record/app.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/wpns/app.rb
+- lib/rpush/client/active_record/wpns/notification.rb
+- lib/rpush/client/redis.rb
+- lib/rpush/client/redis/adm/app.rb
+- lib/rpush/client/redis/adm/notification.rb
+- lib/rpush/client/redis/apns/app.rb
+- lib/rpush/client/redis/apns/feedback.rb
+- lib/rpush/client/redis/apns/notification.rb
+- lib/rpush/client/redis/app.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/wpns/app.rb
+- lib/rpush/client/redis/wpns/notification.rb
 - lib/rpush/configuration.rb
 - lib/rpush/daemon.rb
 - lib/rpush/daemon/adm.rb
 - lib/rpush/daemon/adm/delivery.rb
 - lib/rpush/daemon/apns.rb
-- lib/rpush/daemon/apns/certificate_expired_error.rb
 - lib/rpush/daemon/apns/delivery.rb
-- lib/rpush/daemon/apns/disconnection_error.rb
 - lib/rpush/daemon/apns/feedback_receiver.rb
 - lib/rpush/daemon/app_runner.rb
 - lib/rpush/daemon/batch.rb
 - lib/rpush/daemon/constants.rb
 - lib/rpush/daemon/delivery.rb
 - lib/rpush/daemon/delivery_error.rb
+- lib/rpush/daemon/dispatcher/apns_tcp.rb
 - lib/rpush/daemon/dispatcher/http.rb
 - lib/rpush/daemon/dispatcher/tcp.rb
 - lib/rpush/daemon/dispatcher_loop.rb
-- lib/rpush/daemon/dispatcher_loop_collection.rb
+- lib/rpush/daemon/errors.rb
 - lib/rpush/daemon/feeder.rb
 - lib/rpush/daemon/gcm.rb
 - lib/rpush/daemon/gcm/delivery.rb
 - lib/rpush/daemon/interruptible_sleep.rb
 - lib/rpush/daemon/loggable.rb
+- lib/rpush/daemon/proc_title.rb
+- lib/rpush/daemon/queue_payload.rb
 - lib/rpush/daemon/reflectable.rb
 - lib/rpush/daemon/retry_header_parser.rb
 - lib/rpush/daemon/retryable_error.rb
+- lib/rpush/daemon/ring_buffer.rb
 - lib/rpush/daemon/service_config_methods.rb
+- lib/rpush/daemon/signal_handler.rb
 - lib/rpush/daemon/store/active_record.rb
 - lib/rpush/daemon/store/active_record/reconnectable.rb
+- lib/rpush/daemon/store/interface.rb
+- 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/too_many_requests_error.rb
 - lib/rpush/daemon/wpns.rb
 - lib/rpush/daemon/wpns/delivery.rb
 - lib/rpush/deprecatable.rb
 - lib/rpush/deprecation.rb
 - lib/rpush/embed.rb
-- lib/rpush/gcm/app.rb
-- lib/rpush/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
-- lib/rpush/gcm/notification.rb
 - lib/rpush/logger.rb
 - lib/rpush/multi_json_helper.rb
-- lib/rpush/notification.rb
-- lib/rpush/notifier.rb
-- lib/rpush/payload_data_size_validator.rb
 - lib/rpush/push.rb
-- lib/rpush/railtie.rb
 - lib/rpush/reflection.rb
-- lib/rpush/registration_ids_count_validator.rb
 - lib/rpush/version.rb
-- lib/rpush/wpns/app.rb
-- lib/rpush/wpns/notification.rb
-- lib/tasks/cane.rake
-- lib/tasks/rpush.rake
+- lib/tasks/quality.rake
 - lib/tasks/test.rake
+- spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns_spec.rb
 - spec/functional/embed_spec.rb
 - spec/functional/gcm_spec.rb
+- spec/functional/new_app_spec.rb
+- spec/functional/retry_spec.rb
+- spec/functional/synchronization_spec.rb
 - spec/functional/wpns_spec.rb
+- spec/functional_spec_helper.rb
+- spec/integration/rpush_spec.rb
+- spec/integration/support/gcm_success_response.json
+- spec/spec_helper.rb
+- spec/support/active_record_setup.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
+- spec/support/config/database.yml
 - spec/support/install.sh
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/adm/app_spec.rb
-- spec/unit/adm/notification_spec.rb
-- spec/unit/apns/app_spec.rb
-- spec/unit/apns/feedback_spec.rb
-- spec/unit/apns/notification_spec.rb
 - spec/unit/apns_feedback_spec.rb
-- spec/unit/app_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
+- spec/unit/client/active_record/apns/feedback_spec.rb
+- spec/unit/client/active_record/apns/notification_spec.rb
+- spec/unit/client/active_record/app_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/wpns/app_spec.rb
+- spec/unit/client/active_record/wpns/notification_spec.rb
 - 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/disconnection_error_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
@@ -188,35 +240,28 @@ files:
 - 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_collection_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
-- spec/unit/daemon/interruptible_sleep_spec.rb
 - spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
+- spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
-- spec/unit/daemon/too_many_requests_error_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
 - spec/unit/deprecation_spec.rb
 - spec/unit/embed_spec.rb
-- spec/unit/gcm/app_spec.rb
-- spec/unit/gcm/notification_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
-- spec/unit/notification_spec.rb
-- spec/unit/notifier_spec.rb
 - spec/unit/push_spec.rb
 - spec/unit/reflection_spec.rb
 - spec/unit/rpush_spec.rb
-- spec/unit/wpns/app_spec.rb
-- spec/unit/wpns/notification_spec.rb
 - spec/unit_spec_helper.rb
+- bin/rpush
 homepage: https://github.com/rpush/rpush
 licenses:
 - MIT
@@ -237,35 +282,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
-summary: Professional grade APNs and GCM for Ruby
+summary: The push notification service for Ruby.
 test_files:
-- config/database.yml
+- spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns_spec.rb
 - spec/functional/embed_spec.rb
 - spec/functional/gcm_spec.rb
+- spec/functional/new_app_spec.rb
+- spec/functional/retry_spec.rb
+- spec/functional/synchronization_spec.rb
 - spec/functional/wpns_spec.rb
+- spec/functional_spec_helper.rb
+- spec/integration/rpush_spec.rb
+- spec/integration/support/gcm_success_response.json
+- spec/spec_helper.rb
+- spec/support/active_record_setup.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
+- spec/support/config/database.yml
 - spec/support/install.sh
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/adm/app_spec.rb
-- spec/unit/adm/notification_spec.rb
-- spec/unit/apns/app_spec.rb
-- spec/unit/apns/feedback_spec.rb
-- spec/unit/apns/notification_spec.rb
 - spec/unit/apns_feedback_spec.rb
-- spec/unit/app_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
+- spec/unit/client/active_record/apns/feedback_spec.rb
+- spec/unit/client/active_record/apns/notification_spec.rb
+- spec/unit/client/active_record/app_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/wpns/app_spec.rb
+- spec/unit/client/active_record/wpns/notification_spec.rb
 - 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/disconnection_error_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
@@ -273,32 +331,24 @@ test_files:
 - 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_collection_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
-- spec/unit/daemon/interruptible_sleep_spec.rb
 - spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
+- spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
-- spec/unit/daemon/too_many_requests_error_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
 - spec/unit/deprecation_spec.rb
 - spec/unit/embed_spec.rb
-- spec/unit/gcm/app_spec.rb
-- spec/unit/gcm/notification_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
-- spec/unit/notification_spec.rb
-- spec/unit/notifier_spec.rb
 - spec/unit/push_spec.rb
 - spec/unit/reflection_spec.rb
 - spec/unit/rpush_spec.rb
-- spec/unit/wpns/app_spec.rb
-- spec/unit/wpns/notification_spec.rb
 - spec/unit_spec_helper.rb

data/lib/rpush/TODO

@@ -1,3 +0,0 @@
-* Should internal errors mark a notification as failed?
-* Check cert expiry when connected.
-* Lazy connect on socket write? - would allow to catch initial expiry error and mark on notification.

data/lib/rpush/adm/app.rb

@@ -1,15 +0,0 @@
-module Rpush
-  module Adm
-    class App < Rpush::App
-      validates :client_id, :client_secret, :presence => true
-
-      def access_token_expired?
-        self.access_token_expiration.nil? || self.access_token_expiration < Time.now
-      end
-
-      def service_name
-        'adm'
-      end
-    end
-  end
-end

data/lib/rpush/adm/data_validator.rb

@@ -1,11 +0,0 @@
-module Rpush
-  module Adm
-    class DataValidator < ActiveModel::Validator
-      def validate(record)
-        if record.collapse_key.nil? && record.data.nil?
-          record.errors[:data] << "must be set unless collapse_key is specified"
-        end
-      end
-    end
-  end
-end

data/lib/rpush/adm/notification.rb

@@ -1,29 +0,0 @@
-module Rpush
-  module Adm
-    class Notification < Rpush::Notification
-      validates :registration_ids, :presence => true
-
-      validates_with Rpush::PayloadDataSizeValidator, limit: 6144
-      validates_with Rpush::RegistrationIdsCountValidator, limit: 100
-
-      validates_with Rpush::Adm::DataValidator
-
-      def as_json
-        json = {
-          'data' => data
-        }
-
-        if collapse_key
-          json['consolidationKey'] = collapse_key
-        end
-
-        # number of seconds before message is expired
-        if expiry
-          json['expiresAfter'] = expiry
-        end
-
-        json
-      end
-    end
-  end
-end

data/lib/rpush/apns/app.rb

@@ -1,29 +0,0 @@
-module Rpush
-  module Apns
-    class App < Rpush::App
-      validates :environment, :presence => true, :inclusion => { :in => %w(development production sandbox) }
-      validates :certificate, :presence => true
-      validate :certificate_has_matching_private_key
-
-      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.nil? && !pkey.nil?
-          rescue OpenSSL::OpenSSLError
-            errors.add :certificate, 'Certificate value must contain a certificate and a private key.'
-          end
-        end
-        result
-      end
-    end
-  end
-end

data/lib/rpush/apns/binary_notification_validator.rb

@@ -1,12 +0,0 @@
-module Rpush
-  module Apns
-    class BinaryNotificationValidator < ActiveModel::Validator
-
-      def validate(record)
-        if record.payload_size > 256
-          record.errors[:base] << "APN notification cannot be larger than 256 bytes. Try condensing your alert and device attributes."
-        end
-      end
-    end
-  end
-end

data/lib/rpush/apns/device_token_format_validator.rb

@@ -1,12 +0,0 @@
-module Rpush
-  module Apns
-    class DeviceTokenFormatValidator < ActiveModel::Validator
-
-      def validate(record)
-        if record.device_token !~ /^[a-z0-9]{64}$/i
-          record.errors[:device_token] << "is invalid"
-        end
-      end
-    end
-  end
-end

data/lib/rpush/apns/feedback.rb

@@ -1,16 +0,0 @@
-module Rpush
-  module Apns
-    class Feedback < ActiveRecord::Base
-      self.table_name = 'rpush_feedback'
-
-      if Rpush.attr_accessible_available?
-        attr_accessible :device_token, :failed_at, :app
-      end
-
-      validates :device_token, :presence => true
-      validates :failed_at, :presence => true
-
-      validates_with Rpush::Apns::DeviceTokenFormatValidator
-    end
-  end
-end