glib-web 0.11.10 → 0.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4968b1b18a9b99cc1451f33acaff156293cf8e90eea4f51f8db2a71d0606eb
-  data.tar.gz: 2c93eb68a4d5ab07a0df6ae61ad83746b9f8ed851350b45a0d36a61b929873ef
+  metadata.gz: c601a7500143869b7353159bd2e884fe76226ca424a5f5453a3a4b366a041461
+  data.tar.gz: 32abfcfa586909fd761cb1cd744b665b5df44215f24c28d50a870c0f74fd6725
 SHA512:
-  metadata.gz: 5da158f07169d49350f0ec3bf800c1eda26a5b294c3e488f9e0716a8c73ceae9ce25910e4e5c3e960f1ea630295029f1eecfdd87b1fd65c789fa462eb40f81d5
-  data.tar.gz: 9cc6fa9b6dea847e117f1829354f9728541136dca16adcb4ed1be581ccd237f01712f799ce1cef9377a1d73d9d7d197295f89b9f84223d62ee8f54f4761f475c
+  metadata.gz: 7214acff9c321a08ebed504a4d78874a60609c5d71b4435d997e58987247c2da3c74aef1464da1d5ed9d24c27f2f0491d23f2a35cb1b07284b7606139e7363a1
+  data.tar.gz: 44cdb69292131f9575731a2a3f7c4c6b3eab7fb390f2e26a82f6768c06ac05485fa996cc437ec7bf4552a701ed585a0fde0f487720c893e6c647e98be45ecad9

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/helpers/glib/json_ui/action_builder/dialogs.rb

@@ -37,6 +37,7 @@ class Glib::JsonUi::ActionBuilder
     end
 
     class Reload < Action
+      panels_builder :content, :body
       string :url, cache: true
       bool :showClose
     end

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -219,6 +219,8 @@ class Glib::JsonUi::ViewBuilder
       action :onClick
       string :offIcon
       string :onIcon
+
+      views :childViews
     end
 
     class File < Text

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

data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder

@@ -54,34 +54,8 @@ section.rows builder: ->(template) do
     end
   end
 
-  markdown = '## Emphasis' + "\n" +
-    '**This is bold text**' + "\n" +
-    "\n" +
-    '*This is italic text*' + "\n" +
-    "\n" +
-    '~~Strikethrough~~' + "\n"
   template.thumbnail title: 'dialogs/show', onClick: ->(action) do
-    action.dialogs_show showClose: true, content: ->(dialog) do
-      dialog.body padding: glib_json_padding_body, childViews: ->(body) do
-        body.markdown text: markdown
-
-        body.panels_split width: 'matchParent', content: ->(split) do
-          split.left childViews: ->(left) do
-            left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-              horizontal.label text: 'Open current', onClick: ->(subaction) do
-                subaction.dialogs_reload url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
-              end
-            end
-          end
-
-          split.right childViews: ->(right) do
-            right.button text: 'Open New', onClick: ->(subaction) do
-              subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
-            end
-          end
-        end
-      end
-    end
+    render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show
   end
 
   template.thumbnail title: 'dialogs/open', onClick: ->(action) do

data/app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder

@@ -0,0 +1,28 @@
+markdown = '## Emphasis' + "\n" +
+  '**This is bold text**' + "\n" +
+  "\n" +
+  '*This is italic text*' + "\n" +
+  "\n" +
+  '~~Strikethrough~~' + "\n"
+
+action.send "dialogs_#{dialog_mode}", showClose: true, content: ->(dialog) do
+  dialog.body padding: glib_json_padding_body, childViews: ->(body) do
+    body.markdown text: markdown
+
+    body.panels_split width: 'matchParent', content: ->(split) do
+      split.left childViews: ->(left) do
+        left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+          horizontal.label text: 'Open current', onClick: ->(subaction) do
+            subaction.dialogs_reload url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog_reload')
+          end
+        end
+      end
+
+      split.right childViews: ->(right) do
+        right.button text: 'Open New', onClick: ->(subaction) do
+          subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+        end
+      end
+    end
+  end
+end

data/app/views/json_ui/garage/forms/basic.json.jbuilder

@@ -10,8 +10,13 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
   form.panels_split width: 'matchParent', content: ->(split) do
     split.left childViews: ->(left) do
       left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-        if params[:mode] == 'dialog'
+        case params[:mode]
+        when 'dialog'
           horizontal.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+        when 'dialog_reload'
+          horizontal.button styleClass: 'link', text: 'back', onClick: ->(action) do
+            render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :reload
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.14
 platform: ruby
 authors:
 - ''
@@ -129,6 +129,7 @@ files:
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_commands.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs.json.jbuilder
+- app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder
 - app/views/json_ui/garage/actions/_http.json.jbuilder
 - app/views/json_ui/garage/actions/_panels.json.jbuilder
 - app/views/json_ui/garage/actions/_reload.json.jbuilder