notification_hub 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f71402bbe668a01735d421b5a70a08008b0b2f
-  data.tar.gz: 7cbaeedc0f217c0dbd54154c9f4f122b1613108d
+  metadata.gz: a8895e84d5c3c0daf5214e941b639693ae9385e6
+  data.tar.gz: 91502ea58fb041ae93b06951265a471e12469fa7
 SHA512:
-  metadata.gz: 7116589dc0ca3bc5b14b15cbf2235116d34ed78eabf22d3e48b4a4d470004c267dbda3b8ebd10e820545e681c7276f7b7a9f3ae1f23105e1d4d85152d33562bf
-  data.tar.gz: 63d42acaa6ba0206d0147d83561d33c6589c81efe4be762dfa0eca7a1d705e302a9ebd3c838b803f8f2ef3aae35d71c99d8befa94814a289088b87b3d3937ca2
+  metadata.gz: 4cf1e16be88979de44447a2885941960ef7539d120417adc7b09db1c042d026abe9da1cf960a8345857ac5ba6521f71037b8de3b3102088f3e33ffc24a1e56c8
+  data.tar.gz: 3f6b80333ab94cd4d88b2cd6633a81cff22a9f5779cf44979f07cc4c8aa83b3a96d59c8faea96b16a8c2b2648d5f1bd6acc9316db7d09cf5c2687749e3c49a0e

data/lib/generators/notification_hub/templates/jobs/active_job.rb

@@ -1,7 +1,13 @@
 class NotificationHubJob < ActiveJob::Base
   queue_as :<%= queue_name %>
 
-  def perform(association_model_id, event_code, data, options)
-    NotificationHub.send_message(association_model_id, event_code, data, options)
+  def perform(method, association_model_id, event_code, data, device_details=nil, 
+  	channel_code=nil, gateway_code=nil)
+    if method == "deliver"
+    	NotificationHub.send_message(association_model_id, event_code, data)
+    elsif method == "deliver_direct"
+    	NotificationHub.send_direct_message(event_code, data, device_details, 
+    		channel_code, gateway_code)
+    end
   end
 end

data/lib/generators/notification_hub/templates/jobs/sidekiq_job.rb

@@ -2,7 +2,13 @@ class NotificationHubJob
   include Sidekiq::Worker
   sidekiq_options :queue => :<%= queue_name %>, :retry => 10, :backtrace => true
 
-  def perform(association_model_id, event_code, data, options)
-    NotificationHub.send_message(association_model_id, event_code, data, options)
+  def perform(method, association_model_id, event_code, data, device_details=nil, 
+  	channel_code=nil, gateway_code=nil)
+    if method == "deliver"
+    	NotificationHub.send_message(association_model_id, event_code, data)
+    elsif method == "deliver_direct"
+    	NotificationHub.send_direct_message(event_code, data, device_details, 
+    		channel_code, gateway_code)
+    end
   end
 end

data/lib/notification_hub.rb

@@ -29,19 +29,31 @@ module NotificationHub
       "NotificationHub::Channels::#{channel.to_s.camelize}::#{gateway.to_s.camelize}".constantize.new(options)
     end
 
-    def deliver_now(association_model_id, event_code, data, options=nil)
-    	send_message(association_model_id, event_code, data, options)      
+    def deliver_now(association_model_id, event_code, data)
+    	send_message(association_model_id, event_code, data)      
     end
 
-    def deliver(association_model_id, event_code, data, options=nil)   
+    def deliver(association_model_id, event_code, data)   
       if NotificationHubJob.respond_to?("perform_later".to_sym)   
-        NotificationHubJob.perform_later(association_model_id, event_code, data, options)      
+        NotificationHubJob.perform_later("deliver", association_model_id, event_code, data)      
       elsif NotificationHubJob.respond_to?("perform_async".to_sym)
-        NotificationHubJob.perform_async(association_model_id, event_code, data, options)    
+        NotificationHubJob.perform_async("deliver", association_model_id, event_code, data)    
       end
     end
 
-    def send_message(association_model_id, event_code, data_wrapper, options)       
+    def deliver_direct_now(event_code, data, device_details, channel_code, gateway_code=nil)
+      send_direct_message(event_code, data, device_details, channel_code, gateway_code)     
+    end
+
+    def deliver_direct(event_code, data, device_details, channel_code, gateway_code=nil)   
+      if NotificationHubJob.respond_to?("perform_later".to_sym)   
+        NotificationHubJob.perform_later("deliver_direct", nil, event_code, data, device_details, channel_code, gateway_code)      
+      elsif NotificationHubJob.respond_to?("perform_async".to_sym)
+        NotificationHubJob.perform_async("deliver_direct", nil, event_code, data, device_details, channel_code, gateway_code)    
+      end
+    end
+
+    def send_message(association_model_id, event_code, data_wrapper)       
       # Fetch data from the database if record id is passed.
       data = {}
       data_wrapper.each do |key,value|
@@ -74,7 +86,17 @@ module NotificationHub
       end     
     end
 
-    def send_direct(event_code, data, device_details, channel_code, gateway_code=nil)   
+    def send_direct_message(event_code, data_wrapper, device_details, channel_code, gateway_code=nil)   
+      # Fetch data from the database if record id is passed.
+      data = {}
+      data_wrapper.each do |key,value|
+        if value.is_a?(Integer)
+          data[key.to_sym] = key.to_s.classify.constantize.find_by_id(value)
+        else
+          data[key.to_sym] = value
+        end
+      end
+
       if gateway_code.present?
         channel_const = "NotificationHub::Channels::#{channel_code.camelize}::#{gateway_code.camelize}".constantize
       else

data/lib/notification_hub/subscription_manager.rb

@@ -6,9 +6,9 @@ module NotificationHub
 
 			def create_subscription(association_model_id, event_code, channel_code, device_details=nil)
 				subscription = NotificationHub::Subscription.
-					where("#{NotificationHub.association_model}_id" => association_model_id, event_code: event_code, 
-					channel_code: channel_code).first_or_create
-				
+					where("#{NotificationHub.association_model}_id" => association_model_id, 
+						event_code: event_code, channel_code: channel_code).first_or_create!
+
 				if device_details
 					device = NotificationHub::DeviceManager.create_device(association_model_id, channel_code, device_details)				
 					
@@ -20,7 +20,7 @@ module NotificationHub
 
 			def update_subscription(id, event_code, channel_code, device_details)
 				subscription = NotificationHub::Subscription.find(id)
-				subscription.update_attributes(event_code: event_code, channel_code: channel_code)
+				subscription.update_attributes!(event_code: event_code, channel_code: channel_code)
 				if device_details
 					subscription.notification_hub_subscription_devices.destroy_all
 					association_model_id = eval("subscription.#{NotificationHub.association_model}.id")
@@ -35,10 +35,10 @@ module NotificationHub
 			def create_subscription_device(association_model_id, device_id, event_code, channel_code)
 				subscription = NotificationHub::Subscription.
 					where("#{NotificationHub.association_model}_id" => association_model_id, event_code: event_code, 
-					channel_code: channel_code).first_or_create
+					channel_code: channel_code).first_or_create!
 
 				subscription_device = NotificationHub::SubscriptionDevice.where(notification_hub_subscription_id: 
-					subscription.id, notification_hub_device_id: device_id).first_or_create
+					subscription.id, notification_hub_device_id: device_id).first_or_create!
 
 				subscription_device
 			end

data/lib/notification_hub/version.rb

@@ -1,3 +1,3 @@
 module NotificationHub
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notification_hub
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Viduranga Wijesooriya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler