tramway-api 1.8.7.2 → 2.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae1c864b0adbd268a320967b353e9e4dafd1229927a1446f7970712e09b7e14
-  data.tar.gz: 9a181d73ef86e3938e6a39116393c49ed32ffef83b23e65b54077e2112875171
+  metadata.gz: c5ab385b1f17e7f65727c6601d470043e3c76c393409f38b914d79c05e6df524
+  data.tar.gz: d82903e94875d6a00eb3c885ccf0b28b11c62e1183abec7e5ff1d646b1b8224d
 SHA512:
-  metadata.gz: 9bcef82854507a041424b52ea238316a4ee730b93f315de4f3e9581664af043713171a4ced01504bf3311ba854701711c3ecbb9884a5ec4806ce04b30f054180
-  data.tar.gz: f945e100c867be14f73423d23d40b0aaca80479ab7ea7e5170cb6494dcbafe63608bc7ebfda9310efcdeeaa798ff8cf1f3dbfad575482b9dab60fd7fa3bf3443
+  metadata.gz: 226e85b0c6f7ce0f46ab03f0ae1be2bad0ef7ac645a45498473520b86d4e36ab05ef56d02c3fa3a0f2dc57e50d1a99ca4b6fe934072df8938ee55ebd33875688
+  data.tar.gz: e14d07574e5d6cc8603707ec5b95f46f2b9ddcff0f7be5d5ee127db0e72daefb02cbe9de1f1d0bf7410051b9aec6c249e6e0f7f3f8b92a390b3a02d9241992cc

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

@@ -16,7 +16,7 @@ module Tramway
       end
 
       def authenticate
-        return if current_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
+        return if current_tramway_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
 
         unauthorized
       end
@@ -35,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
@@ -44,7 +44,7 @@ module Tramway
       def find_user_by_auth_attributes
         user_based_model = params[:user_based_model].constantize
         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])
+          object = user_based_model.where.not(attribute => nil).find_by(attribute => auth_params[:login])
           return object if object
         end
         nil
@@ -54,7 +54,7 @@ module Tramway
         params[:auth]&.permit(:login, :password)
       end
 
-      def current_user
+      def current_tramway_user
         Tramway::Api.user_based_models.map do |user_based_model|
           send("current_#{user_based_model.constantize.name.underscore}") unless user_based_model == User
         end.compact.first

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

@@ -44,7 +44,7 @@ module Tramway
 
         def check_available_model_class
           unless model_class
-            head(:unauthorized) && return unless current_user
+            head(:unauthorized) && return unless current_tramway_user
 
             head(:unprocessable_entity) && return
           end
@@ -53,7 +53,7 @@ module Tramway
         def check_available_model_action_for_record
           action_is_available = check_action
           action_is_available.tap do
-            if action_is_available.is_a?(Proc) && !action_is_available.call(record, current_user)
+            if action_is_available.is_a?(Proc) && !action_is_available.call(record, current_tramway_user)
               head(:unprocessable_entity) && return
             end
           end
@@ -63,7 +63,7 @@ module Tramway
           action_is_available = check_action
           return records if action_is_available == true
 
-          action_is_available.call records, current_user if action_is_available.is_a?(Proc)
+          action_is_available.call records, current_tramway_user if action_is_available.is_a?(Proc)
         end
 
         def check_action
@@ -73,7 +73,7 @@ module Tramway
               project: (@application_engine || application_name),
               role: role,
               model_name: params[:model],
-              current_user: current_user
+              current_tramway_user: current_tramway_user
             )
           end.compact.uniq - [false]
 
@@ -94,17 +94,17 @@ module Tramway
             project: (@application_engine || application_name),
             model_name: params[:model]
           )
-          head(:unauthorized) && return if !current_user && !action_is_open
+          head(:unauthorized) && return if !current_tramway_user && !action_is_open
         end
 
-        def available_models_for_current_user
+        def available_models_for_current_tramway_user
           checking_roles.reduce([]) do |models, role|
             models += ::Tramway::Api.available_models(role: role).map(&:to_s)
           end
         end
 
         def checking_roles
-          [:open, current_user&.role].compact
+          [:open, current_tramway_user&.role].compact
         end
 
         protected

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/app/controllers/tramway/api/v1/users_controller.rb

@@ -26,7 +26,7 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
   end
 
   def show
-    render json: current_user, status: :ok
+    render json: current_tramway_user, status: :ok
   end
 
   private

data/lib/tramway/api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.7.2
+  version: 2.0.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-05-11 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.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Engine for api