notify_user 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac2603bea84ed0732f612ebe0a863a014f8091b
-  data.tar.gz: ef99a7d91412f59b1499d7024c0ec4c8623e6eb2
+  metadata.gz: d94141a8a16e9d4f68c8f8b8f0dbb2d4daf4c59e
+  data.tar.gz: 105a25b9ca97eb2f7a9f2a9fa3f8303acb34ad2c
 SHA512:
-  metadata.gz: f8fed45fe13ac4a464a1244fb23ad9450aaad74aa3265ebceb3ce6f3cb99d81d0175263e3ee7bfebfe0d011d08978bf00e1866a9a6ad443e296305e5f327369d
-  data.tar.gz: 8ae0a24bb1aa3fb3227dd3781919d02241351fe2390dc4e5c25df3420a48fbba006e76c71b812d5ca6a6363e28fe5635a78bec2e159f9cadc40e9dfdd4d50d1d
+  metadata.gz: a9d94e03b19c8016aff586a032030f5b9dec2734be69db9d3ac8f220c0be6e02e865386421988276acbe6fd743bfecc91ef0f25c2aa11cbbe645dfdb96b8bbd7
+  data.tar.gz: 5cab189693268c92ab1d77e27711296e7778ca35949f8ef825216036586fae45800848f6dd5efc382bfc1a55d97cd6c721e55911ed64d9ad3bc6a3ed23861b54

data/app/models/notify_user/base_notification.rb

@@ -66,7 +66,7 @@ module NotifyUser
       ActionView::Base.new(
              Rails.configuration.paths["app/views"]).render(
              :template => self.class.views[:mobile_sdk][:template_path].call(self), :formats => [:html], 
-             :locals => { :params => self.params}, :layout => false).html_safe
+             :locals => { :params => self.params}, :layout => false)
     end
 
     def mobile_message(length=115)
@@ -274,7 +274,6 @@ module NotifyUser
     end
 
     private
-    
     def unsubscribed_validation
       errors.add(:target, (" has unsubscribed from this type")) if user_has_unsubscribed?   
     end
@@ -293,5 +292,6 @@ module NotifyUser
       return false 
     end
 
+
   end
 end

data/app/models/notify_user/pub_nub.rb

@@ -29,11 +29,19 @@ module NotifyUser
       pn_apns[:aps][:action_id] = notification.params[:action_id] if notification.params[:action_id]
       pn_apns[:aps]['content-available'] = notification.params['content-available'] if notification.params['content-available']
 
+      pn_gcm = {
+        message: notification.mobile_message,
+        type: notification.type
+      }
+
+      pn_gcm[:action_id] = notification.params[:action_id] if notification.params[:action_id]
+
       pubnub.publish(
         channel: notification.target.uuid,
         http_sync: true,
         message: {
-          pn_apns: pn_apns
+          pn_apns: pn_apns,
+          pn_gcm: pn_gcm
         }
       )
     end

data/lib/notify_user/version.rb

@@ -1,3 +1,3 @@
 module NotifyUser
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notify_user
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Tom Spacek