notify_user 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b33bbd2593d7ade8139c4a5a5bbb693ca0806fc6
-  data.tar.gz: cd5dba867d875a448871642ca027b5553f937c02
+  metadata.gz: dc991c9547c3c9b6a595ebee3bb5a48284f620d2
+  data.tar.gz: 923ed73f2a0d2be1fc57a35b6ab5c6c0f0f59562
 SHA512:
-  metadata.gz: 91ae7db27368c1ea284d9eb6567bf8f5430a7f956bf12c3cc5163a0662aad19543fc0d19e55dce11ca226414ee1d196159ad5b075ee6e511ab42f8257bc12488
-  data.tar.gz: 42525066c51679061f1cc730797c090d87a5b9a911ba2d510fcd7dd6f9cc7202601220ae5a5c79585b48d4fd83ac9bdcbc86307c3d5073f20df2622b95a75777
+  metadata.gz: 8ef3f9889f3f3524633eca6d9d8dc70e09bd530b444a4978409b2abe6e4154437c8440ce6e8b84b9e13468ac4a68b9335007a1bf9397adfb28f7033a2cc621ce
+  data.tar.gz: c0969fcd052e22151f9ec4bf17b6ce1d9c45779d3318d4954f1e0db91733bac9c1abbdd0e4b62f8ed8101e22b7c3194a4dce333e198bc8aead830727cf514a24

data/app/models/notify_user/base_notification.rb

@@ -77,18 +77,19 @@ module NotifyUser
     def message
       string = 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)
-      return ::CGI.unescapeHTML("#{string}")        
+             :template => self.class.views[:mobile_sdk][:template_path].call(self), :formats => [:html],
+             :locals => { :params => self.params})
+
+      return ::CGI.unescapeHTML("#{string}")
     end
 
     def mobile_message(length=115)
       string = truncate(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), :length => length)
+             :template => self.class.views[:mobile_sdk][:template_path].call(self), :formats => [:html],
+             :locals => { :params => self.params}), :length => length)
 
-      return ::CGI.unescapeHTML("#{string}") 
+      return ::CGI.unescapeHTML("#{string}")
     end
 
     ## Public Interface
@@ -175,7 +176,7 @@ module NotifyUser
         # if aggregation is false bypass aggregation completely
         self.channels.each do |channel_name, options|
           if(options[:aggregate_per] == false)
-            self.class.delay.deliver_notification_channel(self.id, channel_name)    
+            self.class.delay.deliver_notification_channel(self.id, channel_name)
           else
             # only notifies channels if no pending aggreagte notifications
             if not aggregation_pending?
@@ -186,7 +187,7 @@ module NotifyUser
       end
     end
 
-    # Sends immediately and without aggregation 
+    # Sends immediately and without aggregation
     def deliver!
       if pending_no_aggregation? and not user_has_unsubscribed?
         self.mark_as_sent!
@@ -242,7 +243,7 @@ module NotifyUser
 
       # Find any pending notifications with the same type and target, which can all be sent in one message.
       notifications = self.pending_aggregation_with(notification)
-      
+
       notifications.map(&:mark_as_sent)
       notifications.map(&:save)
 
@@ -257,21 +258,21 @@ module NotifyUser
     end
 
     private
-    
+
     def unsubscribed_validation
-      errors.add(:target, (" has unsubscribed from this type")) if user_has_unsubscribed?   
+      errors.add(:target, (" has unsubscribed from this type")) if user_has_unsubscribed?
     end
 
     def user_has_unsubscribed?
-      #return true if user has unsubscribed 
-      return true unless NotifyUser::Unsubscribe.has_unsubscribed_from(self.target, self.type).empty?  
+      #return true if user has unsubscribed
+      return true unless NotifyUser::Unsubscribe.has_unsubscribed_from(self.target, self.type).empty?
 
-      return false 
+      return false
     end
- 
+
     def self.unsubscribed_from_channel?(user, type)
-      #return true if user has unsubscribed 
-      return !NotifyUser::Unsubscribe.has_unsubscribed_from(user, type).empty?   
+      #return true if user has unsubscribed
+      return !NotifyUser::Unsubscribe.has_unsubscribed_from(user, type).empty?
     end
 
 

data/lib/notify_user/version.rb

@@ -1,3 +1,3 @@
 module NotifyUser
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notify_user
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tom Spacek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails