tramway-api 1.8 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdcaae068ee8dbb36b6cfd6a85c414d5356c4e25d5d9404d8340f1093e18a786
-  data.tar.gz: 893e1421c8296743740e969d7740a536b98cca1c3f308b3b84c2959c717996c7
+  metadata.gz: 3065ba5d3d8a135210084aae9fdeea5291bfbc25c195bffa97e544491b7c9776
+  data.tar.gz: 9e604ff996584c0982dc2abd7ce7da324060d89f53e55383cf2dc24caa47ed03
 SHA512:
-  metadata.gz: 68691b7551fb533604c7aafb6cb87d0b6770940c6da3d053800b55c6aeb0d191d8c377fe0a00581fb5dcd20206fa0483a1b47205403c9f781da88a72a1161bb7
-  data.tar.gz: b7988845eb7752b6e1f82d3956d52f2d13f419a221ee4aa7f1a4e0bea984417d61b84446b32d4b12cae68ffdf27b28ba0db16d4ff28901b6cc00171ce27d386a
+  metadata.gz: cd85298817523d5f697e9c4074f45bc258f004f8d07865ea2297248d62ba42327f20a2fbd9dde83d2d1d714769e8df0cfd6207da65309085ad804a3f4861de14
+  data.tar.gz: f101fd0601e24a0b96488daadad96d5dd8d8db666aa52d839e403444b4478f9d33325e8ef926b06a7a83277036b12478716ca2fff5b924706a50ac824252e2b9

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

@@ -3,13 +3,13 @@
 module Tramway::Api::V1
   class RecordsController < ::Tramway::Api::V1::ApplicationController
     before_action :check_available_model_class
-    before_action :check_available_model_action
+    before_action :check_available_model_action_for_record, only: [ :show, :update, :destroy ]
     before_action :authenticate_user_if_needed
 
     def index
-      records = model_class.active.order(id: :desc).send params[:scope] || :all
-      records = records.full_text_search params[:search] if params[:search]
-      render json: records,
+      collection = available_action_for_collection
+
+      render json: collection,
              each_serializer: serializer_class,
              include: '*',
              status: :ok
@@ -63,6 +63,12 @@ module Tramway::Api::V1
       end
     end
 
+    def records
+      collection = model_class.active.order(id: :desc).send params[:scope] || :all
+      collection = collection.full_text_search params[:search] if params[:search]
+      collection
+    end
+
     def check_available_model_class
       unless model_class
         head(:unauthorized) && return unless current_user
@@ -70,23 +76,43 @@ module Tramway::Api::V1
       end
     end
 
-    def check_available_model_action
+    def check_available_model_action_for_record
+      action_is_available = check_action
+      action_is_available.tap do
+        head(:unprocessable_entity) && return if action_is_available.is_a?(Proc) && !action_is_available.call(record, current_user)
+      end
+    end
+
+    def available_action_for_collection
+      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)
+    end
+
+    def check_action
       action_is_available = checking_roles.map do |role|
-        Tramway::Api.action_is_available?(
-          record: record,
+        Tramway::Api.action_is_available(
           action: action_name.to_sym,
           project: (@application_engine || @application.name),
           role: role,
           model_name: params[:model],
           current_user: current_user
         )
-      end.include? true
+      end.compact.uniq - [false]
+
+      if action_is_available.count > 1
+        Tramway::Error.raise_error(:tramway, :api, :api, :v1, :records_controller, :available_action_for_collection, :duplicate_actions)
+      end
+
+      action_is_available = action_is_available.first
 
-      head(:unprocessable_entity) && return unless action_is_available
+      action_is_available.tap do
+        head(:unprocessable_entity) && return unless action_is_available
+      end
     end
 
     def authenticate_user_if_needed
-      action_is_open = Tramway::Api.action_is_available?(
+      action_is_open = Tramway::Api.action_is_available(
         action: action_name.to_sym,
         project: (@application_engine || @application.name),
         model_name: params[:model]

data/lib/tramway/api.rb

@@ -54,7 +54,7 @@ module Tramway
         end&.flatten || []
       end
 
-      def action_is_available?(record: nil, project:, role: :open, model_name:, action:, current_user: nil)
+      def action_is_available(project:, role: :open, model_name:, action:, current_user: nil)
         actions = select_actions(project: project, role: role, model_name: model_name)
         availability = actions&.select do |a|
           if a.is_a? Symbol
@@ -67,7 +67,7 @@ module Tramway
         return false unless availability.present?
         return true if availability.is_a? Symbol
 
-        availability.values.first.call record, current_user
+        availability.values.first
       end
 
       def select_actions(project:, role:, model_name:)

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8'
+    VERSION = '1.8.1'
   end
 end

metadata

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