glib-web 0.5.48 → 0.5.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096278d9b11151bcb169ba83f5c62c080471bb076f8ea3d34913e898a9537382'
-  data.tar.gz: bb831b31d185198292f251cbc3e9ab4536b1c4f3e3a28ceb32a5c7b76c25cba6
+  metadata.gz: b12f4b3c8c68a3186c98a87a2b5a50bdc6720d04926b042c48c21116eae6062f
+  data.tar.gz: 2e2423b34dc9ad34a0c8e38cbf7c5178eb71e861062dbe7dd4286f39e1a002d0
 SHA512:
-  metadata.gz: fcbb3bded93e840d4db717c74a78bd16537e405bdc2262343274604f9940d0b768256e6df5e01225d9f699d422693f5030e0156e5b9a596a4b685575355e8347
-  data.tar.gz: 99c46875985b061cea7e7932bb2a86c7b1d0f613c205ec15207cf212f1703df44eb6a03bffd81a5dfbd64e5b5a89b09d5f18ca830d48b2d95b6e8260bca065e0
+  metadata.gz: 1e54bfdd8bf13af51abbc7b81067acfdf2efda44cbc6c277b361e6de797898e8f597f34de810da521cfe589e7832970a23f1a7f5adcd8e5946609245f43914bc
+  data.tar.gz: 1fc0990f8ac4287cb011b7e818b3c470a4974aed979d8211277cb61557cece79c860e7c2ac98258cd42855ce1699cd82dc981021f3ae1362f12cb446a163aed3

data/app/channels/glib/channel/is_typing_channel.rb

@@ -0,0 +1,28 @@
+module Glib
+  module Channel
+    class IsTypingChannel < ApplicationCable::Channel
+      class << self
+        attr_accessor :channel_name
+      end
+
+      def channel_name
+        self.class.channel_name
+      end
+
+      def subscribed
+        stream_from "#{self.class.channel_name}_#{params['conversation_id']}"
+      end
+
+      def typing(data)
+        ActionCable.server.broadcast \
+          "#{self.class.channel_name}_#{params['conversation_id']}",
+          action: {
+            action: 'component/set',
+            name: User.find(data['user_id']).full_name,
+            status: data['status'],
+            user_id: data['user_id']
+          }
+      end
+    end
+  end
+end

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

@@ -73,6 +73,11 @@ module Glib::Json::Traversal
       traverse_vertical_content view['center'], block
       traverse_vertical_content view['right'], block
 
+      # List template
+      traverse_multiple view['editButtons'], block
+      traverse_multiple view['leftButtons'], block
+      traverse_multiple view['rightButtons'], block
+
       # TODO: crawl header and footer
       # Table/List
       if (sections = view['sections']).is_a? Array

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

@@ -99,6 +99,7 @@ module Glib
         class Push < Action
           string :channel
           string :event
+          hash :payload
         end
       end
 

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

@@ -22,5 +22,10 @@ class Glib::JsonUi::ActionBuilder
       string :url, cache: true
       action :onReload
     end
+
+    class CloseWithReload < Action
+      string :fallbackUrl
+      action :onReload
+    end
   end
 end

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

@@ -38,7 +38,11 @@ module Glib
           bool :avatar
           action :onReorder
           string :paramNameForFormData
-          string :paramNameForNewIndex
+          string :paramNameForNewAbsoluteIndex
+          string :paramNameForNewSectionIndex
+          string :paramNameForNewSectionedRowIndex
+
+          string :paramNameForNewIndex # Deprecated
 
           # # NOTE: Experimental. Still deciding whether this needs to be a full blown panel or
           # # an array of badges (with relevant properties, e.g. text, color, etc)

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

@@ -109,6 +109,7 @@ module Glib
       end
 
       class Label < AbstractText
+        hash :actionCable
         # string :format
         action :onClick
       end

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

@@ -12,6 +12,7 @@ class Glib::JsonUi::ViewBuilder
       icon :icon
       string :message
       singleton_array :styleClass, :styleClasses
+      color :color
 
       def buttons(block)
         json.buttons do

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

@@ -76,6 +76,8 @@ class Glib::JsonUi::ViewBuilder
       icon :leftIcon
       string :leftText
       string :rightText
+      action :onTypeStart
+      action :onTypeEnd
     end
 
     class Number < Text
@@ -234,5 +236,11 @@ class Glib::JsonUi::ViewBuilder
     class CreditCard < AbstractField
       string :publicKey
     end
+
+    class Rating < AbstractField
+      bool    :halfIncrements
+      string  :color
+      int     :size
+    end
   end
 end

data/app/helpers/glib/urls_helper.rb

@@ -3,5 +3,10 @@ module Glib
     def glib_url_current(new_params)
       url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
     end
+
+    def glib_url_equals_current?(url)
+      route = Rails.application.routes.recognize_path(url)
+      route[:controller] == controller_name && route[:action] == action_name
+    end
   end
 end

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

@@ -16,7 +16,7 @@ page.list sections: [
       template.thumbnail title: "Submission Flow (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/submission_flow')
       end
-      template.thumbnail title: "Submission Indicator", onClick: ->(action) do
+      template.thumbnail title: 'Submission Indicator', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/submission_indicator')
       end
       template.thumbnail title: 'GET Request', onClick: ->(action) do
@@ -59,7 +59,6 @@ page.list sections: [
       template.thumbnail title: 'Floating Submit', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/floating_submit')
       end
-
     end
   end, ->(section) do
     section.header padding: glib_json_padding_list, childViews: ->(header) do

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

@@ -3,7 +3,12 @@ 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
+page.form \
+  url: json_ui_garage_url(path: 'forms/generic_post'),
+  method: 'post',
+  padding: glib_json_padding_body,
+  childViews: ->(form) do
+
   form.h2 text: 'Radio Group'
   form.spacer height: 6
   form.h4 text: 'Gender'
@@ -15,15 +20,40 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
 
   form.spacer height: 20
   form.h2 text: 'Single Checkbox'
-  form.fields_check name: 'user[age_range]', value: '16+', checkValue: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
-  form.fields_check name: 'user[employer]', checkValue: 1, label: 'I am an employer (no default value)'
-  form.fields_check name: 'user[enabled]', checkValue: true, label: 'Enable', styleClass: 'switch', value: 'true'
+  form.fields_check \
+    name: 'user[age_range]',
+    value: '16+',
+    checkValue: '16+',
+    uncheckValue: '0-16',
+    label: 'I am over 16 (has default value)'
+  form.fields_check \
+    name: 'user[employer]',
+    checkValue: 1,
+    label: 'I am an employer (no default value)'
+  form.fields_check \
+    name: 'user[enabled]',
+    checkValue: true,
+    label: 'Enable',
+    styleClass: 'switch',
+    value: 'true'
 
   form.spacer height: 20
   form.h2 text: 'Date/Time'
   form.spacer height: 6
-  form.fields_date name: 'user[date]', width: 'matchParent', label: 'Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01'
-  form.fields_datetime name: 'user[date_time]', width: 'matchParent', label: 'Date Time', min: '2018-06-09T00:00', max: '2018-06-17T00:00', value: '2018-06-15T19:30'
+  form.fields_date \
+    name: 'user[date]',
+    width: 'matchParent',
+    label: 'Date',
+    min: '2010-01-01',
+    max: '2012-01-01',
+    value: '2010-02-01'
+  form.fields_datetime \
+    name: 'user[date_time]',
+    width: 'matchParent',
+    label: 'Date Time',
+    min: '2018-06-09T00:00',
+    max: '2018-06-17T00:00',
+    value: '2018-06-15T19:30'
 
   form.spacer height: 20
   form.h2 text: 'Country'
@@ -34,13 +64,39 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
   form.spacer height: 20
   form.h2 text: 'Map'
   form.spacer height: 6
-  form.fields_location name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
+  form.fields_location \
+    name: 'user[address]',
+    width: 'matchParent',
+    label: 'Type an address',
+    value: 'Sydney Harbour Bridge',
     autocompleteOptions: { componentRestrictions: { country: 'au' }, types: ['(cities)'] },
     latitudeField: { view: 'fields/text', name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
     longitudeField: { view: 'fields/text', name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true },
     zoomField: { view: 'fields/text', name: 'user[zoom]', label: 'Zoom' }
 
   form.spacer height: 20
-  form.fields_submit text: 'Submit'
+  form.h2 text: 'Rating'
+  form.spacer height: 6
+  form.fields_rating \
+    name: 'user[rating_summary1]',
+    value: 1,
+    color: 'primary'
+  form.fields_rating \
+    name: 'user[rating_summary2]',
+    value: 1.5,
+    halfIncrements: true,
+    color: 'secondary'
+  form.fields_rating \
+    name: 'user[rating_summary3]',
+    value: 2,
+    color: 'ternary',
+    size: 35
+  form.fields_rating \
+    name: 'user[rating_summary4]',
+    value: 3,
+    readOnly: true,
+    size: 40
 
+  form.spacer height: 20
+  form.fields_submit text: 'Submit'
 end

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

@@ -2,15 +2,15 @@ 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/submission_flow_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
     form.fields_radioGroup name: 'user[flow]', childViews: ->(group) do
       group.h3 text: 'Flow'
       group.spacer height: 6
-      group.fields_radio value: 'close_reload', label: 'close+reload - useful for form submission in mobile apps'
-      group.fields_radio value: 'open', label: 'open - useful for form submission in web app'
-      group.fields_radio value: 'close_alert', label: 'close+alert - useful for non-model form (e.g. contact us) in both mobile/web'
-      group.fields_radio value: 'alert_close', label: 'alert+close - useful for non-model form (e.g. contact us) in both mobile/web'
+      group.fields_radio value: 'open', label: 'open - useful for form create'
+      group.fields_radio value: 'close_with_reload', label: 'closeWithReload - useful for form update'
+      group.fields_radio value: 'close_alert', label: 'close+alert - useful for non-model form (e.g. contact us)'
+      group.fields_radio value: 'alert_close', label: 'alert+close - useful for non-model form (e.g. contact us)'
     end
     form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
   end

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

@@ -5,10 +5,12 @@ json_ui_response json do |action|
     action.dialogs_alert message: 'Please enter all required information'
   else
     case flow
-    when 'close_reload'
-      action.windows_close onClose: ->(action) do
-        action.windows_reload
-      end
+    when 'close_with_reload'
+      # action.windows_close onClose: ->(action) do
+      #   action.windows_reload
+      # end
+
+      action.windows_closeWithReload fallbackUrl: json_ui_garage_url(path: 'forms/index')
     when 'close_alert'
       action.windows_close onClose: ->(action) do
         action.dialogs_alert message: 'Thanks for the submission!'

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

@@ -2,30 +2,34 @@ json.title 'Menu'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
-  
+
   page.list firstSection: ->(section) do
     section.rows builder: ->(template) do
-      template.thumbnail title: 'Pages', onClick: ->(action) do 
+      template.thumbnail title: 'Pages', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/index')
       end
-      template.thumbnail title: 'Lists', onClick: ->(action) do 
+      template.thumbnail title: 'Panels', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'panels/index')
+      end
+      template.thumbnail title: 'Lists', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/index')
       end
-      template.thumbnail title: 'Forms', onClick: ->(action) do 
+      template.thumbnail title: 'Forms', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/index')
       end
-      template.thumbnail title: 'Panels', onClick: ->(action) do 
-        action.windows_open url: json_ui_garage_url(path: 'panels/index')
-      end
-      template.thumbnail title: 'Views', onClick: ->(action) do 
+      template.thumbnail title: 'Views', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'views/index')
       end
-      template.thumbnail title: 'Actions', onClick: ->(action) do 
+      template.thumbnail title: 'Actions', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'actions/index')
       end
-      template.thumbnail title: 'Tables (Web Only)', onClick: ->(action) do 
+      template.thumbnail title: 'Tables (Web Only)', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'tables/index')
       end
+      # Disabled to prevent errors in crawler tests due to external dependencies
+      # template.thumbnail title: 'Services', onClick: ->(action) do
+      #   action.windows_open url: json_ui_garage_url(path: 'services/index')
+      # end
     end
 
   end

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

@@ -18,7 +18,17 @@ else
 
   render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  page.list nextPage: next_page, firstSection: ->(section) do
-    render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index, reorder: true
-  end
+  page.list nextPage: next_page, sections: [
+    ->(section) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
+        header.h3 text: 'Section One'
+      end
+    end,
+    ->(section) do
+      section.header padding: glib_json_padding_list, childViews: ->(header) do
+        header.h3 text: 'Section Two'
+      end
+      render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index, reorder: true
+    end
+  ]
 end

data/app/views/json_ui/garage/notifications/action_cable.json.jbuilder

@@ -1,3 +1,4 @@
+json.title 'ActionCable Real-time Update'
 page = json_ui_page json
 
 # Implement a page that shows how ActionCable works in json_ui
@@ -9,14 +10,16 @@ page = json_ui_page json
 #   end
 # end
 
-# 2. Example for textarea
-#    - TODO: Put onKeyUp in Textarea class in app/helpers/glib/json_ui/view_builder/fields.rb
-#    - TODO: Implement onKeyUp in glib-web-npm
-#    - TODO: Implement cables_push in glib-web-npm
-# form.fields_textarea prop: :content, width: 'matchParent', label: 'Message', onKeyUp: ->(action) do
-#   action.cables_push channel: 'message', event: 'typing'
+# page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+#   form.fields_textarea \
+#     width: 'matchParent',
+#     label: 'Message',
+#     onKeyUp: ->(action) do
+#       action.cables_push channel: 'isTypingChannel', data: { conversationId: 1, userId: 1 }
+#     end
 # end
 
+
 # 3. Example for online status
 #    - TODO: Implement "repeat: true" in glib-web-npm
 # page.on load: ->(action) do
@@ -24,3 +27,71 @@ page = json_ui_page json
 #     subaction.cables_push channel: 'message', event: 'online'
 #   end
 # end
+
+
+# put on app/channels/is_typing_channel.rb
+# class IsTypingChannel < Glib::Channel::IsTypingChannel
+#   self.channel_name = 'IsTypingChannel'
+# end
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+
+  channel = 'IsTypingChannel'
+  first_user = User.first
+  second_user = User.offset(1).first
+
+  scroll.panels_split width: 'matchParent', content: ->(content) do
+    content.left childViews: ->(left) do
+      left.fields_textarea \
+        width: 440,
+        label: "Messages from #{first_user.full_name}",
+        onTypeStart: lambda { |action|
+          action.cables_push \
+            channel: channel, event: 'typing',
+            payload: { status: true, user_id: first_user.id }
+        },
+        onTypeEnd: lambda { |action|
+          action.cables_push \
+            channel: channel,
+            event: 'typing',
+            payload: { status: false, user_id: first_user.id }
+        }
+      left.spacer height: 10
+
+      socket_config = {
+        channel: channel,
+        filterKey: first_user.id,
+        params: {
+          conversation: 2
+        }
+      }
+      left.label actionCable: socket_config, text: ' '
+    end
+    content.right childViews: ->(right) do
+      right.fields_textarea \
+        width: 440,
+        label: "Messages from #{second_user.full_name}",
+        onTypeStart: lambda { |action|
+          action.cables_push \
+            channel: channel, event: 'typing',
+            payload: { status: true, user_id: second_user.id }
+        },
+        onTypeEnd: lambda { |action|
+          action.cables_push \
+            channel: channel,
+            event: 'typing',
+            payload: { status: false, user_id: second_user.id }
+        }
+      right.spacer height: 10
+
+      socket_config = {
+        channel: channel,
+        filterKey: second_user.id,
+        params: {
+          conversation: 2
+        }
+      }
+      right.label actionCable: socket_config, text: ' '
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.48
+  version: 0.5.54
 platform: ruby
 authors:
 - ''
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -58,12 +52,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: actioncable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.1
 description: 
 email: ''
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/channels/glib/channel/is_typing_channel.rb
 - app/controllers/concerns/glib/analytics/funnel.rb
 - app/controllers/concerns/glib/auth/policy.rb
 - app/controllers/concerns/glib/json/dynamic_text.rb
@@ -254,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ''