notifiable-rails 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517b2ed6174e9bd62e6e780f4f83b4e8615a33df
-  data.tar.gz: e6d16036d447f3ce4e252bd5338fab1ca86e7384
+  metadata.gz: 4e5c9e0517d0c144b71ee217a4d01ba004f2d535
+  data.tar.gz: 2294beb4bd3cded57e19c4c95039311c958f52af
 SHA512:
-  metadata.gz: abe080484c13af1cff08c15ebf90ebcde24204180061ff91222a2336e4f97329d3aee1830d623d248be179f220b5983b1524e9d952505cfd18e97cca2a24a46a
-  data.tar.gz: 26d5b31cf9d864c182cdaf9088c5f9a83ab8bdd6c09ef6da254c9cd3f5b14fe5e14c41b513fa36d9c681e1003a52c99b58b5b37e77360e430364ef8751d3bca0
+  metadata.gz: f1f8a84df5cb874e8576323c8985a6765c821e62d49ac725e509b64033282c65ab751b8536051c408021cc73342967baf0eaa6ff55c3da8169c2c44a7ed35bb4
+  data.tar.gz: de8e5cab899553948f08ef806228eea319c1cd85fafa899536ab93f9229adc525b9b74be1e5b665c127fd40b4780f7d5ac581386e5f5f42e68655641e1d27c15

data/app/controllers/notifiable/device_tokens_controller.rb

@@ -13,19 +13,11 @@ module Notifiable
       @device_token = DeviceToken.find_by(:token => params[:token]) 
       @device_token = DeviceToken.new unless @device_token
 
-      if @device_token.update_attributes(device_token_params)
-        render :json => { :id => @device_token.id }, :status => :ok
-      else
-        render :json => { :errors => @device_token.errors.full_messages }, :status => :unprocessable_entity
-      end
+      perform_update(device_token_params)
     end
     
     def update
-      if @device_token.update_attributes(device_token_params)
-        head :status => :ok
-      else
-        render :json => { :errors => @device_token.errors.full_messages }, :status => :unprocessable_entity
-      end
+      perform_update(device_token_params)
     end
 
     def destroy    
@@ -36,7 +28,15 @@ module Notifiable
       end
     end
     
-    private    
+    private
+      def perform_update(params)
+        if @device_token.update_attributes(params)
+          render :json => @device_token.to_json(:only => Notifiable.api_device_token_params.push(:id)), :status => :ok
+        else
+          render :json => { :errors => @device_token.errors.full_messages }, :status => :unprocessable_entity
+        end
+      end
+    
       def device_token_params
         device_token_params = params.permit(Notifiable.api_device_token_params)
         

data/lib/notifiable/version.rb

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

data/spec/controllers/device_tokens_controller_spec.rb

@@ -15,7 +15,8 @@ describe Notifiable::DeviceTokensController do
   it "creates a new device token for an existing user" do
     post :create, :token => "ABC123", :user_email => user1.email, :provider => :apns, :app_id => app.id
     
-    expect(response).to be_success
+    response.status.should == 200
+    Notifiable.api_device_token_params.push('id').each{|p| json.should have_key(p.to_s)} 
     
     Notifiable::DeviceToken.count.should == 1
     user1.device_tokens.count.should == 1
@@ -28,7 +29,8 @@ describe Notifiable::DeviceTokensController do
   it "creates a new device token for an anonymous user" do
     post :create, :token => "ABC123", :provider => :apns, :app_id => app.id
     
-    expect(response).to be_success
+    response.status.should == 200
+    Notifiable.api_device_token_params.push('id').each{|p| json.should have_key(p.to_s)} 
     
     Notifiable::DeviceToken.count.should == 1
     dt = Notifiable::DeviceToken.first
@@ -41,7 +43,8 @@ describe Notifiable::DeviceTokensController do
   it "uses an existing token" do
     post :create, :token => user2_device_token.token, :provider => user2_device_token.provider, :app_id => app.id, :user_email => user2.email
     
-    expect(response).to be_success
+    response.status.should == 200
+    Notifiable.api_device_token_params.push('id').each{|p| json.should have_key(p.to_s)} 
     
     Notifiable::DeviceToken.count.should == 1
     user2.device_tokens.count.should == 1
@@ -54,7 +57,7 @@ describe Notifiable::DeviceTokensController do
   it "doesn't create a token if no app is specified" do
     post :create, :token => "ABC123", :user_email => user1.email, :provider => :mpns
     
-  	expect(response.status).to eq(422)
+    response.status.should == 422
   	Notifiable::DeviceToken.count.should == 0
   end
   
@@ -62,7 +65,9 @@ describe Notifiable::DeviceTokensController do
     
     post :create, :token => user2_device_token.token, :provider => :mpns
     
-  	expect(response.status).to eq(200)
+  	response.status.should == 200
+    Notifiable.api_device_token_params.push('id').each{|p| json.should have_key(p.to_s)} 
+    
   	Notifiable::DeviceToken.count.should == 1
     dt = Notifiable::DeviceToken.first
     dt.token.should eql user2_device_token.token
@@ -72,7 +77,8 @@ describe Notifiable::DeviceTokensController do
   it "updates token for an existing device token" do
     put :update, :id => user2_device_token.id, :token => "DEF456", :user_email => user2.email
 
-  	expect(response.status).to eq(200)
+  	response.status.should == 200
+    Notifiable.api_device_token_params.each{|p| json.should have_key(p.to_s)} 
     
   	Notifiable::DeviceToken.count.should == 1
     dt = Notifiable::DeviceToken.first
@@ -89,21 +95,23 @@ describe Notifiable::DeviceTokensController do
   it "doesn't delete token unless authorised" do
   	delete :destroy, :id => user2_device_token.id
     
-  	expect(response.status).to eq(401)
+  	response.status.should == 401 
+    
   	Notifiable::DeviceToken.where(:token => user2_device_token.token).count.should == 1
   end
   
   it "doesn't delete tokens of other users" do
   	delete :destroy, :id => user2_device_token.id, :user_email => user1.email
     
-  	expect(response.status).to eq(401)
+  	response.status.should == 401
+    
   	Notifiable::DeviceToken.where(:token => user2_device_token.token).count.should == 1
   end
   
   it "doesnt delete tokens if they don't exist" do
   	delete :destroy, :id => 59, :user_email => user1.email
     
-  	expect(response.status).to eq(404)
+  	response.status.should == 404
   	Notifiable::DeviceToken.where(:token => user2_device_token.token).count.should == 1
   end
   

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
   config.include EngineControllerTestMonkeyPatch, :type => :controller
+  config.include Requests::JsonHelpers, :type => :controller
   
   config.before(:each) {
     DatabaseCleaner.start

data/spec/support/request_helpers.rb

@@ -0,0 +1,7 @@
+module Requests
+  module JsonHelpers
+    def json
+      @json ||= JSON.parse(response.body)
+    end
+  end
+end