push-apns 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8fd74a35925a321646bd48be98bb16ca81b47b
-  data.tar.gz: 52ed265ad2fe8c0bfc30be4b76acc5c5df8de3df
+  metadata.gz: a8006ceeba9466f4247ff88d322e2dc2a95e4c6c
+  data.tar.gz: 5801f214584d08f6caa8247c6a698172c0b142db
 SHA512:
-  metadata.gz: fc4bcde17bfa7ef69438ec37337912bfcc000352654283ba544af1309cd0d8bf94227a6831608c3aa25cd344e9bab30a8667862c5e8e70d58381d87172a8bc42
-  data.tar.gz: 43627b54eeca02245988e98bfedf52bd6891b61b3a767e1802e05a86e3b476aae5dd9ea54b809d8dda20d514c1b52332cced2c6b5cbcd080c4109bbe174fb76b
+  metadata.gz: b66649efce34bc628a2282524c2ed42f5012b8ab245f3719a0a8eb248a70e5572fc1e40a0439fa5003481f447ed42b234833b3cca2b34c4c5388897d7d075c36
+  data.tar.gz: 1fbe1623468c625882c9165576459dc3d7474b1bdd6d449a1a71f07c2305418e3d4bdb52036434727eb03e9d3552b9ee353c0826b1a5a23f2cab3db17ecc53f6

data/lib/push-apns/version.rb

@@ -1,3 +1,3 @@
 module PushApns
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/push/apns/binary_notification_validator.rb

@@ -6,7 +6,19 @@ module Push
         if record.payload_size > 256
           record.errors[:base] << "APN notification cannot be larger than 256 bytes. Try condensing your alert and device attributes."
         end
+
+        if [5, 10].include?(record.priority) == false
+          record.errors[:priority] << "APN priority must be 5 or 10."
+        end
+
+        if record.alert.nil? &&
+           record.badge.nil? &&
+           record.sound.nil? &&
+           record.content_available.present? &&
+           record.priority == 10
+           record.errors[:priority] << "APN priority cannot be 10 for a push that contains only the content_available key."
+        end
       end
     end
   end
-end
+end

data/lib/push/configuration_apns.rb

@@ -11,4 +11,4 @@ module Push
       :apns
     end
   end
-end
+end

data/lib/push/message_apns.rb

@@ -2,27 +2,31 @@ module Push
   class MessageApns < Push::Message
     SELECT_TIMEOUT = 0.2
     ERROR_TUPLE_BYTES = 6
+    APNS_PRIORITY_IMMEDIATE = 10
+    APNS_PRIORITY_CONSERVE_POWER = 5
     APN_ERRORS = {
-      1 => "Processing error",
-      2 => "Missing device token",
-      3 => "Missing topic",
-      4 => "Missing payload",
-      5 => "Missing token size",
-      6 => "Missing topic size",
-      7 => "Missing payload size",
-      8 => "Invalid token",
-      255 => "None (unknown error)"
-    }
-    store :properties, accessors: [:alert, :badge, :sound, :expiry, :attributes_for_device, :content_available]
-    attr_accessible :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device, :content_available if defined?(ActiveModel::MassAssignmentSecurity)
+      1 =>   "Processing error".freeze,
+      2 =>   "Missing device token".freeze,
+      3 =>   "Missing topic".freeze,
+      4 =>   "Missing payload".freeze,
+      5 =>   "Missing token size".freeze,
+      6 =>   "Missing topic size".freeze,
+      7 =>   "Missing payload size".freeze,
+      8 =>   "Invalid token".freeze,
+      10 =>  "Shutdown".freeze,
+      255 => "None (unknown error)".freeze
+    }.freeze
+    store :properties, accessors: [:alert, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority]
+    attr_accessible :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority if defined?(ActiveModel::MassAssignmentSecurity)
 
     validates :badge, :numericality => true, :allow_nil => true
     validates :expiry, :numericality => true, :presence => true
+    validates :priority, :numericality => true, :allow_nil => true
     validates :device, :format => { :with => /\A[a-z0-9]{64}\z/ }
     validates_with Push::Apns::BinaryNotificationValidator
 
     def attributes_for_device=(attrs)
-      raise ArgumentError, "attributes_for_device must be a Hash" if !attrs.is_a?(Hash)
+      raise ArgumentError, "attributes_for_device must be a Hash" unless attrs.is_a?(Hash)
       properties[:attributes_for_device] = MultiJson.dump(attrs)
     end
 
@@ -43,11 +47,14 @@ module Push
       MultiJson.load(string_or_json) rescue string_or_json
     end
 
-    # This method conforms to the enhanced binary format.
-    # http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW4
     def to_message(options = {})
-      id_for_pack = options[:for_validation] ? 0 : id
-      [1, id_for_pack, expiry, 0, 32, device, payload_size, payload].pack("cNNccH*na*")
+      frame = ""
+      frame << device_token_item
+      frame << payload_item
+      frame << identifier_item(options)
+      frame << expiration_item
+      frame << priority_item
+      [2, frame.bytesize].pack("cN") + frame
     end
 
     def use_connection
@@ -62,8 +69,41 @@ module Push
       payload.bytesize
     end
 
+    def priority
+      if properties[:alert].nil? &&
+         properties[:badge].nil? &&
+         properties[:sound].nil? &&
+         properties[:content_available].present?
+        APNS_PRIORITY_CONSERVE_POWER
+      else
+        properties[:priority].present? ? properties[:priority] : APNS_PRIORITY_IMMEDIATE
+      end
+    end
+
     private
 
+    def device_token_item
+      [1, 32, device].pack("cnH*")
+    end
+
+    def payload_item
+      json = payload
+      [2, json.bytesize, json].pack("cna*")
+    end
+
+    def identifier_item(options)
+      frame_id = options[:for_validation] ? 0 : id
+      [3, 4, frame_id].pack("cnN")
+    end
+
+    def expiration_item
+      [4, 4, expiry.to_i].pack("cnN")
+    end
+
+    def priority_item
+      [5, 1, priority].pack("cnc")
+    end
+
     def as_json
       json = ActiveSupport::OrderedHash.new
       json['aps'] = ActiveSupport::OrderedHash.new
@@ -100,4 +140,4 @@ module Push
       end
     end
   end
-end
+end

data/spec/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/spec/dummy/config/application.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "push-apns"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end

data/spec/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -0,0 +1,41 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/spec/dummy/config/environments/production.rb

@@ -0,0 +1,79 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/spec/dummy/config/environments/test.rb

@@ -0,0 +1,42 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/spec/dummy/config/initializers/assets.rb

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )

data/spec/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/spec/dummy/config/initializers/cookies_serializer.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

data/spec/dummy/config/initializers/inflections.rb

@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end

data/spec/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf

data/spec/dummy/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end

data/spec/dummy/config/locales/en.yml

@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -0,0 +1,56 @@
+Rails.application.routes.draw do
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
+
+  # You can have the root of your site routed with "root"
+  # root 'welcome#index'
+
+  # Example of regular route:
+  #   get 'products/:id' => 'catalog#view'
+
+  # Example of named route that can be invoked with purchase_url(id: product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+
+  # Example resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Example resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Example resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Example resource route with more complex sub-resources:
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', on: :collection
+  #     end
+  #   end
+
+  # Example resource route with concerns:
+  #   concern :toggleable do
+  #     post 'toggle'
+  #   end
+  #   resources :posts, concerns: :toggleable
+  #   resources :photos, concerns: :toggleable
+
+  # Example resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+end

data/spec/dummy/config/secrets.yml

@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: b782370a5ae7ab624ecfea230512310c4c230ffad9a003625ee7ed106565909df519bc62a5ae712c9462c3db011e72f66e8bf3a7f4206a519fdfb8f28e3841e2
+
+test:
+  secret_key_base: 277ff6fe985366d27e515f1540a5ba3a838d36ed09c42d58f391520027f4923f102a4739279b8d668729f9d935805b7ac89991b35d292b06d76fb6a9f4da565f
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/spec/dummy/db/migrate/20160602100607_create_push.rb

@@ -0,0 +1,49 @@
+class CreatePush < ActiveRecord::Migration
+  def self.up
+    create_table :push_configurations do |t|
+      t.string    :type,                  :null => false
+      t.string    :app,                   :null => false
+      t.text      :properties,            :null => true
+      t.boolean   :enabled,               :null => false, :default => false
+      t.integer   :connections,           :null => false, :default => 1
+      t.timestamps
+    end
+
+    create_table :push_messages do |t|
+      t.string    :app,                   :null => false
+      t.string    :device,                :null => false
+      t.string    :type,                  :null => false
+      t.text      :properties,            :null => true
+      t.boolean   :delivered,             :null => false, :default => false
+      t.timestamp :delivered_at,          :null => true
+      t.boolean   :failed,                :null => false, :default => false
+      t.timestamp :failed_at,             :null => true
+      t.integer   :error_code,            :null => true
+      t.string    :error_description,     :null => true
+      t.timestamp :deliver_after,         :null => true
+      t.timestamps
+    end
+
+    add_index :push_messages, [:delivered, :failed, :deliver_after]
+
+    create_table :push_feedback do |t|
+      t.string    :app,                   :null => false
+      t.string    :device,                :null => false
+      t.string    :type,                  :null => false
+      t.string    :follow_up,             :null => false
+      t.timestamp :failed_at,             :null => false
+      t.boolean   :processed,             :null => false, :default => false
+      t.timestamp :processed_at,          :null => true
+      t.text      :properties,            :null => true
+      t.timestamps
+    end
+
+    add_index :push_feedback, :processed
+  end
+
+  def self.down
+    drop_table :push_feedback
+    drop_table :push_messages
+    drop_table :push_configurations
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20160602100607) do
+
+  create_table "push_configurations", force: :cascade do |t|
+    t.string   "type",                        null: false
+    t.string   "app",                         null: false
+    t.text     "properties"
+    t.boolean  "enabled",     default: false, null: false
+    t.integer  "connections", default: 1,     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "push_feedback", force: :cascade do |t|
+    t.string   "app",                          null: false
+    t.string   "device",                       null: false
+    t.string   "type",                         null: false
+    t.string   "follow_up",                    null: false
+    t.datetime "failed_at",                    null: false
+    t.boolean  "processed",    default: false, null: false
+    t.datetime "processed_at"
+    t.text     "properties"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "push_feedback", ["processed"], name: "index_push_feedback_on_processed"
+
+  create_table "push_messages", force: :cascade do |t|
+    t.string   "app",                               null: false
+    t.string   "device",                            null: false
+    t.string   "type",                              null: false
+    t.text     "properties"
+    t.boolean  "delivered",         default: false, null: false
+    t.datetime "delivered_at"
+    t.boolean  "failed",            default: false, null: false
+    t.datetime "failed_at"
+    t.integer  "error_code"
+    t.string   "error_description"
+    t.datetime "deliver_after"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "push_messages", ["delivered", "failed", "deliver_after"], name: "index_push_messages_on_delivered_and_failed_and_deliver_after"
+
+end

data/spec/dummy/lib/push/feedback_processor.rb

@@ -0,0 +1,28 @@
+module Push
+  class FeedbackProcessor
+    def self.process(feedback)
+      if feedback.instance_of? Push::FeedbackGcm
+        if feedback.follow_up == 'delete'
+          # TODO: delete gcm device
+
+        elsif feedback.follow_up == 'update'
+          # TODO: update gcm device
+          # device = feedback.update_to
+
+        end
+      elsif feedback.instance_of? Push::FeedbackC2dm
+        if feedback.follow_up == 'delete'
+          # TODO: delete c2dm device
+
+        end
+      elsif feedback.instance_of? Push::FeedbackApns
+        if feedback.follow_up == 'delete'
+          # TODO: delete apns device
+
+        end
+      else
+        Push::Daemon.logger.info("[FeedbackProcessor] Unknown feedback type")
+      end
+    end
+  end
+end

data/spec/push/message_apns_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe Push::MessageApns do
+  let(:app) { 'com.test.app' }
+  let(:device) { 'ce8be6272e43e85516033e24b4c289220eeda4879c477160b2545e95b68b5969' }
+  let(:expiry) { 1.day.to_i }
+  let(:badge) { 1 }
+  let(:attributes_for_device) {
+    {
+      test: 1
+    }
+  }
+  let(:sound) { 'default' }
+  let(:alert) { 'We have a new push notification for you' }
+  let(:content_available) { 1 }
+  let(:priority) { 10 }
+  let(:notification_options) {
+    {
+      app: app,
+      device: device,
+      expiry: expiry,
+      badge: badge,
+      attributes_for_device: attributes_for_device,
+      sound: sound,
+      alert: alert,
+      content_available: content_available,
+      priority: priority
+    }
+  }
+  let(:instance) { Push::MessageApns.create(notification_options) }
+
+  describe "#badge" do
+    subject { instance.badge }
+    it { should == badge }
+  end
+
+  describe "#alert" do
+    subject { instance.alert }
+    it { should == alert }
+  end
+
+  describe "#app" do
+    subject { instance.app }
+    it { should == app }
+  end
+
+  describe "#sound" do
+    subject { instance.sound }
+    it { should == sound }
+  end
+
+  describe "#expiry" do
+    subject { instance.expiry }
+    it { should == expiry }
+  end
+
+  describe "#device" do
+    subject { instance.device }
+    it { should == device }
+  end
+
+  describe "#content_available" do
+    subject { instance.content_available }
+    it { should == content_available }
+  end
+
+  describe "#priority" do
+    subject { instance.priority }
+    it { should == priority }
+  end
+
+  describe "#attributes_for_device" do
+    subject { instance.attributes_for_device }
+    it { should == { "test" => 1 } }
+  end
+
+  describe "#payload" do
+    it "should create compliant json structure" do
+      expect(instance.payload).to eq(MultiJson.dump({
+        "aps" => {
+          "alert" => alert,
+          "badge" => badge,
+          "sound" => sound,
+          "content-available" => content_available
+        },
+        "test" => "1"
+      }))
+    end
+  end
+
+  describe "#to_message" do
+   it "should create a message with command 2" do
+     command, _1, _2 = instance.to_message.unpack("cNa*")
+     expect(command).to eq(2)
+   end
+
+   it "should create a message with correct frame length" do
+     _1, length, _2 = instance.to_message.unpack("cNa*")
+     expect(length).to eq(176)
+   end
+
+   def items
+     _1, _2, items_stream = instance.to_message.unpack("cNa*")
+     items = []
+     until items_stream.empty?
+       item_id, item_length, items_stream = items_stream.unpack("cna*")
+       item_data, items_stream = items_stream.unpack("a#{item_length}a*")
+       items << [item_id, item_length, item_data]
+     end
+     items
+   end
+
+   it "should include five items" do
+     expect(items.size).to eq(5)
+   end
+
+   it "should include item #1 with the token as hexadecimal" do
+     expect(items).to include([1, 32, [device].pack("H*")])
+   end
+
+   it "should include item #2 with the payload as JSON" do
+     expect(items).to include([2, 120, "{\"aps\":{\"alert\":\"We have a new push notification for you\",\"badge\":1,\"sound\":\"default\",\"content-available\":1},\"test\":\"1\"}"])
+   end
+
+   it "should include item #3 with the identifier" do
+     expect(items).to include([3, 4, [1].pack("N")])
+   end
+
+   it "should include item #4 with the expiry" do
+     expect(items).to include([4, 4, [expiry].pack("N")])
+   end
+
+   it "should include item #5 with the priority" do
+     expect(items).to include([5, 1, [priority].pack("c")])
+   end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
+require "rails/test_help"
+require "rspec/rails"
+require "multi_json"
+
+# Checks for pending migrations before tests are run.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+end

metadata

@@ -1,41 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: push-apns
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: push-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: multi_json
+  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'
 description: APNS support for the modular push daemon.
@@ -56,6 +112,45 @@ files:
 - lib/push/daemon/apns_support/feedback_receiver.rb
 - lib/push/feedback_apns.rb
 - lib/push/message_apns.rb
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/images/.keep
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/.keep
+- spec/dummy/app/models/.keep
+- spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/db/migrate/20160602100607_create_push.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/lib/assets/.keep
+- spec/dummy/lib/push/feedback_processor.rb
+- spec/dummy/log/.keep
+- spec/push/message_apns_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/tompesman/push-apns
 licenses: []
 metadata: {}
@@ -65,18 +160,57 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: APNS (iOS/Apple) part of the modular push daemon.
-test_files: []
+test_files:
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/images/.keep
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/.keep
+- spec/dummy/app/models/.keep
+- spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/db/migrate/20160602100607_create_push.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/lib/assets/.keep
+- spec/dummy/lib/push/feedback_processor.rb
+- spec/dummy/log/.keep
+- spec/push/message_apns_spec.rb
+- spec/spec_helper.rb