glib-web 0.5.40 → 0.5.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b928a561f073b490adf1ea7cd8f5bfbf0da713c3cb580bc70384ea6c21579af
-  data.tar.gz: fe3fc8437847278266fd2d50cb0fb0501305a582e76f8d4696979d3375559d48
+  metadata.gz: b863f20666907aa007728759d473d1e8dad478ba7efffcb66aa94fb898536a35
+  data.tar.gz: 21e14417f6a72d74e58a8e5ee1ebce72d2a21c11c6e5ba4fb363b7a6820f4c0b
 SHA512:
-  metadata.gz: 39a4149930f9ce32a68a91fae80a6589d9829f6efffc3d62578750258cd54163e5cc05115ad476276cd0a4992f190c25626d578813d827aac2936b4054ee127e
-  data.tar.gz: d890dec1c65fb22290234d16d88597fe39d54700009ce6d55f96cb69823167f01dc4fabc709828712a52e5e2a9165c01dbc7df29761f1dbfb095566a03679c66
+  metadata.gz: 15f888278858a1e6b8ebdc9944c6abcf07e4b0746dc91ffd3694be98552026a43a664e9da8c8fb63c45c8eb31f6506c487f40b98de5c92bca3679b341612ae8d
+  data.tar.gz: 3e2bdb8dbfeddacccbe3269bfe9973bd65cb398faa25207d315d1970b951647a1854d415db4004fd6485d335186ca1286b30c2397c588ae5d0104447b0e8fe42

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

@@ -148,6 +148,7 @@ module Glib
       end
 
       class Hr < View
+        color :color
       end
 
       class Spacer < 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,16 +40,13 @@ 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 || {})
@@ -56,7 +54,6 @@ class Glib::JsonUi::ViewBuilder
           @placeholder ||= form.placeholder_label(@prop, @placeholder_args || {})
 
           @validation ||= form.field_validation(@prop)
-
         end
         json.name @name
         json.value @value if @value
@@ -68,13 +65,15 @@ class Glib::JsonUi::ViewBuilder
         # - Placeholder competes with label for space
         json.placeholder @placeholder if @placeholder
 
-        json.validation @validation if @validation
+        # TODO: Add a flag so the framework's user can turn it on and off.
+        # json.validation @validation if @validation
       end
 
     end
 
     class Text < AbstractField
       int :maxLength
+      icon :leftIcon
     end
 
     class Number < Text

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}"
@@ -88,7 +93,7 @@ class Glib::JsonUi::ViewBuilder
         json.childViews do
           if @method != :get
             json.child! do
-              json.view 'fields/hidden-v1'
+              json.view 'fields/hidden'
               json.name 'authenticity_token'
               json.value page.context.form_authenticity_token
             end

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

@@ -1,23 +1,22 @@
 json.title 'Actions'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
 
-  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
-    end, ->(section) do
-      render "#{@path_prefix}/actions/sheets", section: section
-    end, ->(section) do
-      render "#{@path_prefix}/actions/windows", section: section
-    end, ->(section) do
-      render "#{@path_prefix}/actions/timeouts", section: section
-    end, ->(section) do
-      render "#{@path_prefix}/actions/http", section: section
-    end
-  ]
-end
+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
+  end, ->(section) do
+    render "#{@path_prefix}/actions/sheets", section: section
+  end, ->(section) do
+    render "#{@path_prefix}/actions/windows", section: section
+  end, ->(section) do
+    render "#{@path_prefix}/actions/timeouts", section: section
+  end, ->(section) do
+    render "#{@path_prefix}/actions/http", section: section
+  end
+]

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

@@ -1,22 +1,21 @@
 json.title 'Forms'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
+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
-    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
-    form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
+page.form url: json_ui_garage_url(path: 'forms/basic_post'), 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'
 
-    form.panels_split width: 'matchParent', content: ->(split) do
-      split.left childViews: ->(left) do
-        if params[:mode] == 'dialog'
-          left.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
-        end
-      end
-      split.right childViews: ->(right) do
-        # right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-        right.fields_submit text: 'Submit'
+  form.panels_split width: 'matchParent', content: ->(split) do
+    split.left childViews: ->(left) do
+      if params[:mode] == 'dialog'
+        left.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
       end
     end
+    split.right childViews: ->(right) do
+      # right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+      right.fields_submit text: 'Submit'
+    end
   end
 end

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

@@ -1,44 +1,43 @@
 json.title 'Forms'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.scroll childViews: ->(scroll) do
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-    scroll.panels_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: 'Check Group'
-      form.fields_checkGroup name: 'user[skills][]', uncheckValue: 1, childViews: ->(group) do
-        form.fields_check value: 2, label: 'Game Development'
-        form.fields_check value: 3, label: 'Web Development'
-        form.fields_check value: 4, label: 'Mobile Development'
-      end
+page.scroll childViews: ->(scroll) do
+
+  scroll.panels_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: 'Check Group'
+    form.fields_checkGroup name: 'user[skills][]', uncheckValue: 1, childViews: ->(group) do
+      form.fields_check value: 2, label: 'Game Development'
+      form.fields_check value: 3, label: 'Web Development'
+      form.fields_check value: 4, label: 'Mobile Development'
+    end
 
-      form.spacer height: 20
-      form.h2 text: 'Rating'
-      form.spacer height: 6
-      form.fields_radioGroup name: 'user[rating1][]', iconOfSelected: 'star', iconOfBeforeSelected: 'star', iconOfAfterSelected: 'star_border', childViews: ->(panel) do
-        panel.panels_horizontal childViews: ->(panel) do
-          panel.fields_radio value: 1
-          panel.fields_radio value: 2
-          panel.fields_radio value: 3
-          panel.fields_radio value: 4
-          panel.fields_radio value: 5
-        end
+    form.spacer height: 20
+    form.h2 text: 'Rating'
+    form.spacer height: 6
+    form.fields_radioGroup name: 'user[rating1][]', iconOfSelected: 'star', iconOfBeforeSelected: 'star', iconOfAfterSelected: 'star_border', childViews: ->(panel) do
+      panel.panels_horizontal childViews: ->(panel) do
+        panel.fields_radio value: 1
+        panel.fields_radio value: 2
+        panel.fields_radio value: 3
+        panel.fields_radio value: 4
+        panel.fields_radio value: 5
       end
-      form.fields_radioGroup name: 'user[rating2][]', iconOfSelected: 'star', iconOfBeforeSelected: 'star', iconOfAfterSelected: 'star_border', value: 1, childViews: ->(panel) do
-        panel.panels_horizontal childViews: ->(panel) do
-          panel.fields_radio value: 1
-          panel.fields_radio value: 2
-          panel.fields_radio value: 3
-          panel.fields_radio value: 4
-          panel.fields_radio value: 5
-        end
+    end
+    form.fields_radioGroup name: 'user[rating2][]', iconOfSelected: 'star', iconOfBeforeSelected: 'star', iconOfAfterSelected: 'star_border', value: 1, childViews: ->(panel) do
+      panel.panels_horizontal childViews: ->(panel) do
+        panel.fields_radio value: 1
+        panel.fields_radio value: 2
+        panel.fields_radio value: 3
+        panel.fields_radio value: 4
+        panel.fields_radio value: 5
       end
-  
-      form.spacer height: 20
-      form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
-    
+
+    form.spacer height: 20
+    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
   end
+
 end

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

@@ -1,22 +1,57 @@
 json.title 'Forms'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
+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.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', 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' } }
+page.form \
+  url: json_ui_garage_url(path: 'forms/generic_post'),
+  method: 'post',
+  padding: glib_json_padding_body,
+  childViews: ->(form) do
+    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' } },
+      leftIcon: 'attach_money'
+
+    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 } }
-    form.fields_select name: 'user[gender]', width: 'matchParent', label: 'Gender', validation: { required: { message: 'Required' } }, options: options
+    form.fields_select \
+      name: 'user[gender]',
+      width: 'matchParent',
+      label: 'Gender',
+      validation: { required: { message: 'Required' } },
+      options: options
 
     form.spacer height: 20
-    form.fields_stripeToken name: 'user[stripe_token]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx'
+    form.fields_stripeToken \
+      name: 'user[stripe_token]',
+      width: 'matchParent',
+      publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx'
 
     form.spacer height: 30
     form.fields_submit text: 'Submit'
   end
-end

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

@@ -24,12 +24,15 @@ json.pins do
     { lat: -42.734358, lng: 147.501315 },
     { lat: -42.735258, lng: 147.438 },
     { lat: -43.999792, lng: 170.463352 },
+    { lat: 49.003109, lng: 108.490479, size: 3500000 },
+    { lat: -6.611423, lng: 141.922091, size: 3700 },
   ];
 
   locations.each do |location|
     json.child! do
       json.latitude location[:lat]
       json.longitude location[:lng]
+      json.clusterSize location[:size]
       json.infoWindow do
         json.title "TEST #{rand(1000)}"
       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

metadata

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