glib-web 0.5.4 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c258b37bbad81871f329c41e5b854b5b6563fb4f
-  data.tar.gz: 3e8d5f94006a46084869252b667d0c9e405de569
+  metadata.gz: 9c409da37352d6e9066f4b7895d76c3cba5e81f2
+  data.tar.gz: 7116d6e9e13cc00d98811010acb550749acdcbba
 SHA512:
-  metadata.gz: bece2c2bae109009e5b468e9e43cd52591b5c367977a8fec1b623e27876efd28d25a1432bde847943eb310fe62bef9f4e3b1b38ea93924f2767cb9e1a42c4477
-  data.tar.gz: 756e23d1771b4f1dae8eebe2d4d0f0c4f5397fc8762baac96c2c5bfe7ffc73a6fcab6cad2575d8aae760d84570edffeb456231d70a815918c234a8e5153895bf
+  metadata.gz: 5ce3e630395c565eb252a653db28eb026388100082105109d4f2a380f19bab6d0465bd5d04ff65ff0da4c729c4273a08d800c2e8db614678767349ef279a8422
+  data.tar.gz: cb22a75b02ed382066e4d6060026600093cd543032c0d9c0679f64628750068a8ffa3dca4070995907040db5871b75ae171a4a5172ec445aa4e762357bd73235

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

@@ -31,6 +31,13 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
+  def json_ui_page_lifecycle_prop(name)
+    if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
+      hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
+      hash[name]['childActions']
+    end
+  end
+
   def __json_ui_start(options)
     @__json_ui_activated = false
     @__json_ui_rendering = nil

data/app/helpers/glib/app_feature_support_helper.rb

@@ -0,0 +1,16 @@
+module Glib
+  module AppFeatureSupportHelper
+    def glib_app_feature_supported?(name, app_version, dictionary)
+      device = (app_device_os || :default).to_sym
+
+      version = dictionary[name.to_sym].try(:[], device)
+      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
+
+      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
+    end
+
+    def glib_app_version_gte(feature_version, app_version)
+      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module Glib
           str.slice(0,1).capitalize + str.slice(1..-1)
         end
 
-        def add_singleton_element type, name, *args
+        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?
@@ -22,7 +22,7 @@ module Glib
           "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
-        def add_element_to_array type, name, *args
+        def add_element_to_array(type, name, *args)
           json.child! do
             add_singleton_element type, name, *args
           end
@@ -69,6 +69,12 @@ module Glib
 
       private
 
+      def self.any(propName)
+        define_method(propName) do |value|
+          json.set! propName, value
+        end
+      end
+
       def self.date(propName)
         define_method(propName) do |value|
           json.set! propName, value&.to_date
@@ -191,7 +197,7 @@ module Glib
           json.set!(propName) do
             if name
               data[:material] ||= {}
-              data[:material][:name] = name 
+              data[:material][:name] = name
             end
 
             if (material = data[:material])

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

@@ -1,8 +1,18 @@
 module Glib
   module JsonUi
     class ActionBuilder < AbstractBuilder
-      def method_missing m, *args
-        add_singleton_element_v1 'action', m, *args
+      def initialize(json, page, multiple)
+        super(json, page)
+
+        @multiple = multiple
+      end
+
+      def method_missing(m, *args)
+        if @multiple
+          add_element_to_array_v1 'action', m, *args
+        else
+          add_singleton_element_v1 'action', m, *args
+        end
       end
 
       class Action < JsonUiElement
@@ -38,19 +48,31 @@ module Glib
 
       ### Action definitions
 
+      class RunMultiple < Action
+        def childActions(block)
+          json.childActions do
+            block.call ActionBuilder.new(json, page, true)
+          end
+        end
+      end
+
       module Forms
         class Submit < Action
         end
-
       end
 
-      # Consider deprecating this. See Data
       module Auth
         class SaveCsrfToken < Action
           string :token
           action :onSave
         end
+      end
 
+      module Analytics
+        class LogEvent < Action
+          string :name
+          hash :params
+        end
       end
 
       module Timeouts
@@ -59,6 +81,10 @@ module Glib
           action :onTimeout
         end
 
+        # FUTURE
+        class Remove < Action
+        end
+
         # FUTURE
         class Clear < Action
         end
@@ -66,11 +92,15 @@ module Glib
 
       # FUTURE
       module Data
-        class SaveCsrfToken < Action
-          string :token
+        class Save < Action
+          string :key
+          string :value
           action :onSave
         end
 
+        class Remove < Action
+        end
+
         class Clear < Action
         end
       end

data/app/helpers/glib/json_ui/action_builder/windows.rb

@@ -2,6 +2,7 @@ class Glib::JsonUi::ActionBuilder
   module Windows
     class Close < Action
       action :onClose
+      # action :onAfterClose
     end
 
     class CloseAll < Action

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

@@ -35,11 +35,16 @@ module Glib
       #   json.attributes!
       # end
 
-      def json_ui_section(json, &block)
+      def json_ui_section(json)
         @__json_ui_section ||= Page.new(json, self)
         @__json_ui_section.list_section_builder
       end
 
+      def json_ui_action(json)
+        @__json_ui_section ||= Page.new(json, self)
+        @__json_ui_section.action_builder
+      end
+
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
         attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :split_content_builder
@@ -52,7 +57,7 @@ module Glib
           @context = context
 
           @view_builder = ViewBuilder.new(json, self, true)
-          @action_builder = ActionBuilder.new(json, self)
+          @action_builder = ActionBuilder.new(json, self, false)
           @menu_builder = MenuBuilder.new(json, self)
 
           @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
@@ -99,9 +104,12 @@ module Glib
             #   options[:leftItems]&.call @menu_builder
             # end
             # json.logoUrl "http://localhost:3000/assets/logo_dark-02d9b6a91fdbf22515da7b921d31367b70696214415f6789d2f90232e4a287b7.svg"
-            json.rightItems do
-              options[:rightItems]&.call @menu_builder
-            end
+
+            # json.rightItems do
+            #   options[:rightItems]&.call @menu_builder
+            # end
+
+            @view_builder.add_singleton_view('appBar', options)
           end
         end
 

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

@@ -15,7 +15,7 @@ module Glib
           @json = json
           @context = context
 
-          @action_builder = ActionBuilder.new(json, self)
+          @action_builder = ActionBuilder.new(json, self, false)
         end
       end
     end

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

@@ -1,6 +1,9 @@
 module Glib
   module JsonUi
     module StylingHelper
+
+      ### Padding
+
       def glib_json_padding_body
         { top: 12, left: 20, right: 20, bottom: 12 }
       end
@@ -9,6 +12,12 @@ module Glib
         { top: 12, bottom: 12, left: 16, right: 16 }
       end
 
+      ###
+
+
+
+      ### Image
+
       def glib_json_image_standard_url
         'https://cdn-images-1.medium.com/max/1200/1*Qc0XxYm-qAZL-7tjjlNfrg.png'
       end
@@ -20,6 +29,19 @@ module Glib
       def glib_json_image_blob_key
         'o6CKzNt67PWnkPdUEnWMt7pr'
       end
+
+      ###
+
+
+
+      ### Color
+
+      def glib_color_panel_background
+        '#b3bac2'
+      end
+
+      ###
+
     end
   end
 end

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

@@ -15,6 +15,10 @@ module Glib
         end
       end
 
+      def add_singleton_view(name, *args)
+        add_singleton_element 'view', name, *args
+      end
+
       def method_missing(m, *args)
         add_view m, *args
       end
@@ -152,26 +156,22 @@ module Glib
             block.call page.menu_builder
           end
         end
+      end
 
-        # Should be deprecated
-        # def tabButtons(block)
-        #   json.tabButtons do
-        #     block.call page.menu_builder
-        #   end
-        # end
-
-        # def options(options)
-        #   current_url = page.context.request.base_url + page.context.request.fullpath
+      class AppBar < View
+        color :color
 
-        #   buttons ->(menu) do
-        #     options.each do |tab|
-        #       menu.button text: tab[:text], disabled: tab[:url] == current_url, onClick: ->(action) do
-        #         action.windows_reload url: tab[:url]
-        #       end
-        #     end
+        # def leftButtons(block)
+        #   json.leftButtons do
+        #     block.call page.menu_builder
         #   end
         # end
 
+        def rightButtons(block)
+          json.rightButtons do
+            block.call page.menu_builder
+          end
+        end
       end
 
       class Datetime < View
@@ -182,4 +182,4 @@ module Glib
 
     end
   end
-end
+end

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

@@ -103,7 +103,15 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class Check < Text
-      string :uncheckValue
+      any :uncheckValue
+      any :checkValue
+
+
+      def value(value)
+        @value = value if value != Glib::Value::DEFAULT
+      end
+
+      # Where possible, use value instead of this
       bool :checked
     end
 

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

@@ -123,6 +123,8 @@ class Glib::JsonUi::ViewBuilder
       hash :nextPage
       hash :export
       hash :import
+      action :onScrollToTop
+      action :onScrollToBottom
 
       def firstSection(block)
         json.sections [1] do

data/app/helpers/glib/urls_helper.rb

@@ -0,0 +1,7 @@
+module Glib
+  module UrlsHelper
+    def glib_url_current(new_params)
+      url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
+    end
+  end
+end

data/app/policies/glib/application_policy.rb

@@ -113,41 +113,17 @@ module Glib
       controller.policy_scope(record.class, policy_scope_class: policy_scope_class)
     end
 
-    # TODO: Remove. Deprecated
-    private  # Used by child
-    def public?
-      true
-    end
-
-    private  # Used by child
-    def everyone
-      true
-    end
-
-    # TODO: Deprecate `user()`
-    private  # Used by child
-    def current_user
-      user
-    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
 
+    # TODO: Remove. Deprecated
+    # private  # Used by child
+    # def public?
+    #   true
+    # end
+
     class Scope
       attr_reader :user, :scope
 
@@ -156,9 +132,30 @@ module Glib
         @scope = scope
       end
 
+      # def current_user
+      #   user
+      # end
+
+      # To be overridden
       def resolve
         scope.none
       end
     end
+
+    private  # Used by child
+      def everyone
+        true
+      end
+
+      # def current_user
+      #   user
+      # end
+
+      # TODO: Bad pattern. Implement explicit policy parameter instead.
+      # - E.g. can? :destroy, :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      # - E.g. super class: :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      def controller_var(name)
+        controller.instance_variable_get(:"@#{name}")
+      end
   end
 end

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

@@ -5,6 +5,8 @@ json_ui_page json do |page|
 
   page.list sections: [
     ->(section) do
+      render "#{@path_prefix}/actions/reload", section: section
+    end, ->(section) do
       render "#{@path_prefix}/actions/dialogs", section: section
     end, ->(section) do
       render "#{@path_prefix}/actions/snackbars", section: section
@@ -16,8 +18,6 @@ json_ui_page json do |page|
       render "#{@path_prefix}/actions/timeouts", section: section
     end, ->(section) do
       render "#{@path_prefix}/actions/http", section: section
-    end, ->(section) do
-      render "#{@path_prefix}/actions/reload", section: section
     end
   ]
 end