tramway-api 1.6.3.1 → 1.7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3d2db65fc5b4b06905703a83e8652a7794f46cf2c28147cf0c39d95bb81f4f
-  data.tar.gz: 84d4b9f3f77bd968d75d2a512679647352c687193d26a2b30d909b58643cc3fa
+  metadata.gz: 56da4809e88d47a601a85acdeed9104c1ec4114c33a1c6cbc2c3a86b41a49003
+  data.tar.gz: 5c68a2cb731c77780b7ccdf399b66b792dd11626447eb9b676311ac5a839d840
 SHA512:
-  metadata.gz: ee82990f80e8692e5a1428ad0685ee0d17ff9ffa3acd5474716b3385fae07570be6d1d2a21fa3590b9351992eab8f318b3c0fa3359fc76fef0d1aef96ab58c92
-  data.tar.gz: 1fbe1b706291a8cfb0a04ea9e7ebeec5376032f2970d345424d18263d467d5d7da070dbb3f056482dd712e451d489e63bb314ed58ee0f1603f794d5c2fb32208
+  metadata.gz: a7eb92d306828573f93795a3fbbebd5df72a5a63af74144d19aed2658d1245fad3d9579582d9611765884357dca7d8c3804509e2e836d10a30cf9dab3e5a4553
+  data.tar.gz: e23a71a3d8a71b9ef5159ac2361912a186a0f7b522b83a8ca0951a84240485f9a31213f73f82fe30d207b168ffaf22786bb7fd46e3baa173a8b707c1474af6bc

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

@@ -18,6 +18,7 @@ module Tramway::Api::V1
     def create
       record_form = form_class.new model_class.new
       if record_form.submit snake_case params[:data][:attributes]
+        record_form.model.reload
         render json: record_form.model,
                serializer: serializer_class,
                include: '*',
@@ -28,7 +29,7 @@ module Tramway::Api::V1
     end
 
     def update
-      record_form = form_class.new model_class.active.find 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,
@@ -40,7 +41,7 @@ module Tramway::Api::V1
     end
 
     def show
-      record = model_class.active.find params[:id]
+      record = model_class.active.find_by uuid: params[:id]
       render json: record,
              serializer: serializer_class,
              include: '*',
@@ -48,7 +49,7 @@ module Tramway::Api::V1
     end
 
     def destroy
-      record = model_class.active.find 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
+          uuid: user_form.model.uuid
         )
       )
       render json: serialized_user, status: :created

data/app/serializers/tramway/api/v1/application_serializer.rb

@@ -3,6 +3,12 @@
 class Tramway::Api::V1::ApplicationSerializer < ActiveModel::Serializer
   include ::Tramway::Core::Concerns::AttributesDecoratorHelper
 
+  attribute :id
+
+  def id
+    object.uuid
+  end
+
   def created_at
     object.created_at.iso8601
   end

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.6.3.1'
+    VERSION = '1.7.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.6.3.1
+  version: 1.7.0.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers