tramway-api 1.8.6.13 → 1.8.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca5bbce598b65c6fb0dec505e188231b9c54d58b0969d051c86d6db6036d20b
-  data.tar.gz: ffe9fcb8a71069a74053d894738d61b45b214d232514296cb48323be9cfb3e8f
+  metadata.gz: 3ae1c864b0adbd268a320967b353e9e4dafd1229927a1446f7970712e09b7e14
+  data.tar.gz: 9a181d73ef86e3938e6a39116393c49ed32ffef83b23e65b54077e2112875171
 SHA512:
-  metadata.gz: db32e275c1fe0475cc0207b8b43d6789f5d611b5210863389e151a165171645e235d9b7f101a8494035378f9d7eba743c5c84de8b24f83709066ef5e986d50db
-  data.tar.gz: 50683c4c9c361680a73faba41569e72d660060e0111e2c6f447b3ae496f59745142712b8291ed292d0de577f1151254a7c523f785e69265cd72c6950a01783c2
+  metadata.gz: 9bcef82854507a041424b52ea238316a4ee730b93f315de4f3e9581664af043713171a4ced01504bf3311ba854701711c3ecbb9884a5ec4806ce04b30f054180
+  data.tar.gz: f945e100c867be14f73423d23d40b0aaca80479ab7ea7e5170cb6494dcbafe63608bc7ebfda9310efcdeeaa798ff8cf1f3dbfad575482b9dab60fd7fa3bf3443

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

@@ -6,37 +6,6 @@ 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
@@ -74,7 +43,7 @@ module Tramway
 
       def find_user_by_auth_attributes
         user_based_model = params[:user_based_model].constantize
-        Tramway::Api.auth_attributes[user_based_model].each do |attribute|
+        Tramway::Api.auth_attributes[params[:user_based_model]].each do |attribute|
           object = user_based_model.active.where.not(attribute => nil).find_by(attribute => auth_params[:login])
           return object if object
         end
@@ -87,7 +56,7 @@ module Tramway
 
       def current_user
         Tramway::Api.user_based_models.map do |user_based_model|
-          send("current_#{user_based_model.name.underscore}") unless user_based_model == User
+          send("current_#{user_based_model.constantize.name.underscore}") unless user_based_model == User
         end.compact.first
       end
     end

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

@@ -8,9 +8,11 @@ module Tramway::Api::V1
     before_action :application
 
     def index
-      collection = available_action_for_collection
+      @collection = available_action_for_collection
 
-      render json: collection,
+      raise 'Collection has empty uuid. It should not be empty, because all records with empty uuid will not be rendered' if @collection.map(&:uuid).map(&:empty?).include? true
+
+      render json: @collection,
              each_serializer: serializer_class,
              include: '*',
              status: :ok

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.6.13'
+    VERSION = '1.8.7.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.6.13
+  version: 1.8.7.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 0.10.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 0.10.12
 - !ruby/object:Gem::Dependency
   name: knock
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for api