tramway-api 1.8.6.9 → 1.8.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 715fdb8596a8e3e42aaf7d8bf7150e004488f53e5522d960cb4b355c4c5d77fb
-  data.tar.gz: 140d4c0e45a45791677f9942995be2d9f277391e0633e804aaaa8aeb63c185da
+  metadata.gz: 5f74bf7e6832d2bfb526269d6d1604618017598f124287da8fee292ba5c26f6e
+  data.tar.gz: b98eb65cfe16ba9be869e96dafcc57b3c3539ddf57f3bac76cf6f462aae333c3
 SHA512:
-  metadata.gz: b1a164a8e6aff4f1a6485ff3952a488fa74f7a3baf21d2c2cb12b5b22d56f6a79bfbd98932ec8740a8d06c8833a756b5eebf1038cef754450226be6287161139
-  data.tar.gz: 9aeb6d5b7699ac269dde2417a8a1c9a742cbabaff6505731fc42055d1af548539cc379600cbd73818caf68e90e1a8d05e17da5552d6085be853c1e26f5dd647f
+  metadata.gz: 4923dd219e9c0cf859657fc9fe73634d39f0ec96f1bffc662ddf1c8e7c8c45cc0140101fb18f4485314c84174c39a4bf296c4cd8feab31c457896d14ba0612d1
+  data.tar.gz: f51b96cdf8bc331d0150a2039477bdad427aa56569b2c12e820bb69d1388fe0c7019ee0b2d92de9c2c8ba31569135c7c4446bbf7f0ce56a7a60e73712439cde9

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

@@ -6,9 +6,38 @@ 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 :load_application
+
+      def load_application
+        if engine_loaded(request).present?
+          build_application_with_engine engine_loaded request
+        elsif application_class(request).present?
+          @application = application_class(request).camelize.constantize.first
+        else
+          @application = application_object request
+        end
+      end
 
       private
 
+      def build_application_with_engine(engine_loaded)
+        engine_module = "::Tramway::#{engine_loaded.camelize}".constantize
+        @application = "#{engine_module}::#{engine_module.application.to_s.camelize}".constantize.first
+        @application_engine = engine_loaded
+      end
+
+      def application_class(request)
+        Constraints::DomainConstraint.new(request.domain).application_class
+      end
+
+      def engine_loaded(request)
+        Constraints::DomainConstraint.new(request.domain).engine_loaded
+      end
+
+      def application_object(request)
+        Constraints::DomainConstraint.new(request.domain).application_object
+      end
+
       def not_found
         render json: { data: [] }, status: :not_found
       end

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
@@ -91,6 +89,7 @@ module Tramway
         end
 
         def authenticate_user_if_needed
+          load_application
           action_is_open = Tramway::Api.action_is_available(
             action: action_name.to_sym,
             project: (@application_engine || application_name),
@@ -112,17 +111,11 @@ module Tramway
         protected
 
         def application_name
-          if @application.present?
+          @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
+          begin
             @application.name
-          else
-            if ::Tramway::Core.application
-              @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
-            end
-            if @application.present?
-              @application.name
-            else
-              raise("Tramway::Api @application not initialized, Tramway::Core.application: #{::Tramway::Core.application}, model_class: #{Tramway::Core.application&.model_class }")
-            end
+          rescue
+            raise("Tramway::Api @application not initialized, Tramway::Core.application: #{::Tramway::Core.application}, model_class: #{Tramway::Core.application&.model_class }")
           end
         end
 

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.6.9'
+    VERSION = '1.8.6.14'
   end
 end

metadata

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