tramway-api 1.8.6.7 → 1.8.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3206561c6202bb16eb547409a92afc1ffd3bd0577ab5924f0ba9142b2d2da5f7
-  data.tar.gz: fc82ca7b002060d3f2a1d49d723a26d0405f5765ffd34a0b7b6a287914d68018
+  metadata.gz: 1c7fde28a2dba38baca9b59921296f203bee015e5065567cbfc8c818e49c15c9
+  data.tar.gz: e54a9190f07f0f3b78485f6667d1585a2847ec4ae0503e14362afe5a60cafbe3
 SHA512:
-  metadata.gz: 9311be67f963e06248ab95056f9e20a40d819b706e8ce9814dbe28b8c063439dac7ebc42bc7ef9f2f3495579db8fd641a9db6032ea9ef4ebbd7847d1c008987d
-  data.tar.gz: 6a0baa01d8e34556901407c738ceacf3facb379b6dbf5a27df2834347de75d79ca3bcf524f159d4a95fea9fc37e2eea8cf45a54f25f028e9bb1f443705f934b0
+  metadata.gz: 34d26aaadfe0f49d721903fabe39147b4c577cd74c3a8b0983435a5066121950a73915f9ea242adde527d2964bc24891ddf0e3ce523f797ad94a91cd7ae18cce
+  data.tar.gz: 8e51f5fb8e026a090a086d3f293356bdf35c272d5dc0dc5382ec4f2500735824e7a7770f4cf1ea591b5586dbe2c1f960adbfbc188f95b4fc432376a3b56a2847

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

@@ -6,6 +6,7 @@ module Tramway
       include ::Knock::Authenticable
       protect_from_forgery with: :null_session, if: proc { |c| c.request.format == 'application/json' }
       rescue_from ActiveRecord::RecordNotFound, with: :not_found if Rails.env.production?
+      before_action :application
 
       private
 

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

@@ -4,8 +4,6 @@ module Tramway
   module Api
     module V1
       class ApplicationController < ::Tramway::Api::ApplicationController
-        before_action :application
-
         def render_errors_for(model)
           render json: model, status: :unprocessable_entity, serializer: ::Tramway::Api::V1::ErrorSerializer
         end
@@ -72,7 +70,7 @@ module Tramway
           action_is_available = checking_roles.map do |role|
             Tramway::Api.action_is_available(
               action: action_name.to_sym,
-              project: (@application_engine || @application.name),
+              project: (@application_engine || application_name),
               role: role,
               model_name: params[:model],
               current_user: current_user
@@ -93,7 +91,7 @@ module Tramway
         def authenticate_user_if_needed
           action_is_open = Tramway::Api.action_is_available(
             action: action_name.to_sym,
-            project: (@application_engine || @application.name),
+            project: (@application_engine || application_name),
             model_name: params[:model]
           )
           head(:unauthorized) && return if !current_user && !action_is_open
@@ -111,6 +109,15 @@ module Tramway
 
         protected
 
+        def application_name
+          @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
+          begin
+            @application.name
+          rescue
+            raise("Tramway::Api @application not initialized, Tramway::Core.application: #{::Tramway::Core.application}, model_class: #{Tramway::Core.application&.model_class }")
+          end
+        end
+
         def model_class
           params[:model].constantize
         rescue ActiveSupport::Concern::MultipleIncludedBlocks => e

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.6.7'
+    VERSION = '1.8.6.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.6.7
+  version: 1.8.6.12
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers