glib-web 0.11.11 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85abe76e3d1977c064f2e86fdbb94762e1876847a81fca85846c7081f6ccb863
-  data.tar.gz: '0192085bf3a998491f3090afc395a953d31d4c66d8199e6754fd9f0e1c71c430'
+  metadata.gz: a875d9c1ed1a30eb71d3550f7dd18c51f99958daea36369c5c09b8a10416e039
+  data.tar.gz: 220264def4842e22b6cddbcfb23017db1c4718bfbe45001998de60bf04011de9
 SHA512:
-  metadata.gz: 030c770a4d216aa32c5ca2f01d662112de29646adbe92777bdf4eed1e3b027896c4bbf9fe201780190c9d964f1c0a500cb7f3aaded8d337565b7ad249dc96d00
-  data.tar.gz: 191d5d6e515722fdf0bb53f84c4c689dba91c5fb4112c850d9b6540ab5b3e376b8c7eda433a80e2b577efd74c838459cbe900cca27590557473b4a952942c09c
+  metadata.gz: 589f9889c0a50a2deab52f8800404c34705d1dd98f15dddd52b9e8c4269e446b6a33fd5af7523c236c79dd8a5f9e361cd4f2927749baf20844a1ebb421262f04
+  data.tar.gz: b7affe18ed96cecda9f9f3d9a8c82b245c80b1eea0962a8241a82b3d84e845490c2438ef220ba482dd3231c781f9d7a293668f69613dd857295547d4f98cc5ce

data/app/controllers/concerns/glib/auth/policy.rb

@@ -5,7 +5,7 @@ module Glib::Auth
     extend ActiveSupport::Concern
 
     included do
-      include Pundit
+      include Pundit::Authorization
       include Overrides
       extend ClassMethods
 
@@ -20,11 +20,14 @@ module Glib::Auth
     module Overrides
 
       public  # Override
-      def policy(record, policy_name = nil, attributes = {})
+      def policy(record, policy_name = nil, context = nil)
         policy_name ||= record
 
         @__pundit_policies ||= {}
-        return @__pundit_policies[policy_name] if @__pundit_policies[policy_name]
+        if @__pundit_policies[policy_name]
+          @__pundit_policies[policy_name].context = context
+          return @__pundit_policies[policy_name]
+        end
 
         if policy_name.is_a?(Symbol) && policy_name.to_s.ends_with?('_admin')
           policy_class = CommonAdminPolicy
@@ -34,7 +37,10 @@ module Glib::Auth
 
         raise "Policy not found for #{policy_name.is_a?(Symbol) || policy_name.is_a?(Class) ? policy_name : policy_name.class}" unless policy_class
 
-        @__pundit_policies[policy_name] = policy_class.new(current_user, record, policy_name, self, request, params, attributes: attributes)
+        policy_instance = policy_class.new(current_user, record, policy_name, self, request, params)
+        policy_instance.context = context
+
+        @__pundit_policies[policy_name] = policy_instance
       end
 
       # Expose protected method
@@ -51,13 +57,13 @@ module Glib::Auth
       end
 
     public
-    def can?(action, record, attributes = {})
-      policy(record, nil, attributes).send("#{action}?")
+    def can?(action, record, context = nil)
+      policy(record, nil, context).send("#{action}?")
     end
 
     public
-    def cannot?(action, record)
-      !policy(record).send("#{action}?")
+    def cannot?(action, record, context = nil)
+      !policy(record, nil, context).send("#{action}?")
     end
 
     # Inspired from https://github.com/ryanb/cancan/wiki/Non-RESTful-Controllers
@@ -84,7 +90,7 @@ module Glib::Auth
       resource_instance = instance_variable_get("@#{resource_name}") || policy_name
 
       query = "#{action_name}?"
-      policy_instance = policy(resource_instance, policy_name, options.except(:class))
+      policy_instance = policy(resource_instance, policy_name, options.fetch(:context, nil))
       raise_access_denied(resource_instance, policy_instance) unless policy_instance.public_send(query)
     end
 

data/app/controllers/concerns/glib/json/ui.rb

@@ -83,6 +83,12 @@ module Glib::Json::Ui
     def __json_ui_vue(hash, options)
       renderer_path = options[:renderer_path]
       @__json_ui_orig_page = response.body
-      response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
+      response.body = render_to_string(
+        template: renderer_path,
+        layout: 'json_ui/renderer',
+        content_type: 'text/html',
+        formats: [:html],
+        locals: { page: hash, options: options }
+      )
     end
 end

data/app/policies/glib/application_policy.rb

@@ -2,11 +2,11 @@
 # it's better to perform an explicit check (e.g. as a validation in the model or using a before_action).
 module Glib
   class ApplicationPolicy
+    attr_accessor :context
     attr_reader :user, :record, :policy_name, :controller, :request, :params
-    class_attribute :should_exist_attributes, instance_writer: false, default: []
 
     private
-      def initialize(user, record, policy_name, controller, request, params, attributes: {})
+      def initialize(user, record, policy_name, controller, request, params)
         @user = user
         @record = record
         @controller = controller
@@ -15,31 +15,11 @@ module Glib
         # See Presenter::Model::inside_mock_controller()
         @params = params
         @policy_name = policy_name
-
-        if attributes.present? && controller.action_name != 'index'
-          self.class.module_eval { attr_accessor(*attributes.keys) }
-          attributes.each do |key, value|
-            send("#{key}=", value)
-          end
-        end
-
-        if controller.user_signed_in?
-          should_exist_attributes.each do |attribute|
-            if try(attribute).blank? && !['index'].include?(controller.action_name)
-              raise "Attribute #{attribute} is blank, policy will not working properly"
-            end
-          end
-        end
       end
 
       class << self
         attr_reader :catch_all
 
-        def inherited(base)
-          base.should_exist_attributes = should_exist_attributes.dup
-          super
-        end
-
         # This is to define the authorization logic for an action (or a group of actions). It's different from controller's
         # authorize().
         private  # Used by child
@@ -58,9 +38,6 @@ module Glib
             end
           end
 
-          def should_exist(*attributes)
-            should_exist_attributes.push(*attributes)
-          end
       end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
 platform: ruby
 authors:
 - ''
@@ -297,8 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ''