notifiable-core 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0865eabff60a2f39d986369dfa5b7fb781d8504aca696a933c2ce7928a86751
-  data.tar.gz: 817efa58bc322fa260647ff998f0af1095582a50bb0dcf6d804af9a0b2c419ce
+  metadata.gz: ee5fccd800a04500a363939b090a2a9f88faa45c84a6d43af689e0036efe1191
+  data.tar.gz: a7bf3297962dda646bc268d9ee07a09008f89a917e0450f4c896e85ed57c6ad2
 SHA512:
-  metadata.gz: 715b4ecbc1da59868a6b02e8471400b14abc8f705d9e13c03cd0ee2c5910482caa0a7fe329c8920473bc9a2578e0bd859cb95ca999bc03180f67901ba2d7e317
-  data.tar.gz: 5d92f645691f0a6822990e8812ecae30320c62f2f0da08657a8f5b0d0a6f93531f0c9be65eb545d2283fec890289f81fec3e8e639b9bff044bc081b23276803f
+  metadata.gz: f3816a57d151d68f66dce06cdf8210a773a03e965b08cb91955a6baa788ce8c04d3c7d9e5b0ba0f1495814986cf9deeee91a9a85a27f25c78691cf1bbdcbabee
+  data.tar.gz: 119f7f22adc594d0af15b16b5f7c2811cf256184138623c0f788573690eb8a8600f0b18f8aae952f082068116ee84d1d03d49c481d1ae09b2a2c853e5ab593bf

data/db/migrate/201808272135000_add_status_to_notifications.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStatusToNotifications < ActiveRecord::Migration[4.2]
+  def change
+    add_column :notifiable_notifications, :status, :integer, default: 0
+  end
+end

data/lib/notifiable/notification.rb

@@ -10,12 +10,20 @@ module Notifiable
     serialize :parameters
 
     has_many :notification_statuses, class_name: 'Notifiable::NotificationStatus', dependent: :destroy
+    
+    after_initialize :set_default_status
+    
+    ERROR_STATUS = -1
+    WAITING_STATUS = 0
+    SENDING_STATUS = 1
+    FINISHED_STATUS = 2
 
     def batch
+      update(status: SENDING_STATUS)
       yield(self)
-      update(last_error_message: nil)
+      update_attributes({status: FINISHED_STATUS, last_error_message: nil})
     rescue => e
-      update(last_error_message: e.message)
+      update_attributes({status: ERROR_STATUS, last_error_message: e.message})
       raise e
     ensure
       close
@@ -41,6 +49,10 @@ module Notifiable
 
     private
 
+    def set_default_status
+      self.status ||= WAITING_STATUS
+    end
+
     def notifiers
       @notifiers ||= {}
     end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-core
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -201,6 +201,7 @@ files:
 - db/migrate/201806182135000_add_thread_id_to_notifications.rb
 - db/migrate/201806242135000_add_category_to_notifications.rb
 - db/migrate/201808242135000_add_error_message_to_notification_statuses.rb
+- db/migrate/201808272135000_add_status_to_notifications.rb
 - lib/notifiable.rb
 - lib/notifiable/app.rb
 - lib/notifiable/device_token.rb