glib-web 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3229621ccc977c76e4adc70e1ab7271a76daf08
-  data.tar.gz: fa4e7c9f17a1d9c6b6cd770771730e13f583eb7e
+  metadata.gz: 8cb6ba9cc8312e05a50ed1179f7690b3dd985410
+  data.tar.gz: b896cd852f0f42fa7e5a198ff6d3a49f5fca037e
 SHA512:
-  metadata.gz: 2c1cf1ee7207ee7fa8276d6e94df95a6079bc011f429a0d9ca87a1305e4bb7201da04d13cda66de0c5872e7e1604374065dd307144e8e8d3110fcae424d5ae9f
-  data.tar.gz: '09fb824243fc37c0cd3ce3d6f0d0b6a85944ab02fa5b88383df8be9ff93394608fc1e0c394b9eadfa7fa51dbd854da3e8cf7ee4ed1da2895cfcdec06509a731e'
+  metadata.gz: b151098400b68a0eea5271b0d513be08a527fb091668d25769375215d6975d2c71f10268d2303125c156fdba610cf8d6a965b6ec8eb9d3c18a61c32f5fc528f6
+  data.tar.gz: 030e32c03a9d1b4ad9b4141406d367b60de018b6ce7738eab0080ef5327a9b2958b363d84a182663bcaae9df4fa4b8b66554af4cbcc61a738cebc1d7511be292

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

@@ -31,6 +31,13 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
+  def json_ui_lifecycle_prop(name)
+    if (hash = json_transformation_start).is_a?(Hash)
+      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/json_ui/abstract_builder.rb

@@ -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/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))

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/view_builder/fields.rb

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

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

@@ -3,7 +3,7 @@ json.title 'Forms'
 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'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
   form.h1 text: 'Text'
   form.fields_password name: 'user[text1]', width: 'matchParent', label: 'Type "show"'
   form.label text: 'Typed', showIf: {
@@ -29,7 +29,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
 
   form.spacer height: 20
   form.h1 text: 'Check'
-  form.fields_check name: 'user[check1]', value: 'on', label: 'Show text'
+  form.fields_check name: 'user[check1]', checkValue: 'on', label: 'Show text'
   form.spacer height: 10
   form.label text: 'Checked', showIf: {
     "==": [
@@ -70,7 +70,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
   }
 
   form.spacer height: 20
-  form.h1 text: 'Combo1'
+  form.h1 text: 'Combined conditions'
   form.label text: 'Select the same option on both the radio and select fields above'
   form.spacer height: 10
   form.h3 text: 'Same!', showIf: {
@@ -84,5 +84,22 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
     ]
   }
 
+  form.spacer height: 20
+  form.h1 text: 'Show/hide another field'
+  form.label text: ''
+  form.spacer height: 10
+  form.fields_check name: 'user[check2]', checkValue: 'on', label: 'Show field'
+  form.spacer height: 10
+  form.fields_text width: 'matchParent', label: 'Comment (optional)', name: 'user[comment]', value: 'This field can be submitted when it is hidden, but it is not necessary (i.e. up to the app)', showIf: {
+    "==": [
+      {
+        "var": 'user[check2]'
+      },
+      'on'
+    ]
+  }
+
+  form.spacer height: 20
+  form.fields_submit text: 'Submit'
   form.spacer height: 40
 end

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

@@ -7,7 +7,7 @@ json_ui_page json do |page|
     form.fields_email name: 'user[email]', width: 'matchParent', label: 'Email'
     form.fields_url name: 'user[url]', width: 'matchParent', label: 'URL'
     form.fields_number name: 'user[number]', width: 'matchParent', label: 'Number', validation: { required: { message: 'Required' } }
-    form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
+    form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password', hint: 'Should contain at least 6 characters'
     form.fields_textarea name: 'user[textarea]', width: 'matchParent', label: 'Textarea with maxLength', maxLength: 50, validation: { required: { message: 'Required' } }
 
     options = ['male', 'female'].map { |i| { text: i.humanize, value: i } }

data/lib/glib/json_crawler/action_crawlers/forms_submit.rb

@@ -31,7 +31,7 @@ module Glib
 
             include_params = case name
             when 'fields/check', 'fields/check-v1'
-              child['checked']
+              child['checkValue'] == child['value']
             else
               true
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - ''