tramway-api 1.7.0.1 → 1.7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4269e235370ca885bcc4d212091512a0cfc78fe8729ae54399b55307e6881377
-  data.tar.gz: 2a2fb6263eb6cf7af5a2ae589e0f0aab763a2e6338bc393cd20810d03e156be7
+  metadata.gz: 882cf139a619aab77c7030d6c3864e9cfa51a6abbfe5e516891acbd192221a89
+  data.tar.gz: 24077c4462a3d65b4dc1bcdca0761ea20b4e53c68a4af11b4ef190924128d655
 SHA512:
-  metadata.gz: f4a8ae6e825bf27cdfcc070d3c77ca500fa3e11523c4e660ad3834787f9c6199f8b6c1e34896964ee8e4cf81a6408f4c522d537e808568f0f1045449652d1b8f
-  data.tar.gz: 6cf3ddf571f095be66c25747294e75409810c456a3f184914a09743f577c390ca98e7e96233129b03a49fb3fb22c29f9f42be780b02161169df00447bb4faae1
+  metadata.gz: 8a6fcfe6c3f09ae9cbabaa91e3c4005c5abfb8aa88e5a28a792dcb6e26d1f09988b44b330865e70216239fef7ec2812f858e9179c9a0345bd7ec01f50d1f73ff
+  data.tar.gz: 687f34614962c0a8702dd671c93aca3cfa743e3b2ef1ee0fe6f42482416090cbd5848ec035131936ffd75e33d0d204be9f84036f264001800b1a41054ab50e4d

data/README.md

@@ -70,12 +70,22 @@ Then generate User (you use another name, it's just an example) model
 rails g model user email:text password_digest:text username:text state:text uid:text
 ```
 
-Add generating uid by default
+Enable extension in your database:
 
-*db/migrate/create_users_*.rb
+*db/migrate/enable_extension.rb*
+```
+def change
+  enable_extension 'uuid-ossp'
+end
+```
+
+
+Add generating uuid by default to every model, that is accessible by API
+
+*db/migrate/add_uuid_to_some_model.rb*
 
 ```ruby
-t.uuid :uid, default: 'uuid_generate_v4()'
+t.uuid :uuid, default: 'uuid_generate_v4()'
 ```
 
 *app/models/user.rb*
@@ -85,7 +95,7 @@ class User < Tramway::Core::ApplicationRecord
   has_secure_password
   
   def self.from_token_payload(payload)
-    find_by uid: payload['sub']
+    find_by uuid: payload['sub']
   end
 end
 ```
@@ -227,7 +237,7 @@ RSpec.describe 'Post generate token', type: :feature 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, uid: user.uid })
+      expect(json_response[:user]).to include_json({ email: user.email, uuid: user.uuid })
     end
 
   end

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

@@ -29,7 +29,7 @@ module Tramway
         if entity.respond_to? :to_token_payload
           ::Knock::AuthToken.new payload: entity.to_token_payload
         else
-          ::Knock::AuthToken.new payload: { sub: entity.uid }
+          ::Knock::AuthToken.new payload: { sub: entity.uuid }
         end
       end
 

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

@@ -29,7 +29,7 @@ module Tramway::Api::V1
     end
 
     def update
-      record_form = form_class.new model_class.active.find_by uuid: params[:id]
+      record_form = form_class.new model_class.active.find_by! uuid: params[:id]
       if record_form.submit snake_case params[:data][:attributes]
         render json: record_form.model,
                serializer: serializer_class,
@@ -41,7 +41,7 @@ module Tramway::Api::V1
     end
 
     def show
-      record = model_class.active.find_by uuid: params[:id]
+      record = model_class.active.find_by! uuid: params[:id]
       render json: record,
              serializer: serializer_class,
              include: '*',
@@ -49,7 +49,7 @@ module Tramway::Api::V1
     end
 
     def destroy
-      record = model_class.active.find_by uuid: params[:id]
+      record = model_class.active.find_by! uuid: params[:id]
       record.remove
       render json: record,
              serializer: serializer_class,

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

@@ -8,8 +8,7 @@ class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationCo
         auth_token: token,
         user: {
           email: @entity.email,
-          uid: @entity.uid,
-          id: @entity.id
+          uuid: @entity.uuid
         }
       }, status: :created
     else

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

@@ -10,13 +10,12 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
     user_form = sign_up_form_class_name(user_based_model).new user_based_model.new
     # Implement JSON API spec here
     if user_form.submit snake_case params[:data][:attributes]
-      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
+      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uuid }).token
       # FIXME: refactor this bullshit
       serialized_user = OpenStruct.new(
         user_form.model.attributes.merge(
           authentication_token: token,
-          uid: user_form.model.uid,
-          id: user_form.model.id
+          id: user_form.model.uuid
         )
       )
       render json: serialized_user, status: :created

data/lib/tramway/api.rb

@@ -18,12 +18,14 @@ module Tramway
       end
 
       def user_based_models
+        @@auth_config ||= []
         @@auth_config.map do |conf|
           conf[:user_model]
         end
       end
 
       def auth_attributes
+        @@auth_config ||= []
         @@auth_config.reduce({}) do |hash, conf|
           hash.merge! conf[:user_model] => conf[:auth_attributes]
         end

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.7.0.1'
+    VERSION = '1.7.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.7.0.1
+  version: 1.7.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Engine for api