active_record_api-rest 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2537b1905e2d0946f1c8b394098218f25e8c1133e543b2c2d4c1f8d6c72907eb
-  data.tar.gz: 8a27e78b241d05d66c58055a507d9754816a5921b9cc7a1d2f777c961f1eef9e
+  metadata.gz: ff6756954ff6e7850e0752d0cd93ec08c9dfa24d19b561ff596da81a7da0a731
+  data.tar.gz: de5097a542640c0d61f358961b1f4491b125f16cfbc0becb96826777f4cde420
 SHA512:
-  metadata.gz: d2bf1bc5384984895248ce316daf9881ed8f4cfd7f3f0c4ac930d8b212d748a09629317837ef3b98cf2dc438cea332e968c48c60696beba6147cdb66e27ca857
-  data.tar.gz: ef76711aa7fbf4b593d99e1902c2045487c333248bbb26b38ec20dff1147c4cb511d03375cd02b1eb1b28fcf79fe98a6358b895a766b711668ff5099b243355c
+  metadata.gz: c1f4535211bad38775aa6c538765d39fe74ae42fffca97fadc75fa2b244fe732ea0be647f715804a13fb2cc5f10a8ab47163428ad8147cbcf8b1d09853b67f11
+  data.tar.gz: 4d8ad1f62e00c338c2f0233ea3f7b048ed2962f9c0414ec83de21b29c5354817311127899629c94612d5bed0f86fe972106ae44e807c5b19a9f0e1a202a6ac21

data/lib/active_record_api/rest/auth/controller.rb

@@ -16,23 +16,22 @@ module ActiveRecordApi
         end
 
         def can?
-          @can ||= policy.can?
+          @can ||= scope.can?
         end
 
         def authorized_models
           @authorized_models ||= scope.authorized_models
         end
 
-        def policy
-          @policy ||= policy_klass.new(session: session, model_klass: model_klass, action_name: action_name, params: params)
-        end
-
-        def policy_klass
-          "#{self.class.name.remove(/Controller$/)}Policy".safe_constantize || Policy
-        end
-
         def scope
-          @scope ||= scope_klass.new(session: session, model_klass: model_klass, action_name: action_name, queryable_params: queryable_params, modifiable_params: modifiable_params)
+          @scope ||= scope_klass.new(
+            session: session,
+            model_klass: model_klass,
+            action_name: action_name,
+            params: params,
+            queryable_params: queryable_params,
+            modifiable_params: modifiable_params
+          )
         end
 
         def scope_klass

data/lib/active_record_api/rest/auth/scope.rb

@@ -9,8 +9,40 @@ module ActiveRecordApi
           send(action_name)
         end
 
+        def can?
+          send("#{action_name}?")
+        end
+
+        def can_manage?
+          false
+        end
+
+        def can_read?
+          false
+        end
+
         protected
 
+        def can_index?
+          can_manage? || can_read?
+        end
+
+        def can_show?
+          can_manage? || can_read?
+        end
+
+        def can_create?
+          can_manage?
+        end
+
+        def can_update?
+          can_manage?
+        end
+
+        def can_destroy?
+          can_manage?
+        end
+
         def index
           model_klass.where('1=0')
         end

data/lib/active_record_api/rest/controller.rb

@@ -3,7 +3,7 @@ module ActiveRecordApi
     class Controller < ApplicationController
       include GracefulErrors
       delegate  :previous_id, :limit, :queryable_params, :modifiable_params, :not_allowed_params, to: :parameters
-      delegate :next_url, :redirect_url, to: :request_url_generator
+      delegate :next_url, to: :request_url_generator
       before_action :initialize_model, only: :create
       before_action :validate_params
 
@@ -19,7 +19,7 @@ module ActiveRecordApi
 
       def create
         if model.save
-          redirect_to_model
+          render json: model, serializer: serializer
         else
           render json: model.errors, status: :unprocessable_entity
         end
@@ -27,7 +27,7 @@ module ActiveRecordApi
 
       def update
         if model.update(modifiable_params)
-          redirect_to_model
+          render json: model, serializer: serializer
         else
           render json: model.errors, status: :unprocessable_entity
         end
@@ -45,10 +45,6 @@ module ActiveRecordApi
         render json: { base: "Extra parameters are not allow: #{not_allowed_params.join(', ')}" }, status: :unprocessable_entity
       end
 
-      def redirect_to_model
-        redirect_to redirect_url(model), status: :see_other
-      end
-
       def model
         @model ||= authorized_models.find_by(id: queryable_params[:id])
       end
@@ -89,8 +85,21 @@ module ActiveRecordApi
         @pagination_param_direction ||= :asc # from params
       end
 
+      def pagination_param_default
+        case pagination_param_column_definition.type
+        when :uuid
+          '00000000-0000-0000-0000-000000000000'
+        when :integer
+          0
+        when :datetime
+          '1900-01-01'
+        else
+          ''
+        end
+      end
+
       def pagination_param_value
-        @pagination_param_value = params[pagination_param_name]
+        @pagination_param_value ||= params[pagination_param_name] || pagination_param_default
       end
 
       def serializer
@@ -117,6 +126,12 @@ module ActiveRecordApi
           pagination_param_name: pagination_param_name
         )
       end
+
+      def pagination_param_column_definition
+        @column_definition = model_klass.columns.detect do |column|
+          column.name.to_sym == pagination_param_name
+        end
+      end
     end
   end
 end

data/lib/active_record_api/rest/parameters.rb

@@ -43,12 +43,6 @@ module ActiveRecordApi
           column_name.to_s.gsub('encrypted_', '').to_sym
         end
       end
-
-      def column_definition(column_name)
-        model_klass.columns.detect do |column|
-          column.name == column_name
-        end
-      end
     end
   end
 end

data/lib/active_record_api/rest/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecordApi
   module Rest
-    VERSION = '1.0.21'.freeze
+    VERSION = '1.0.22'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-rest
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Full Measure Education
@@ -147,7 +147,6 @@ files:
 - lib/active_record_api/rest/auth/access_denied_exception.rb
 - lib/active_record_api/rest/auth/bad_session_exception.rb
 - lib/active_record_api/rest/auth/controller.rb
-- lib/active_record_api/rest/auth/policy.rb
 - lib/active_record_api/rest/auth/scope.rb
 - lib/active_record_api/rest/controller.rb
 - lib/active_record_api/rest/graceful_errors.rb

data/lib/active_record_api/rest/auth/policy.rb

@@ -1,44 +0,0 @@
-module ActiveRecordApi
-  module Rest
-    module Auth
-      class Policy
-        include ActiveAttr::Model
-        attr_accessor :session, :model_klass, :action_name, :params
-
-        def can?
-          send("#{action_name}?")
-        end
-
-        def can_manage?
-          false
-        end
-
-        def can_read?
-          false
-        end
-
-        protected
-
-        def index?
-          can_manage? || can_read?
-        end
-
-        def show?
-          can_manage? || can_read?
-        end
-
-        def create?
-          can_manage?
-        end
-
-        def update?
-          can_manage?
-        end
-
-        def destroy?
-          can_manage?
-        end
-      end
-    end
-  end
-end