fwt_push_notification_server 0.0.6 → 0.0.7.b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a98d7e08a6ce4dc5ab5581744f744465c9ac05a
-  data.tar.gz: 9d61f5bd7dccccb2bdad535cf9d08341f25818d0
+  metadata.gz: 7172b0f43a912e0d5fb9cffc3d7dfd4e17e2b1e0
+  data.tar.gz: 3d376af460f6b7bf7d1828946ddda354610a0f1f
 SHA512:
-  metadata.gz: 55c320a011822f617a37f154e803b3156d9a449d2abda7ca000f616720bc1a039cdbfcf68aa0be4c6f6b25b85711c5624d72828ad1a6e6b46cf801ec6fa16723
-  data.tar.gz: 07682b7ff307e4809600bedd2522458389d0c226adbaf6212901383252e36f7bef4f4612d83d17d196c990a7bf43259d83e74b031a1afada84879162d1708b15
+  metadata.gz: f497d2a95216156d3b1eb88c48c95821331c8413defa2159944b7599ad346bd4f1dd4c8e41c6d4914108aa3a4ae2948ee68dc9c410849090f489027b532df00a
+  data.tar.gz: 206e5e4e2f6493bf8836e0e8d0ee2d2d452d0352ebbc2e1c7aa227441608c7e0c458f54640ee015d52ef3d4b0e66c09ebf087f46b0172dd4415347bb9a831bd1

data/app/controllers/fwt_push_notification_server/device_tokens_controller.rb

@@ -1,35 +1,15 @@
-require_dependency "fwt_push_notification_server/application_controller"
-require 'digest'
 
 module FwtPushNotificationServer
   
-  class DeviceTokensController < ApplicationController
+  class DeviceTokensController < FwtPushNotificationServer.api_controller_class
 
-    skip_before_filter :authenticate_user!, :if => lambda {
-      if params[:token].blank? || params[:sig].blank?
-        false
-      else
-        token = params[:token]
-        device_name = params[:device_name]
-        device_id = params[:device_id]
-        config = FwtPushNotificationServer.config
-        key = config[:api_key]
-        params_string = "token=#{token}&device_name=#{device_name}&device_id=#{device_id}"
-        !!(Digest::HMAC.hexdigest(params_string, key, Digest::SHA256) == params[:sig])
-      end
-    }
-
-    # GET /device_tokens
-    def index
-      @device_tokens = DeviceToken.page.per(100)
-    end
+    skip_authorization_check
 
-    # POST /device_tokens
     def create
       @device_token = DeviceToken.find_or_create_by_token(params[:token])
       @device_token.update_attributes({
-        :device_id => params[:device_id] || "",
-        :device_name => params[:device_name] || ""
+        :user_id => params[:user_id],
+        :provider => params[:provider]
       })
       if @device_token.present?
         @device_token.save
@@ -41,9 +21,8 @@ module FwtPushNotificationServer
     end
 
     private
-      # Only allow a trusted parameter "white list" through.
       def device_token_params
-        params.permit(:token, :device_id, :device_name, :is_valid, :key, :sig)
+        params.permit(:token, :user_id, :provider)
       end
 
   end

data/app/models/fwt_push_notification_server/device_token.rb

@@ -4,6 +4,15 @@ module FwtPushNotificationServer
   
   	validates_uniqueness_of :token
 
+  	def user
+  		user_id.blank? ? nil : FwtPushNotificationServer.user_class.find_by(FwtPushNotificationServer.user_key => user_id)
+  	end
+
+  	def notifier
+  		return nil if provider.nil?
+		FwtPushNotificationServer.notifiers[provider.to_sym]
+	end
+
   end
 
 end

data/config/routes.rb

@@ -1,11 +1,6 @@
-FwtPushNotificationServer::Engine.routes.draw do
   
-	resources :device_tokens, only: [:create, :index]
-	root :to => 'device_tokens#index'
+FwtPushNotificationServer::Engine.routes.draw do
 
-	devise_for :users, {
-    	class_name: 'FwtPushNotificationServer::User',
-    	module: :devise
-  	}
+	resources :device_tokens, only: [:create]
 
 end

data/lib/devise/models/notifiable.rb

@@ -0,0 +1,30 @@
+module Devise
+	module Models
+
+		module Notifiable
+
+			extend ActiveSupport::Concern
+
+			def notify_once(message)
+				device_tokens.each do |device|
+					next unless device.is_valid
+					device.notifier.notify_once(message, device) unless device.notifier.nil?
+				end
+			end
+
+			def schedule_notification
+				device_tokens.each do |device|
+					next unless device.is_valid
+					device.notifier.add_device_token(device) unless device.notifier.nil?
+				end
+			end
+
+			def device_tokens
+				key = FwtPushNotificationServer.user_key
+				FwtPushNotificationServer::DeviceToken.where(:user_id => send(key))
+			end
+
+		end
+
+	end
+end

data/lib/fwt_push_notification_server/engine.rb

@@ -1,11 +1,7 @@
-require "kaminari-bootstrap"
-require "bootstrap-sass"
-require "sass-rails"
 require "devise"
 require "cancan"
-require "simple_form"
-require "rails_bootstrap_navbar"
-require "coffee-rails"
+require "grocer"
+require "gcm"
 
 module FwtPushNotificationServer
   

data/lib/fwt_push_notification_server/version.rb

@@ -1,3 +1,3 @@
 module FwtPushNotificationServer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7.b4"
 end

data/lib/fwt_push_notification_server.rb

@@ -1,48 +1,62 @@
 require "fwt_push_notification_server/engine"
-require 'active_support/core_ext/hash/slice'
-require "devise"
-require "grocer"
+require 'notifier/base'
+require 'notifier/apns'
+require 'notifier/gcm'
 
 module FwtPushNotificationServer
 
-	mattr_accessor :config
-
-	def self.apns_config
-		config.slice(:gateway, :certificate, :passphrase)
-	end
-
-	def self.send_notification_to_all(alert)
-		devices = DeviceToken.where(:is_valid => true).all
-		send_notification(alert, devices)
-	end
-
-	def self.send_notification(alert, device_tokens)
-
-      alert = alert.byteslice(0, 232)
-      alert += '...' if alert.bytesize > 232
-      
-      config = self.apns_config
-      
-      pusher = Grocer.pusher(config)
-      
-      device_tokens = [device_tokens] unless device_tokens.is_a?(Array)
-
-      device_tokens.each do |device|
-      	if device.is_valid
-        	token = device.token
-      	 	n = Grocer::Notification.new(device_token: token, alert: alert)
-        	pusher.push n
-    	end
-      end
-
-      feedback = Grocer.feedback(config)
-      feedback.each do |attempt|
-        token = attempt.device_token
-        device_token = DeviceToken.find_by_token(token)
-        device_token.update_attribute("is_valid", false) unless device_token.nil?
-        puts "Device #{token} failed at #{attempt.timestamp}"
-      end
-
-	end
+  mattr_accessor :api_controller_class
+
+  mattr_accessor :authentication_filter
+  @@authentication_filter = :authenticate_user!
+
+  mattr_accessor :user_class
+
+  mattr_accessor :user_key
+  @@user_key = :user_id  
+
+  mattr_accessor :apns_gateway
+  @@apns_gateway = 'sandbox.push.apple.com'
+
+  mattr_accessor :apns_certificate
+
+  mattr_accessor :apns_passphrase
+
+
+  mattr_accessor :gcm_api_key
+
+  def self.configure
+    yield self
+  end
+
+  ###
+  # Push Notifications
+  ###
+
+  mattr_accessor :notifiers
+  @@notifiers = {
+    :apns => Notifier::APNS.new,
+    :gcm => Notifier::GCM.new
+  }
+
+  def self.apns_config
+    {
+      :gateway => apns_gateway,
+      :certificate => apns_certificate,
+      :passphrase => apns_passphrase
+    }
+  end
+
+  def self.begin_transaction(message)
+    notifiers.each_value do |notifier|
+      notifier.begin_transaction(message)
+    end
+  end
+
+  def self.commit_transaction
+    notifiers.each_value do |notifier|
+      notifier.commit_transaction
+    end
+  end
 
 end

data/lib/generators/fwt_push_notification_server/install/install_generator.rb

@@ -22,7 +22,7 @@ module FwtPushNotificationServer
 
       def copy_migrations
         migration_template "create_fwt_push_notification_server_device_tokens.rb", "db/migrate/create_fwt_push_notification_server_device_tokens.rb"
-        migration_template "devise_create_fwt_push_notification_server_users.rb", "db/migrate/devise_create_fwt_push_notification_server_users.rb"
+        migration_template "add_provider_to_push_notification_server_device_tokens.rb", "db/migrate/add_provider_to_push_notification_server_device_tokens.rb"
       end
 
       desc "Add initializer"
@@ -31,13 +31,6 @@ module FwtPushNotificationServer
         copy_file "initializer.rb", "config/initializers/#{app_name}.rb"
       end
     
-      desc "Add seeds"
-
-      def append_seeds
-        seeds = File.read(File.join(File.dirname(__FILE__), "templates/seeds.rb"))
-        append_file "db/seeds.rb", seeds
-      end
-
       private
         def app_name
           "fwt_push_notification_server"

data/lib/generators/fwt_push_notification_server/install/templates/add_provider_to_push_notification_server_device_tokens.rb

@@ -0,0 +1,7 @@
+class AddProviderToPushNotificationServerDeviceTokens < ActiveRecord::Migration
+  
+  def change
+  	add_column :fwt_push_notification_server_device_tokens, :provider, :string
+  end
+
+end

data/lib/generators/fwt_push_notification_server/install/templates/create_fwt_push_notification_server_device_tokens.rb

@@ -3,8 +3,7 @@ class CreateFwtPushNotificationServerDeviceTokens < ActiveRecord::Migration
   def change
     create_table :fwt_push_notification_server_device_tokens do |t|
       t.string :token
-      t.string :device_id
-      t.string :device_name
+      t.string :user_id
       t.boolean :is_valid, :default => true
 
       t.timestamps

data/lib/generators/fwt_push_notification_server/install/templates/initializer.rb

@@ -1,20 +1,18 @@
-#development (sandbox)
-FwtPushNotificationServer.config = {
 
-	:api_key => 'YOUR-DEVELOPMENT-KEY-HERE',
-    :certificate => File.join(Rails.root, 'config', 'APNSDevelopment.pem'),
-    :passphrase => 'PASSPHRASE',
-    :gateway => 'gateway.sandbox.push.apple.com',
-    :title => 'FWT Push Notifications'
-};
+FwtPushNotificationServer.configure do |config|
 
-#production
-# FwtPushNotificationServer.config = {
+	# APNS
+	config.apns_certificate = File.join(Rails.root, 'config', 'APNSDevelopment.pem')
+	config.apns_passphrase = 'PASSPHRASE'
+	config.apns_gateway = 'gateway.sandbox.push.apple.com'
+	
+	# GCM
+	config.gcm_api_key = 'YOUR-KEY-HERE'
 
-# 	  :api_key => 'YOUR-PRODUCTION-KEY-HERE',
-#     :certificate => File.join(Rails.root, 'config', 'APNSProduction.pem'),
-#     :passphrase => 'PASSPHRASE',
-#     :gateway => 'gateway.push.apple.com',
-#     :title => 'FWT Push Notifications'
+	# Devise integration
+	config.api_controller_class = ApplicationController
+	config.authentication_filter = :authenticate_user!
+	config.user_class = User
+	config.user_key = :user_id
 
-# };
+end

data/lib/notifier/apns.rb

@@ -0,0 +1,38 @@
+module FwtPushNotificationServer
+
+	module Notifier
+
+		class APNS < Notifier::Base
+
+			def notify_once(message, device_tokens)
+
+				alert = message.byteslice(0, 232)
+		     	alert += '...' if alert.bytesize > 232
+		      
+		     	config = FwtPushNotificationServer.apns_config
+		     	pusher = Grocer.pusher(config)
+		      
+		     	device_tokens = [device_tokens] unless device_tokens.is_a?(Array)
+				device_tokens.each do |device|
+		      		if device.is_valid
+		        		token = device.token
+		      	 		n = Grocer::Notification.new(device_token: token, alert: alert)
+		        		pusher.push n
+		    	  	end
+		      	end
+
+		      	feedback = Grocer.feedback(config)
+		      	feedback.each do |attempt|
+		        	token = attempt.device_token
+		        	device_token = DeviceToken.find_by_token(token)
+		        	device_token.update_attribute("is_valid", false) unless device_token.nil?
+		        	puts "APNS: Device #{token} failed at #{attempt.timestamp}"
+		      	end
+
+			end
+
+		end
+
+	end
+
+end

data/lib/notifier/base.rb

@@ -0,0 +1,28 @@
+module FwtPushNotificationServer
+
+	module Notifier
+
+		class Base
+
+			def begin_transaction(message)
+				@device_tokens = []
+				@message = message
+			end
+
+			def add_device_token(device_token)
+				@device_tokens << device_token if device_token.is_valid
+			end
+
+			def commit_transaction
+				notify_once(@message, @device_tokens.uniq)
+			end
+
+			def notify_once(message, device_tokens)
+
+			end
+
+		end
+
+	end
+
+end

data/lib/notifier/gcm.rb

@@ -0,0 +1,41 @@
+module FwtPushNotificationServer
+
+	module Notifier
+
+		class GCM < Notifier::Base
+
+			def notify_once(message, device_tokens)
+
+				@device_tokens = device_tokens.is_a?(Array) ? device_tokens : [device_tokens]
+				
+				@gcm = ::GCM.new(FwtPushNotificationServer.gcm_api_key)
+
+				@registration_ids = []
+				@payload = { :data => { :message => message } }
+				@device_tokens.each do |device|
+					@registration_ids << device.token
+					if @registration_ids.count == 1000
+						send_batch
+					end
+				end
+				send_batch
+			end
+
+			private
+			def send_batch
+				response = @gcm.send_notification(@registration_ids, @payload)
+				body = JSON.parse(response.fetch(:body, "{}"))
+				results = body.fetch("results", [])
+				results.each_with_index do |result, idx|
+					if result["error"]
+						@device_tokens[idx].update_attribute('is_valid', false)
+					end
+				end
+				@registration_ids = []
+			end
+
+		end
+
+	end
+
+end