rpush 1.0.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915d2b22f7338ed473b11711d2928b99f77b140d
-  data.tar.gz: 70614eb04113241f04021e1d691bd595a12bb0d3
+  metadata.gz: 8d5bf4a64ca72a0c58b62a78da3e4315d06601cc
+  data.tar.gz: 2472ea351a2cc76e46668951eeabcfaf43b94b1f
 SHA512:
-  metadata.gz: d307e38e19be35ffd0bafcef76e5601371760b78d0f4fb6481d223a9db5a3ff706ca527eb61ee315b1f53f30c576b8d93fe8f402462371c864eb6f92b052f633
-  data.tar.gz: fd82f029800ef107c7b0cb312084763244e11a5f499add5f0530133b59737f1d98a8db7274dbaedbbcc17c62f9858559c0a4d4c25e9252ffd4d0841e20f8a15d
+  metadata.gz: 1e34c0d97f7a604e0cc47b9c2e3548055207d87cd7a09c0800632c123cc4d7f4f62c7dbc7d014fa302c797ae822e2df2ae788d50b9670c24b003dbe00e7af767
+  data.tar.gz: 39e8509bb7fcfc76cb0347d55b4eee1a74f2083248ea3c71ccfbfff5e08a4ca8a3cfe6d8f6d1b7f788955f8af8fea016c469e741a5306c0c547fef5afd031029

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.0.0 (unreleased)
+  * Use APNs enhanced binary format version 2.
+  * Support running multiple Rpush processes when using ActiveRecord and Redis.
+  * APNs error detection is now performed asynchronously, 'check_for_errors' is therefore deprecated.
+  * Deprecated attributes_for_device accessors. Use data instead.
+  * Fix signal handling to work with Ruby 2.x. (#40).
+  * You no longer need to signal HUP after creating a new app, they will be loaded automatically for you.
+  * APNs notifications are now delivered in batches, greatly improving throughput.
+  * Signaling HUP now also causes Rpush to immediately check for new notifications.
+  * The 'wakeup' config option has been removed.
+  * The 'batch_storage_updates' config option has been deprecated, storage backends will now always batch updates where appropriate.
+  * The rpush process title updates with number of queued notifications and number of dispatchers.
+
 ## 1.0.0 (Feb 9, 2014)
   * Renamed to Rpush (from Rapns). Version number reset to 1.0.0.
   * Reduce default batch size to 100.

data/README.md

@@ -1,24 +1,24 @@
 [![Build Status](https://secure.travis-ci.org/rpush/rpush.png?branch=master)](http://travis-ci.org/rpush/rpush)
 [![Code Climate](https://codeclimate.com/github/rpush/rpush.png)](https://codeclimate.com/github/rpush/rpush)
-[![Coverage Status](https://coveralls.io/repos/rpush/rpush/badge.png?branch=master)](https://coveralls.io/r/rpush/rpush?branch=master)
+[![Code Coverage](https://codeclimate.com/github/rpush/rpush/coverage.png)](https://codeclimate.com/github/rpush/rpush)
 [![Gem Version](https://badge.fury.io/rb/rpush.png)](http://badge.fury.io/rb/rpush)
 
-<img src="https://raw.github.com/rpush/rpush/master/rpush.png" align="right" width="200px" />
+<img src="https://raw.github.com/rpush/rpush/master/logo.png" align="right" width="200px" />
 
 ### Rpush. The push notification service for Ruby.
 
 * Supports:
   * **Apple Push Notification Service**
-  * **Google Cloud Messaging)**
-  * **Amazon Devide Messaging**
-  * **Windows Push Notification Service**.
+  * **Google Cloud Messaging**
+  * **Amazon Device Messaging**
+  * **Windows Phone Push Notification Service**.
 * Seamless Rails (3, 4) integration.
 * Scalable - choose the number of persistent connections for each app.
 * Designed for uptime - signal -HUP to add, update apps.
 * Run as a daemon or inside an [existing processs](https://github.com/rpush/rpush/wiki/Embedding-API).
 * Use in a scheduler for low-workload deployments ([Push API](https://github.com/rpush/rpush/wiki/Push-API)).
 * Hooks for fine-grained instrumentation and error handling ([Reflection API](https://github.com/rpush/rpush/wiki/Reflection-API)).
-* Works with MRI, JRuby, Rubinius 1.9, 2.0, 2.1.
+* Works with MRI, JRuby and Rubinius.
 
 
 ### Getting Started
@@ -57,7 +57,7 @@ n = Rpush::Apns::Notification.new
 n.app = Rpush::Apns::App.find_by_name("ios_app")
 n.device_token = "..."
 n.alert = "hi mom!"
-n.attributes_for_device = {:foo => :bar}
+n.data = { foo: :bar }
 n.save!
 ```
 
@@ -76,8 +76,8 @@ app.save!
 ```ruby
 n = Rpush::Gcm::Notification.new
 n.app = Rpush::Gcm::App.find_by_name("android_app")
-n.registration_ids = ["..."]
-n.data = {:message => "hi mom!"}
+n.registration_ids = ["token", "..."]
+n.data = { message: "hi mom!" }
 n.save!
 ```
 
@@ -98,7 +98,7 @@ app.save!
 n = Rpush::Adm::Notification.new
 n.app = Rpush::Adm::App.find_by_name("kindle_app")
 n.registration_ids = ["..."]
-n.data = {:message => "hi mom!"}
+n.data = { message: "hi mom!"}
 n.collapse_key = "Optional consolidationKey"
 n.save!
 ```
@@ -124,7 +124,7 @@ n.save!
 
 ### Starting Rpush
 
-As a daemon:
+As a daemon (recommended):
 
     cd /path/to/rails/app
     rpush <Rails environment> [options]
@@ -135,8 +135,6 @@ Inside an existing process (see [Embedding API](https://github.com/rpush/rpush/w
 Rpush.embed
 ```
 
-*Please note that only ever a single instance of Rpush should be running.*
-
 In a scheduler (see [Push API](https://github.com/rpush/rpush/wiki/Push-API)):
 
 ```ruby
@@ -172,7 +170,7 @@ After updating you should run `rails g rpush` to check for any new migrations.
 * [Silent failures might be dropped connections](https://github.com/rpush/rpush/wiki/Dropped-connections)
 
 ### Google Cloud Messaging
-* [Notification Options](https://github.com/rpush/rpush/wiki//GCM-Notification-Options)
+* [Notification Options](https://github.com/rpush/rpush/wiki/GCM-Notification-Options)
 * [Canonical IDs](https://github.com/rpush/rpush/wiki/Canonical-IDs)
 * [Delivery Failures & Retries](https://github.com/rpush/rpush/wiki/Delivery-Failures-&-Retries)
 

data/bin/rpush

@@ -16,8 +16,17 @@ options = ARGV.options do |opts|
   opts.on('-p PATH', '--pid-file PATH', String, 'Path to write PID file. Relative to Rails root unless absolute.') { |path| config.pid_file = path }
   opts.on('-b N', '--batch-size N', Integer, 'Storage backend notification batch size.') { |n| config.batch_size = n }
   opts.on('-B', '--[no-]batch-storage-updates', 'Perform storage updates in batches.') { |v| config.batch_storage_updates = v }
-  opts.on('-v', '--version', 'Print the version.') { puts "rpush #{Rpush::VERSION}"; exit }
-  opts.on('-h', '--help', 'You\'re looking at it.') { puts opts; exit }
+  opts.on('-v', '--version', 'Print the version.') do
+    puts "rpush #{Rpush::VERSION}"
+    exit
+  end
+  opts.on('-h', '--help', 'You\'re looking at it.') do
+    hidden_switches = %w(-e --no-error-checks)
+    puts opts.to_s.split("\n").delete_if do |line|
+      hidden_switches.any? { |s| line =~ /#{s}/ }
+    end.join("\n")
+    exit
+  end
 end
 
 if environment.nil? || environment =~ /^-/

data/lib/generators/rpush_generator.rb

@@ -20,8 +20,10 @@ class RpushGenerator < Rails::Generators::Base
       add_rpush_migration('add_adm')
       add_rpush_migration('rename_rapns_to_rpush')
       add_rpush_migration('add_fail_after_to_rpush_notifications')
+      add_rpush_migration('add_processing_to_rpush_notifications')
     else
       add_rpush_migration('add_rpush')
+      add_rpush_migration('rpush_2_0_0_updates')
     end
   end
 

data/lib/generators/templates/add_adm.rb

@@ -6,14 +6,14 @@ class AddAdm < ActiveRecord::Migration
   end
 
   def self.up
-    add_column :rapns_apps, :client_id, :string, :null => true
-    add_column :rapns_apps, :client_secret, :string, :null => true
-    add_column :rapns_apps, :access_token, :string, :null => true
-    add_column :rapns_apps, :access_token_expiration, :datetime, :null => true
+    add_column :rapns_apps, :client_id, :string, null: true
+    add_column :rapns_apps, :client_secret, :string, null: true
+    add_column :rapns_apps, :access_token, :string, null: true
+    add_column :rapns_apps, :access_token_expiration, :datetime, null: true
   end
 
   def self.down
-    AddAdm::Rapns::Notification.where(:type => 'Rapns::Adm::Notification').delete_all
+    AddAdm::Rapns::Notification.where(type: 'Rapns::Adm::Notification').delete_all
 
     remove_column :rapns_apps, :client_id
     remove_column :rapns_apps, :client_secret

data/lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb

@@ -1,6 +1,6 @@
 class AddAlertIsJsonToRapnsNotifications < ActiveRecord::Migration
   def self.up
-    add_column :rapns_notifications, :alert_is_json, :boolean, :null => true, :default => false
+    add_column :rapns_notifications, :alert_is_json, :boolean, null: true, default: false
   end
 
   def self.down

data/lib/generators/templates/add_app_to_rapns.rb

@@ -1,7 +1,7 @@
 class AddAppToRapns < ActiveRecord::Migration
   def self.up
-    add_column :rapns_notifications, :app, :string, :null => true
-    add_column :rapns_feedback, :app, :string, :null => true
+    add_column :rapns_notifications, :app, :string, null: true
+    add_column :rapns_feedback, :app, :string, null: true
   end
 
   def self.down

data/lib/generators/templates/add_fail_after_to_rpush_notifications.rb

@@ -1,6 +1,6 @@
 class AddFailAfterToRpushNotifications < ActiveRecord::Migration
   def self.up
-    add_column :rpush_notifications, :fail_after, :timestamp, :null => true
+    add_column :rpush_notifications, :fail_after, :timestamp, null: true
   end
 
   def self.down

data/lib/generators/templates/add_gcm.rb

@@ -11,34 +11,34 @@ class AddGcm < ActiveRecord::Migration
   end
 
   def self.up
-    add_column :rapns_notifications, :type, :string, :null => true
-    add_column :rapns_apps, :type, :string, :null => true
+    add_column :rapns_notifications, :type, :string, null: true
+    add_column :rapns_apps, :type, :string, null: true
 
-    AddGcm::Rapns::Notification.update_all :type => 'Rapns::Apns::Notification'
-    AddGcm::Rapns::App.update_all :type => 'Rapns::Apns::App'
+    AddGcm::Rapns::Notification.update_all type: 'Rapns::Apns::Notification'
+    AddGcm::Rapns::App.update_all type: 'Rapns::Apns::App'
 
-    change_column :rapns_notifications, :type, :string, :null => false
-    change_column :rapns_apps, :type, :string, :null => false
-    change_column :rapns_notifications, :device_token, :string, { :null => true, :limit => 64 }
-    change_column :rapns_notifications, :expiry, :integer, { :null => true, :default => 1.day.to_i }
-    change_column :rapns_apps, :environment, :string, :null => true
-    change_column :rapns_apps, :certificate, :text, :null => true, :default => nil
+    change_column :rapns_notifications, :type, :string, null: false
+    change_column :rapns_apps, :type, :string, null: false
+    change_column :rapns_notifications, :device_token, :string, { null: true, limit: 64 }
+    change_column :rapns_notifications, :expiry, :integer, { null: true, default: 1.day.to_i }
+    change_column :rapns_apps, :environment, :string, null: true
+    change_column :rapns_apps, :certificate, :text, null: true, default: nil
 
-    change_column :rapns_notifications, :error_description, :text, :null => true, :default => nil
-    change_column :rapns_notifications, :sound, :string, :default => 'default'
+    change_column :rapns_notifications, :error_description, :text, null: true, default: nil
+    change_column :rapns_notifications, :sound, :string, default: 'default'
 
     rename_column :rapns_notifications, :attributes_for_device, :data
     rename_column :rapns_apps, :key, :name
 
-    add_column :rapns_apps, :auth_key, :string, :null => true
+    add_column :rapns_apps, :auth_key, :string, null: true
 
-    add_column :rapns_notifications, :collapse_key, :string, :null => true
-    add_column :rapns_notifications, :delay_while_idle, :boolean, :null => false, :default => false
+    add_column :rapns_notifications, :collapse_key, :string, null: true
+    add_column :rapns_notifications, :delay_while_idle, :boolean, null: false, default: false
 
     reg_ids_type = ActiveRecord::Base.connection.adapter_name.include?('Mysql') ? :mediumtext : :text
-    add_column :rapns_notifications, :registration_ids, reg_ids_type, :null => true
-    add_column :rapns_notifications, :app_id, :integer, :null => true
-    add_column :rapns_notifications, :retries, :integer, :null => true, :default => 0
+    add_column :rapns_notifications, :registration_ids, reg_ids_type, null: true
+    add_column :rapns_notifications, :app_id, :integer, null: true
+    add_column :rapns_notifications, :retries, :integer, null: true, default: 0
 
     AddGcm::Rapns::Notification.reset_column_information
     AddGcm::Rapns::App.reset_column_information
@@ -47,30 +47,30 @@ class AddGcm < ActiveRecord::Migration
       AddGcm::Rapns::Notification.update_all(['app_id = ?', app.id], ['app = ?', app.name])
     end
 
-    change_column :rapns_notifications, :app_id, :integer, :null => false
+    change_column :rapns_notifications, :app_id, :integer, null: false
     remove_column :rapns_notifications, :app
 
     if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi", true)
-      remove_index :rapns_notifications, :name => "index_rapns_notifications_multi"
+      remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
     elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after", false)
-      remove_index :rapns_notifications, :name => "index_rapns_notifications_on_delivered_failed_deliver_after"
+      remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
     end
-    add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], :name => "index_rapns_notifications_multi"
+    add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], name: "index_rapns_notifications_multi"
   end
 
   def self.down
-    AddGcm::Rapns::Notification.where(:type => 'Rapns::Gcm::Notification').delete_all
+    AddGcm::Rapns::Notification.where(type: 'Rapns::Gcm::Notification').delete_all
 
     remove_column :rapns_notifications, :type
     remove_column :rapns_apps, :type
 
-    change_column :rapns_notifications, :device_token, :string, { :null => false, :limit => 64 }
-    change_column :rapns_notifications, :expiry, :integer, { :null => false, :default => 1.day.to_i }
-    change_column :rapns_apps, :environment, :string, :null => false
-    change_column :rapns_apps, :certificate, :text, :null => false
+    change_column :rapns_notifications, :device_token, :string, { null: false, limit: 64 }
+    change_column :rapns_notifications, :expiry, :integer, { null: false, default: 1.day.to_i }
+    change_column :rapns_apps, :environment, :string, null: false
+    change_column :rapns_apps, :certificate, :text, null: false
 
-    change_column :rapns_notifications, :error_description, :string, :null => true, :default => nil
-    change_column :rapns_notifications, :sound, :string, :default => '1.aiff'
+    change_column :rapns_notifications, :error_description, :string, null: true, default: nil
+    change_column :rapns_notifications, :sound, :string, default: '1.aiff'
 
     rename_column :rapns_notifications, :data, :attributes_for_device
     rename_column :rapns_apps, :name, :key
@@ -82,7 +82,7 @@ class AddGcm < ActiveRecord::Migration
     remove_column :rapns_notifications, :registration_ids
     remove_column :rapns_notifications, :retries
 
-    add_column :rapns_notifications, :app, :string, :null => true
+    add_column :rapns_notifications, :app, :string, null: true
 
     AddGcm::Rapns::Notification.reset_column_information
     AddGcm::Rapns::App.reset_column_information
@@ -92,11 +92,11 @@ class AddGcm < ActiveRecord::Migration
     end
 
     if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi, true)
-        remove_index :rapns_notifications, :name => :index_rapns_notifications_multi
+      remove_index :rapns_notifications, name: :index_rapns_notifications_multi
     end
 
     remove_column :rapns_notifications, :app_id
 
-    add_index :rapns_notifications, [:delivered, :failed, :deliver_after], :name => :index_rapns_notifications_multi
+    add_index :rapns_notifications, [:delivered, :failed, :deliver_after], name: :index_rapns_notifications_multi
   end
 end

data/lib/generators/templates/add_rpush.rb

@@ -44,28 +44,28 @@ class AddRpush < ActiveRecord::Migration
   class CreateRapnsNotifications < ActiveRecord::Migration
     def self.up
       create_table :rapns_notifications do |t|
-        t.integer   :badge,                 :null => true
-        t.string    :device_token,          :null => false, :limit => 64
-        t.string    :sound,                 :null => true,  :default => "1.aiff"
-        t.string    :alert,                 :null => true
-        t.text      :attributes_for_device, :null => true
-        t.integer   :expiry,                :null => false, :default => 1.day.to_i
-        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.integer   :badge,                 null: true
+        t.string    :device_token,          null: false, limit: 64
+        t.string    :sound,                 null: true,  default: "1.aiff"
+        t.string    :alert,                 null: true
+        t.text      :attributes_for_device, null: true
+        t.integer   :expiry,                null: false, default: 1.day.to_i
+        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 :rapns_notifications, [:delivered, :failed, :deliver_after], :name => 'index_rapns_notifications_multi'
+      add_index :rapns_notifications, [:delivered, :failed, :deliver_after], name: 'index_rapns_notifications_multi'
     end
 
     def self.down
       if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi', true)
-        remove_index :rapns_notifications, :name => 'index_rapns_notifications_multi'
+        remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
       end
       drop_table :rapns_notifications
     end
@@ -74,8 +74,8 @@ class AddRpush < ActiveRecord::Migration
   class CreateRapnsFeedback < ActiveRecord::Migration
     def self.up
       create_table :rapns_feedback do |t|
-        t.string    :device_token,          :null => false, :limit => 64
-        t.timestamp :failed_at,             :null => false
+        t.string    :device_token,          null: false, limit: 64
+        t.timestamp :failed_at,             null: false
         t.timestamps
       end
 
@@ -92,7 +92,7 @@ class AddRpush < ActiveRecord::Migration
 
   class AddAlertIsJsonToRapnsNotifications < ActiveRecord::Migration
     def self.up
-      add_column :rapns_notifications, :alert_is_json, :boolean, :null => true, :default => false
+      add_column :rapns_notifications, :alert_is_json, :boolean, null: true, default: false
     end
 
     def self.down
@@ -102,8 +102,8 @@ class AddRpush < ActiveRecord::Migration
 
   class AddAppToRapns < ActiveRecord::Migration
     def self.up
-      add_column :rapns_notifications, :app, :string, :null => true
-      add_column :rapns_feedback, :app, :string, :null => true
+      add_column :rapns_notifications, :app, :string, null: true
+      add_column :rapns_feedback, :app, :string, null: true
     end
 
     def self.down
@@ -115,11 +115,11 @@ class AddRpush < ActiveRecord::Migration
   class CreateRapnsApps < ActiveRecord::Migration
     def self.up
       create_table :rapns_apps do |t|
-        t.string    :key,             :null => false
-        t.string    :environment,     :null => false
-        t.text      :certificate,     :null => false
-        t.string    :password,        :null => true
-        t.integer   :connections,     :null => false, :default => 1
+        t.string    :key,             null: false
+        t.string    :environment,     null: false
+        t.text      :certificate,     null: false
+        t.string    :password,        null: true
+        t.integer   :connections,     null: false, default: 1
         t.timestamps
       end
     end
@@ -142,66 +142,66 @@ class AddRpush < ActiveRecord::Migration
     end
 
     def self.up
-      add_column :rapns_notifications, :type, :string, :null => true
-      add_column :rapns_apps, :type, :string, :null => true
+      add_column :rapns_notifications, :type, :string, null: true
+      add_column :rapns_apps, :type, :string, null: true
 
-      AddGcm::Rapns::Notification.update_all :type => 'Rapns::Apns::Notification'
-      AddGcm::Rapns::App.update_all :type => 'Rapns::Apns::App'
+      AddGcm::Rapns::Notification.update_all type: 'Rapns::Apns::Notification'
+      AddGcm::Rapns::App.update_all type: 'Rapns::Apns::App'
 
-      change_column :rapns_notifications, :type, :string, :null => false
-      change_column :rapns_apps, :type, :string, :null => false
-      change_column :rapns_notifications, :device_token, :string, { :null => true, :limit => 64 }
-      change_column :rapns_notifications, :expiry, :integer, { :null => true, :default => 1.day.to_i }
-      change_column :rapns_apps, :environment, :string, :null => true
-      change_column :rapns_apps, :certificate, :text, :null => true, :default => nil
+      change_column :rapns_notifications, :type, :string, null: false
+      change_column :rapns_apps, :type, :string, null: false
+      change_column :rapns_notifications, :device_token, :string, { null: true, limit: 64 }
+      change_column :rapns_notifications, :expiry, :integer, { null: true, default: 1.day.to_i }
+      change_column :rapns_apps, :environment, :string, null: true
+      change_column :rapns_apps, :certificate, :text, null: true, default: nil
 
-      change_column :rapns_notifications, :error_description, :text, :null => true, :default => nil
-      change_column :rapns_notifications, :sound, :string, :default => 'default'
+      change_column :rapns_notifications, :error_description, :text, null: true, default: nil
+      change_column :rapns_notifications, :sound, :string, default: 'default'
 
       rename_column :rapns_notifications, :attributes_for_device, :data
       rename_column :rapns_apps, :key, :name
 
-      add_column :rapns_apps, :auth_key, :string, :null => true
+      add_column :rapns_apps, :auth_key, :string, null: true
 
-      add_column :rapns_notifications, :collapse_key, :string, :null => true
-      add_column :rapns_notifications, :delay_while_idle, :boolean, :null => false, :default => false
+      add_column :rapns_notifications, :collapse_key, :string, null: true
+      add_column :rapns_notifications, :delay_while_idle, :boolean, null: false, default: false
 
       reg_ids_type = ActiveRecord::Base.connection.adapter_name.include?('Mysql') ? :mediumtext : :text
-      add_column :rapns_notifications, :registration_ids, reg_ids_type, :null => true
-      add_column :rapns_notifications, :app_id, :integer, :null => true
-      add_column :rapns_notifications, :retries, :integer, :null => true, :default => 0
+      add_column :rapns_notifications, :registration_ids, reg_ids_type, null: true
+      add_column :rapns_notifications, :app_id, :integer, null: true
+      add_column :rapns_notifications, :retries, :integer, null: true, default: 0
 
       AddGcm::Rapns::Notification.reset_column_information
       AddGcm::Rapns::App.reset_column_information
 
       AddGcm::Rapns::App.all.each do |app|
-        AddGcm::Rapns::Notification.update_all(['app_id = ?', app.id], ['app = ?', app.name])
+        AddGcm::Rapns::Notification.where(app: app.name).update_all(app_id: app.id)
       end
 
-      change_column :rapns_notifications, :app_id, :integer, :null => false
+      change_column :rapns_notifications, :app_id, :integer, null: false
       remove_column :rapns_notifications, :app
 
       if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi", true)
-        remove_index :rapns_notifications, :name => "index_rapns_notifications_multi"
+        remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
       elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after", false)
-        remove_index :rapns_notifications, :name => "index_rapns_notifications_on_delivered_failed_deliver_after"
+        remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
       end
-      add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], :name => "index_rapns_notifications_multi"
+      add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], name: "index_rapns_notifications_multi"
     end
 
     def self.down
-      AddGcm::Rapns::Notification.where(:type => 'Rapns::Gcm::Notification').delete_all
+      AddGcm::Rapns::Notification.where(type: 'Rapns::Gcm::Notification').delete_all
 
       remove_column :rapns_notifications, :type
       remove_column :rapns_apps, :type
 
-      change_column :rapns_notifications, :device_token, :string, { :null => false, :limit => 64 }
-      change_column :rapns_notifications, :expiry, :integer, { :null => false, :default => 1.day.to_i }
-      change_column :rapns_apps, :environment, :string, :null => false
-      change_column :rapns_apps, :certificate, :text, :null => false
+      change_column :rapns_notifications, :device_token, :string, { null: false, limit: 64 }
+      change_column :rapns_notifications, :expiry, :integer, { null: false, default: 1.day.to_i }
+      change_column :rapns_apps, :environment, :string, null: false
+      change_column :rapns_apps, :certificate, :text, null: false
 
-      change_column :rapns_notifications, :error_description, :string, :null => true, :default => nil
-      change_column :rapns_notifications, :sound, :string, :default => '1.aiff'
+      change_column :rapns_notifications, :error_description, :string, null: true, default: nil
+      change_column :rapns_notifications, :sound, :string, default: '1.aiff'
 
       rename_column :rapns_notifications, :data, :attributes_for_device
       rename_column :rapns_apps, :name, :key
@@ -213,22 +213,22 @@ class AddRpush < ActiveRecord::Migration
       remove_column :rapns_notifications, :registration_ids
       remove_column :rapns_notifications, :retries
 
-      add_column :rapns_notifications, :app, :string, :null => true
+      add_column :rapns_notifications, :app, :string, null: true
 
       AddGcm::Rapns::Notification.reset_column_information
       AddGcm::Rapns::App.reset_column_information
 
       AddGcm::Rapns::App.all.each do |app|
-        AddGcm::Rapns::Notification.update_all(['app = ?', app.key], ['app_id = ?', app.id])
+        AddGcm::Rapns::Notification.where(app_id: app.id).update_all(app: app.key)
       end
 
       if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi, true)
-          remove_index :rapns_notifications, :name => :index_rapns_notifications_multi
+          remove_index :rapns_notifications, name: :index_rapns_notifications_multi
       end
 
       remove_column :rapns_notifications, :app_id
 
-      add_index :rapns_notifications, [:delivered, :failed, :deliver_after], :name => :index_rapns_notifications_multi
+      add_index :rapns_notifications, [:delivered, :failed, :deliver_after], name: :index_rapns_notifications_multi
     end
   end
 
@@ -240,11 +240,11 @@ class AddRpush < ActiveRecord::Migration
     end
 
     def self.up
-      add_column :rapns_notifications, :uri, :string, :null => true
+      add_column :rapns_notifications, :uri, :string, null: true
     end
 
     def self.down
-      AddWpns::Rapns::Notification.where(:type => 'Rapns::Wpns::Notification').delete_all
+      AddWpns::Rapns::Notification.where(type: 'Rapns::Wpns::Notification').delete_all
       remove_column :rapns_notifications, :uri
     end
   end
@@ -257,14 +257,14 @@ class AddRpush < ActiveRecord::Migration
     end
 
     def self.up
-      add_column :rapns_apps, :client_id, :string, :null => true
-      add_column :rapns_apps, :client_secret, :string, :null => true
-      add_column :rapns_apps, :access_token, :string, :null => true
-      add_column :rapns_apps, :access_token_expiration, :datetime, :null => true
+      add_column :rapns_apps, :client_id, :string, null: true
+      add_column :rapns_apps, :client_secret, :string, null: true
+      add_column :rapns_apps, :access_token, :string, null: true
+      add_column :rapns_apps, :access_token_expiration, :datetime, null: true
     end
 
     def self.down
-      AddAdm::Rapns::Notification.where(:type => 'Rapns::Adm::Notification').delete_all
+      AddAdm::Rapns::Notification.where(type: 'Rapns::Adm::Notification').delete_all
 
       remove_column :rapns_apps, :client_id
       remove_column :rapns_apps, :client_secret
@@ -339,7 +339,7 @@ class AddRpush < ActiveRecord::Migration
 
   class AddFailAfterToRpushNotifications < ActiveRecord::Migration
     def self.up
-      add_column :rpush_notifications, :fail_after, :timestamp, :null => true
+      add_column :rpush_notifications, :fail_after, :timestamp, null: true
     end
 
     def self.down