glib-web 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3adb040610928c28643f3b77533d8801492d903
-  data.tar.gz: 480c9264c9cf49e6ef035a298a910e512ee29a52
+  metadata.gz: 28296441cfbabaa9915d315407f81ee8ff6c3d0f
+  data.tar.gz: 44bafc6c627fe454fca1630bd9e3288f8c71b52c
 SHA512:
-  metadata.gz: 0b0a885853c31a7f21d06abccca26f08d219f56fa70dd276746f3c21cc741a5803f28ca3ee69dfeb837a8e64772d8c008cf4c75990f721a96f39fc2a786ad979
-  data.tar.gz: '095bbad9b01f7af4798bd1f813d5b5843af1c58ccd947956ca80982c228de9831e972f503e188c387cfced23459734b732531441529305b3b770218cfcc8d1a2'
+  metadata.gz: 6e043b39a9176c67a66027b2aed616d9c0b30c423047c72e3a48a075c5854ab85ae75e8ef50050b7a00faf6ad9afe535231e17b422642cf6c4c2a60e8be19ac0
+  data.tar.gz: e35a72b90a294c8cfee957d62788dab43a78801308cb17db43d0889ffce133e97175102456b70a4b5df6607ba3b10969719169dccafbb4d5758d7d585ff4c926

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

@@ -123,9 +123,11 @@ module Glib
         end
       end
 
-      def self.string propName
-        define_method(propName) do |value| 
-          json.set! propName, value&.to_s
+      def self.string propName, options = {}
+        define_method(propName) do |value|
+          str = value&.to_s 
+          instance_variable_set("@#{propName}", str) if options[:cache]
+          json.set! propName, str
         end
       end
 
@@ -147,12 +149,15 @@ module Glib
         end
       end
 
-      def self.icon propName
+      def self.icon propName, options = {}
         define_method(propName) do |value|
+          
           if value.is_a?(Hash)
+            name = value[:name]
+
             json.set!(propName) do
               json.set value[:set] || 'material'
-              json.name value[:name]
+              json.name name
 
               if (badge = value[:badge]).is_a?(Hash)
                 json.badge badge
@@ -164,10 +169,15 @@ module Glib
               
             end
           else
+            name = value
+
             json.set!(propName) do
-              json.name value
+              json.name name
             end
           end 
+
+          instance_variable_set("@#{propName}", name) if options[:cache]
+          
         end
       end
       

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

@@ -6,6 +6,34 @@ module Glib
       end
       
       class Action < JsonUiElement
+        def analytics(value)
+          if value.is_a?(String)
+            @analyticsEnabled = true
+            @analyticsId = value
+          else
+            @analyticsEnabled = value == true
+          end
+        end
+
+        # Override
+        def created
+          if @analyticsEnabled
+            suffix = @analyticsId
+            # TODO: recognize_path() needs `method` as a second argument for POST request
+            if suffix.nil? && @url && (route = Rails.application.routes.recognize_path(@url))
+              suffix = "#{route[:controller]}_#{route[:action]}"
+            end
+
+            if suffix
+              json.analytics do
+                json.track :event
+                json.nameSuffix suffix
+              end
+            end
+
+          end
+        end
+
       end
 
       ### Action definitions
@@ -33,7 +61,7 @@ module Glib
         end
         
         class Open < Action
-          string :url
+          string :url, cache: true
         end
         
         # Consider renaming to ShowSnackbar
@@ -59,7 +87,7 @@ module Glib
         end
       
         class Open < Action
-          string :url
+          string :url, cache: true
         end
       
         class OpenWeb < Action
@@ -67,7 +95,7 @@ module Glib
         end
         
         class Reload < Action
-          string :url
+          string :url, cache: true
         end
       end
 
@@ -93,17 +121,17 @@ module Glib
 
       module Http
         class Post < Action
-          string :url
+          string :url, cache: true
           hash :formData
         end
       
         class Patch < Action
-          string :url
+          string :url, cache: true
           hash :formData
         end
       
         class Delete < Action
-          string :url
+          string :url, cache: true
           hash :formData
         end
       

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

