tramway-api 1.2 → 1.4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e41e964d3ade1c230c77385929ee24692558d8cf59571134ccd9da815db2295
-  data.tar.gz: 9dc5042350b5a9deb0e2afda435797bec9015743eaa5bb0f184aaaa1ccfcbb21
+  metadata.gz: 04f5055e00ef3608b436ae004240b26578fb7c9862eee1935e6fbfb6c299e1c6
+  data.tar.gz: 8269beafa9c7c8ca209d6eb4f35ce5ba7f7539106acd8e2ec1d984c386cff225
 SHA512:
-  metadata.gz: 7627d0d269ff690cddc29a5a78369f968701e3992cb53e0b1f7c5b61d7e9e2b99e7a5af343dd5266e762bc5aa786ecfb06573128930360279e98f1ed1f7fce7f
-  data.tar.gz: ddebade027114042a877ff9a19a531bedd8787317bd8b3065b630a7fff9ba062262bfc719d94dc81bd514b9f4fef6790e46a34566510aa424db94421de362712
+  metadata.gz: 86986d7a77393d34502750ffeb93240c71acdba6666df665f33916a815ce25b25038296a0bd5b603acfdda793354c5497f5a3b3375feeb3b4d11bcdba4aa6388
+  data.tar.gz: a6aed10bc3451c21abf1528893e06f778beb2b669ac89a17b0ca04dc500bf098628e35d8c34f674e5a34ef00dcba3bd51b5dcaeeadc8a7686cfc476411ff0c8b

data/README.md

@@ -89,7 +89,7 @@ Create file `config/initializers/tramway.rb`
 
 ```ruby
 ::Tramway::Api.auth_config = { user_model: User, auth_attributes: %i[email username] }
-::Tramway::Api.set_available_models user: %i[create update]
+::Tramway::Api.set_available_models user: { open: %i[create], closed: %i[update] }
 ```
 
 Run `rails g tramway:core:install`
@@ -271,7 +271,10 @@ 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 arrays of available methods for every model.
+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:
 

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

@@ -25,7 +25,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.id }
+          ::Knock::AuthToken.new payload: { sub: entity.uid }
         end
       end
 

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

@@ -2,7 +2,7 @@ module Tramway::Api::V1
   class RecordsController < ::Tramway::Api::V1::ApplicationController
     before_action :check_available_model_class
     before_action :check_available_model_action
-    before_action :authenticate_user
+    before_action :authenticate_user_if_needed
 
     def index
       records = model_class.active.order(id: :desc).send params[:scope] || :all
@@ -40,6 +40,14 @@ module Tramway::Api::V1
         status: :ok
     end
 
+    def destroy
+      record = model_class.active.find params[:id]
+      record.remove
+      render json: record,
+        serializer: serializer_class,
+        status: :no_content
+    end
+
     private
 
     def check_available_model_class
@@ -47,7 +55,15 @@ module Tramway::Api::V1
     end
 
     def check_available_model_action
-      head :unprocessable_entity and return unless action_name.in? Tramway::Api.available_models[model_class.to_s].map(&:to_s)
+      open_actions = Tramway::Api.available_models[model_class.to_s][:open]&.map(&:to_s) || []
+      closed_actions =  Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []
+      head :unprocessable_entity and return unless action_name.in? open_actions + closed_actions
+    end
+
+    def authenticate_user_if_needed
+      if action_name.in? Tramway::Api::available_models[model_class.to_s][:closed]&.map(&:to_s) || []
+        authenticate_user
+      end
     end
 
     def model_class

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '1.2'
+    VERSION = '1.4.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.4.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock