tramway-api 1.8.6.14 → 1.8.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f74bf7e6832d2bfb526269d6d1604618017598f124287da8fee292ba5c26f6e
-  data.tar.gz: b98eb65cfe16ba9be869e96dafcc57b3c3539ddf57f3bac76cf6f462aae333c3
+  metadata.gz: 11004151aa05f918b93dfcc0732fe11e69030074fd0f677470b8d8971bf15cb8
+  data.tar.gz: 966562fdf9a961d25ed49e70b509df1039b8009e49520374ccdc4667432053f7
 SHA512:
-  metadata.gz: 4923dd219e9c0cf859657fc9fe73634d39f0ec96f1bffc662ddf1c8e7c8c45cc0140101fb18f4485314c84174c39a4bf296c4cd8feab31c457896d14ba0612d1
-  data.tar.gz: f51b96cdf8bc331d0150a2039477bdad427aa56569b2c12e820bb69d1388fe0c7019ee0b2d92de9c2c8ba31569135c7c4446bbf7f0ce56a7a60e73712439cde9
+  metadata.gz: cda3e5383e1b5e8d18b6ca86b58a811fc44d58ad2a6d8a0a080d283081053a385d56d24c175687ab648232560128d3dbf7e4f11d2801e1819f927fa57900a61a
+  data.tar.gz: c6e6e8f9bbf3ae234ce5f5b415d946158b69a5ba281f0dc638ef0c4eaf5b742700cc661744fc7182d8bc71000e80cc61bca74a39efdb2c99ab430f83b6435d90

data/README.md

@@ -378,7 +378,7 @@ end
 it 'returns needed count' do
   get '/api/v1/records', params: { model: 'User' }, headers: headers
 
-  expect(json_response[:data].size).to eq User.active.count
+  expect(json_response[:data].size).to eq User.count
 end
 ```
 

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
@@ -66,7 +35,7 @@ module Tramway
         user_based_model = params[:user_based_model].constantize
         @entity ||=
           if user_based_model.respond_to? :from_token_request
-            user_based_model.active.from_token_request request
+            user_based_model.from_token_request request
           else
             params[:auth] && find_user_by_auth_attributes
           end
@@ -74,8 +43,8 @@ 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|
-          object = user_based_model.active.where.not(attribute => nil).find_by(attribute => auth_params[:login])
+        Tramway::Api.auth_attributes[params[:user_based_model]].each do |attribute|
+          object = user_based_model.where.not(attribute => nil).find_by(attribute => auth_params[:login])
           return object if object
         end
         nil
@@ -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/application_controller.rb

@@ -89,7 +89,6 @@ 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),

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.14'
+    VERSION = '1.8.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.6.14
+  version: 1.8.7.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-12-19 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