rpush 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f3cc8682dd4d0be056e3fdac764d7e611f93d13
-  data.tar.gz: 9d98d267c188c407324808d28d9a3922dbb9b060
+  metadata.gz: a1610a8d44461c0347fcc0d4475906e96c79f7d6
+  data.tar.gz: ef3c2b45c48acd439f6e928bfd87fa8c67a80ccb
 SHA512:
-  metadata.gz: 59ee90a994a38a3684baef26510f1bf8befac593c91d691988f729224eeda34129c4965aa3bd8b7ed7db2b2c4288087bf11372c4089b73c90a77e78706fc56f4
-  data.tar.gz: c6d83831032136982317afe65731d0c0f56c2c568ce8c5c27ad96e5cb0b573587615d09fa36da7791999e78c652f8f2b05808a1c266e67f19025e3cb9a3b8ba5
+  metadata.gz: 3477a221b69f267071e04d02b52b2d5914ad3d1a905c421490c654fc3b161592e08659a4cba15f7c6b105ca3a63d88fa7f8b60ef6fcce96608cc147a6653f932
+  data.tar.gz: 0952319256425cda18ae58a16580e3a8f0933b74bd2b9917065715002030c8c761efebbb1636b06a4d4354a8b53f3ef1fd467aa3a617408e1f1a5e4edbbe8549

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-## 2.6.0 (Jan 25, 2016)
+## 2.7.0 (February 9, 2016)
+
+#### Features
+
+* Added support for GCM priorities. ([#243](https://github.com/rpush/rpush/pull/243) by [@aried3r](https://github.com/aried3r))
+* Added support for GCM notification payload ([#246](https://github.com/rpush/rpush/pull/246) by [@aried3r](https://github.com/aried3r))
+* Added support for Windows Raw Notifications (in JSON form) ([#238](https://github.com/rpush/rpush/pull/238) by [@mseppae](https://github.com/mseppae))
+* Added WNS badge notifications ([#247](https://github.com/rpush/rpush/pull/247) by [@wouterh](https://github.com/wouterh))
+* Added the `launch` argument of WNS toast notifications ([#247](https://github.com/rpush/rpush/pull/247) by [@wouterh](https://github.com/wouterh))
+* Added sound in WNS toast notifications ([#247](https://github.com/rpush/rpush/pull/247) by [@wouterh](https://github.com/wouterh))
+
+#### Changes
+
+* Change `alert` type from `string` to `text` in ActiveRecord to allow bigger alert dictionaries. ([#248](https://github.com/rpush/rpush/pull/248) by [@schmidt](https://github.com/schmidt))
+
+#### Fixes
+
+* Fixed issue where setting the `mdm` parameter broke `to_binary` for MDM APNs ([#234](https://github.com/rpush/rpush/pull/234) by [@troya2](https://github.com/troya2))
+* Fixed `as_json` ([#231](https://github.com/rpush/rpush/issues/231) by [@aried3r](https://github.com/aried3r))
+
+## 2.6.0 (January 25, 2016)
 
 #### Features
 

data/README.md

@@ -87,11 +87,20 @@ n = Rpush::Gcm::Notification.new
 n.app = Rpush::Gcm::App.find_by_name("android_app")
 n.registration_ids = ["..."]
 n.data = { message: "hi mom!" }
+n.priority = 'high'        # Optional, can be either 'normal' or 'high'
+n.content_available = true # Optional
+# Optional notification payload. See the reference below for more keys you can use!
+n.notification = { body: 'great match!',
+                   title: 'Portugal vs. Denmark',
+                   icon: 'myicon'
+                 }
 n.save!
 ```
 
 GCM also requires you to respond to [Canonical IDs](https://github.com/rpush/rpush/wiki/Canonical-IDs).
 
+Check the [GCM reference](https://developers.google.com/cloud-messaging/http-server-ref#notification-payload-support) for what keys you can use and are available to you. **Note:** Not all are yet implemented in Rpush.
+
 #### Amazon Device Messaging
 
 ```ruby
@@ -114,7 +123,9 @@ n.save!
 
 For more documentation on [ADM](https://developer.amazon.com/sdk/adm.html).
 
-#### Windows Phone Notification Service
+#### Windows Phone Notification Service (Windows Phone 8.0 and 7.x)
+
+Uses the older [Windows Phone 8 Toast template](https://msdn.microsoft.com/en-us/library/windows/apps/jj662938(v=vs.105).aspx)
 
 ```ruby
 app = Rpush::Wpns::App.new
@@ -133,6 +144,42 @@ n.data = {title:"MyApp", body:"Hello world", param:"user_param1"}
 n.save!
 ```
 
+#### Windows Notification Service (Windows 8.1, 10 Apps & Phone > 8.0)
+
+Uses the more recent [Toast template](https://msdn.microsoft.com/en-us/library/windows/apps/xaml/mt631604.aspx)
+
+The `client_id` here is the SID URL as seen [here](https://msdn.microsoft.com/en-us/library/windows/apps/hh465407.aspx#7-SIDandSecret). Do not confuse it with the `client_id` on dashboard.
+
+```ruby
+app = Rpush::Wns::App.new
+app.name = "windows_phone_app"
+app.client_id = YOUR_SID_URL
+app.client_secret = YOUR_CLIENT_SECRET
+app.connections = 1
+app.save!
+```
+
+```ruby
+n = Rpush::Wns::Notification.new
+n.app = Rpush::Wns::App.find_by_name("windows_phone_app")
+n.uri = "http://..."
+n.data = {title:"MyApp", body:"Hello world"}
+n.save!
+```
+
+#### Windows Raw Push Notifications
+
+Note: The data is passed as `.to_json` so only this format is supported, altough raw notifications are meant to support any kind of data.
+Current data structure enforces hashes and `.to_json` representation is natural presentation of it.
+
+```ruby
+n = Rpush::Wns::RawNotification.new
+n.app = Rpush::Wns::App.find_by_name("windows_phone_app")
+n.uri = 'http://...'
+n.data = { foo: 'foo', bar: 'bar' }
+n.save!
+```
+
 ### Running Rpush
 
 It is recommended to run Rpush as a separate process in most cases, though embedding and manual modes are provided for low-workload environments.

data/lib/generators/rpush_migration_generator.rb

@@ -41,6 +41,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')
+    add_rpush_migration('rpush_2_7_0_updates')
   end
 
   protected
@@ -48,7 +49,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
   def has_migration?(template)
     migration_dir = File.expand_path('db/migrate')
     self.class.migration_exists?(migration_dir, template)
-   end
+  end
 
   def add_rpush_migration(template)
     self.class.next_template = template

data/lib/generators/templates/rpush_2_7_0_updates.rb

@@ -0,0 +1,12 @@
+class Rpush270Updates < ActiveRecord::Migration
+  def self.up
+    change_column :rpush_notifications, :alert, :text
+    add_column :rpush_notifications, :notification, :text
+  end
+
+  def self.down
+    change_column :rpush_notifications, :alert, :string
+    remove_column :rpush_notifications, :notification
+  end
+end
+

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

@@ -14,7 +14,7 @@ module Rpush
             end
           end
 
-          def as_json
+          def as_json(options = nil)
             json = { 'data' => data }
             json['consolidationKey'] = collapse_key if collapse_key
             # number of seconds before message is expired

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

@@ -38,7 +38,7 @@ module Rpush
             self.data = (data || {}).merge(CONTENT_AVAILABLE_KEY => true)
           end
 
-          def as_json # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+          def as_json(options = nil) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
             json = ActiveSupport::OrderedHash.new
 
             if data && data.key?(MDM_KEY)
@@ -80,7 +80,7 @@ module Rpush
 
           def priority_for_frame
             # It is an error to use APNS_PRIORITY_IMMEDIATE for a notification that only contains content-available.
-            if as_json['aps'].keys == ['content-available']
+            if as_json['aps'].try(:keys) == ['content-available']
               APNS_PRIORITY_CONSERVE_POWER
             else
               priority || APNS_PRIORITY_IMMEDIATE

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

@@ -3,9 +3,14 @@ module Rpush
     module ActiveModel
       module Gcm
         module Notification
+          GCM_PRIORITY_HIGH = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_IMMEDIATE
+          GCM_PRIORITY_NORMAL = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_CONSERVE_POWER
+          GCM_PRIORITIES = [GCM_PRIORITY_HIGH, GCM_PRIORITY_NORMAL]
+
           def self.included(base)
             base.instance_eval do
               validates :registration_ids, presence: true
+              validates :priority, inclusion: { in: GCM_PRIORITIES }, allow_nil: true
 
               validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator, limit: 4096
               validates_with Rpush::Client::ActiveModel::RegistrationIdsCountValidator, limit: 1000
@@ -14,17 +19,39 @@ module Rpush
             end
           end
 
-          def as_json
+          # This is a hack. The schema defines `priority` to be an integer, but GCM expects a string.
+          # But for users of rpush to have an API they might expect (setting priority to `high`, not 10)
+          # we do a little conversion here.
+          # I'm not happy about it, but this will have to do until I can take a further look.
+          def priority=(priority)
+            case priority
+              when 'high'
+                super(GCM_PRIORITY_HIGH)
+              when 'normal'
+                super(GCM_PRIORITY_NORMAL)
+              else
+                errors.add(:priority, 'must be one of either "normal" or "high"')
+            end
+          end
+
+          def as_json(options = nil)
             json = {
-              'registration_ids' => registration_ids,
-              'delay_while_idle' => delay_while_idle,
-              'data' => data
+                'registration_ids' => registration_ids,
+                'delay_while_idle' => delay_while_idle,
+                'data' => data
             }
             json['collapse_key'] = collapse_key if collapse_key
-            json['time_to_live'] = expiry if expiry
             json['content_available'] = content_available if content_available
+            json['notification'] = notification if notification
+            json['priority'] = priority_for_notification if priority
+            json['time_to_live'] = expiry if expiry
             json
           end
+
+          def priority_for_notification
+            return 'high' if priority == GCM_PRIORITY_HIGH
+            'normal' if priority == GCM_PRIORITY_NORMAL
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module Rpush
               data['title'] = value
               self.data = data
             end
+
+            def skip_data_validation?
+              false
+            end
           end
 
           def self.included(base)
@@ -18,7 +22,7 @@ module Rpush
 
               validates :uri, presence: true
               validates :uri, format: { with: %r{https?://[\S]+} }
-              validates :data, presence: true
+              validates :data, presence: true, unless: :skip_data_validation?
             end
           end
         end

data/lib/rpush/client/active_record.rb

@@ -16,6 +16,8 @@ require 'rpush/client/active_record/wpns/notification'
 require 'rpush/client/active_record/wpns/app'
 
 require 'rpush/client/active_record/wns/notification'
+require 'rpush/client/active_record/wns/raw_notification'
+require 'rpush/client/active_record/wns/badge_notification'
 require 'rpush/client/active_record/wns/app'
 
 require 'rpush/client/active_record/adm/notification'

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

@@ -16,15 +16,21 @@ 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, :content_available
+                          :uri, :url_args, :category, :content_available, :notification
         end
 
         def data=(attrs)
           return unless attrs
-          fail ArgumentError, "must be a Hash" unless attrs.is_a?(Hash)
+          fail ArgumentError, 'must be a Hash' unless attrs.is_a?(Hash)
           write_attribute(:data, multi_json_dump(attrs.merge(data || {})))
         end
 
+        def notification=(attrs)
+          return unless attrs
+          fail ArgumentError, 'must be a Hash' unless attrs.is_a?(Hash)
+          write_attribute(:notification, multi_json_dump(attrs.merge(data || {})))
+        end
+
         def registration_ids=(ids)
           ids = [ids] if ids && !ids.is_a?(Array)
           super
@@ -33,6 +39,10 @@ module Rpush
         def data
           multi_json_load(read_attribute(:data)) if read_attribute(:data)
         end
+
+        def notification
+          multi_json_load(read_attribute(:notification)) if read_attribute(:notification)
+        end
       end
     end
   end

data/lib/rpush/client/active_record/wns/badge_notification.rb

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Wns
+        class BadgeNotification < Rpush::Client::ActiveRecord::Notification
+          include Rpush::Client::ActiveModel::Wns::Notification
+
+          def skip_data_validation?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/wns/raw_notification.rb

@@ -0,0 +1,13 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Wns
+        class RawNotification < Rpush::Client::ActiveRecord::Notification
+          validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator,
+                         limit: 5120
+          include Rpush::Client::ActiveModel::Wns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/mongoid.rb

@@ -28,6 +28,8 @@ require 'rpush/client/mongoid/wpns/notification'
 require 'rpush/client/mongoid/wpns/app'
 
 require 'rpush/client/mongoid/wns/notification'
+require 'rpush/client/mongoid/wns/raw_notification'
+require 'rpush/client/mongoid/wns/badge_notification'
 require 'rpush/client/mongoid/wns/app'
 
 require 'rpush/client/mongoid/adm/notification'

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

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

data/lib/rpush/client/mongoid/wns/badge_notification.rb

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module Mongoid
+      module Wns
+        class BadgeNotification < Rpush::Client::Mongoid::Notification
+          include Rpush::Client::ActiveModel::Wns::Notification
+
+          def skip_data_validation?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/mongoid/wns/raw_notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Mongoid
+      module Wns
+        class RawNotification < Rpush::Client::Mongoid::Notification
+          include Rpush::Client::ActiveModel::Wns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis.rb

@@ -32,6 +32,8 @@ require 'rpush/client/redis/wpns/notification'
 
 require 'rpush/client/redis/wns/app'
 require 'rpush/client/redis/wns/notification'
+require 'rpush/client/redis/wns/raw_notification'
+require 'rpush/client/redis/wns/badge_notification'
 
 Modis.configure do |config|
   config.namespace = :rpush

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

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

data/lib/rpush/client/redis/wns/badge_notification.rb

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module Redis
+      module Wns
+        class BadgeNotification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Wns::Notification
+
+          def skip_data_validation?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/wns/raw_notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Wns
+        class RawNotification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Wns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/daemon.rb

@@ -46,6 +46,10 @@ require 'rpush/daemon/gcm'
 require 'rpush/daemon/wpns/delivery'
 require 'rpush/daemon/wpns'
 
+require 'rpush/daemon/wns/post_request'
+require 'rpush/daemon/wns/raw_request'
+require 'rpush/daemon/wns/toast_request'
+require 'rpush/daemon/wns/badge_request'
 require 'rpush/daemon/wns/delivery'
 require 'rpush/daemon/wns'
 

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

@@ -0,0 +1,32 @@
+module Rpush
+  module Daemon
+    module Wns
+      class BadgeRequest
+        def self.create(notification, access_token)
+          body = BadgeRequestPayload.new(notification).to_xml
+          uri  = URI.parse(notification.uri)
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            "Content-Length" => body.length.to_s,
+            "Content-Type" => "text/xml",
+            "X-WNS-Type" => "wns/badge",
+            "X-WNS-RequestForStatus" => "true",
+            "Authorization" => "Bearer #{access_token}"
+          )
+          post.body = body
+          post
+        end
+      end
+
+      class BadgeRequestPayload
+        def initialize(notification)
+          @badge = notification.badge || 0
+        end
+
+        def to_xml
+          "<badge value=\"#{@badge}\"/>"
+        end
+      end
+    end
+  end
+end

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

@@ -132,20 +132,12 @@ module Rpush
         end
 
         def do_post
-          body = notification_to_xml
-          uri = URI.parse(@notification.uri)
-          post = Net::HTTP::Post.new(uri.request_uri,
-                                     "Content-Length" => body.length.to_s,
-                                     "Content-Type" => "text/xml",
-                                     "X-WNS-Type" => "wns/toast",
-                                     "X-WNS-RequestForStatus" => "true",
-                                     "Authorization" => "Bearer #{access_token}")
-          post.body = body
+          post = PostRequest.create(@notification, access_token)
           @http.request(URI.parse(@notification.uri), post)
         end
 
         def status_from_response(response)
-          headers = response.to_hash.inject({}) {|h, v| h[v[0].downcase] = v[1]; h}
+          headers = response.to_hash.each_with_object({}) { |e, a| a[e[0].downcase] = e[1] }
           {
             notification:         headers["x-wns-status"],
             device_connection:    headers["x-wns-deviceconnectionstatus"],
@@ -155,24 +147,6 @@ module Rpush
           }
         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?
-          "<toast>
-            <visual version='1' lang='en-US'>
-              <binding template='ToastText02'>
-                <text id='1'>#{title}</text>
-                <text id='2'>#{body}</text>
-              </binding>
-            </visual>
-          </toast>"
-        end
-
-        def clean_param_string(string)
-          string.gsub(/&/, "&amp;").gsub(/</, "&lt;") \
-            .gsub(/>/, "&gt;").gsub(/'/, "&apos;").gsub(/"/, "&quot;")
-        end
-
         def access_token
           if @notification.app.access_token.nil? || @notification.app.access_token_expired?
             post = Net::HTTP::Post.new(WPN_TOKEN_URI.path, 'Content-Type' => 'application/x-www-form-urlencoded')

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

@@ -0,0 +1,33 @@
+module Rpush
+  module Daemon
+    module Wns
+      class PostRequest
+        def self.create(notification, access_token)
+          stringify_keys(notification.data) unless notification.data.nil?
+
+          if raw_notification?(notification)
+            RawRequest.create(notification, access_token)
+          elsif badge_notification?(notification)
+            BadgeRequest.create(notification, access_token)
+          else
+            ToastRequest.create(notification, access_token)
+          end
+        end
+
+        private_class_method
+
+        def self.raw_notification?(notification)
+          notification.class.name.match(/RawNotification/)
+        end
+
+        def self.badge_notification?(notification)
+          notification.class.name.match(/BadgeNotification/)
+        end
+
+        def self.stringify_keys(data)
+          data.keys.each { |key| data[key.to_s || key] = data.delete(key) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Rpush
+  module Daemon
+    module Wns
+      class RawRequest
+        def self.create(notification, access_token)
+          body = notification.data.to_json
+          uri = URI.parse(notification.uri)
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            "Content-Length" => body.length.to_s,
+            "Content-Type" => "application/octet-stream",
+            "X-WNS-Type" => "wns/raw",
+            "X-WNS-RequestForStatus" => "true",
+            "Authorization" => "Bearer #{access_token}"
+          )
+          post.body = body
+          post
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+module Rpush
+  module Daemon
+    module Wns
+      class ToastRequest
+        def self.create(notification, access_token)
+          body = ToastRequestPayload.new(notification).to_xml
+          uri  = URI.parse(notification.uri)
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            "Content-Length" => body.length.to_s,
+            "Content-Type" => "text/xml",
+            "X-WNS-Type" => "wns/toast",
+            "X-WNS-RequestForStatus" => "true",
+            "Authorization" => "Bearer #{access_token}"
+          )
+          post.body = body
+          post
+        end
+      end
+
+      class ToastRequestPayload
+        def initialize(notification)
+          @title = notification.data['title'] || ''
+          @body = notification.data['body'] || ''
+          @launch = notification.data['launch']
+          @sound = notification.sound unless notification.sound.eql?("default".freeze)
+        end
+
+        def to_xml
+          launch_string = "" unless @launch
+          launch_string = " launch='#{CleanParamString.clean(@launch)}'" if @launch
+          audio_string = "" unless @sound
+          audio_string = "<audio src='#{CleanParamString.clean(@sound)}'/>" if @sound
+          "<toast#{launch_string}>
+            <visual version='1' lang='en-US'>
+              <binding template='ToastText02'>
+                <text id='1'>#{CleanParamString.clean(@title)}</text>
+                <text id='2'>#{CleanParamString.clean(@body)}</text>
+              </binding>
+            </visual>
+            #{audio_string}
+          </toast>"
+        end
+      end
+
+      class CleanParamString
+        def self.clean(string)
+          string.gsub(/&/, "&amp;").gsub(/</, "&lt;") \
+            .gsub(/>/, "&gt;").gsub(/'/, "&apos;").gsub(/"/, "&quot;")
+        end
+      end
+    end
+  end
+end

data/lib/rpush/version.rb

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

data/spec/support/active_record_setup.rb

@@ -30,8 +30,9 @@ 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'
+require 'generators/templates/rpush_2_7_0_updates'
 
-migrations = [AddRpush, Rpush200Updates, Rpush210Updates, Rpush260Updates]
+migrations = [AddRpush, Rpush200Updates, Rpush210Updates, Rpush260Updates, Rpush270Updates]
 
 unless ENV['TRAVIS']
   migrations.reverse_each do |m|

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

@@ -23,6 +23,17 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
     expect(notification.errors[:base].include?("APN notification cannot be larger than 2048 bytes. Try condensing your alert and device attributes.")).to be_truthy
   end
 
+  it "should store long alerts" do
+    notification.app = app
+    notification.device_token = "a" * 64
+    notification.alert = "*" * 300
+    expect(notification.valid?).to be_truthy
+
+    notification.save!
+    notification.reload
+    expect(notification.alert).to eq("*" * 300)
+  end
+
   it "should default the sound to 'default'" do
     expect(notification.sound).to eq('default')
   end
@@ -98,6 +109,11 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'MDM' do
   let(:magic) { 'abc123' }
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
 
+  before do
+    notification.device_token = "a" * 64
+    notification.id = 1234
+  end
+
   it 'includes the mdm magic in the payload' do
     notification.mdm = magic
     expect(notification.as_json).to eq('mdm' => magic)
@@ -108,6 +124,11 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'MDM' do
     notification.mdm = magic
     expect(notification.as_json.key?('aps')).to be_falsey
   end
+
+  it 'can be converted to binary' do
+    notification.mdm = magic
+    expect(notification.to_binary).to be_present
+  end
 end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'content-available' do

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

@@ -36,4 +36,32 @@ describe Rpush::Client::ActiveRecord::Gcm::Notification do
     notification.content_available = true
     expect(notification.as_json['content_available']).to eq true
   end
+
+  it 'sets the priority to high when set to high' do
+    notification.priority = 'high'
+    expect(notification.as_json['priority']).to eq 'high'
+  end
+
+  it 'sets the priority to normal when set to normal' do
+    notification.priority = 'normal'
+    expect(notification.as_json['priority']).to eq 'normal'
+  end
+
+  it 'validates the priority is either "normal" or "high"' do
+    notification.priority = 'invalid'
+    expect(notification.errors[:priority]).to eq ['must be one of either "normal" or "high"']
+  end
+
+  it 'excludes the priority if it is not defined' do
+    expect(notification.as_json).not_to have_key 'priority'
+  end
+
+  it 'includes the notification payload if defined' do
+    notification.notification = { key: 'any key is allowed' }
+    expect(notification.as_json).to have_key 'notification'
+  end
+
+  it 'excludes the notification payload if undefined' do
+    expect(notification.as_json).not_to have_key 'notification'
+  end
 end if active_record?

data/spec/unit/client/active_record/wns/badge_notification_spec.rb

@@ -0,0 +1,15 @@
+require 'unit_spec_helper'
+
+describe Rpush::Client::ActiveRecord::Wns::BadgeNotification do
+  let(:notification) do
+    notif = Rpush::Client::ActiveRecord::Wns::BadgeNotification.new
+    notif.app  = Rpush::Client::ActiveRecord::Wns::App.new(name: "aname")
+    notif.uri  = 'https://db5.notify.windows.com/?token=TOKEN'
+    notif.badge = 42
+    notif
+  end
+
+  it 'should allow a notification without data' do
+    expect(notification.valid?).to be(true)
+  end
+end if active_record?

data/spec/unit/client/active_record/wns/raw_notification_spec.rb

@@ -0,0 +1,26 @@
+require 'unit_spec_helper'
+
+describe Rpush::Client::ActiveRecord::Wns::RawNotification do
+  let(:notification) do
+    notif = Rpush::Client::ActiveRecord::Wns::RawNotification.new
+    notif.app  = Rpush::Client::ActiveRecord::Wns::App.new(name: "aname")
+    notif.uri  = 'https://db5.notify.windows.com/?token=TOKEN'
+    notif.data = { foo: 'foo', bar: 'bar' }
+    notif
+  end
+
+  it 'does not allow the size of payload over 5 KB' do
+    allow(notification).to receive(:payload_data_size) { 5121 }
+    expect(notification.valid?).to be(false)
+  end
+
+  it 'allows exact payload of 5 KB' do
+    allow(notification).to receive(:payload_data_size) { 5120 }
+    expect(notification.valid?).to be(true)
+  end
+
+  it 'allows the size of payload under 5 KB' do
+    allow(notification).to receive(:payload_data_size) { 5119 }
+    expect(notification.valid?).to be(true)
+  end
+end if active_record?

data/spec/unit/daemon/wns/delivery_spec.rb

@@ -54,6 +54,11 @@ describe Rpush::Daemon::Wns::Delivery do
       expect(store).to receive(:update_app).with app
       perform
     end
+
+    it 'uses the PostRequest factory for creating the request' do
+      expect(Rpush::Daemon::Wns::PostRequest).to receive(:create).with(notification, "dummy_access_token")
+      perform
+    end
   end
 
   describe "an 200 response with a valid access token" do

data/spec/unit/daemon/wns/post_request_spec.rb

@@ -0,0 +1,117 @@
+require 'unit_spec_helper'
+
+describe Rpush::Daemon::Wns::PostRequest do
+  let(:app) do
+    Rpush::Wns::App.create!(
+      name: "MyApp",
+      client_id: "someclient",
+      client_secret: "somesecret",
+      access_token: "access_token",
+      access_token_expiration: Time.now + (60 * 10)
+    )
+  end
+
+  context 'Notification' do
+    let(:notification) do
+      Rpush::Wns::Notification.create!(
+        app: app,
+        data: {
+          title: "MyApp",
+          body: "Example notification"
+        },
+        uri: "http://some.example/"
+      )
+    end
+
+    it 'creates a request characteristic for toast notification' do
+      request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+      expect(request['X-WNS-Type']).to eq('wns/toast')
+      expect(request['Content-Type']).to eq('text/xml')
+      expect(request.body).to include('<toast>')
+      expect(request.body).to include('MyApp')
+      expect(request.body).to include('Example notification')
+    end
+
+    context 'with launch' do
+      let(:notification) do
+        Rpush::Wns::Notification.create!(
+          app: app,
+          data: {
+            title: "MyApp",
+            body: "Example notification",
+            launch: "MyLaunchArgument"
+          },
+          uri: "http://some.example/"
+        )
+      end
+
+      it 'creates a request characteristic for toast notification with launch' do
+        request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+        expect(request['X-WNS-Type']).to eq('wns/toast')
+        expect(request['Content-Type']).to eq('text/xml')
+        expect(request.body).to include("<toast launch='MyLaunchArgument'>")
+        expect(request.body).to include('MyApp')
+        expect(request.body).to include('Example notification')
+      end
+    end
+
+    context 'with sound' do
+      let(:notification) do
+        Rpush::Wns::Notification.create!(
+          app: app,
+          data: {
+            title: "MyApp",
+            body: "Example notification"
+          },
+          uri: "http://some.example/",
+          sound: "ms-appx:///examplesound.wav"
+        )
+      end
+
+      it 'creates a request characteristic for toast notification' do
+        request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+        expect(request['X-WNS-Type']).to eq('wns/toast')
+        expect(request['Content-Type']).to eq('text/xml')
+        expect(request.body).to include('<toast>')
+        expect(request.body).to include('MyApp')
+        expect(request.body).to include('Example notification')
+        expect(request.body).to include("<audio src='ms-appx:///examplesound.wav'/>")
+      end
+    end
+  end
+
+  context 'RawNotification' do
+    let(:notification) do
+      Rpush::Wns::RawNotification.create!(
+        app: app,
+        data: { foo: 'foo', bar: 'bar' },
+        uri: "http://some.example/"
+      )
+    end
+
+    it 'creates a request characteristic for raw notification' do
+      request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+      expect(request['X-WNS-Type']).to eq('wns/raw')
+      expect(request['Content-Type']).to eq('application/octet-stream')
+      expect(request.body).to eq("{\"foo\":\"foo\",\"bar\":\"bar\"}")
+    end
+  end
+
+  context 'BadgeNotification' do
+    let(:notification) do
+      Rpush::Wns::BadgeNotification.create!(
+        app: app,
+        uri: "http://some.example/",
+        badge: 42
+      )
+    end
+
+    it 'creates a request characteristic for badge notification' do
+      request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+      expect(request['X-WNS-Type']).to eq('wns/badge')
+      expect(request['Content-Type']).to eq('text/xml')
+      expect(request.body).to include('<badge')
+      expect(request.body).to include('42')
+    end
+  end
+end

data/spec/unit/notification_shared.rb

@@ -1,35 +1,53 @@
-shared_examples_for "an Notification subclass" do
-  describe "when assigning data for the device" do
+shared_examples_for 'an Notification subclass' do
+  describe 'when assigning data for the device' do
     before { allow(Rpush::Deprecation).to receive(:warn) }
 
-    it "calls MultiJson.dump when multi_json responds to :dump" do
+    it 'calls MultiJson.dump when multi_json responds to :dump' do
       notification = notification_class.new
       allow(MultiJson).to receive(:respond_to?).with(:dump).and_return(true)
       expect(MultiJson).to receive(:dump).with(any_args)
       notification.data = { pirates: 1 }
     end
 
-    it "calls MultiJson.encode when multi_json does not respond to :dump" do
+    it 'calls MultiJson.encode when multi_json does not respond to :dump' do
       notification = notification_class.new
       allow(MultiJson).to receive(:respond_to?).with(:dump).and_return(false)
       expect(MultiJson).to receive(:encode).with(any_args)
       notification.data = { ninjas: 1 }
     end
 
-    it "raises an ArgumentError if something other than a Hash is assigned" do
+    it 'raises an ArgumentError if something other than a Hash is assigned' do
       expect do
         notification.data = []
-      end.to raise_error(ArgumentError, "must be a Hash")
+      end.to raise_error(ArgumentError, 'must be a Hash')
     end
 
-    it "encodes the given Hash as JSON" do
-      notification.data = { hi: "mom" }
-      expect(notification.read_attribute(:data)).to eq("{\"hi\":\"mom\"}")
+    it 'encodes the given Hash as JSON' do
+      notification.data = { hi: 'mom'}
+      expect(notification.read_attribute(:data)).to eq('{"hi":"mom"}')
     end
 
-    it "decodes the JSON when using the reader method" do
-      notification.data = { hi: "mom" }
-      expect(notification.data).to eq("hi" => "mom")
+    it 'decodes the JSON when using the reader method' do
+      notification.data = { hi: 'mom'}
+      expect(notification.data).to eq('hi' => 'mom')
+    end
+  end
+
+  describe 'when assigning the notification payload for the device' do
+    it 'raises an ArgumentError if something other than a Hash is assigned' do
+      expect do
+        notification.notification = []
+      end.to raise_error(ArgumentError, 'must be a Hash')
+    end
+
+    it 'encodes the given Hash as JSON' do
+      notification.notification = { hi: 'dad'}
+      expect(notification.read_attribute(:notification)).to eq('{"hi":"dad"}')
+    end
+
+    it 'decodes the JSON when using the reader method' do
+      notification.notification = { hi: 'dad'}
+      expect(notification.notification).to eq('hi' => 'dad')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -129,6 +129,7 @@ files:
 - 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/generators/templates/rpush_2_7_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb
@@ -161,7 +162,9 @@ files:
 - lib/rpush/client/active_record/gcm/notification.rb
 - lib/rpush/client/active_record/notification.rb
 - lib/rpush/client/active_record/wns/app.rb
+- lib/rpush/client/active_record/wns/badge_notification.rb
 - lib/rpush/client/active_record/wns/notification.rb
+- lib/rpush/client/active_record/wns/raw_notification.rb
 - lib/rpush/client/active_record/wpns/app.rb
 - lib/rpush/client/active_record/wpns/notification.rb
 - lib/rpush/client/mongoid.rb
@@ -175,7 +178,9 @@ files:
 - lib/rpush/client/mongoid/gcm/notification.rb
 - lib/rpush/client/mongoid/notification.rb
 - lib/rpush/client/mongoid/wns/app.rb
+- lib/rpush/client/mongoid/wns/badge_notification.rb
 - lib/rpush/client/mongoid/wns/notification.rb
+- lib/rpush/client/mongoid/wns/raw_notification.rb
 - lib/rpush/client/mongoid/wpns/app.rb
 - lib/rpush/client/mongoid/wpns/notification.rb
 - lib/rpush/client/redis.rb
@@ -189,7 +194,9 @@ files:
 - lib/rpush/client/redis/gcm/notification.rb
 - lib/rpush/client/redis/notification.rb
 - lib/rpush/client/redis/wns/app.rb
+- lib/rpush/client/redis/wns/badge_notification.rb
 - lib/rpush/client/redis/wns/notification.rb
+- lib/rpush/client/redis/wns/raw_notification.rb
 - lib/rpush/client/redis/wpns/app.rb
 - lib/rpush/client/redis/wpns/notification.rb
 - lib/rpush/configuration.rb
@@ -233,7 +240,11 @@ files:
 - lib/rpush/daemon/synchronizer.rb
 - lib/rpush/daemon/tcp_connection.rb
 - lib/rpush/daemon/wns.rb
+- lib/rpush/daemon/wns/badge_request.rb
 - lib/rpush/daemon/wns/delivery.rb
+- lib/rpush/daemon/wns/post_request.rb
+- lib/rpush/daemon/wns/raw_request.rb
+- lib/rpush/daemon/wns/toast_request.rb
 - lib/rpush/daemon/wpns.rb
 - lib/rpush/daemon/wpns/delivery.rb
 - lib/rpush/deprecatable.rb
@@ -280,6 +291,8 @@ files:
 - 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/wns/badge_notification_spec.rb
+- spec/unit/client/active_record/wns/raw_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
@@ -306,6 +319,7 @@ files:
 - spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
+- spec/unit/daemon/wns/post_request_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
@@ -375,6 +389,8 @@ test_files:
 - 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/wns/badge_notification_spec.rb
+- spec/unit/client/active_record/wns/raw_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
@@ -401,6 +417,7 @@ test_files:
 - spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
+- spec/unit/daemon/wns/post_request_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb