tramway-api 1.8.7 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7460f1d97abb9ea3e24e8cf6b5e3bb81fece303364dd906f4a42617ae92ed08b
-  data.tar.gz: 772e32b2c3c73a501b49fb2a166d99256558e221f71254d47094d6ec2d8d9b10
+  metadata.gz: 1d0caeaa1462195c9c7d270d716a7970ce658f6ffbfaf139662bc3c0e382630c
+  data.tar.gz: 7c7cef68dfa06f0cb0dcdfd530e28c0a41b42515bb175a9978946ed13c6b7600
 SHA512:
-  metadata.gz: d706c1f376c0300a3c8ae6b2a7af4e3ec987b67960301d6aa52a5d69d4475c6e2910d854d91671a5584aebeffed2f3560780d55cd7afc6fb3a13c05041c42987
-  data.tar.gz: c3e35375b7597d57cc2d96cb6cc37cfd1084327afb23a1931d9a19ca93314b60f8d5f24335f7747f7fdf388860c28213c7c5895c914bddd1b72b748da853278b
+  metadata.gz: f5659a1cad529417c3bdccc5766167690654008e0c2e903e6efb638277c4d7fe161ec9bfcb18a91088c3ba58a5204a3f13efbfd5fa6fef4a7746e03e60f6a872
+  data.tar.gz: 738e22ab29825ec1ebe351c5a3e5c64b2e92a87fee4e84e8285c16b31a664faefc0ec75a67e65c9c5c8705df2b59d24106c4bd26454abd68dedee5b0b9ec337f

data/README.md

@@ -257,7 +257,7 @@ RSpec.describe 'Post creating user', type: :feature do
 
     it 'returns created status' do
       post '/api/v1/user', params: { user: attributes }
-      expect(response.status).to eq 201
+      expect(response[:status]).to eq 201
     end
     
     it 'returns no errors' do
@@ -275,17 +275,17 @@ end
 require 'rails_helper'
 
 RSpec.describe 'Post generate token', type: :feature do
-  describe 'POST /api/v1/user_token' do
+  describe 'POST /api/v1/user_tokens' do
     let(:user) { create :user, password: '123456789' }
 
     it 'returns created status' do
-      post '/api/v1/user_token', params: { auth: { login: user.email, password: '123456789' }  }
+      post '/api/v1/user_tokens', params: { auth: { login: user.email, password: '123456789' }  }
 
-      expect(response.status).to eq 201
+      expect(response[:status]).to eq 201
     end
     
     it 'returns token' do
-      post '/api/v1/user_token', params: { auth: { login: user.email, password: '123456789' }  }
+      post '/api/v1/user_tokens', params: { auth: { login: user.email, password: '123456789' }  }
 
       expect(json_response[:auth_token].present?).to be_truthy
       expect(json_response[:user]).to include_json({ email: user.email, uuid: user.uuid })
@@ -372,13 +372,13 @@ Then write test:
 it 'returns status' do
   get '/api/v1/records', params: { model: 'User' }, headers: headers
 
-  expect(response.status).to eq 200
+  expect(response[:status]).to eq 200
 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
 ```
 
@@ -455,7 +455,7 @@ RSpec.describe 'Post generate token', type: :feature do
     it 'returns created status' do
       post '/api/v1/user_token', params: { auth: { login: user.email, password: '123456789' }  }
 
-      expect(response.status).to eq 201
+      expect(response[:status]).to eq 201
     end
     
     it 'returns token' do

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

@@ -51,7 +51,7 @@ module Tramway::Api::V1
     end
 
     def destroy
-      record.remove
+      record.destroy
       render json: record,
              serializer: serializer_class,
              include: '*',

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.7'
+    VERSION = '2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: '2.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -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