glib-web 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8246b8bcd18dcbe28425e75bbce1a103b1bbc9b91fb76ca55e377de79e0d26e7
-  data.tar.gz: 8b9bc8c89bdb6937f22b189366865f0e131909e0607c7dccec353e6f72b9da35
+SHA1:
+  metadata.gz: 44f56b6f20013c8665e3b044739028764d66b7bd
+  data.tar.gz: 6d06c9cdb1675fd7b4a52992c2efeac135069bcf
 SHA512:
-  metadata.gz: 20ba5755e83751d7898b731d1772a5502a2b49b7972dfb2dc9069dfe221838e6881ef0840b57344c433b2e098ceb0010463efc956525cbba9c2a5ebe0d73d055
-  data.tar.gz: db0c95b2a8123f3e992054509d06c60043acd203ece6d52f1cd455374f70faed07a72ede92537feb6259e5a666ec6d0cdc1416a8dc058b890085901d7aa466b0
+  metadata.gz: 62b319bacfaeb022fed0fe1614c23dd2d72c85fc452fa539e95906c8d0e3e35d9d8f262302edc0a5e84548f29831b812cd09858492e5fab95a4b0a50d81b44d1
+  data.tar.gz: 94d0bec30592a9d69e9789add39c865a895b1d16360d554bc053a6e57ce6519afc908a999b250dfeb3dfd66025925e1d710837ac6ce9cf90601cce4f8dcf21d1

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

@@ -227,6 +227,12 @@ module Glib
         end
       end
 
+      def self.panels_builder(propName, *panelNames)
+        define_method(propName) do |value|
+          value.call(page.content_builder(panelNames))
+        end
+      end
+
       def created
         # To be overridden
       end

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

@@ -0,0 +1,63 @@
+class Glib::JsonUi::ActionBuilder
+  module Dialogs
+    class Alert < Action
+      string :message
+      # string :message_format
+      action :onClose
+    end
+
+    class Show < Action
+      string :body
+      action :onClose
+    end
+
+    # class Confirm < Action
+    #   string :message
+    #   action :onConfirm
+    #   action :onCancel
+    # end
+
+    # Deprecated in favour of `sheets/select`
+    class Options < Action
+      string :message
+
+      def buttons(block)
+        json.buttons do
+          block.call page.menu_builder
+        end
+      end
+    end
+
+    class Show < Action
+      panels_builder :content, :body
+
+      # Future plan
+      # panels_builder :content, :body, :footer
+    end
+
+    class Open < Action
+      string :url, cache: true
+    end
+
+    class Close < Action
+      action :onClose
+    end
+
+    class Oauth < Action
+      hash :provider
+      action :onSuccess
+      string :providerParamName
+      string :callbackUrlParamName
+    end
+
+    # TODO: Consider switching to `notifications/alert`
+    class Notification < Action
+      string :title
+      string :message
+      string :tag
+      int :timeout
+      action :onClick
+    end
+
+  end
+end

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

@@ -0,0 +1,15 @@
+class Glib::JsonUi::ActionBuilder
+  module Sheets
+
+    class Select < Action
+      string :message
+
+      def buttons(block)
+        json.buttons do
+          block.call page.menu_builder
+        end
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,41 @@
+class Glib::JsonUi::ActionBuilder
+
+  module Snackbars
+    class Alert < Action
+      string :message
+      # string :message_format
+      action :onClose
+
+      string :verticalPosition
+      string :horizontalPosition
+      singleton_array :styleClass, :styleClasses
+    end
+
+    # class Confirm < Action
+    #   string :message
+    #   action :onConfirm
+    #   action :onCancel
+
+    #   string :verticalPosition
+    #   string :horizontalPosition
+    #   singleton_array :styleClass, :styleClasses
+    # end
+
+    class Select < Action
+      string :message
+
+      string :verticalPosition
+      string :horizontalPosition
+      singleton_array :styleClass, :styleClasses
+
+      def buttons(block)
+        json.buttons do
+          block.call page.menu_builder
+        end
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,25 @@
+class Glib::JsonUi::ActionBuilder
+  module Windows
+    class Close < Action
+      action :onClose
+    end
+
+    class CloseAll < Action
+      action :onClose
+    end
+
+    class Open < Action
+      string :url, cache: true
+      action :onOpen
+    end
+
+    class OpenWeb < Action
+      string :url
+    end
+
+    class Reload < Action
+      string :url, cache: true
+      action :onReload
+    end
+  end
+end

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

@@ -38,125 +38,12 @@ module Glib
 
       ### Action definitions
 
-      module Dialogs
-        class Alert < Action
-          string :message
-          action :onClose
-        end
-
-        # class Confirm < Action
-        #   string :message
-        #   action :onConfirm
-        #   action :onCancel
-        # end
-
-        class Options < Action
-          string :message
-
-          def buttons(block)
-            json.buttons do
-              block.call page.menu_builder
-            end
-          end
-        end
-
-        class Open < Action
-          string :url, cache: true
-        end
-
-        class Close < Action
-          action :onClose
-        end
-
-        class Oauth < Action
-          hash :provider
-          action :onSuccess
-          string :providerParamName
-          string :callbackUrlParamName
-        end
-
-        class Alert < Action
-          string :message
-          action :onClose
-        end
-
-        class Notification < Action
-          string :title
-          string :body
-          string :tag
-          int :timeout
-          action :onClick
-        end
-
-      end
-
-      module Snackbars
-        class Alert < Action
-          string :message
-          action :onClose
-
-          string :verticalPosition
-          string :horizontalPosition
-          singleton_array :styleClass, :styleClasses
-        end
-
-        # class Confirm < Action
-        #   string :message
-        #   action :onConfirm
-        #   action :onCancel
-
-        #   string :verticalPosition
-        #   string :horizontalPosition
-        #   singleton_array :styleClass, :styleClasses
-        # end
-
-        class Options < Action
-          string :message
-
-          string :verticalPosition
-          string :horizontalPosition
-          singleton_array :styleClass, :styleClasses
-
-          def buttons(block)
-            json.buttons do
-              block.call page.menu_builder
-            end
-          end
-
-        end
-
-      end
-
       module Forms
         class Submit < Action
         end
 
       end
 
-      module Windows
-        class Close < Action
-          action :onClose
-        end
-
-        class CloseAll < Action
-          action :onClose
-        end
-
-        class Open < Action
-          string :url, cache: true
-          action :onOpen
-        end
-
-        class OpenWeb < Action
-          string :url
-        end
-
-        class Reload < Action
-          string :url, cache: true
-          action :onReload
-        end
-      end
-
       # Consider deprecating this. See Data
       module Auth
         class SaveCsrfToken < Action

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

@@ -0,0 +1,25 @@
+module Glib
+  module JsonUi
+    module DynamicFieldBuilders
+      
+      class Group < AbstractBuilder
+        def initialize json, page, template
+          super json, page
+          @template = template
+        end
+
+        # string :titlePrefix
+        def titlePrefix(string)
+          json.titlePrefix string
+        end
+
+        def template(options = {})
+          # json.template do
+            page.vertical_content(options)
+          # end
+        end
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Glib
+  module JsonUi
+    module GenericBuilders
+
+      class Content < AbstractBuilder
+        def initialize(json, page, template)
+          super json, page
+          @template = template
+        end
+
+        def definePanels(names)
+          names.each do |name|
+            define_singleton_method(name) do |options|
+              json.set!(name) { page.vertical_content(options) }
+            end
+          end
+        end
+
+        # def body(options = {})
+        #   json.body do
+        #     page.vertical_content(options)
+        #   end
+        # end
+      end
+
+    end
+  end
+end

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

@@ -36,6 +36,17 @@ module Glib
           @drawer_content_builder = ListBuilders::Section.new(json, self, @menu_builder)
           @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
           @split_content_builder = SplitBuilders::Content.new(json, self, @view_builder)
+
+          # TODO: Deprecate
+          # For generic `body` builder. For others, use content_builder()
+          # @generic_content_builder = GenericBuilders::Content.new(json, self, @view_builder)
+        end
+
+        def content_builder(panelNames)
+          # NOTE: Can potentially be cached
+          builder = GenericBuilders::Content.new(json, self, @view_builder)
+          builder.definePanels(panelNames)
+          builder
         end
 
         def rightNavButtons
@@ -120,7 +131,8 @@ module Glib
         end
 
         def vertical_content(options)
-          options = options.reverse_merge(width: 'matchParent')
+          # TODO: try disabling this
+          # options = options.reverse_merge(width: 'matchParent')
 
           [:padding, :backgroundColor, :width, :height, :align].each do |name|
             if (value = options.delete(name))

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

@@ -1,17 +1,17 @@
 module Glib
   module JsonUi
     module ResponseHelper
-      def json_ui_response json
+      def json_ui_response(json)
         json.onResponse do
           response = Response.new(json, self)
           yield response.action_builder
         end
       end
-      
+
       class Response
         attr_reader :action_builder
 
-        def initialize json, context
+        def initialize(json, context)
           @json = json
           @context = context
 

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

@@ -19,14 +19,14 @@ module Glib
             page.vertical_content(options)
           end
         end
-        
+
         def right(options = {})
           json.right do
             page.vertical_content(options)
           end
         end
       end
-      
+
     end
   end
 end