glib-web 0.15.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee300b7e05299ffaed9427513fada06ef2f248c68f8329bc6d07de7faf947a0
-  data.tar.gz: 8c11c15ae46e15b7fcfaf5c43744fbe2f872a6b6ea2e185e75f882759473c3db
+  metadata.gz: 7c8f181923acfe45b4f5fc8db68d538d457518dec51a7f88591e9dd7f45b5fa2
+  data.tar.gz: 619177b9d7e1153eb15230797ba241c1c54c795b979aba1747a195d2310b7295
 SHA512:
-  metadata.gz: 4b97228f7f53ea4f1fb86877c08c1cecadf12aaee9536e2ee8488eed58ffff4502c253984c9bc38d0e7df839e46283a5ac5aebbc6b63de63dcc98fa968e77bd6
-  data.tar.gz: b5a3e5a45469e5486465a7b5f3c12400d15ade17bcee01c237528cda747b404478cbc500347b5442992a1a8ae84efd0895f8fb9eefa4ef91493a340977d0df6a
+  metadata.gz: 79b252be8c126c21548f4c4f100800156240026a96756ebbe5d97ff64684150392f3a76f2afaa1fffae0dce5c139026847ae12a836774a9aeeea1612b7b5ba5c
+  data.tar.gz: 82712cc9297d5ac4e76f79fe6f21cf42183b901dbbee57a01387c8cfb3e20311829078c600f069710f49db56d7c3c0e804bba25e8bb7a849e59d493cda144922

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

@@ -26,6 +26,8 @@ class Glib::JsonUi::ActionBuilder
     class Show < Action
       panels_builder :content, :body
       bool :showClose
+      string :fullscreen # mobile, always
+      length :width
 
       # Future plan
       # panels_builder :content, :body, :footer
@@ -34,12 +36,16 @@ class Glib::JsonUi::ActionBuilder
     class Open < Action
       string :url, cache: true
       bool :showClose
+      string :fullscreen
+      length :width
     end
 
     class Reload < Action
       panels_builder :content, :body
       string :url, cache: true
       bool :showClose
+      string :fullscreen # mobile, always
+      length :width
     end
 
     class Close < Action

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

@@ -224,7 +224,6 @@ module Glib
             end
           end
         end
-
       end
     end
   end

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

@@ -99,6 +99,10 @@ class Glib::JsonUi::ViewBuilder
             end
           end
 
+          if page.current_form
+            raise 'Nested form is not allowed'
+          end
+
           # NOTE: this pattern will not work for views that can be nested. Luckily forms shouldn't be nested anyway.
           page.current_form = self
           @childViewsBlock.call(page.view_builder)

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

@@ -23,6 +23,14 @@ module Glib
         add_view m, *args
       end
 
+      def form_if_not_exists(*args)
+        if page.current_form
+          panels_responsive *args
+        else
+          panels_form *args
+        end
+      end
+
       class View < JsonUiElement
         string :id
         length :width

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

@@ -59,7 +59,11 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'dialogs/open', onClick: ->(action) do
-    action.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+    action.dialogs_open width: 950, url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+  end
+
+  template.thumbnail title: 'dialogs/open (fullscreen on mobile)', onClick: ->(action) do
+    action.dialogs_open fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
   end
 
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do

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

@@ -13,7 +13,7 @@ action.send "dialogs_#{dialog_mode}", showClose: true, content: ->(dialog) do
       split.left childViews: ->(left) do
         left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
           horizontal.label text: 'Open current', onClick: ->(subaction) do
-            subaction.dialogs_reload url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog_reload')
+            subaction.dialogs_reload width: 900, fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog_reload')
           end
         end
       end

data/app/views/json_ui/garage/forms/_conditional_banner.json.jbuilder

@@ -0,0 +1,28 @@
+panel.panels_form width: 'matchParent', childViews: ->(visibility) do
+  state = {
+    has_content: false
+  }
+  style_classes ||= nil
+  style_class ||= nil
+  padding ||= nil
+  id ||= nil
+
+  visibility.banners_select \
+    id: id,
+    width: 'matchParent',
+    styleClass: style_class || (style_classes ? nil : 'warning'),
+    message: message,
+    padding: padding,
+    buttons: ->(menu) do
+      yield(menu, state)
+    end,
+    showIf: {
+      "==": [
+        {
+          "var": 'banner'
+        },
+        'show'
+      ]
+    }
+  visibility.fields_hidden name: 'banner', value: state[:has_content] ? 'show' : 'hide'
+end

data/app/views/json_ui/garage/forms/_more_less_text.json.jbuilder

@@ -0,0 +1,37 @@
+if text.length > min_chars
+  panel.form_if_not_exists childViews: ->(form) do
+    form.markdown \
+      text: text.truncate(min_chars),
+      styleClasses: ['line-clamp', "line-clamp-#{max_lines}"],
+      showIf: {
+        "!=": [
+          {
+            "var": 'expand'
+          },
+          'expand'
+        ]
+      }
+    form.markdown \
+      text: text,
+      showIf: {
+        "==": [
+          {
+            "var": 'expand'
+          },
+          'expand'
+        ]
+      }
+    form.fields_check \
+      width: 'matchParent',
+      offIcon: 'expand_more',
+      onIcon: 'expand_less',
+      label: 'Read more',
+      onLabel: 'Read less',
+      checkValue: 'expand',
+      uncheckValue: nil,
+      name: 'expand',
+      disableDirtyCheck: true
+  end
+else
+  panel.markdown text: text
+end

data/app/views/json_ui/garage/forms/full_page_form_dialog.json.jbuilder

@@ -4,18 +4,9 @@ page = json_ui_page json
 
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.form url: json_ui_garage_url(path: 'forms/basic_post?id=dialog'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+page.form url: json_ui_garage_url(path: 'forms/basic_post', id: :dialog), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
   form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
   form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
-end
-
-page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-  footer.label text: 'This button will submit the form above because this whole page is wrapped in a giant form.'
-  footer.spacer height: 6
-
-  footer.panels_split width: 'matchParent', content: ->(content) do
-    content.right childViews: ->(right) do
-      right.fields_submit text: 'Submit'
-    end
-  end
+  form.spacer height: 14
+  form.fields_submit text: 'Submit'
 end

data/app/views/json_ui/garage/forms/show_hide.json.jbuilder

@@ -4,6 +4,7 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+# page.scroll childViews: ->(form) do
   form.h1 text: 'Text'
   form.fields_password name: 'user[text1]', width: 'matchParent', label: 'Type "show"', value: ''
   form.label text: 'Typed', showIf: {
@@ -148,49 +149,20 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     ]
   }
 
+  form.spacer height: 20
+  form.h1 text: 'Show more/less text'
+  form.label text: ''
+  render "#{@path_prefix}/forms/more_less_text",
+    panel: form,
+    min_chars: 300,
+    max_lines: 2,
+    text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
+
   form.spacer height: 20
   form.fields_submit text: 'Submit'
   form.spacer height: 40
 end
 
-# if text.length > 100
-#   inner_column.panels_form local: true, childViews: ->(form) do
-#     form.markdown \
-#       text: text,
-#       styleClasses: ['many-line'],
-#       showIf: {
-#         "!=": [
-#           {
-#             "var": 'expand[bundle_description]'
-#           },
-#           'expand'
-#         ]
-#       }
-#     form.markdown \
-#       text: text,
-#       showIf: {
-#         "==": [
-#           {
-#             "var": 'expand[bundle_description]'
-#           },
-#           'expand'
-#         ]
-#       }
-#     form.fields_check \
-#       width: 'matchParent',
-#       offIcon: 'expand_more',
-#       onIcon: 'expand_less',
-#       label: 'Read more',
-#       onLabel: 'Read less',
-#       checkValue: 'expand',
-#       uncheckValue: nil,
-#       name: 'expand[bundle_description]',
-#       disableDirtyCheck: true
-#   end
-# else
-#   inner_column.markdown text: text
-# end
-
 # panel.panels_form width: 'matchParent', childViews: ->(visibility) do
 #   state = {
 #     has_content: false

data/app/views/json_ui/garage/forms/submission_flow.json.jbuilder

@@ -49,6 +49,7 @@ page.scroll childViews: ->(scroll) do
     childViews: ->(form) do
       form.h3 text: 'Perform custom actions on submit'
       form.spacer height: 6
+      # See https://stackoverflow.com/questions/4196681/form-not-submitting-when-pressing-enter
       form.label text: 'This also works when you press ENTER in the following text fields'
       form.spacer height: 6
 

data/app/views/json_ui/garage/forms/submit_on_change.json.jbuilder

@@ -77,6 +77,21 @@ page.scroll childViews: ->(scroll) do
             end
           end
         end
+
+      form.spacer height: 20
+      form.h2 text: 'Text (Asynchronous) -- TODO'
+      form.fields_text \
+        name: 'user[video_url]',
+        width: 'matchParent',
+        onChange: ->(action) do
+          action.sheets_select message: 'Submit data?', buttons: ->(menu) do
+            menu.http_post # TODO
+
+            # menu.button text: 'Yes, submit', onClick: ->(subaction) do
+            #   action.forms_submit
+            # end
+          end
+        end
     end
 
 end

data/app/views/json_ui/garage/tables/layout.json.jbuilder

@@ -4,7 +4,7 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 column_indexes = (1..5)
-page.table sections: [
+page.table styleClass: 'table--grid', sections: [
   ->(section) do
     section.rows builder: ->(row) do
       row.default colSpans: [3, 2], cellViews: ->(cell) do

data/lib/glib/json_crawler/router.rb

@@ -1,17 +1,22 @@
+
 module Glib
   module JsonCrawler
     class Router
-      attr_reader :read_only_actions, :logger, :page_spec
+      attr_reader :read_only_actions, :logger
       attr_accessor :host
 
       def log(action, url, response = nil)
-        @logger +='  ' * @depth + [
+        @logger += '  ' * @depth + [
           action,
           response.present? ? response.code : nil,
           url
         ].compact.join(' :: ') + "\n"
       end
 
+      def _puts(text)
+        puts '  ' * @depth + text
+      end
+
       def initialize
         @depth = -1
         @logger = ''
@@ -19,7 +24,7 @@ module Glib
         @read_only_actions = Set.new
         # default rails's development host
         @host ||= 'localhost:3000'
-        @page_spec = nil
+        @page_specs = []
       end
 
       def step(http, args)
@@ -95,13 +100,17 @@ module Glib
       end
 
       def begin_page(spec)
-        @page_spec = spec
-        @visitor.begin_page spec
+        @page_specs << spec
+        @visitor.begin_page(spec)
       end
 
       def end_page(spec)
-        @page_spec = nil
-        @visitor.end_page spec
+        @page_specs.pop
+        @visitor.end_page(spec)
+      end
+
+      def page_spec
+        @page_specs.last
       end
 
       def allowed?(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.3
 platform: ruby
 authors:
 - ''
@@ -143,6 +143,8 @@ files:
 - app/views/json_ui/garage/actions/dialogs_oauth_post.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
+- app/views/json_ui/garage/forms/_conditional_banner.json.jbuilder
+- app/views/json_ui/garage/forms/_more_less_text.json.jbuilder
 - app/views/json_ui/garage/forms/basic.json.jbuilder
 - app/views/json_ui/garage/forms/basic_post.json.jbuilder
 - app/views/json_ui/garage/forms/checkboxes.json.jbuilder