notifiable-rails 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbaafd78d10a107a81067e143a9d6adbafaaae50
-  data.tar.gz: c18c874d3fbe4f4adb5aec8c26f162d2449bf7c0
+  metadata.gz: 6771605e049c4c99a9ca06e52203f8b5b348d7e0
+  data.tar.gz: 46439784fe393b8282422590d34454b977ea32e8
 SHA512:
-  metadata.gz: 1f30704e7c7fb1566c2dd82f833da44a6188e37dc207fb795ba18c1fa46436573943552bca39a7be6a25734d1c21df3f2e126c0d30a830ccea39d2f70a2e6078
-  data.tar.gz: f4c16109523ffc3dd18efe5a34dd105cd472ffeef79b35daf05951c8d009e7b4c5badf79e6df16f074738c32f23d210ea0415ce195b06b2afb1ea52209f1db03
+  metadata.gz: e0b39ee3bb705fe1e945a32e4a00f334720417616173150413e0ea1f9c7ce0551f784202408c3db4bfe1f46b0d8ebf221b471f922b2ac5d0ad7a9a5e251e12b2
+  data.tar.gz: 4e91ea250c6b0d81fff90e7f142fd21d87aba3ab02bdb64ed8ee901e3ebc25ce6060df2a145ebc81ce520564c2092d632b69d86c4a7916e13179195036f89c90

data/app/controllers/notifiable/device_tokens_controller.rb

@@ -10,7 +10,7 @@ module Notifiable
     before_filter :find_device_token, :ensure_authorized!, :except => :create
     
     def create
-      @device_token = DeviceToken.find_by(:token => params[:token]) 
+      @device_token = DeviceToken.find_by(:token => params[:token], :is_valid => true) 
       @device_token = DeviceToken.new unless @device_token
 
       perform_update(device_token_params)

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

@@ -4,6 +4,7 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
     create_table :notifiable_device_tokens do |t|
       t.string :token
     	t.string :provider
+      t.boolean :is_valid, :default => true
       t.integer :user_id
       t.references :app
 

data/lib/notifiable/device_token.rb

@@ -3,7 +3,6 @@ module Notifiable
     belongs_to :app, :class_name => "Notifiable::App"
     
     validates_presence_of :token, :provider, :app
-  	validates_uniqueness_of :token
 
   	def user
   		user_id.blank? ? nil : Notifiable.user_class.find(user_id)

data/lib/notifiable/notification.rb

@@ -22,7 +22,7 @@ module Notifiable
     def add_device_token(d)
       provider = d.provider.to_sym
 
-      if notifiers[provider].nil?
+      unless notifiers[provider]
         clazz = Notifiable.notifier_classes[provider]          
         raise "Notifier #{provider} not configured" unless clazz
         
@@ -32,7 +32,10 @@ module Notifiable
         notifiers[provider] = notifier
       end
       
-      notifiers[provider].send_notification(d)  		  
+      notifier = @notifiers[provider]
+      if d.is_valid? && !notifier.nil? 
+  		  notifier.send_notification(d)
+      end
     end
     
     def send_params

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/spec/controllers/device_tokens_controller_spec.rb

@@ -6,6 +6,7 @@ describe Notifiable::DeviceTokensController do
   let(:user2) { FactoryGirl.create(:user_with_mock_token) }
   let(:user2_device_token) { user2.device_tokens.first }
   let(:app) { FactoryGirl.create(:app) }
+  let(:invalid_device_token) { FactoryGirl.create(:invalid_mock_token) }
   
   before(:each) do
     @request.env["HTTP_ACCEPT"] = "application/json"
@@ -54,6 +55,18 @@ describe Notifiable::DeviceTokensController do
     dt.app.should.eql? app
   end
   
+  it "uses an existing token unless its invalid" do
+    post :create, :token => invalid_device_token.token, :provider => invalid_device_token.provider, :app_id => app.id, :user_email => user1.email
+    response.status.should == 200
+    Notifiable.api_device_token_params.push('id').each{|p| json.should have_key(p.to_s)} 
+    
+    Notifiable::DeviceToken.count.should == 2
+    user1.device_tokens.count.should == 1
+    dt = Notifiable::DeviceToken.last
+    dt.token.should.eql? invalid_device_token.token
+    dt.is_valid.should be_true
+  end
+  
   it "doesn't create a token if no app is specified" do
     post :create, :token => "ABC123", :user_email => user1.email, :provider => :mpns
     

data/spec/notifiable_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Notifiable::Concern do
   let(:user1) { FactoryGirl.create(:user_with_mock_token) }
+  let(:invalid_token_user) { FactoryGirl.create(:user_with_invalid_mock_token) }
   let(:notification1) { FactoryGirl.create(:notification, :message => "First test message")}
     
   it "sends a single push notification" do        
@@ -9,4 +10,11 @@ describe Notifiable::Concern do
     
     Notifiable::NotificationStatus.count.should == 1    
   end
+  
+  it "sends zero notifications if the device is not valid" do
+    invalid_token_user.send_notification(notification1)
+    
+    Notifiable::NotificationStatus.count.should == 0    
+  end
+  
 end

data/spec/support/factories.rb

@@ -4,6 +4,10 @@ FactoryGirl.define do
     provider :mock
     sequence(:token) {|n| "ABCD#{n}" }
     app
+    
+    factory :invalid_mock_token do
+      is_valid false
+    end
   end
   
   factory :app, :class => Notifiable::App do
@@ -29,6 +33,12 @@ FactoryGirl.define do
         FactoryGirl.create(:mock_token, :user_id => user.id)
       end
     end
+  
+    factory :user_with_invalid_mock_token do
+      after(:create) do |user, evaluator|
+        FactoryGirl.create(:invalid_mock_token, :user_id => user.id)
+      end
+    end  
   end
   
   

data/spec/test_app/db/migrate/20131228225139_create_notifiable_device_tokens.rb

@@ -4,13 +4,14 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
     create_table :notifiable_device_tokens do |t|
       t.string :token
     	t.string :provider
+      t.boolean :is_valid, :default => true
       t.integer :user_id
       t.references :app
 
       t.timestamps
     end
 
-    add_index :notifiable_device_tokens, :token, :unique => true      
+    add_index :notifiable_device_tokens, :token 
     add_index :notifiable_device_tokens, :user_id
   end
 

data/spec/test_app/db/schema.rb

@@ -23,13 +23,14 @@ ActiveRecord::Schema.define(version: 20131229104039) do
   create_table "notifiable_device_tokens", force: true do |t|
     t.string   "token"
     t.string   "provider"
+    t.boolean  "is_valid",   default: true
     t.integer  "user_id"
     t.integer  "app_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "notifiable_device_tokens", ["token"], name: "index_notifiable_device_tokens_on_token", unique: true
+  add_index "notifiable_device_tokens", ["token"], name: "index_notifiable_device_tokens_on_token"
   add_index "notifiable_device_tokens", ["user_id"], name: "index_notifiable_device_tokens_on_user_id"
 
   create_table "notifiable_notifications", force: true do |t|