glib-web 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dbaa7e89ae8707efe39b3f950d4e4482cd4e651a7a48184f1600c6e948aa080f
-  data.tar.gz: 734f9417b01c0e82d8eb2e2a96be0c778b0b6e28a042319e4a9167437b110032
+SHA1:
+  metadata.gz: 8dc0677c6f29166100884d7d415d3f85a5caaef4
+  data.tar.gz: 1d9ab884a48db31bc4957d86b43370938bc5fefc
 SHA512:
-  metadata.gz: f961b9bd3c3785356b4cd297340f8a3c77d5357840e34743597643f0af41bc5f6ad27376c2af80e511914da720ad15beaa697c002e93103833f38f352b91a600
-  data.tar.gz: c95e65b6b889457228bd60c99015cac7d134e54008c9727fd7f352a5a0fdf401396f13f26c2a93add3eafdde82bfd32eceb167b5ecd99a84cc47c09ab95022b3
+  metadata.gz: 5f890e2878ee7d3ac12030008b81c703e3a2398b4ed22b829294ca33d28391a01e656fd7d5ae5362e81e50aeeaae80ab4ff2ea36bb4c101a85c83c77062c50d3
+  data.tar.gz: 3bb000732b8dcc373ee166cdd91bc0d6ef601ab9d74adc427d345e7daad9ca2a840026367059754178a4c2e1c22bda7ae9aa2bcdd09042ab96eced346f53334c

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

@@ -36,6 +36,10 @@ module Glib::Json::Libs
     json_ui_app_device_os == 'web'
   end
 
+  def json_ui_render(template, args = {})
+    JSON.parse(render_to_string(template, locals: args))
+  end
+
 
 
   module ClassMethods

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

@@ -1,3 +1,4 @@
+# TODO: Remove old DynamicText
 module Glib::Json::NewDynamicText
   def __json_traversal_register_dynamic_text
     @__specs = {}
@@ -30,6 +31,7 @@ module Glib::Json::NewDynamicText
     examples_translations = {
       'home.json_ui_garage.hello' => 'Hello {{name}}',
       'home.json_ui_garage.greeting' => 'Good day!',
+      'home.json_ui_garage.greeting_with_image' => 'Good day! (with image)',
     }
 
     translated_texts = {}
@@ -105,6 +107,7 @@ module Glib::Json::NewDynamicText
       }
     end
 
+    # TODO: Reuse method from DynamicTextsHelper
     def image_server_url(blob_key, w: 100, h: 100)
       return unless blob_key.present?
 

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

@@ -64,10 +64,6 @@ module Glib::Json::Traversal
       # Generic view children
       traverse_multiple view['childViews'], block
 
-      # panels/split
-      # crawl_multiple view['leftViews'], block
-      # crawl_multiple view['rightViews'], block
-
       # Split panel
       traverse_vertical_content view['left'], block
       traverse_vertical_content view['center'], block

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -17,7 +17,7 @@ module Glib
       if text_object.images.attached?
         content = content.gsub(/\{\{image(\d)\}\}/) {
           if image = text_object.images[$1.to_i - 1]
-            image_server_url(image.blob.key)
+            dt_image_server_url(image.blob.key)
           else
             "{{image#{$1}}}"
           end
@@ -39,9 +39,10 @@ module Glib
       }.merge(args)
     end
 
-    def image_server_url(blob_key, w: 100, h: 100)
+    def dt_image_server_url(blob_key, w: 100, h: 100)
       return unless blob_key.present?
 
+      # TODO: This should probably be set as a parameter for json_libs
       uri = URI::HTTPS.build(
         host: 'imageserver-demo.herokuapp.com',
         path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",

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

@@ -2,7 +2,7 @@ module Glib
   module JsonUi
     module PageHelper
       def json_ui_garage_url(options = {})
-        return Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
+        Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
           protocol: request.protocol,
           host: request.host,
           port: request.port,
@@ -10,10 +10,11 @@ module Glib
         )
       end
 
-      def json_ui_page json, &block
-        page = Page.new(json, self)
-        block&.call page
-        page
+      # TODO: Remove the block
+      def json_ui_page(json, &block)
+        @__json_ui_page ||= Page.new(json, self)
+        block&.call @__json_ui_page
+        @__json_ui_page
       end
 
       class Page
@@ -23,7 +24,7 @@ module Glib
         # See Panels::Form
         attr_accessor :current_form
 
-        def initialize json, context
+        def initialize(json, context)
           @json = json
           @context = context
 
@@ -36,7 +37,7 @@ module Glib
           @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
           @split_content_builder = SplitBuilders::Content.new(json, self, @view_builder)
         end
-        
+
         def rightNavButtons
           json.rightNavButtons do
             yield @menu_builder
@@ -48,18 +49,16 @@ module Glib
         end
 
         def leftDrawer(options = {})
-          # json.leftDrawer do
-          #   json.title options[:title]
-          #   json.items do
-          #     yield @menu_builder
-          #   end
-          # end
-
           json.leftDrawer do
+            [:styleClasses].each do |name|
+              if (value = options.delete(name))
+                json.set! name, value
+              end
+            end
             options[:content]&.call drawer_content_builder
           end
         end
-        
+
         def navBar(options = {})
           json.navBar do
             json.rightItems do
@@ -85,7 +84,7 @@ module Glib
             vertical_content(options)
           end
         end
-        
+
         def list(options = {})
           json.body do
             json.childViews do
@@ -93,7 +92,7 @@ module Glib
             end
           end
         end
-        
+
         def table(options = {})
           json.body do
             json.childViews do
@@ -101,7 +100,7 @@ module Glib
             end
           end
         end
-        
+
         def scroll(options = {})
           json.body do
             json.childViews do

data/app/policies/glib/application_policy.rb

@@ -1,148 +1,148 @@
-# The main purpose of this is for security. If it is important to display useful error message or to provide a "banana", then
-# 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_reader :user, :record, :controller, :request, :params
-
-    private
-    def initialize(user, record, controller, request, params)
-      @user = user
-      @record = record
-      @controller = controller
-      @request = request
-      # Don't get params from request because we might not have a proper request object. This might execute in Sidekiq. 
-      # See Presenter::Model::inside_mock_controller()
-      @params = params
-    end
-    
-    class << self
-      attr_reader :catch_all
-
-      # 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
-      def authorize(*actions, &block)
-        actions.each do |action|
-          if action == :manage
-            # Serve as a catch-all to all actions that have not been specified in the policy.
-            @catch_all = block
-          else
-            method_name = "#{action}?"
-            # Avoid accidentally redefining multiple times from child policies. But it's okay if the child policy
-            # wants to override the parent's authorization method.
-            raise "Action authorization has been declared: #{action}" if instance_methods(false).include?(method_name.to_sym)
-            define_method method_name, &block
-          end
-        end
-      end
-    end
-    
-    private
-    def catch_all
-      self.class.catch_all
-    end
-    
-    private
-    # To ensure the block is called on the policy's instance instead class.
-    def call_catch_all
-      instance_eval(&catch_all)
-    end
-
-    authorize :index do
-      # We need this line because in `index` action, this method will be called instead of method_missing().
-      # Having this line ensures that the catch_all behaviour works according to the priority below:
-      # - child_policy#index?
-      # - child_policy#manage? -- catch_all
-      # - application_policy@index?
-      return call_catch_all if catch_all
-
-      false
-    end
-
-    authorize :show do
-      return call_catch_all if catch_all
-
-      scope.where(id: record.id).exists?
-    end
-
-    authorize :create do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    authorize :new do
-      return call_catch_all if catch_all
-      
-      create?
-    end
-
-    authorize :update do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    authorize :edit do
-      return call_catch_all if catch_all
-      
-      update?
-    end
-
-    authorize :destroy do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    public
-    def method_missing(name, *args, &block)
-      if name.to_s.end_with?('?') && catch_all
-        call_catch_all
-      else
-        super
-      end
-    end
-
-    public
-    def scope
-      Pundit.policy_scope!(user, record.class)
-    end
-
-    private  # Used by child
-    def public?
-      true
-    end
-
-    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
-    # private  # Used by child
-    # def not_deleted_unless_owner_or_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
-    # end
-
-    # private  # Used by child
-    # def not_deleted_unless_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && block.call(@record))
-    # end
-
-    public
-    def self.args_builder
-      Proc.new { |controller| [] }
-    end
-    
-    class Scope
-      attr_reader :user, :scope
-
-      def initialize(user, scope)
-        @user = user
-        @scope = scope
-      end
-
-      def resolve
-        scope
-      end
-    end
-  end
-end
+# The main purpose of this is for security. If it is important to display useful error message or to provide a "banana", then
+# 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_reader :user, :record, :controller, :request, :params
+
+    private
+    def initialize(user, record, controller, request, params)
+      @user = user
+      @record = record
+      @controller = controller
+      @request = request
+      # Don't get params from request because we might not have a proper request object. This might execute in Sidekiq. 
+      # See Presenter::Model::inside_mock_controller()
+      @params = params
+    end
+    
+    class << self
+      attr_reader :catch_all
+
+      # 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
+      def authorize(*actions, &block)
+        actions.each do |action|
+          if action == :manage
+            # Serve as a catch-all to all actions that have not been specified in the policy.
+            @catch_all = block
+          else
+            method_name = "#{action}?"
+            # Avoid accidentally redefining multiple times from child policies. But it's okay if the child policy
+            # wants to override the parent's authorization method.
+            raise "Action authorization has been declared: #{action}" if instance_methods(false).include?(method_name.to_sym)
+            define_method method_name, &block
+          end
+        end
+      end
+    end
+    
+    private
+    def catch_all
+      self.class.catch_all
+    end
+    
+    private
+    # To ensure the block is called on the policy's instance instead class.
+    def call_catch_all
+      instance_eval(&catch_all)
+    end
+
+    authorize :index do
+      # We need this line because in `index` action, this method will be called instead of method_missing().
+      # Having this line ensures that the catch_all behaviour works according to the priority below:
+      # - child_policy#index?
+      # - child_policy#manage? -- catch_all
+      # - application_policy@index?
+      return call_catch_all if catch_all
+
+      false
+    end
+
+    authorize :show do
+      return call_catch_all if catch_all
+
+      scope.where(id: record.id).exists?
+    end
+
+    authorize :create do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    authorize :new do
+      return call_catch_all if catch_all
+      
+      create?
+    end
+
+    authorize :update do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    authorize :edit do
+      return call_catch_all if catch_all
+      
+      update?
+    end
+
+    authorize :destroy do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    public
+    def method_missing(name, *args, &block)
+      if name.to_s.end_with?('?') && catch_all
+        call_catch_all
+      else
+        super
+      end
+    end
+
+    public
+    def scope
+      Pundit.policy_scope!(user, record.class)
+    end
+
+    private  # Used by child
+    def public?
+      true
+    end
+
+    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
+    # private  # Used by child
+    # def not_deleted_unless_owner_or_moderator?(&block)
+    #   block ||= lambda { |unused_arg| @user.moderator? }
+    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
+    # end
+
+    # private  # Used by child
+    # def not_deleted_unless_moderator?(&block)
+    #   block ||= lambda { |unused_arg| @user.moderator? }
+    #   !@record.deleted? || (@user && block.call(@record))
+    # end
+
+    public
+    def self.args_builder
+      Proc.new { |controller| [] }
+    end
+    
+    class Scope
+      attr_reader :user, :scope
+
+      def initialize(user, scope)
+        @user = user
+        @scope = scope
+      end
+
+      def resolve
+        scope
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - ''
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ''