glib-web 0.5.37 → 0.5.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb7c646f770095389bca3804f3d1ab86c2d2dc240cdb934ccef1a16b93253be
-  data.tar.gz: fa79aaa7267315df1f0c34be561049c8a75e7ed333ad1eb630041bc7d654d0ff
+  metadata.gz: 6ab405054fbe1b42c1027a1b17f3c347be295c9321b02a0bb34be63171d1ec84
+  data.tar.gz: 0f2ee1810c68d21052d45a9c2a8c8eecfc793b4dc6cb75ade1b3055786658ba5
 SHA512:
-  metadata.gz: 3f42d123df1f2b643c0f5db79b6e6acf9bb46e3eec41a0b3575c438ff18ed21ba18b08e67d52ca8056f7f68b3b1079184f6b5e70b1c235bd6d40b56cb536548a
-  data.tar.gz: 177314114e31104840908492faf6a9042205e6586cfcefb8adc1e5004d465f56ecdbffa18d58b799335b2be19278a8fb6d8cfcbb7e04909988c3c4f8a3f941e0
+  metadata.gz: fe5d7dc16c90de11ac3202e08911df710815b510798ca1c97184faafbdd8ea9d1fe533caf04ff8e3ca40da0ffdb6e4ebed07e6b369c2693d7e833238621a88df
+  data.tar.gz: 85b8e9cb0c45abf9a5127842dc2f31f0be322e04833a28ff7bab5fbc1425f534cdee2d06cd92b6a2b7e0445d164a081edd268ad0d999c6957c4a3db63e6a4901

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

@@ -23,6 +23,7 @@ module Glib::Json::Ui
     options = {}
     options[:_render] = params[:_render]
     options[:_locale] = params[:_locale]
+    options[:_preview] = params[:_preview]
     options[:format] = :json if request.format == :json
     options
   end
@@ -56,7 +57,9 @@ module Glib::Json::Ui
       @__json_ui_activated = true
       request.variant = :ui
 
-      if request.format.html? && params[:_skip_render] != 'true'
+      # Some bots (e.g. Line and DuckDuckGo) passes `*/*` in the `Accept` header
+      is_html = request.format.html? || request.format == '*/*'
+      if is_html && params[:_skip_render] != 'true'
         @__json_ui_rendering = :vue
         request.format = 'json'
       end

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

@@ -263,6 +263,14 @@ module Glib
           end
         end
 
+        def self.menu(propName)
+          define_method(propName) do |value|
+            json.set! propName do
+              value.call(page.menu_builder)
+            end
+          end
+        end
+
         def self.singleton_array(singletonName, arrayName)
           array arrayName
 

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

@@ -7,23 +7,22 @@ module Glib
         end
 
         class AbstractTemplate < JsonUiElement
-          # def contextButtons(block)
-          #   json.contextButtons do
+          menu :leftButtons
+          menu :rightButtons
+          menu :editButtons
+          menu :chips
+
+          # def editButtons(block)
+          #   json.editButtons do
           #     block.call page.menu_builder
           #   end
           # end
 
-          def editButtons(block)
-            json.editButtons do
-              block.call page.menu_builder
-            end
-          end
-
-          def chips(block)
-            json.chips do
-              block.call page.menu_builder
-            end
-          end
+          # def chips(block)
+          #   json.chips do
+          #     block.call page.menu_builder
+          #   end
+          # end
         end
 
         class Standard < AbstractTemplate

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

@@ -48,10 +48,15 @@ module Glib
       end
 
       def json_ui_action(json)
-        @__json_ui_section ||= Page.new(json, self)
-        @__json_ui_section.action_builder
+        @__json_ui_action ||= Page.new(json, self)
+        @__json_ui_action.action_builder
       end
 
+      # def json_ui_view(json)
+      #   @__json_ui_view ||= Page.new(json, self)
+      #   @__json_ui_view.view_builder
+      # end
+
       def json_ui_action_payload(&block)
         dataJson = Jbuilder.new
         block&.call Page.new(dataJson, self).action_builder

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

@@ -30,6 +30,7 @@ module Glib
         hash :padding
         singleton_array :styleClass, :styleClasses
         hash :showIf
+        hash :valueIf
         hash :analytics
 
         # def initialize(json, page)
@@ -157,6 +158,7 @@ module Glib
         float :longitude
         int :zoom
         string :dataUrl
+        bool :cluster
       end
 
       class Chip < View

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

@@ -4,6 +4,7 @@ class Glib::JsonUi::ViewBuilder
     class AbstractField < View
       bool :readOnly
       hash :validation
+      # string :label
 
       def label(label)
         @label = label
@@ -39,20 +40,20 @@ class Glib::JsonUi::ViewBuilder
 
       def prop(prop)
         @prop = prop
-        # if (form = page.current_form)
-        #   @name ||= form.field_name(prop)
-        #   @value ||= form.field_value(prop)
-        # end
       end
 
       # Override
       def created
         if @prop && (form = page.current_form)
+          form.field_assert_respond_to(@prop)
+
           @name ||= form.field_name(@prop, @multiple || false)
           @value ||= form.field_value(@prop)
           @label ||= form.field_label(@prop, @label_args || {})
           @hint ||= form.hint_label(@prop, @hint_args || {})
           @placeholder ||= form.placeholder_label(@prop, @placeholder_args || {})
+
+          @validation ||= form.field_validation(@prop)
         end
         json.name @name
         json.value @value if @value
@@ -63,6 +64,9 @@ class Glib::JsonUi::ViewBuilder
         # - Placeholder gets hidden when there is input which may be confusing
         # - Placeholder competes with label for space
         json.placeholder @placeholder if @placeholder
+
+        # TODO: Add a flag so the framework's user can turn it on and off.
+        # json.validation @validation if @validation
       end
 
     end

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

@@ -16,6 +16,11 @@ class Glib::JsonUi::ViewBuilder
         @model.class.try(:reflect_on_association, prop)&.macro == :has_many
       end
 
+      def field_assert_respond_to(prop)
+        # Identify a prop being used on a nil model or incorrect model.
+        raise "Invalid property `#{prop}` on '#{@model.class}'" unless @model.respond_to?(prop)
+      end
+
       def field_name(prop, multiple)
         suffix = is_array_association?(prop) || multiple ? '[]' : ''
         "#{@model_name}[#{prop}]#{suffix}"
@@ -41,6 +46,16 @@ class Glib::JsonUi::ViewBuilder
         I18n.t("dt_models.#{@model_name}.#{prop}.placeholder", args.merge(default: nil))
       end
 
+      def field_validation(prop)
+        validations = {}
+        @model.class.validators_on(prop).each do |validator|
+          if validator.kind == :presence
+            validations[:required] = { message: 'Required' }
+          end
+        end
+        validations
+      end
+
       def url(url)
         @url = url
       end

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

@@ -0,0 +1,36 @@
+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/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+  form.spacer height: 20
+  form.h2 text: 'Date'
+  form.spacer height: 6
+  form.fields_date name: 'user[date_start]', width: 'matchParent', label: 'Start Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01'
+  form.fields_date name: 'user[date_end]', width: 'matchParent', label: 'End Date', min: '2010-01-01', max: '2012-01-01', valueIf: {
+    "+": [
+      {
+        "var": 'user[date_start]'
+      },
+      24 * 3600
+    ]
+  }
+
+  form.spacer height: 20
+  form.h2 text: 'Date/Time'
+  form.spacer height: 6
+  form.fields_datetime name: 'user[datetime_start]', width: 'matchParent', label: 'Start Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01T01:00'
+  form.fields_datetime name: 'user[datetime_end]', width: 'matchParent', label: 'End Date', min: '2010-01-01', max: '2012-01-01', valueIf: {
+    "+": [
+      {
+        "var": 'user[datetime_start]'
+      },
+      3600
+    ]
+  }
+
+  form.spacer height: 20
+  form.fields_submit text: 'Submit'
+  form.spacer height: 40
+end

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

@@ -36,6 +36,9 @@ json_ui_page json do |page|
         template.thumbnail title: 'Show/Hide', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/show_hide')
         end
+        template.thumbnail title: 'Conditional Value', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/conditional_value')
+        end
 
       end
     end, ->(section) do

data/app/views/json_ui/garage/lists/edit_actions.json.jbuilder

@@ -5,7 +5,18 @@ json_ui_page json do |page|
 
   page.list firstSection: ->(section) do
     section.rows builder: ->(template) do
-      template.thumbnail title: 'Click menu (web) or swipe left (Android/iOS)', editButtons: ->(menu) do
+      template.thumbnail title: 'Click menu (web) or swipe left (Android/iOS)', leftButtons: ->(menu) do
+        menu.button styleClass: 'icon', icon: 'check_box', onClick: ->(subaction) do
+          subaction.dialogs_alert message: 'Tick/untick'
+        end
+      end, rightButtons: ->(menu) do
+        menu.button styleClass: 'icon', icon: 'share', onClick: ->(subaction) do
+          subaction.dialogs_alert message: 'Share'
+        end
+        menu.button styleClass: 'icon', icon: 'open_in_new', onClick: ->(subaction) do
+          subaction.dialogs_alert message: 'Open'
+        end
+      end, editButtons: ->(menu) do
         menu.button text: 'Edit', onClick: ->(action) do
           action.dialogs_alert message: 'Perform action'
         end

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

@@ -8,7 +8,7 @@ json_ui_page json do |page|
       template.thumbnail icon: 'list', title: 'Templating', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/templating')
       end
-      template.thumbnail title: 'Edit Actions', onClick: ->(action) do
+      template.thumbnail title: 'Action Buttons', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/edit_actions')
       end
       template.thumbnail title: 'FAB (Floating Action Button)', onClick: ->(action) do

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

@@ -22,6 +22,9 @@ json_ui_page json do |page|
         template.thumbnail title: 'Banners', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/banners')
         end
+        template.thumbnail title: 'Maps', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'views/maps')
+        end
         template.thumbnail title: 'Misc', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'views/misc')
         end

data/app/views/json_ui/garage/views/map_cluster_data.json.jbuilder

@@ -0,0 +1,38 @@
+
+json.pins do
+  locations = [
+    { lat: -31.56391, lng: 147.154312 },
+    { lat: -33.718234, lng: 150.363181 },
+    { lat: -33.727111, lng: 150.371124 },
+    { lat: -33.848588, lng: 151.209834 },
+    { lat: -33.851702, lng: 151.216968 },
+    { lat: -34.671264, lng: 150.863657 },
+    { lat: -35.304724, lng: 148.662905 },
+    { lat: -36.817685, lng: 175.699196 },
+    { lat: -36.828611, lng: 175.790222 },
+    { lat: -37.75, lng: 145.116667 },
+    { lat: -37.759859, lng: 145.128708 },
+    { lat: -37.765015, lng: 145.133858 },
+    { lat: -37.770104, lng: 145.143299 },
+    { lat: -37.7737, lng: 145.145187 },
+    { lat: -37.774785, lng: 145.137978 },
+    { lat: -37.819616, lng: 144.968119 },
+    { lat: -38.330766, lng: 144.695692 },
+    { lat: -39.927193, lng: 175.053218 },
+    { lat: -41.330162, lng: 174.865694 },
+    { lat: -42.734358, lng: 147.439506 },
+    { lat: -42.734358, lng: 147.501315 },
+    { lat: -42.735258, lng: 147.438 },
+    { lat: -43.999792, lng: 170.463352 },
+  ];
+
+  locations.each do |location|
+    json.child! do
+      json.latitude location[:lat]
+      json.longitude location[:lng]
+      json.infoWindow do
+        json.title "TEST #{rand(1000)}"
+      end
+    end
+  end
+end

data/app/views/json_ui/garage/views/map_data.json.jbuilder

@@ -1,6 +1,7 @@
 
-json.pins do
+page = json_ui_page json
 
+json.pins do
   latitude = params[:lat]&.to_f
   longitude = params[:long]&.to_f
 
@@ -37,7 +38,14 @@ json.pins do
     json.infoWindow do
       json.title 'You'
       json.subtitle 'Current location'
-      json.subsubtitle "#{latitude}, #{longitude}"
+
+      json.body do
+        page.vertical_content padding: { top: 10 }, childViews: ->(body) do
+          body.button text: 'Info', onClick: ->(action) do
+            action.dialogs_alert message: "#{latitude}, #{longitude}"
+          end
+        end
+      end
     end
   end
 end

data/app/views/json_ui/garage/views/maps.json.jbuilder

@@ -0,0 +1,31 @@
+json.title 'Views'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+    scroll.spacer height: 20
+    scroll.h2 text: 'Map with Markers'
+    scroll.spacer height: 6
+    scroll.map \
+      width: 'matchParent',
+      latitude: 13.4837,
+      longitude: 144.7917,
+      zoom: 11,
+      height: 250,
+      dataUrl: json_ui_garage_url(path: 'views/map_data')
+
+    scroll.spacer height: 20
+    scroll.h2 text: 'Map with Clustered Markers'
+    scroll.spacer height: 6
+    scroll.map \
+      width: 'matchParent',
+      latitude: -42.162376,
+      longitude: 172.671437,
+      zoom: 7,
+      height: 480,
+      cluster: true,
+      dataUrl: json_ui_garage_url(path: 'views/map_cluster_data')
+
+  end
+end

data/app/views/json_ui/garage/views/misc.json.jbuilder

@@ -20,10 +20,10 @@ json_ui_page json do |page|
     scroll.datetime value: 1.week.ago, format: 'YYYY-MM-DD'
     scroll.datetime value: DateTime.current, format: 'hh:mm:ss', tick: true
 
-    scroll.spacer height: 20
-    scroll.h2 text: 'Map'
-    scroll.spacer height: 6
-    scroll.map width: 'matchParent', latitude: 13.4837, longitude: 144.7917, zoom: 11, height: 250, dataUrl: json_ui_garage_url(path: 'views/map_data')
+    # scroll.spacer height: 20
+    # scroll.h2 text: 'Map'
+    # scroll.spacer height: 6
+    # scroll.map width: 'matchParent', latitude: 13.4837, longitude: 144.7917, zoom: 11, height: 250, dataUrl: json_ui_garage_url(path: 'views/map_data')
 
     scroll.spacer height: 20
     scroll.h2 text: 'Calendar'

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

@@ -10,7 +10,9 @@ module Glib
           crawl left_drawer['rows']
         end
 
-        perform(json['onLoad'])
+        if (on_load = (args.fetch('onLoad', nil)))
+          perform(on_load)
+        end
       end
     end
   end

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

@@ -22,7 +22,9 @@ module Glib
               end
             end
 
-            perform(json['onLoad'])
+            if (on_load = (args.fetch('onLoad', nil)))
+              perform(on_load)
+            end
           end
         end
       end

data/lib/glib/json_crawler/router.rb

@@ -30,8 +30,8 @@ module Glib
         end
 
         if args.is_a?(Hash) && args['rel'] != 'nofollow'
-          if (onClick = (args.fetch('onClick', nil)))
-            process_action(http, onClick)
+          if (on_click = (args.fetch('onClick', nil)))
+            process_action(http, on_click)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.42
 platform: ruby
 authors:
 - ''
@@ -125,6 +125,7 @@ files:
 - 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
+- app/views/json_ui/garage/forms/conditional_value.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_group.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_select.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder
@@ -197,7 +198,9 @@ files:
 - app/views/json_ui/garage/views/images.json.jbuilder
 - app/views/json_ui/garage/views/index.json.jbuilder
 - app/views/json_ui/garage/views/links.json.jbuilder
+- app/views/json_ui/garage/views/map_cluster_data.json.jbuilder
 - app/views/json_ui/garage/views/map_data.json.jbuilder
+- app/views/json_ui/garage/views/maps.json.jbuilder
 - app/views/json_ui/garage/views/markdowns.json.jbuilder
 - app/views/json_ui/garage/views/misc.json.jbuilder
 - app/views/json_ui/garage/views/texts.json.jbuilder