@@ -16,6 +16,27 @@ module Glib
         hash :padding
         array :styleClasses
         singleton_array :styleClass, :styleClasses
+
+        def analytics(value)
+          if value.is_a?(String)
+            @analyticsEnabled = true
+            @analyticsId = value
+          else
+            @analyticsEnabled = value == true
+          end
+        end
+
+        # Override
+        def created
+          if @analyticsEnabled
+            context = page.context
+            json.analytics do
+              content = @analyticsId || (@text || @icon)&.gsub(/\s+/, '_')&.downcase || 'nil'
+              json.namePrefix [context.controller_name, context.action_name, content].join('_')
+            end
+          end
+        end
+
       end
 
       ### View definitions
@@ -44,8 +65,8 @@ module Glib
       end
 
       class Button < View
-        icon :icon
-        string :text
+        icon :icon, cache: true
+        string :text, cache: true
         action :onClick
         color :color
       end

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

@@ -61,10 +61,12 @@ class Glib::JsonUi::ViewBuilder
         # end
 
         json.childViews do
-          json.child! do
-            json.view 'fields/hidden-v1'
-            json.name 'authenticity_token'
-            json.value page.context.form_authenticity_token
+          if @method.downcase != 'get'
+            json.child! do
+              json.view 'fields/hidden-v1'
+              json.name 'authenticity_token'
+              json.value page.context.form_authenticity_token
+            end
           end
 
           # if insert_method_field

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

@@ -1,4 +1,4 @@
-info = "Submitted information:\n{\n"
+info = "Method: #{request.method}\nForm Data:\n{\n"
 params.require(:user).each do |k, v|
   value = v.is_a?(String) ? '"' + v + '"' : v
   info += "  #{k} => #{value}\n"

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

@@ -0,0 +1,22 @@
+json.title 'Forms'
+
+data = params[:user] || {}
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+  page.form url: json_ui_garage_url(path: 'forms/get_request'), method: 'get', padding: json_padding_body, childViews: ->(form) do
+    # TODO: Potential improvement: 
+    # Use `reload` behaviour instead of `open` (i.e. don't keep adding URL to history).
+    # Probably introduce a flag to panels_form so developer can enable/disable this behaviour.
+    form.h3 text: "Hello #{ data[:name] }"
+    form.spacer height: 6
+    form.label text: 'On the web, upon submit, URL needs to change on the browser'
+    form.spacer height: 10
+    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+    
+    form.panels_split width: 'matchParent', rightViews: ->(split) do
+      split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    end
+  end
+end

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

@@ -22,6 +22,9 @@ json_ui_page json do |page|
         template.thumbnail title: 'Text Validation', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/text_validation')
         end
+        template.thumbnail title: 'GET Request', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/get_request')
+        end
         
       end
     end, ->(section) do
@@ -30,9 +33,12 @@ json_ui_page json do |page|
       end
 
       section.rows builder: ->(template) do
-        template.thumbnail title: 'Pickers (TODO: ios, android)', onClick: ->(action) do
+        template.thumbnail title: 'Pickers', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/pickers')
         end
+        template.thumbnail title: 'Select Fields', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/selects')
+        end
         template.thumbnail title: 'File Upload', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/file_upload')
         end

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

@@ -17,20 +17,20 @@ json_ui_page json do |page|
     form.fields_check name: 'user[age_range]', value: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
     form.fields_check name: 'user[employer]', value: 1, label: 'I am an employer (no default value)'
 
-    form.spacer height: 20
-    form.h2 text: 'Select'
-    form.spacer height: 6
-    languages = {
-      'zh-HK' => 'Hong Kong',
-      'zh-TW' => 'Taiwan',
-      'zh-CN' => 'China',
-      'ja-JP' => 'Japan',
-      'ko-KR' => 'Korea',
-      'ru-RU' => 'Russian',
-      'en-PH' => 'Philippines'
-    }
-    form.fields_select name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language', options: languages.map { |k, v| { value: k, text: v } }, value: 'ja-JP'
-    form.fields_select name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', options: languages.map { |k, v| { value: k, text: v } }, value: ['ja-JP', 'ko-KR'], multiple: true
+    # form.spacer height: 20
+    # form.h2 text: 'Select'
+    # form.spacer height: 6
+    # languages = {
+    #   'zh-HK' => 'Hong Kong',
+    #   'zh-TW' => 'Taiwan',
+    #   'zh-CN' => 'China',
+    #   'ja-JP' => 'Japan',
+    #   'ko-KR' => 'Korea',
+    #   'ru-RU' => 'Russian',
+    #   'en-PH' => 'Philippines'
+    # }
+    # form.fields_select name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language', options: languages.map { |k, v| { value: k, text: v } }, value: 'ja-JP'
+    # form.fields_select name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', options: languages.map { |k, v| { value: k, text: v } }, value: ['ja-JP', 'ko-KR'], multiple: true
 
     form.spacer height: 20
     form.h2 text: 'Date/Time'

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

@@ -0,0 +1,41 @@
+json.title 'Forms'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+  page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: json_padding_body, childViews: ->(form) do
+
+    form.spacer height: 20
+    form.h2 text: 'Basic select fields'
+    form.spacer height: 6
+    languages = {
+      'zh-HK' => 'Hong Kong',
+      'zh-TW' => 'Taiwan',
+      'zh-CN' => 'China',
+      'ja-JP' => 'Japan',
+      'ko-KR' => 'Korea',
+      'ru-RU' => 'Russian',
+      'en-PH' => 'Philippines'
+    }
+    form.fields_select name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language', options: languages.map { |k, v| { value: k, text: v } }, value: 'ja-JP'
+    form.fields_select name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', options: languages.map { |k, v| { value: k, text: v } }, value: ['ja-JP', 'ko-KR'], multiple: true
+
+    form.spacer height: 20
+    form.h2 text: 'Select fields with manual entry'
+    form.spacer height: 6
+    skills = ['Singing', 'Dancing', 'Fighting']
+    form.fields_select name: 'user[skill]', width: 'matchParent', label: 'Skill', options: skills, value: 'Singing', manualEntry: true
+    form.fields_select name: 'user[skills][]', width: 'matchParent', label: 'Skills', options: skills, value: ['Dancing', 'Fencing'], multiple: true, manualEntry: true
+
+    form.spacer height: 20
+    form.h2 text: 'Select fields with auto complete'
+    form.spacer height: 6
+    form.label text: 'Applicable to select fields with many options'
+    form.spacer height: 6
+    # TODO
+
+    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+
+  end
+
+end

data/app/views/json_ui/garage/home/blank.json.jbuilder

@@ -1,3 +1,5 @@
+sleep 0.5
+
 json.title 'Menu'
 
 json_ui_page json do |page|

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

@@ -11,6 +11,13 @@ json_ui_page json do |page|
       action.windows_open url: json_ui_garage_url(path: 'home/blank')
     end
 
+    scroll.spacer height: 20
+    scroll.h2 text: 'Button with icon'
+    scroll.spacer height: 6
+    scroll.button icon: 'info', text: 'Button', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    end
+
     scroll.spacer height: 20
     scroll.h2 text: 'Button with link style'
     scroll.spacer height: 6
@@ -34,6 +41,9 @@ json_ui_page json do |page|
       action.windows_open url: json_ui_garage_url(path: 'home/blank')
     end
 
+    scroll.fab icon: 'add', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - ''
@@ -58,9 +58,11 @@ files:
 - app/views/json_ui/garage/forms/file_upload.json.jbuilder
 - app/views/json_ui/garage/forms/floating_submit.json.jbuilder
 - app/views/json_ui/garage/forms/generic_post.json.jbuilder
+- app/views/json_ui/garage/forms/get_request.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
 - app/views/json_ui/garage/forms/pickers.json.jbuilder
 - app/views/json_ui/garage/forms/rich_text.json.jbuilder
+- app/views/json_ui/garage/forms/selects.json.jbuilder
 - app/views/json_ui/garage/forms/submission_flow.json.jbuilder
 - app/views/json_ui/garage/forms/submission_flow_post.json.jbuilder
 - app/views/json_ui/garage/forms/submission_indicator.json.jbuilder