notifiable-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4955923e80912ffec3e18234d87fb942380a8b
-  data.tar.gz: c4b3b65c9c917b88f35705118a65988eca07327a
+  metadata.gz: 39b16fa6a22178fc28e5ce367b72f065ebaba804
+  data.tar.gz: 67bd6e6fbe7c05b79b5af04bb810abe78c9f9f54
 SHA512:
-  metadata.gz: 72aab818f6684b44bb6f3a32745f09746391a357209495e34744f44dbaf8051586583134ecbbb08ea62ef23278ca648020d6c1c845b129dfb0bb1e4c43779ece
-  data.tar.gz: cf21d9790ee894059d9cf6dc384864e491bed33ffee9a39347ad93c04dd5ca2aa061500998b9363b8caca32d51a17281ca3d64aa06b25a1700c576e1aabcc2fd
+  metadata.gz: f7e405b314ead10453aae774684a9fef411adcc9736e57198135cc4f84b0a5e6db66aa5b1e38fdc1d8694ef9a0b1af70045ba0707e9e8a44e629e6871f78f79d
+  data.tar.gz: 1df7aa3df2289fa1f58624c6d5bfcc9e1919de6a99b92a32927eb048bcf4c10fc3b7a8e9b61758fbea85dfc6b167a3e73eac341a8d669eacdb013c719843cce6

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

@@ -2,8 +2,12 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
   
   def change
     create_table :notifiable_notifications do |t|
+      t.text :title
       t.text :message
-      t.text :payload
+      t.text :params
+      t.integer :badge
+      t.text :sound
+      t.datetime :expiry
       t.timestamps
     end
   end

data/lib/notifiable/notification.rb

@@ -1,16 +1,8 @@
 module Notifiable
   class Notification < ActiveRecord::Base
     
-    serialize :payload
+    serialize :params
     
     has_many :notification_device_tokens, :class_name => 'Notifiable::NotificationDeviceToken'
-    
-    def provider_value(provider, key)
-      if self.payload && self.payload[provider] && self.payload[provider][key]
-        self.payload[provider][key]
-      elsif self.respond_to? key
-        self.send(key)
-      end       
-    end
   end
 end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/notifiable_server_spec.rb

@@ -16,11 +16,11 @@ describe Notifiable do
     
     all_notifications = Notifiable::NotificationDeviceToken.all
     first_notification_token = all_notifications[0]
-    first_notification_token.notification.provider_value(:mock, :message).should eql "First test message"
+    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.notification.provider_value(:mock, :message).should eql "First test message"
+    second_notification_token.notification.message.should eql "First test message"
     second_notification_token.device_token.should eql user2.device_tokens[0]
   end
   
@@ -34,11 +34,11 @@ describe Notifiable do
     
     all_notifications = Notifiable::NotificationDeviceToken.all
     first_notification_token = all_notifications[0]
-    first_notification_token.notification.provider_value(:mock, :message).should eql "First test message"
+    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.notification.provider_value(:mock, :message).should eql "Second test message"
+    second_notification_token.notification.message.should eql "Second test message"
     second_notification_token.device_token.should eql user2.device_tokens[0]
   end
   

data/spec/notification_spec.rb

@@ -3,21 +3,15 @@ require 'spec_helper'
 describe Notifiable::Notification do
   
   it "stores a message" do    
-    Notifiable::Notification.create :message => "Test message"
+    Notifiable::Notification.create(:message => "Test message")
     
-    Notifiable::Notification.first.provider_value(:mock, :message).should eql "Test message"
+    Notifiable::Notification.first.message.should eql "Test message"
   end
   
-  it "overrides a message" do    
-    Notifiable::Notification.create :message => "Test message", :payload => {:mock => {:message => "A different message"}}
+  it "stores params" do    
+    Notifiable::Notification.create :params => {:custom_property => "A different message"}
     
-    Notifiable::Notification.first.provider_value(:mock, :message).should eql "A different message"
-  end
-  
-  it "returns nil for a property that doesnt exist" do    
-    Notifiable::Notification.create :message => "Test message"
-    
-    Notifiable::Notification.first.provider_value(:mock, :sound).should be_nil
+    Notifiable::Notification.first.params.should == {:custom_property => "A different message"}
   end
   
 end

data/spec/test_app/db/migrate/20131228225140_create_notifiable_notifications.rb

@@ -2,8 +2,12 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
   
   def change
     create_table :notifiable_notifications do |t|
+      t.text :title
       t.text :message
-      t.text :payload
+      t.text :params
+      t.integer :badge
+      t.text :sound
+      t.datetime :expiry
       t.timestamps
     end
   end

data/spec/test_app/db/schema.rb

@@ -35,8 +35,12 @@ ActiveRecord::Schema.define(version: 20131229104039) do
   end
 
   create_table "notifiable_notifications", force: true do |t|
+    t.text     "title"
     t.text     "message"
-    t.text     "payload"
+    t.text     "params"
+    t.integer  "badge"
+    t.text     "sound"
+    t.datetime "expiry"
     t.datetime "created_at"
     t.datetime "updated_at"
   end