rpush 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e562313c0e7b3ce34abf0013edf503f2f5dd4d2
-  data.tar.gz: 1b3e1799010d17074316c353e77f8bef16bf54a7
+  metadata.gz: 6f3cc8682dd4d0be056e3fdac764d7e611f93d13
+  data.tar.gz: 9d98d267c188c407324808d28d9a3922dbb9b060
 SHA512:
-  metadata.gz: bd1b05e4f6a848428b2d3f008e57806f062b9803605d2544b9ad45a26e4e2f90f56f1af095a56963d1e3f2b5edf835e07694b758bec2fca036171de3135543bc
-  data.tar.gz: 85f65b3f5278077a738dbbc10ae16f1eeae6ece50cfdde65c9333a053ea595551ce071aa9e68a52acdf9ce4710230bda6d9d866f97f69352fcc9e63ffdc23014
+  metadata.gz: 59ee90a994a38a3684baef26510f1bf8befac593c91d691988f729224eeda34129c4965aa3bd8b7ed7db2b2c4288087bf11372c4089b73c90a77e78706fc56f4
+  data.tar.gz: c6d83831032136982317afe65731d0c0f56c2c568ce8c5c27ad96e5cb0b573587615d09fa36da7791999e78c652f8f2b05808a1c266e67f19025e3cb9a3b8ba5

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2.6.0 (Jan 25, 2016)
+
+#### Features
+
+* Added support for GCM for iOS' `content_available`. ([#221](https://github.com/rpush/rpush/pull/221))
+
+#### Fixes
+
+* Fix typo in Oracle support. ([#185](https://github.com/rpush/rpush/pull/185))
+* Remove `param` tag from WNS message. ([#190](https://github.com/rpush/rpush/pull/190))
+* Fixed WNS response headers parser. ([#192](https://github.com/rpush/rpush/pull/192))
+* GCM: fixed raise of unhandled errors. ([#193](https://github.com/rpush/rpush/pull/193))
+* Fix issue with custom PID file set in `Rpush.config`. ([#224](https://github.com/rpush/rpush/pull/224), [#225](https://github.com/rpush/rpush/pull/225))
+
 ## 2.5.0 (July 19, 2015)
   Features:
   * Add 'rpush status' to inspect running Rpush internal status.
@@ -10,7 +24,7 @@
   * Fix for handling APNs error when using `rpush push` or `Rpush.push`.
   * Fix backwards compatibility issue with ActiveRecord (#144).
 
-## 2.4.0 (Fed 18, 2015)
+## 2.4.0 (Feb 18, 2015)
   Features:
   * Support for MongoDB (using Mongoid).
   * config.feedback_poll is now deprecated, use config.apns.feedback_receiver.frequency instead.

data/README.md

@@ -119,6 +119,8 @@ For more documentation on [ADM](https://developer.amazon.com/sdk/adm.html).
 ```ruby
 app = Rpush::Wpns::App.new
 app.name = "windows_phone_app"
+app.client_id = # Get this from your apps dashboard https://dev.windows.com
+app.client_secret = # Get this from your apps dashboard https://dev.windows.com
 app.connections = 1
 app.save!
 ```
@@ -175,6 +177,10 @@ end
 
 Call this during startup of your application, for example, by adding it to the end of `config/rpush.rb`. See [Embedding API](https://github.com/rpush/rpush/wiki/Embedding-API) for more details.
 
+#### Using mina
+
+If you're using [mina](https://github.com/mina-deploy/mina), there is a gem called [mina-rpush](https://github.com/d4rky-pl/mina-rpush) which helps you control rpush.
+
 ### Configuration
 
 See [Configuration](https://github.com/rpush/rpush/wiki/Configuration) for a list of options.
@@ -216,7 +222,7 @@ You should run `rpush init` after upgrading Rpush to check for configuration and
 
 When running specs, please note that the ActiveRecord adapter can be changed by setting the `ADAPTER` environment variable. For example: `ADAPTER=postgresql rake`.
 
-Available adapters for testing are `mysql`, `mysql2` and `postgresql`.
+Available adapters for testing are `postgresql`, `jdbcpostgresql`, `mysql2`, `jdbcmysql`, `jdbch2`, and `sqlite3`.
 
 Note that the database username is changed at runtime to be the currently logged in user's name. So if you're testing
 with mysql and you're using a user named 'bob', you will need to grant a mysql user 'bob' access to the 'rpush_test'

data/lib/generators/rpush_migration_generator.rb

@@ -40,6 +40,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
 
     add_rpush_migration('rpush_2_0_0_updates')
     add_rpush_migration('rpush_2_1_0_updates')
+    add_rpush_migration('rpush_2_6_0_updates')
   end
 
   protected

data/lib/generators/templates/rpush_2_6_0_updates.rb

@@ -0,0 +1,10 @@
+class Rpush260Updates < ActiveRecord::Migration
+  def self.up
+    add_column :rpush_notifications, :content_available, :boolean, default: false
+  end
+
+  def self.down
+    remove_column :rpush_notifications, :content_available
+  end
+end
+

data/lib/rpush/cli.rb

@@ -93,6 +93,8 @@ module Rpush
 
     desc 'status', 'Show the internal status of the running Rpush instance.'
     def status
+      config_setup
+
       require 'rpush/daemon'
       rpc = Rpush::Daemon::Rpc::Client.new(rpush_process_pid)
       status = rpc.status

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

@@ -22,6 +22,7 @@ module Rpush
             }
             json['collapse_key'] = collapse_key if collapse_key
             json['time_to_live'] = expiry if expiry
+            json['content_available'] = content_available if content_available
             json
           end
         end

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

@@ -16,7 +16,7 @@ module Rpush
           attr_accessible :badge, :device_token, :sound, :alert, :data, :expiry, :delivered,
                           :delivered_at, :failed, :failed_at, :error_code, :error_description, :deliver_after,
                           :alert_is_json, :app, :app_id, :collapse_key, :delay_while_idle, :registration_ids,
-                          :uri, :url_args, :category
+                          :uri, :url_args, :category, :content_available
         end
 
         def data=(attrs)

data/lib/rpush/client/mongoid/notification.rb

@@ -32,6 +32,7 @@ module Rpush
         field :priority, type: Integer
         field :url_args, type: Array
         field :category, type: String
+        field :content_available, type: Boolean, default: false
 
         field :integer_id, type: Integer
         increments :integer_id, model_name: name

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

@@ -42,6 +42,7 @@ module Rpush
         attribute :priority, :integer
         attribute :url_args, :array
         attribute :category, :string
+        attribute :content_available, :boolean, default: false
 
         def app
           return nil unless app_id

data/lib/rpush/daemon/gcm/delivery.rb

@@ -5,7 +5,7 @@ module Rpush
       class Delivery < Rpush::Daemon::Delivery
         include MultiJsonHelper
 
-        host = 'https://android.googleapis.com'
+        host = 'https://gcm-http.googleapis.com'
         GCM_URI = URI.parse("#{host}/gcm/send")
         UNAVAILABLE_STATES = %w(Unavailable InternalServerError)
         INVALID_REGISTRATION_ID_STATES = %w(InvalidRegistration MismatchSenderId NotRegistered InvalidPackageName)
@@ -44,7 +44,7 @@ module Rpush
           when 503
             service_unavailable(response)
           else
-            fail Rpush::DeliveryError.new(response.code, @notification.id, Rpush::Daemon::HTTP_STATUS_CODES[response.code.to_i])
+            fail Rpush::DeliveryError.new(response.code.to_i, @notification.id, Rpush::Daemon::HTTP_STATUS_CODES[response.code.to_i])
           end
         end
 

data/lib/rpush/daemon/store/active_record.rb

@@ -206,7 +206,7 @@ module Rpush
 
         def claim(relation)
           notifications = relation.lock(true).to_a
-          @using_oracle ? notification.sort_by(&:created_at) : notifications
+          @using_oracle ? notifications.sort_by(&:created_at) : notifications
         end
 
         def adapter_name

data/lib/rpush/daemon/wns/delivery.rb

@@ -145,26 +145,24 @@ module Rpush
         end
 
         def status_from_response(response)
-          headers = response.to_hash
+          headers = response.to_hash.inject({}) {|h, v| h[v[0].downcase] = v[1]; h}
           {
-            notification:         headers["X-WNS-Status"],
-            device_connection:    headers["X-WNS-DeviceConnectionStatus"],
-            msg_id:               headers["X-WNS-Msg-ID"],
-            error_description:    headers["X-WNS-Error-Description"],
-            debug_trace:          headers["X-WNS-Debug-Trace"]
+            notification:         headers["x-wns-status"],
+            device_connection:    headers["x-wns-deviceconnectionstatus"],
+            msg_id:               headers["x-wns-msg-id"],
+            error_description:    headers["x-wns-error-description"],
+            debug_trace:          headers["x-wns-debug-trace"]
           }
         end
 
         def notification_to_xml
           title = clean_param_string(@notification.data['title']) if @notification.data['title'].present?
           body = clean_param_string(@notification.data['body']) if @notification.data['body'].present?
-          param = clean_param_string(@notification.data['param']) if @notification.data['param'].present?
           "<toast>
             <visual version='1' lang='en-US'>
               <binding template='ToastText02'>
                 <text id='1'>#{title}</text>
                 <text id='2'>#{body}</text>
-                <param>#{param}</param>
               </binding>
             </visual>
           </toast>"

data/lib/rpush/version.rb

@@ -1,3 +1,3 @@
 module Rpush
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/functional/cli_spec.rb

@@ -28,6 +28,7 @@ describe Rpush::CLI do
     after { timeout { Rpush.shutdown } }
 
     it 'prints the status' do
+      expect(subject).to receive(:configure_rpush) { true }
       expect(subject).to receive(:puts).with(/app_runners:/)
       subject.status
     end

data/spec/support/active_record_setup.rb

@@ -29,8 +29,9 @@ ActiveRecord::Base.establish_connection(db_config[SPEC_ADAPTER])
 require 'generators/templates/add_rpush'
 require 'generators/templates/rpush_2_0_0_updates'
 require 'generators/templates/rpush_2_1_0_updates'
+require 'generators/templates/rpush_2_6_0_updates'
 
-migrations = [AddRpush, Rpush200Updates, Rpush210Updates]
+migrations = [AddRpush, Rpush200Updates, Rpush210Updates, Rpush260Updates]
 
 unless ENV['TRAVIS']
   migrations.reverse_each do |m|

data/spec/unit/client/active_record/gcm/notification_spec.rb

@@ -31,4 +31,9 @@ describe Rpush::Client::ActiveRecord::Gcm::Notification do
     notification.expiry = 100
     expect(notification.as_json['time_to_live']).to eq 100
   end
+
+  it 'includes content_available in the payload' do
+    notification.content_available = true
+    expect(notification.as_json['content_available']).to eq true
+  end
 end if active_record?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -128,6 +128,7 @@ files:
 - lib/generators/templates/rpush.rb
 - lib/generators/templates/rpush_2_0_0_updates.rb
 - lib/generators/templates/rpush_2_1_0_updates.rb
+- lib/generators/templates/rpush_2_6_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb