glib-web 0.4.20 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c4c7bc6647854b613fa074f065ecfcb6b33dd50
-  data.tar.gz: 8e74f10469c511bac536d56a3756eeac09a2db30
+SHA256:
+  metadata.gz: aa9a08c06c8619898e10d67b5d68ee274401b277ce6da81c740d0e810a64cdb6
+  data.tar.gz: b71b5dbe3831eadbb862401842cdc682d0e611377f6047d8f3824348ab223eb3
 SHA512:
-  metadata.gz: 41cb1081d27f1f961ac3c84b486443d51b6bce60661e9a56a2a3b7b9768188eb4a1dc4fe467efd6f1ed18d6d9310378aaaec3a7c56e8c7089f04572fac440b32
-  data.tar.gz: 0635cdab21ed355d2f106ba8af3bd215e85403a6d70dc03c2b18040200e11d2b846d5f69537691874d0236177386183a3115d7bb3ba7e962461875aee5992fc1
+  metadata.gz: ef9bc351860c115971670b239749bee8e65e8720ef9938b15c711093d15e6d95f12260e72bb82851e359d8e82fc02cfaa6c962c215b0d332cf39053b3137202e
+  data.tar.gz: eb7e1725bd909c633710ea0d8bb45b74468c850231a7adb0b175822141d6b76d1cf7f747919756184429b57702637c2590ab676617fdb545f2aacb5b2764dd63

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

@@ -61,6 +61,8 @@ 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: false, 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', locals: { page: hash, options: options })
+
+    # response.body = render_to_string(template: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
   end
 end

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

@@ -3,105 +3,108 @@ module Glib
     class AbstractBuilder
       attr_reader :json, :page
 
-      def initialize json, page
+      def initialize(json, page)
         @json = json
         @page = page
       end
 
       private
+        def capitalize_first_letter_and_leave_others_alone(str)
+          str.slice(0,1).capitalize + str.slice(1..-1)
+        end
 
-      def capitalize_first_letter_and_leave_others_alone(str)
-        str.slice(0,1).capitalize + str.slice(1..-1)
-      end
+        def add_singleton_element type, name, *args
+          name_components = name.to_s.split('_')
+          json.set! type, "#{name_components.join('/')}" if type
+          args = [yield] if block_given?
 
-      def add_singleton_element type, name, *args
-        name_components = name.to_s.split('_')
-        json.set! type, "#{name_components.join('/')}" if type
-        args = [yield] if block_given?
-        
-        # TODO: consider caching these instances
-        "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
-      end
-      
-      def add_element_to_array type, name, *args
-        json.child! do
-          add_singleton_element type, name, *args
+          # TODO: consider caching these instances
+          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
         end
-      end
 
-      # TODO: Consider removing this in favour of non 'v1' suffix
-      def add_singleton_element_v1 type, name, *args
-        name_components = name.to_s.split('_')
-        json.set! type, "#{name_components.join('/')}-v1" if type
-        args = [yield] if block_given?
-        "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
-      end
-      
-      # TODO: Consider removing this in favour of non 'v1' suffix
-      def add_element_to_array_v1 type, name, *args
-        json.child! do
-          add_singleton_element_v1 type, name, *args
+        def add_element_to_array type, name, *args
+          json.child! do
+            add_singleton_element type, name, *args
+          end
         end
-      end
-      
+
+        # TODO: Consider removing this in favour of non 'v1' suffix
+        def add_singleton_element_v1 type, name, *args
+          name_components = name.to_s.split('_')
+          json.set! type, "#{name_components.join('/')}-v1" if type
+          args = [yield] if block_given?
+          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
+        end
+
+        # TODO: Consider removing this in favour of non 'v1' suffix
+        def add_element_to_array_v1 type, name, *args
+          json.child! do
+            add_singleton_element_v1 type, name, *args
+          end
+        end
+
     end
 
     class JsonUiElement
       attr_reader :json, :page
 
-      def initialize json, page
+      def initialize(json, page)
         @json = json
         @page = page
       end
 
-      def parse args = {}
+      def parse(args = {})
         @args = args
-        
+
         if args.is_a? Hash
           args.each do |k, v|
             send(k, v)
           end
         end
-        
+
         created
       end
 
       private
 
-      def self.date propName
+      def self.date(propName)
         define_method(propName) do |value|
-          if (value = value&.to_s)
-            if !Rails.env.production?
-              # TODO: Use regex to validate date
-            end
-  
-            json.set! propName, value 
-          end
+          json.set! propName, value&.to_date
+
+          # if (value = value&.to_s)
+          #   if !Rails.env.production?
+          #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
+          #   end
+
+          #   json.set! propName, value
+          # end
         end
       end
 
-      def self.date_time propName
+      def self.date_time(propName)
         define_method(propName) do |value|
-          if (value = value&.to_s)
-            if !Rails.env.production?
-              # TODO: Use regex to validate datetime
-            end
-  
-            json.set! propName, value 
-          end
+          json.set! propName, value&.to_datetime
+
+          # if (value = value&.to_s)
+          #   if !Rails.env.production?
+          #     try Date.parse(value) rescue raise "Invalid date: #{value}"
+          #   end
+
+          #   json.set! propName, value
+          # end
         end
       end
 
       def self.color propName
-        define_method(propName) do |value| 
+        define_method(propName) do |value|
           if (value = value&.to_s)
             if !Rails.env.production?
               if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
                 raise "Invalid color: #{value}"
               end
             end
-  
-            json.set! propName, value 
+
+            json.set! propName, value
           end
         end
       end
@@ -119,15 +122,15 @@ module Glib
                 end
               end
             end
-  
-            json.set! propName, value 
+
+            json.set! propName, value
           end
         end
       end
 
       def self.string propName, options = {}
         define_method(propName) do |value|
-          str = value&.to_s 
+          str = value&.to_s
           instance_variable_set("@#{propName}", str) if options[:cache]
           json.set! propName, str
         end
@@ -162,7 +165,7 @@ module Glib
 
       def self.icon propName, options = {}
         define_method(propName) do |value|
-          
+
           if value.is_a?(Hash)
             name = value[:name]
 
@@ -177,7 +180,7 @@ module Glib
                   json.text badge
                 end
               end
-              
+
             end
           else
             name = value
@@ -185,27 +188,27 @@ module Glib
             json.set!(propName) do
               json.name name
             end
-          end 
+          end
 
           instance_variable_set("@#{propName}", name) if options[:cache]
-          
+
         end
       end
-      
+
       def self.action propName
-        define_method(propName) do |value| 
-          json.set!(propName) { value.call(page.action_builder) } 
+        define_method(propName) do |value|
+          json.set!(propName) { value.call(page.action_builder) }
         end
       end
 
       def self.views propName
-        define_method(propName) do |value| 
-          json.set!(propName) { value.call(page.view_builder) } 
+        define_method(propName) do |value|
+          json.set!(propName) { value.call(page.view_builder) }
         end
       end
 
       def self.array propName
-        define_method(propName) do |value| 
+        define_method(propName) do |value|
           json.set! propName, value&.to_a
         end
       end
@@ -218,7 +221,7 @@ module Glib
 
       def self.singleton_array singletonName, arrayName
         array arrayName
-        
+
         define_method(singletonName) do |value|
           json.set! arrayName, [value]
         end

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

@@ -2,7 +2,7 @@ module Glib
   module JsonUi
     module ListBuilders
       class Template < AbstractBuilder
-        def method_missing m, *args
+        def method_missing(m, *args)
           add_element_to_array 'template', m, *args
         end
 
@@ -23,6 +23,7 @@ module Glib
           string :subsubtitle
           string :imageUrl
           action :onClick
+          views :accessoryViews
         end
 
         class Featured < Thumbnail
@@ -30,7 +31,7 @@ module Glib
       end
 
       class Section < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end

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

@@ -137,6 +137,11 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
+    class DynamicGroup < AbstractField
+      string :groupTitlePrefix
+      views :groupTemplateViews
+    end
+
     class RadioGroup < View
       string :name
       string :value
@@ -163,6 +168,11 @@ class Glib::JsonUi::ViewBuilder
     class Date < AbstractField
       date :min
       date :max
+
+      # Override
+      def value(value)
+        super(value&.to_date)
+      end
     end
 
     # This doesn't use camel case to be consistent with the html input equivalent
@@ -176,5 +186,9 @@ class Glib::JsonUi::ViewBuilder
       hash :longitudeField
     end
 
+    class StripeToken < AbstractField
+      string :publicKey
+    end
+    
   end
 end

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

@@ -31,7 +31,7 @@ class Glib::JsonUi::ViewBuilder
       def hint_label(prop, args)
         I18n.t("dt_models.#{@model_name}.#{prop}.hint", args.merge(default: nil))
       end
-      
+
       def placeholder_label(prop, args)
         I18n.t("dt_models.#{@model_name}.#{prop}.placeholder", args.merge(default: nil))
       end
@@ -69,7 +69,7 @@ class Glib::JsonUi::ViewBuilder
 
         json.url @url
         json.method @method
-        
+
         json.childViews do
           if @method != :get
             json.child! do
@@ -100,7 +100,7 @@ class Glib::JsonUi::ViewBuilder
           block.call page.list_section_builder
         end
       end
-      
+
       def sections(blocks)
         json.sections do
           blocks.each do |block|
@@ -116,7 +116,7 @@ class Glib::JsonUi::ViewBuilder
       hash :nextPage
       hash :export
       hash :import
-      
+
       def firstSection(block)
         json.sections [1] do
           block.call page.table_section_builder
@@ -181,10 +181,10 @@ class Glib::JsonUi::ViewBuilder
       string :distribution
     end
 
-    # TODO: Deprecate in favour of styleClasses
-    class Card < View
-      views :childViews
-    end
+    # # TODO: Deprecate in favour of styleClasses
+    # class Card < View
+    #   views :childViews
+    # end
 
     class Custom < View
       string :template

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