tramway-api 1.8.6.6 → 1.8.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c073884812f246c0b76d5367b19c2f1348dbe8539286b08027487e716e2dd959
-  data.tar.gz: d49ede45c33a877a8deea8dcb9fb0285d1ef0d2154cd9e44109b0801e0280e4c
+  metadata.gz: df04e623451ee6c2e632f318925f3f0c90a3f75af5f50fdbf4dba7b44642d90e
+  data.tar.gz: c5c71de5a66e7821b648cb2a2c501e4df11c1f3e2745015fb8c1ed050c2a8e99
 SHA512:
-  metadata.gz: a26de6225b11387505eac518f7d2ddec5ea0d3070007f6838e4d5192e9296793eed0f2c38af2a445286fffc0fc4f2bdb65fb449f32a6c64e4be13d2c51ce1270
-  data.tar.gz: 33e67a11a31f45d4413d8f24a8f7a75075a38f74f3f99cb0456be838f59ccf38acf0f3cf4649cc27c6fb054e0f4349ff0b78fbf241a66204650685ab7f95d4b7
+  metadata.gz: 882cefd561e168aabca2c72eaff7eb5f5781f88659cc7c7f6ebc8431c90d2ff7fde947bae8f6977cf6fe392c5473a27543769eb09ebd1268cda6713422f236b3
+  data.tar.gz: 2906e2e3d2d85dd9712091a1651c0ab3aabb797e810443e2513a3a1d97b07b896237e2745b19256af1e308739b2876dfbc0249efd76cce5c540d10a20211b737

data/README.md

@@ -41,7 +41,6 @@ coming soon...
   ```ruby
   gem 'active_model_serializers', '0.10.5'
   gem 'tramway-core'
-  gem 'state_machine', github: 'seuros/state_machine'
   gem 'knock'
   gem 'audited'
   gem 'ransack'
@@ -146,7 +145,7 @@ end
 
 #### Configurate available models. Tramway will create end points according to this config
 
-```
+```ruby
 ::Tramway::Api.set_available_models({
   User => [
     {
@@ -294,7 +293,6 @@ RSpec.describe 'Post generate token', type: :feature do
 
   end
 end
-
 ```
 
 Run `rspec` to test
@@ -340,11 +338,6 @@ this model must have field `password_digest`, because we use `bcrypt` gem for au
 
 Sets ActiveRecord models which will be used in API
 
-Argument is a hash. Keys are underscored models names, values are hashes with actions of available methods for every model.
-* `open` key means that this action will be used without authentication
-* `closed` key means that this action will be used with authentication
-
-
 Enabled methods:
 
 * create
@@ -360,7 +353,7 @@ Every model you've added in initializer will be able by URL `api/v1/records?mode
 Just update your initializer:
 
 ```ruby
-::Tramway::Api.set_available_models user: { open: %i[create], closed: %i[update index] } # we've added index method
+::Tramway::Api.set_available_models({ User => { %i[index] })
 ```
 
 Create serializer
@@ -436,6 +429,46 @@ Params Structure
 }
 ```
 
+Also, you can test it with this 
+
+*spec/factories/your_models.rb*
+
+```ruby
+FactoryBot.define do
+  factory :your_model do
+    attribute1 { # some code which generate value for this attribute }
+    attribute2 { # some code which generate value for this attribute }
+    name { generate :name }
+  end
+end
+```
+
+*spec/api/your_model_spec.rb*
+
+```ruby
+require 'rails_helper'
+
+RSpec.describe 'Post generate token', type: :feature do
+  describe 'POST /api/v1/user_token' do
+    let(:user) { create :user, password: '123456789' }
+
+    it 'returns created status' do
+      post '/api/v1/user_token', params: { auth: { login: user.email, password: '123456789' }  }
+
+      expect(response.status).to eq 201
+    end
+    
+    it 'returns token' do
+      post '/api/v1/user_token', 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 })
+    end
+
+  end
+end
+```
+
 ### Update
 
 *config/initializers/tramway.rb*

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

@@ -58,9 +58,7 @@ module Tramway
 
       def current_user
         Tramway::Api.user_based_models.map do |user_based_model|
-          unless user_based_model == User
-            send("current_#{user_based_model.name.underscore}")
-          end
+          send("current_#{user_based_model.name.underscore}") unless user_based_model == User
         end.compact.first
       end
     end

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

@@ -4,6 +4,8 @@ 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
@@ -21,6 +23,40 @@ module Tramway
           hash
         end
 
+        # Need to be removed
+        
+        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
+
         private
 
         def record
@@ -45,6 +81,7 @@ module Tramway
         def check_available_model_class
           unless model_class
             head(:unauthorized) && return unless current_user
+
             head(:unprocessable_entity) && return
           end
         end
@@ -69,7 +106,7 @@ module Tramway
           action_is_available = checking_roles.map do |role|
             Tramway::Api.action_is_available(
               action: action_name.to_sym,
-              project: (@application_engine || @application.name),
+              project: (@application_engine || application_name),
               role: role,
               model_name: params[:model],
               current_user: current_user
@@ -90,7 +127,7 @@ module Tramway
         def authenticate_user_if_needed
           action_is_open = Tramway::Api.action_is_available(
             action: action_name.to_sym,
-            project: (@application_engine || @application.name),
+            project: (@application_engine || application_name),
             model_name: params[:model]
           )
           head(:unauthorized) && return if !current_user && !action_is_open
@@ -108,14 +145,21 @@ module Tramway
 
         protected
 
-        def model_class
+        def application_name
+          @application ||= Tramway::Core.application&.model_class&.first || Tramway::Core.application
           begin
-            params[:model].constantize
-          rescue ActiveSupport::Concern::MultipleIncludedBlocks => e
-            raise "#{e}. Maybe #{params[:model]} model doesn't exists or there is naming conflicts with it"
+            @application.name
+          rescue
+            raise("Tramway::Api @application not initialized, Tramway::Core.application: #{::Tramway::Core.application}, model_class: #{Tramway::Core.application&.model_class }")
           end
         end
 
+        def model_class
+          params[:model].constantize
+        rescue ActiveSupport::Concern::MultipleIncludedBlocks => e
+          raise "#{e}. Maybe #{params[:model]} model doesn't exists or there is naming conflicts with it"
+        end
+
         def decorator_class(model_name = nil)
           "#{model_name || model_class}Decorator".constantize
         end

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

@@ -5,6 +5,7 @@ module Tramway::Api::V1
     before_action :check_available_model_class
     before_action :check_available_model_action_for_record, only: %i[show update destroy]
     before_action :authenticate_user_if_needed
+    before_action :application
 
     def index
       collection = available_action_for_collection
@@ -54,5 +55,11 @@ module Tramway::Api::V1
              include: '*',
              status: :no_content
     end
+
+    def application
+      if ::Tramway::Core.application
+        @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
+      end
+    end
   end
 end

data/lib/tramway/api.rb

@@ -96,7 +96,8 @@ module Tramway
       end
 
       def default_id_method_of(model:)
-        @@id_methods[model.to_s][:default]
+        @@id_methods ||= {}
+        @@id_methods.dig(model.to_s, :default)
       end
     end
   end

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.6.6'
+    VERSION = '1.8.6.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.6.6
+  version: 1.8.6.11
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Engine for api
 email:
 - kalashnikovisme@gmail.com
@@ -102,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Engine for api