tramway-api 1.8.1.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1e2133a961aaba201c222f211ca45a609f559b89d44622c345e802f29f67a6
-  data.tar.gz: f8856dba0c3e478af5436cdf93df7a77cfb4b876fed6ce1c3a41c9f7da710674
+  metadata.gz: 56cacd097b745beaad7a04f1b31a63f645ffcb0ca3f2705be6c636765e04968a
+  data.tar.gz: 30b2598b412f3b87d48895254e1eef6ffd8b1c20299ea07b9bee766397aff8a5
 SHA512:
-  metadata.gz: 8143cc790cebc76de7dcd2746204bc8503a4a74ed9b4eefb3068e65cc456b6920a775d0cc107acd01c9dd651cd4c87a6394cf6cf807ca37626a13bd2b60adc08
-  data.tar.gz: 45b9ec7765178d2d26869ec69bfc315b4c714fd5632aa1d86e537ea793617aac85a59dd3f08ea11f3139d5b008ebf49772888557c13859bd7a0975d68a8cd21e
+  metadata.gz: 42275c0a399c5f988e6cbf683a03b1eacbf3aae1da85a212ef06f48e936ed9e0a856ba89132d80e4c4f11e49a620f4cb8a7f2ee2402857ac24a4e5d2772f46c5
+  data.tar.gz: ae1465d070ee21a997310922cd43898617a617d5d74a727e4a37abd6717aca961ca833c547038703738227f2c9559e295dcd3c7bdcf191893b1957f95c962964

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

@@ -19,6 +19,105 @@ module Tramway
           end
           hash
         end
+
+        private
+
+        def record
+          @record = model_class.find_by! uuid: params[:id] if params[:id].present?
+        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
+            head(:unprocessable_entity) && return
+          end
+        end
+
+        def check_available_model_action_for_record
+          action_is_available = check_action
+          action_is_available.tap do
+            if action_is_available.is_a?(Proc) && !action_is_available.call(record, current_user)
+              head(:unprocessable_entity) && return
+            end
+          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(
+              action: action_name.to_sym,
+              project: (@application_engine || @application.name),
+              role: role,
+              model_name: params[:model],
+              current_user: current_user
+            )
+          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
+
+          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: action_name.to_sym,
+            project: (@application_engine || @application.name),
+            model_name: params[:model]
+          )
+          head(:unauthorized) && return if !current_user && !action_is_open
+        end
+
+        def available_models_for_current_user
+          checking_roles.reduce([]) do |models, role|
+            models += ::Tramway::Api.available_models(role: role).map(&:to_s)
+          end
+        end
+
+        def checking_roles
+          [:open, current_user&.role].compact
+        end
+        protected
+
+        def model_class
+          if params[:model].to_s.in? available_models_for_current_user
+            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"
+            end
+          end
+        end
+
+        def decorator_class(model_name = nil)
+          "#{model_name || model_class}Decorator".constantize
+        end
+
+        def form_class(model_name = nil)
+          "#{model_name || model_class}Form".constantize
+        end
+
+        def serializer_class(model_name = nil)
+          "#{model_name || model_class}Serializer".constantize
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Tramway::Api::V1
   class RecordsController < ::Tramway::Api::V1::ApplicationController
     before_action :check_available_model_class
-    before_action :check_available_model_action_for_record, only: [ :show, :update, :destroy ]
+    before_action :check_available_model_action_for_record, only: %i[show update destroy]
     before_action :authenticate_user_if_needed
 
     def index
@@ -54,102 +54,5 @@ module Tramway::Api::V1
              include: '*',
              status: :no_content
     end
-
-    private
-    
-    def record
-      if params[:id].present?
-        @record = model_class.find_by! uuid: params[:id]
-      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
-        head(:unprocessable_entity) && return
-      end
-    end
-
-    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(
-          action: action_name.to_sym,
-          project: (@application_engine || @application.name),
-          role: role,
-          model_name: params[:model],
-          current_user: current_user
-        )
-      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
-
-      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: action_name.to_sym,
-        project: (@application_engine || @application.name),
-        model_name: params[:model]
-      )
-      head(:unauthorized) && return if !current_user && !action_is_open
-    end
-
-    def model_class
-      if params[:model].to_s.in? available_models_for_current_user
-        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"
-        end
-      end
-    end
-
-    def available_models_for_current_user
-      checking_roles.reduce([]) do |models, role|
-        models += ::Tramway::Api.available_models(role: role).map(&:to_s) 
-      end
-    end
-
-    def checking_roles
-      [ :open, current_user&.role ].compact
-    end
-
-    def decorator_class(model_name = nil)
-      "#{model_name || model_class}Decorator".constantize
-    end
-
-    def form_class(model_name = nil)
-      "#{model_name || model_class}Form".constantize
-    end
-
-    def serializer_class(model_name = nil)
-      "#{model_name || model_class}Serializer".constantize
-    end
   end
 end

data/lib/tramway/api.rb

@@ -56,7 +56,10 @@ module Tramway
 
       def action_is_available(project:, role: :open, model_name:, action:, current_user: nil)
         actions = select_actions(project: project, role: role, model_name: model_name)
-        raise "Looks like you did not used array type to define action permissions. Remember it should be this way: `#{model_name} => [ :#{action} ]` or `#{model_name} => [ { #{action}: lambda { |record, current_user| your_condition } } ]`" if actions.present? && !actions.is_a?(Array)
+        if actions.present? && !actions.is_a?(Array)
+          raise "Looks like you did not used array type to define action permissions. Remember it should be this way: `#{model_name} => [ :#{action} ]` or `#{model_name} => [ { #{action}: lambda { |record, current_user| your_condition } } ]`"
+        end
+
         availability = actions&.select do |a|
           if a.is_a? Symbol
             a == action.to_sym

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.1.1'
+    VERSION = '1.8.2'
   end
 end

metadata

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