glib-web 0.4.52 → 0.4.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f2a64c1f50414b9f78db6257981c7d10e3e1f7
-  data.tar.gz: 6931884f622dd063adafab4a1424db2614b34388
+  metadata.gz: ecdaf7a5551b21c24cdaf87798c3d8d23bcad631
+  data.tar.gz: f286b63e80b6e71459809b245931fc4a55974fbb
 SHA512:
-  metadata.gz: c74e46c58ac038df0cdadc164b1c969aaa3ec29ffa444c835b1cf3ed9f689bfc9dd6e2ef1ec6256c86a564b5819d65ac80d14563685276f5b3399dbe6926815c
-  data.tar.gz: 8bbc6f11e229715e6caa490d452dbdfee1dd9b2a0e8d244aa4ad669d464802712accffabebcb9b9fa4df8faf32a444822da9f7847da34389c4028853d9a94140
+  metadata.gz: c288e2f16adecd42e54a7f7b2840f6a77c6d10a890e8e22ef6917ed9000b564c9df7934cc021bb86582f53f7c406790f1c2b2631424a0bae78328a4bf841cd02
+  data.tar.gz: fda78f4480c7be505f7fc0addbfc03586b9d364207845e17d49f69cfb6da27a4a5673439d101e6f7c335e7aec71a7a11cb911ad225b3c033388defbea619d559

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

@@ -115,26 +115,25 @@ module Glib::Auth
         self.before_action(options.slice(:only, :except, :if, :unless)) do |controller|
           resource_name ||= resource_name_from_controller
 
-          if !(resource_key = options[:class]).nil?
-            resource = case resource_key
-            when false
-              resource_name.to_sym
-            when Symbol, Class
-              resource_key
+          begin
+            if !(resource_key = options[:class]).nil?
+              resource = case resource_key
+              when false
+                resource_name.to_sym
+              when Symbol, Class
+                resource_key
+              else
+                raise "Invalid resource class: #{resource_key}"
+              end
+
+              authorize resource
+            elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
+              authorize resource_instance
             else
-              raise "Invalid resource class: #{resource_key}"
+              authorize resource_name.camelize.constantize
             end
-
-            authorize resource
-#            if (policy = policy(resource)) && policy.class.instance_variable_defined?(:@manage_permission)
-#              skip_authorization if policy.manage?
-#            else
-#              authorize resource
-#            end
-          elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
-            authorize resource_instance
-          else
-            authorize resource_name.camelize.constantize
+          rescue Pundit::NotAuthorizedError => e
+            raise_access_denied(e.record, e.policy)
           end
 
           verify_authorized

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

@@ -146,6 +146,13 @@ module Glib
       class TabBar < View
         color :color
 
+        def buttons(block)
+          json.buttons do
+            block.call page.menu_builder
+          end
+        end
+
+        # Should be deprecated
         def tabButtons(block)
           json.tabButtons do
             block.call page.menu_builder

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

@@ -25,6 +25,7 @@ json_ui_page json do |page|
         end
 
         reload_counter = params[:reload_counter].to_i
+        reload_counter = 0 if reload_counter > 5
         template.thumbnail title: "windows/reload with URL (counter: #{reload_counter})", onClick: ->(action) do
           action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
         end

data/lib/glib/json_crawler/action_crawlers/windows_open.rb

@@ -3,17 +3,20 @@ module Glib
     class WindowsOpen < ActionCrawler
       def initialize http, args, controller
         @http = http
-        json = @http.get args['url'], controller
+        if (url = args['url'])
+          json = @http.get url, controller
 
-        unless json.nil?
-          crawl json['header']&.[]('childViews')
-          crawl json['body']&.[]('childViews')
-          crawl json['footer']&.[]('childViews')
+          unless json.nil?
+            crawl json['header']&.[]('childViews')
+            crawl json['body']&.[]('childViews')
+            crawl json['footer']&.[]('childViews')
 
-          json['rightNavButtons']&.each do |button|
-            click button
+            json['rightNavButtons']&.each do |button|
+              click button
+            end
           end
         end
+
       end
     end
   end

data/lib/glib/json_crawler/{covarage.rb → coverage.rb}

@@ -1,8 +1,8 @@
 module Glib
   module JsonCrawler
-    class Covarage
+    class Coverage
       @@files = []
-      @@covarage_files = Set.new
+      @@coverage_files = Set.new
 
       def self.files
         @@files
@@ -12,8 +12,8 @@ module Glib
         @@files = files
       end
 
-      def self.covarage_files
-        @@covarage_files
+      def self.coverage_files
+        @@coverage_files
       end
     end
   end

data/lib/glib/json_crawler/router.rb

@@ -17,7 +17,7 @@ module Glib
 
       def self.step(http, args)
         if controller = http.controller
-          Glib::JsonCrawler::Covarage.covarage_files.add(http.controller.class.instance_method(http.action_name).source_location.first)
+          Glib::JsonCrawler::Coverage.coverage_files.add(http.controller.class.instance_method(http.action_name).source_location.first)
         end
 
         if args.is_a?(Hash) && args['rel'] != 'nofollow'
@@ -31,7 +31,7 @@ module Glib
             child = case action
             when 'initiate_navigation'
               JsonCrawler::NavInitiate.new(http, params, action)
-            when 'windows/open-v1', 'dialogs/open-v1'
+            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
               JsonCrawler::WindowsOpen.new(http, params, action)
             # when 'http/delete-v1'
             #   JsonCrawler::ActionHttp.new(:delete, http, params, action)

data/lib/glib/json_crawler.rb

@@ -1,7 +1,7 @@
 require_relative './json_crawler/http'
 require_relative './json_crawler/router'
 require_relative './json_crawler/action_crawler'
-require_relative './json_crawler/covarage'
+require_relative './json_crawler/coverage'
 
 require_relative './json_crawler/action_crawlers/nav_initiate'
 require_relative './json_crawler/action_crawlers/windows_open'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.52
+  version: 0.4.54
 platform: ruby
 authors:
 - ''
@@ -197,7 +197,7 @@ files:
 - lib/glib/json_crawler/action_crawlers/forms_submit.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
 - lib/glib/json_crawler/action_crawlers/windows_open.rb
-- lib/glib/json_crawler/covarage.rb
+- lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
 - lib/glib/value.rb