notifiable-rails 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846bf4cc8b8d7d968ce3f7507d0f16e50024dc53
-  data.tar.gz: 271e8fe18f6ef3bddceacf3d5837f9f5f4cca5cb
+  metadata.gz: 099d66d35755e715b96fbcd6cd5e54896009a483
+  data.tar.gz: 24d3b8bb3b7e32576ba54afc03e203b18b3ccc8e
 SHA512:
-  metadata.gz: dc8472f2c27ba9786d7cd24459b3136147f42243ce964ed862d3493ed0369f14534a6c6d5ca3d7f8e8dda26bf8774d8e57b050546befa87aab4e818575bee82d
-  data.tar.gz: a86c11aa3581d0aff7d6bc2fd36eb06d92ac006901ab241fdd9fc6f42395762f1e75ccc1f46c0d27812447abe10660371d82caefdf425115c033753f5ca5f84d
+  metadata.gz: fe3ede906fbcf129a02687f48fa98c7497da3e63b614e01f8a9c669d44930ed60477608e1efbae96ba1bb812f942c63731b5b80565b1f826b8f66788ca6f3c2c
+  data.tar.gz: 910a181c644904a8bd3126507937108623acb82aec7a91ceb8c508058fa1130efd628bbfa4db9172cd9088a5465833c8b7b01facc207ebc38f85115cea0148a2

data/lib/generators/notifiable/install/templates/create_notifiable_notification_statuses.rb

@@ -0,0 +1,11 @@
+class CreateNotifiableNotificationStatuses < ActiveRecord::Migration
+  
+  def change
+    create_table :notifiable_notification_statuses do |t|
+      t.references :notification
+      t.references :device_token
+      t.integer :status
+    end
+  end
+
+end

data/lib/notifiable/notification.rb

@@ -3,6 +3,6 @@ module Notifiable
     
     serialize :params
     
-    has_many :notification_device_tokens, :class_name => 'Notifiable::NotificationDeviceToken'
+    has_many :notification_status, :class_name => 'Notifiable::NotificationStatus'
   end
 end

data/lib/notifiable/{notification_device_token.rb → notification_status.rb}

@@ -1,5 +1,5 @@
 module Notifiable
-  class NotificationDeviceToken < ActiveRecord::Base
+  class NotificationStatus < ActiveRecord::Base
     belongs_to :notification, :class_name => 'Notifiable::Notification'
     belongs_to :device_token, :class_name => 'Notifiable::DeviceToken'
   end

data/lib/notifiable/notifier_base.rb

@@ -20,8 +20,8 @@ module Notifiable
       
     end
     
-    def processed(notification, device_token)
-      receipts << {:notification_id => notification.id, :device_token_id => device_token.id }
+    def processed(notification, device_token, status)
+      receipts << {notification_id: notification.id, device_token_id: device_token.id, status: status }
       
       if receipts.count > 10000
         save_receipts
@@ -38,7 +38,7 @@ module Notifiable
     end
     
     def save_receipts
-      Notifiable::NotificationDeviceToken.bulk_insert! receipts
+      Notifiable::NotificationStatus.bulk_insert! receipts
       @receipts = []
     end
 	end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/notifiable.rb

@@ -3,7 +3,7 @@ require 'notifiable/notifiable_concern'
 require 'notifiable/railtie' if defined?(Rails)
 require 'notifiable/engine'
 require 'notifiable/notification'
-require 'notifiable/notification_device_token'
+require 'notifiable/notification_status'
 require 'notifiable/batch'
 require 'notifiable/device_token'
 require 'notifiable/notifier_base'

data/spec/batch_spec.rb

@@ -22,7 +22,7 @@ class ConfigurableMockNotifier < Notifiable::NotifierBase
   attr_accessor :use_sandbox
   
   def enqueue(notification, device_token)
-    processed(notification, device_token)
+    processed(notification, device_token, 200)
   end
 end
 

data/spec/notifiable_server_spec.rb

@@ -12,9 +12,9 @@ describe Notifiable do
       b.add(notification1, user2)
     end
 
-    Notifiable::NotificationDeviceToken.count.should == 2
+    Notifiable::NotificationStatus.count.should == 2
     
-    all_notifications = Notifiable::NotificationDeviceToken.all
+    all_notifications = Notifiable::NotificationStatus.all
     first_notification_token = all_notifications[0]
     first_notification_token.notification.message.should eql "First test message"
     first_notification_token.device_token.should eql user1.device_tokens[0]
@@ -30,14 +30,16 @@ describe Notifiable do
       b.add(notification2, user2)
     end
     
-    Notifiable::NotificationDeviceToken.count.should == 2
+    Notifiable::NotificationStatus.count.should == 2
     
-    all_notifications = Notifiable::NotificationDeviceToken.all
+    all_notifications = Notifiable::NotificationStatus.all
     first_notification_token = all_notifications[0]
+    first_notification_token.status.should == 200
     first_notification_token.notification.message.should eql "First test message"
     first_notification_token.device_token.should eql user1.device_tokens[0]
     
     second_notification_token = all_notifications[1]
+    second_notification_token.status.should == 200
     second_notification_token.notification.message.should eql "Second test message"
     second_notification_token.device_token.should eql user2.device_tokens[0]
   end

data/spec/notifiable_spec.rb

@@ -8,7 +8,7 @@ describe Notifiable::Concern do
     
     user1.send_notification(notification)
     
-    Notifiable::NotificationDeviceToken.count.should == 1    
+    Notifiable::NotificationStatus.count.should == 1    
   end
   
   it "sends zero notifications if the device is not valid" do
@@ -16,7 +16,7 @@ describe Notifiable::Concern do
     
     user.send_notification(notification)
     
-    Notifiable::NotificationDeviceToken.count.should == 0    
+    Notifiable::NotificationStatus.count.should == 0    
   end
   
 end

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ end
 
 class MockNotifier < Notifiable::NotifierBase
   def enqueue(notification, device_token)
-    processed(notification, device_token)
+    processed(notification, device_token, 200)
   end
 end
 

data/spec/test_app/db/migrate/20131229104039_create_notifiable_notification_statuses.rb

@@ -0,0 +1,11 @@
+class CreateNotifiableNotificationStatuses < ActiveRecord::Migration
+  
+  def change
+    create_table :notifiable_notification_statuses do |t|
+      t.references :notification
+      t.references :device_token
+      t.integer :status
+    end
+  end
+
+end

data/spec/test_app/db/schema.rb

@@ -27,11 +27,10 @@ ActiveRecord::Schema.define(version: 20131229104039) do
   add_index "notifiable_device_tokens", ["token"], name: "index_notifiable_device_tokens_on_token", unique: true
   add_index "notifiable_device_tokens", ["user_id"], name: "index_notifiable_device_tokens_on_user_id"
 
-  create_table "notifiable_notification_device_tokens", force: true do |t|
-    t.integer  "notification_id"
-    t.integer  "device_token_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "notifiable_notification_statuses", force: true do |t|
+    t.integer "notification_id"
+    t.integer "device_token_id"
+    t.integer "status"
   end
 
   create_table "notifiable_notifications", force: true do |t|