tramway-api 1.6.2 → 1.7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f922c7476e068d750206e1c8d1efd032ea2057c91840d4855c3cb49119a930f9
-  data.tar.gz: 548da8c04040747f5d7628f54a77d90d1f0fcd5773d418d322137dbe3c70b07e
+  metadata.gz: 2f45730faad28566a38ee77ba298050f2e38b805dcd5aed36e6d479ee37604cb
+  data.tar.gz: 62543c93079ee5496602fe5454d0f909714d7ba2ed267e29ca617d908d0d3111
 SHA512:
-  metadata.gz: edf68c18caac058f083fe6309c1efc9a96a33db6b55e319781b30891aaa4de1a555dce9fde68d0b453c6b2bd91959fea0782e73317142a8642995624c2b56c4e
-  data.tar.gz: 74cb91244809c76c03442491c2689dfc1832664d3ceef4d685579b82b70cba6bf84c7bd45b5f5e4d3a71593893842f0493b52e2414ff14f3f062e48b081eff1f
+  metadata.gz: 315444c1714b3d0076a0e040eee18bcd7b5c7366e8a391258bd2f082e33d4fc970a79ff0ac3c01d5efc5a6d06027548578052e4e82be59befd11a3bd58ae127b
+  data.tar.gz: 1c69b4053f98bff5105a1d5271d21c075e876b61f42aebb7443f4c86be62d91185456b04c2376c9fa1b396564acdba9cc6d3c8f14b46bd95e6f9057e92fbf438

data/app/controllers/tramway/api/application_controller.rb

@@ -5,7 +5,7 @@ module Tramway
     class ApplicationController < ::Tramway::Core::ApplicationController
       include ::Knock::Authenticable
       protect_from_forgery with: :null_session, if: proc { |c| c.request.format == 'application/json' }
-      rescue_from ActiveRecord::RecordNotFound, with: :not_found
+      rescue_from ActiveRecord::RecordNotFound, with: :not_found if Rails.env.production?
 
       private
 
@@ -19,6 +19,7 @@ module Tramway
 
       def authenticate
         return if current_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
+
         unauthorized
       end
 

data/app/controllers/tramway/api/v1/records_controller.rb

@@ -18,6 +18,7 @@ module Tramway::Api::V1
     def create
       record_form = form_class.new model_class.new
       if record_form.submit snake_case params[:data][:attributes]
+        record_form.model.reload
         render json: record_form.model,
                serializer: serializer_class,
                include: '*',
@@ -28,7 +29,7 @@ module Tramway::Api::V1
     end
 
     def update
-      record_form = form_class.new model_class.active.find params[:id]
+      record_form = form_class.new model_class.active.find_by uuid: params[:id]
       if record_form.submit snake_case params[:data][:attributes]
         render json: record_form.model,
                serializer: serializer_class,
@@ -40,7 +41,7 @@ module Tramway::Api::V1
     end
 
     def show
-      record = model_class.active.find params[:id]
+      record = model_class.active.find_by uuid: params[:id]
       render json: record,
              serializer: serializer_class,
              include: '*',
@@ -48,7 +49,7 @@ module Tramway::Api::V1
     end
 
     def destroy
-      record = model_class.active.find params[:id]
+      record = model_class.active.find_by uuid: params[:id]
       record.remove
       render json: record,
              serializer: serializer_class,
@@ -69,7 +70,9 @@ module Tramway::Api::V1
     end
 
     def authenticate_user_if_needed
-      head :unauthorized and return if action_name.in?(Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []) && !current_user
+      if action_name.in?(Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []) && !current_user
+        head(:unauthorized) && return
+      end
     end
 
     def model_class

data/app/controllers/tramway/api/v1/user_tokens_controller.rb

@@ -8,12 +8,11 @@ class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationCo
         auth_token: token,
         user: {
           email: @entity.email,
-          uid: @entity.uid,
-          id: @entity.id
+          uuid: @entity.uuid
         }
       }, status: :created
     else
-      not_found
+      unauthorized
     end
   end
 end

data/app/serializers/tramway/api/v1/application_serializer.rb

@@ -3,6 +3,12 @@
 class Tramway::Api::V1::ApplicationSerializer < ActiveModel::Serializer
   include ::Tramway::Core::Concerns::AttributesDecoratorHelper
 
+  attribute :id
+
+  def id
+    object.uuid
+  end
+
   def created_at
     object.created_at.iso8601
   end

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.6.2'
+    VERSION = '1.7.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers