notifiable-rails 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5c9e0517d0c144b71ee217a4d01ba004f2d535
-  data.tar.gz: 2294beb4bd3cded57e19c4c95039311c958f52af
+  metadata.gz: 83b57f3c9bf7316dfd03fd35f33ab946757bae77
+  data.tar.gz: 74b884fe096cdb15ef63c051d33743c06019cd28
 SHA512:
-  metadata.gz: f1f8a84df5cb874e8576323c8985a6765c821e62d49ac725e509b64033282c65ab751b8536051c408021cc73342967baf0eaa6ff55c3da8169c2c44a7ed35bb4
-  data.tar.gz: de8e5cab899553948f08ef806228eea319c1cd85fafa899536ab93f9229adc525b9b74be1e5b665c127fd40b4780f7d5ac581386e5f5f42e68655641e1d27c15
+  metadata.gz: a43e0b1d07bc1101b373c54295942826580d063d1534c555c5ed748663d661cdc34160452f1b212f9d0e1fdf96a99f149ebb68184e9baca6959465344748b198
+  data.tar.gz: 849f950abc4c4735d9efd34b66ae7fc40c3aa0fd98c33143319e5219088cf6f35f40702d6a10a051b25151abe456ab680d4e623dd63b19521ebf059005d569f0

data/app/controllers/notifiable/notifications_controller.rb

@@ -3,7 +3,7 @@ module Notifiable
   
   class NotificationsController < Notifiable.api_controller_class
     
-    before_filter :ensure_current_notifiable_user!, :find_notification_status!, :check_authorisation!
+    before_filter :find_notification_status!, :check_authorisation!
     
     def opened      
       if @notification_status.opened! && @notification_status.notification.increment!(:opened_count)
@@ -16,20 +16,13 @@ module Notifiable
     
     private
     def find_notification_status!
-      return head :status => :not_acceptable unless params[:notification_id] && params[:device_token] && (params[:device_token][:device_id] || params[:device_token][:token])
-      device_token = params[:device_token][:device_id] ? 
-        DeviceToken.find_by!("device_id = ?", params[:device_token][:device_id]) :  
-        DeviceToken.find_by!("token = ?", params[:device_token][:token])
-      
-      @notification_status = NotificationStatus.find_by!("notification_id = ? AND device_token_id = ?", params[:notification_id], device_token.id)
+      return head :status => :not_acceptable unless params[:notification_id] && params[:device_token_id]
+            
+      @notification_status = NotificationStatus.find_by!("notification_id = ? AND device_token_id = ?", params[:notification_id], params[:device_token_id])
     end
     
     def check_authorisation!
-      head :status => :not_acceptable unless current_notifiable_user == @notification_status.device_token.user
-    end
-    
-    def ensure_current_notifiable_user!
-      head :status => :not_acceptable unless current_notifiable_user
+      head :status => :unauthorized unless current_notifiable_user == @notification_status.device_token.user
     end
   end
   

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

@@ -4,8 +4,8 @@ Notifiable.configure do |config|
 	config.api_controller_class = ApplicationController
   
   # Set the params permitted for creation of device tokens
-  # Defaults to [:device_id, :token, :provider]
-  #config.api_device_token_params = [:device_id, :token, :provider]
+  # Defaults to [:token, :provider, :app_id]
+  #config.api_device_token_params = [:token, :provider, :app_id]
   
   # The class representing the holder of the device
 	config.user_class = User

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

data/spec/controllers/notifications_controller_spec.rb

@@ -7,6 +7,7 @@ describe Notifiable::NotificationsController do
   let(:user2) { FactoryGirl.create(:user) }
   let(:app) { user1_device_token.app }
   let(:notification) { FactoryGirl.create(:notification, :app => app)}
+  let(:anonymous_device_token) { FactoryGirl.create(:mock_token) }
   
   before(:each) do
     @request.env["HTTP_ACCEPT"] = "application/json"
@@ -16,9 +17,25 @@ describe Notifiable::NotificationsController do
   it "marks a status as opened" do
     FactoryGirl.create(:notification_status, :notification => notification, :device_token => user1_device_token)
     
-    put :opened, {:notification_id => notification.id, :device_token => {:token => user1_device_token.token}, :user_email => user1.email}
+    put :opened, {:notification_id => notification.id, :device_token_id => user1_device_token.id, :user_email => user1.email}
     
-    expect(response).to be_success
+    response.status.should == 200
+    
+    Notifiable::NotificationStatus.count.should == 1
+    saved_status = Notifiable::NotificationStatus.first
+    saved_status.opened?.should be_true
+    
+    Notifiable::Notification.count.should == 1
+    saved_notification = Notifiable::Notification.first
+    saved_notification.opened_count.should == 1
+  end
+  
+  it "marks a status as opened anonymously" do
+    FactoryGirl.create(:notification_status, :notification => notification, :device_token => anonymous_device_token)
+    
+    put :opened, {:notification_id => notification.id, :device_token_id => anonymous_device_token.id}
+    
+    response.status.should == 200
     
     Notifiable::NotificationStatus.count.should == 1
     saved_status = Notifiable::NotificationStatus.first
@@ -32,9 +49,9 @@ describe Notifiable::NotificationsController do
   it "returns an error if the user is incorrect" do
     FactoryGirl.create(:notification_status, :notification => notification, :device_token => user1_device_token)
     
-    post :opened, {:notification_id => notification.id, :device_token => {:token => user1_device_token.token}, :user_email => user2.email}
+    post :opened, {:notification_id => notification.id, :device_token_id => user1_device_token.id, :user_email => user2.email}
     
-  	expect(response.status).to eq(406)
+    response.status.should == 401
     
     Notifiable::NotificationStatus.count.should == 1
     saved_status = Notifiable::NotificationStatus.first

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

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

data/spec/test_app/db/schema.rb

@@ -23,7 +23,6 @@ ActiveRecord::Schema.define(version: 20131229104039) do
   create_table "notifiable_device_tokens", force: true do |t|
     t.string   "token"
     t.string   "provider"
-    t.string   "device_id"
     t.boolean  "is_valid",   default: true
     t.integer  "user_id"
     t.integer  "app_id"
@@ -31,7 +30,6 @@ ActiveRecord::Schema.define(version: 20131229104039) do
     t.datetime "updated_at"
   end
 
-  add_index "notifiable_device_tokens", ["device_id"], name: "index_notifiable_device_tokens_on_device_id", unique: true
   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"