notifiable-mpns-nverinaud 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0603e386bffe7f2ec29874223e43307dc6f17380
-  data.tar.gz: a00a3a89015b8ce06a2d2d5d9bf904455390c996
+  metadata.gz: 3042ffd28bb2e60ba04659b082b4b9c433f1eb96
+  data.tar.gz: 3d258a3aebf8eb5ca2841eec6936896b1e210bb1
 SHA512:
-  metadata.gz: 5306484e69d8450bcbac18ad82afacb6174ed1277aa1db9b1eb93024681b139902ae0145991761650704cf6cb57e579e04f2336153179c8d19d2cbca1ee7d335
-  data.tar.gz: 47860a6cf6381af0ffa069f9f46f25b15c9ee5c7bfe04c205cc21fd94bf02fe1e538484c77f0cf304206f0d98ceba943246a13d2ff7255691a68feaa0e77c565
+  metadata.gz: 1433aa2100ef9d100a982302ce90af1661e3de3332e28d499748a8a85becfab4f112a5f550397a8dae8f3c8a2937579859c855a36837fbcbf0aab93c531c871b
+  data.tar.gz: 520f95e5e3aeafaa251cb9e0631cf6df1dc46336285fac5948e97f0d451e34ab5af021b366b7082c0cd829b38a31ba9bdec7acbf6fbc9996f7c5d21b5389d862

data/lib/notifiable/mpns/nverinaud/single_notifier.rb

@@ -7,24 +7,26 @@ module Notifiable
   		class SingleNotifier < Notifiable::NotifierBase
         
         protected 
-    			def enqueue(n, device_token)
+    			def enqueue(device_token)
                         
-            data = {title: n.title, content: n.message, params: n.params}    
+            data = {title: notification.title, content: notification.message, params: notification.send_params}    
             
-            response = MicrosoftPushNotificationService.send_notification device_token.token, :toast, data
+            response = MicrosoftPushNotificationService.send_notification(device_token.token, :toast, data)
             response_code = response.code.to_i
             
+            status_code = 0
             case response_code
             when 200
             when 404
               Rails.logger.info "De-registering device token: #{device_token.id}"
               device_token.update_attribute('is_valid', false)
+              status_code = 1
             else
-              Rails.logger.error "Error sending notification: #{response.code}"              
+              Rails.logger.error "Error sending notification: #{response.code}"  
+              status_code = 2            
             end
             
-            processed(n, device_token, response_code)
-            
+            processed(device_token, status_code)
       		end
   		end
     end

data/lib/notifiable/mpns/nverinaud/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Mpns
     module Nverinaud
-      VERSION = "0.4.0"
+      VERSION = "0.5.0"
     end
   end
 end

data/notifiable-mpns-nverinaud.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "notifiable-rails", ">=0.6.0"
+  spec.add_dependency "notifiable-rails", ">=0.17.0"
   spec.add_dependency "ruby-mpns", "~> 1.2.1"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/single_notifier_spec.rb

@@ -2,65 +2,64 @@ require 'spec_helper'
 
 describe Notifiable::Mpns::Nverinaud::SingleNotifier do
   
-  let(:m) { Notifiable::Mpns::Nverinaud::SingleNotifier.new }
-  let(:d) { Notifiable::DeviceToken.create(:token => "http://db3.notify.live.net/throttledthirdparty/01.00/123456789123456798", :provider => :mpns) }
-  let(:u) { User.new(d) }
+  let(:a) { Notifiable::App.create }  
+  let(:n1) { Notifiable::Notification.create(:title => "Test title", :app => a) }
+  let(:n1_with_message) { Notifiable::Notification.create(:message => "Test message", :app => a) }
+  let(:n1_with_params) { Notifiable::Notification.create(:message => "Test message", :app => a, :params => {:flag => true}) }
+  let(:d) { Notifiable::DeviceToken.create(:token => "http://db3.notify.live.net/throttledthirdparty/01.00/123456789123456798", :provider => :mpns, :app => a) }
   
   it "sends a notification with a title" do
-    n = Notifiable::Notification.create(title: "A title")   
-
     stub_request(:post, d.token)
          
-    m.send_notification(n, d)
-    m.close
+    n1.batch do |n|
+      n.add_device_token(d)
+    end
     
     Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status.should == 200
+    Notifiable::NotificationStatus.first.status.should == 0
     
     a_request(:post, d.token)
-      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1>A title</wp:Text1><wp:Text2></wp:Text2><wp:Param></wp:Param></wp:Toast></wp:Notification>")
+      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1>Test title</wp:Text1><wp:Text2></wp:Text2><wp:Param>?notification_id=#{n1.id}</wp:Param></wp:Toast></wp:Notification>")
       .should have_been_made.once
   end
   
-  it "sends a single mpns notification with content" do
-    n = Notifiable::Notification.create(message: "A message")   
+  it "sends a single mpns notification with a message" do
     stub_request(:post, d.token)
          
-    m.send_notification(n, d)
-    m.close
+    n1_with_message.batch do |n|
+      n.add_device_token(d)
+    end
     
     Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status.should == 200
+    Notifiable::NotificationStatus.first.status.should == 0
     
     a_request(:post, d.token)
-      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1></wp:Text1><wp:Text2>A message</wp:Text2><wp:Param></wp:Param></wp:Toast></wp:Notification>")
+      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1></wp:Text1><wp:Text2>Test message</wp:Text2><wp:Param>?notification_id=#{n1_with_message.id}</wp:Param></wp:Toast></wp:Notification>")
       .should have_been_made.once
   end
   
-  it "sends custom attributes" do 
-    n = Notifiable::Notification.create(:params => {:an_object_id => 123456})    
-    
+  it "sends custom attributes" do     
     stub_request(:post, d.token) 
          
-    m.send_notification(n, d)
-    m.close
+    n1_with_params.batch do |n|
+      n.add_device_token(d)
+    end
     
     Notifiable::NotificationStatus.count.should == 1
     a_request(:post, d.token)
-      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1></wp:Text1><wp:Text2></wp:Text2><wp:Param>?an_object_id=123456</wp:Param></wp:Toast></wp:Notification>")
+      .with(:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?><wp:Notification xmlns:wp=\"WPNotification\"><wp:Toast><wp:Text1></wp:Text1><wp:Text2>Test message</wp:Text2><wp:Param>?flag=true&amp;notification_id=#{n1_with_params.id}</wp:Param></wp:Toast></wp:Notification>")
       .should have_been_made.once
   end
   
-  it "de-registers a device on receiving a 404 status from MPNS" do
-    n = Notifiable::Notification.create(:message => "A message")   
-        
+  it "de-registers a device on receiving a 404 status from MPNS" do        
     stub_request(:post, d.token).to_return(:status => 404)
-         
-    m.send_notification(n, d)
-    m.close
+    
+    n1.batch do |n|
+      n.add_device_token(d)
+    end
     
     Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status.should == 404
+    Notifiable::NotificationStatus.first.status.should == 1
     Notifiable::DeviceToken.first.is_valid.should == false
   end
   

data/spec/support/db/migrate/20131228225138_create_notifiable_apps.rb

@@ -0,0 +1,10 @@
+class CreateNotifiableApps < ActiveRecord::Migration
+  def change
+    create_table :notifiable_apps do |t|
+      t.string :name
+      t.text :configuration
+
+      t.timestamps
+    end
+  end
+end

data/spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb

@@ -3,12 +3,18 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
   def change
     create_table :notifiable_device_tokens do |t|
       t.string :token
-      t.string :user_id
     	t.string :provider
+      t.string :device_id
       t.boolean :is_valid, :default => true
+      t.integer :user_id
+      t.references :app
 
       t.timestamps
     end
+
+    add_index :notifiable_device_tokens, :device_id, :unique => true  
+    add_index :notifiable_device_tokens, :token, :unique => true      
+    add_index :notifiable_device_tokens, :user_id
   end
 
 end

data/spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb

@@ -2,12 +2,23 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
   
   def change
     create_table :notifiable_notifications do |t|
-      t.text :title
       t.text :message
       t.text :params
-      t.integer :badge
-      t.text :sound
-      t.datetime :expiry
+      t.references :app
+      
+      #stats
+      t.integer :sent_count, :default => 0
+      t.integer :gateway_accepted_count, :default => 0
+      t.integer :opened_count, :default => 0
+      
+      # APNS - Optional
+      #t.integer :badge
+      #t.text :sound
+      #t.datetime :expiry
+      
+      # MPNS - Optional
+      t.text :title
+      
       t.timestamps
     end
   end

data/spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb

@@ -0,0 +1,12 @@
+class CreateNotifiableStatuses < ActiveRecord::Migration
+  
+  def change
+    create_table :notifiable_statuses do |t|
+      t.references :notification
+      t.references :device_token
+      t.integer :status
+      t.datetime :created_at
+    end    
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-mpns-nverinaud
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: ruby-mpns
   requirement: !ruby/object:Gem::Requirement
@@ -170,9 +170,10 @@ files:
 - notifiable-mpns-nverinaud.gemspec
 - spec/single_notifier_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb
 homepage: http://www.futureworkshops.com
 licenses:
 - Apache 2.0
@@ -200,6 +201,7 @@ summary: Plugin to use MPNS with Notifiable-Rails
 test_files:
 - spec/single_notifier_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb

data/spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb

@@ -1,11 +0,0 @@
-class CreateNotifiableNotificationStatuses < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_notification_statuses do |t|
-      t.references :notification
-      t.references :device_token
-      t.integer :status
-    end
-  end
-
-end