glib-web 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832af08d8701c658362e9974f4a9ed5a52c5bb5f
-  data.tar.gz: 81b729e8cc79ee02437eb96b715ad8e4ccd86283
+  metadata.gz: 3a631905663a326cc5d4da2aa0be179812d12aae
+  data.tar.gz: a167fd02e4db101e5067832225762ba410bc401b
 SHA512:
-  metadata.gz: 2ee4d1c3b862f97349c17d9d638766006ad47832b26b7abc46d8976139012f1ab2fbe23bf931c0fc36623f06c7a7ae8802e8d766044c9c11a4194a8684214875
-  data.tar.gz: 1d76aa4197f3d12d3131b3224e83d76fe7d8c3aa54a8a258945ca2f76f8b690ef4f281d3d961d3a9b785c8660bb6d66a9ccb45ebc1494a57e2b53162df512ce2
+  metadata.gz: 0a5094637dbe44532c384bd7e30a49bb3dd5377ef87cee6ea13da3528620aae8f2a43eba21f3077df4530a3356087851dcbd8be150d72a3ff1af70b4b3493afb
+  data.tar.gz: 03b85596d99b043700a6818feef54b6e45017e905800358502052a68bdf0d6cb472c64bc9bb352849a9628b587479bfbab41314da1543cb1f92317371639ac07

data/app/controllers/glib/home_controller.rb

@@ -1,6 +1,6 @@
 module Glib
   class HomeController < ApplicationController
-    if glib_auth_inited?
+    if try(:glib_auth_inited?)
       skip_before_action :glib_load_resource
       skip_before_action :glib_authorize_resource
     end

data/app/helpers/glib/app_feature_support_helper.rb

@@ -0,0 +1,16 @@
+module Glib
+  module AppFeatureSupportHelper
+    def glib_app_feature_supported?(name, app_version, dictionary)
+      device = (app_device_os || :default).to_sym
+
+      version = dictionary[name.to_sym].try(:[], device)
+      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
+
+      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
+    end
+
+    def glib_app_version_gte(feature_version, app_version)
+      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
+    end
+  end
+end

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

@@ -41,6 +41,11 @@ module Glib
 
         class Custom < Thumbnail
           string :template
+
+          # TODO: Experimental
+          hash :extra
+
+          # TODO: Deprecate
           hash :data
         end
       end

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

@@ -17,22 +17,27 @@ module Glib
         @__json_ui_page
       end
 
-      # Use this only if you need to generate json independently from the current `json_ui_page`
-      def json_ui_menu(&block)
-        @__json_ui_menu_page ||= Page.new(Jbuilder.new, self)
-        json = @__json_ui_menu_page.json
-        json.nil!
-        block&.call @__json_ui_menu_page.menu_builder
-        json.attributes!
-      end
-
-      # Use this only if you need to generate json independently from the current `json_ui_page`
-      def json_ui_panel(&block)
-        @__json_ui_panel_page ||= Page.new(Jbuilder.new, self)
-        json = @__json_ui_panel_page.json
-        json.nil!
-        block&.call @__json_ui_panel_page.view_builder
-        json.attributes!
+      # # Use this only if you need to generate json independently from the current `json_ui_page`
+      # def json_ui_menu(&block)
+      #   @__json_ui_menu_page ||= Page.new(Jbuilder.new, self)
+      #   json = @__json_ui_menu_page.json
+      #   json.nil!
+      #   block&.call @__json_ui_menu_page.menu_builder
+      #   json.attributes!
+      # end
+
+      # # Use this only if you need to generate json independently from the current `json_ui_page`
+      # def json_ui_panel(&block)
+      #   @__json_ui_panel_page ||= Page.new(Jbuilder.new, self)
+      #   json = @__json_ui_panel_page.json
+      #   json.nil!
+      #   block&.call @__json_ui_panel_page.view_builder
+      #   json.attributes!
+      # end
+
+      def json_ui_section(json, &block)
+        @__json_ui_section ||= Page.new(json, self)
+        @__json_ui_section.list_section_builder
       end
 
       class Page

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

@@ -104,6 +104,9 @@ class Glib::JsonUi::ViewBuilder
 
     class Check < Text
       string :uncheckValue
+      string :checkValue
+
+      # Where possible, use value instead of this
       bool :checked
     end
 

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

@@ -123,6 +123,8 @@ class Glib::JsonUi::ViewBuilder
       hash :nextPage
       hash :export
       hash :import
+      action :onScrollToTop
+      action :onScrollToBottom
 
       def firstSection(block)
         json.sections [1] do

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

@@ -79,17 +79,26 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
-    provider = {
-      name: "facebook",
-      webRequestUrl: "https://www.facebook.com/v3.1/dialog/oauth?auth_type=rerequest&client_id=CLIENT_ID&redirect_uri=http%3A%2F%2Fwww.lvh.me%3A3000%2Foauth_callback%2Ffacebook&response_type=code&scope=email",
-      requestUrl: "https://www.facebook.com/v3.1/dialog/oauth",
-      clientId: "CLIENT_ID",
-      redirectUrl: "http://www.lvh.me:3000/oauth_callback/facebook.json"
-    }
-
-    action.dialogs_oauth provider: provider, providerParamName: "session[oauth_provider]", callbackUrlParamName: "session[[oauth_callback_url]", onSuccess: ->(action) do
-      action.http_post url: 'TODO: post params to server'
+    if respond_to?(:user_facebook_omniauth_authorize_url)
+      provider = {
+        name: 'facebook',
+        webRequestUrl: user_facebook_omniauth_authorize_url(format: nil, _render: nil),
+        requestUrl: user_facebook_omniauth_authorize_url(format: nil),
+        clientId: Devise.omniauth_configs[:facebook].strategy[:client_id],
+        permissions: Devise.omniauth_configs[:facebook].strategy[:scope],
+        redirectUrl: user_facebook_omniauth_callback_url(format: nil)
+      }
+      action.dialogs_oauth provider: provider, providerParamName: 'session[oauth_provider]', callbackUrlParamName: 'session[[oauth_callback_url]', onSuccess: ->(subaction) do
+        subaction.http_post url: json_ui_garage_url(path: 'actions/dialogs_oauth_post'), formData: {
+          authenticity_token: form_authenticity_token
+        }
+      end
+    else
+      action.dialogs_alert message: 'To enable this, set up omniauth using devise'
+      # E.g.
+      # Add `devise :omniauthable, omniauth_providers: %i[facebook]` to user.rb
+      # Add `gem 'omniauth-facebook'` to Gemfile
+      # Add `config.omniauth :facebook` to devise.rb
     end
   end
-
-end
+end

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

@@ -0,0 +1,6 @@
+facebook_graph = Koala::Facebook::API.new(params[:credentials][:token])
+profile = facebook_graph.get_object('me')
+
+json_ui_response json do |action|
+  action.dialogs_alert message: profile
+end

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

@@ -10,7 +10,8 @@ json_ui_page json do |page|
     value = [
       {
         'question': 'Punctuality',
-        'type': 'rating'
+        'type': 'rating',
+        'enabled': '1'
       },
       {
         'question': 'Quality of work',
@@ -21,30 +22,20 @@ json_ui_page json do |page|
         'type': 'yes_no'
       }
     ]
-    # form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, groupTitlePrefix: 'Entry', groupTemplateViews: ->(group) do
-    #   group.spacer height: 10
-    #   group.fields_text width: 'matchParent', name: 'question', label: 'Question'
-    #   group.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
-    # end
-
-    # form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, group: ->(group) do
-    #   group.titlePrefix 'Entry'
-    #   group.template childViews: ->(template) do
-    #     template.spacer height: 10
-    #     template.fields_text width: 'matchParent', name: 'question', label: 'Question'
-    #     template.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
-    #   end
-    # end
 
     form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, titlePrefix: 'Entry', content: ->(group) do
       group.template padding: { left: 32 }, childViews: ->(template) do
         template.spacer height: 10
-        template.fields_text width: 'matchParent', name: 'question', label: 'Question'
-        template.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
+        template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'
+        options = [ :rating, :yes_no ]
+        template.fields_select width: 'matchParent', name: 'type', label: 'Answer Type', placeholder: 'Answer Type', options: options.map { |o| { text: o.to_s.humanize, value: o } }
+        template.fields_check width: 'matchParent', name: 'enabled', label: 'Enable', checkValue: '1'
+
+        template.spacer height: 14
       end
     end
 
     form.spacer height: 20
-    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    form.fields_submit text: 'Submit'
   end
 end

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

@@ -6,18 +6,33 @@ if page < 2
   json.nextPageUrl json_ui_garage_url(path: 'forms/dynamic_select_data', page: page + 1)
 end
 
-json.rows do
+# json.rows do
 
+#   count_per_page = 20
+#   count_per_page.times do |i|
+#     json.child! do
+#       index = page * count_per_page + i
+#       json.template 'thumbnail'
+#       json.title "City #{index} (#{params[:q]})"
+#       json.subtitle "State #{index}"
+#       json.subsubtitle "Country #{index}"
+#       json.value "id#{index}"
+#       json.text "Item #{index}"
+#     end
+#   end
+# end
+
+section = json_ui_section json
+section.rows builder: ->(row) do
   count_per_page = 20
   count_per_page.times do |i|
-    json.child! do
-      index = page * count_per_page + i
-      json.template 'thumbnail'
-      json.title "City #{index} (#{params[:q]})"
-      json.subtitle "State #{index}"
-      json.subsubtitle "Country #{index}"
-      json.value "id#{index}"
-      json.text "Item #{index}"
-    end
+    index = page * count_per_page + i
+    row.custom title: "City #{index} (#{params[:q]})",
+      subtitle: "State #{index}",
+      subsubtitle: "Country #{index}",
+      extra: {
+        value: "id#{index}",
+        text: "Item #{index}"
+      }
   end
 end

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

@@ -8,18 +8,18 @@ options = {
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form options.merge(childViews: ->(form) do
     rules1 = { fileType: "image/*", maxFileSize: 5000 }
     rules2 = { fileType: "image/*", maxFileSize: 1, fileTypeErrorText: 'Invalid!', maxFileSizeErrorText: 'Too big!' }
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_url, 
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Landscape Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_url, 
       value: 'eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4',
       fileUrl: 'https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100',
       fileTitle: '1 month ago',
-      placeholderView: { type: 'image', width: 100, height: 100 }
+      placeholderView: { type: 'image', width: 100, height: 75, url: 'https://www.atms.com.au/wp-content/uploads/2019/10/placeholder-1-1024x683.png?x93630' }
 
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules2, directUploadUrl: rails_direct_uploads_url,
-      placeholderView: { type: 'avatar', width: 100, height: 100 }
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Avatar', accepts: rules2, directUploadUrl: rails_direct_uploads_url,
+      placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' }
 
     form.fields_submit text: 'Submit'
     # form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

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

@@ -8,14 +8,16 @@ json_ui_page json do |page|
     form.spacer height: 6
     form.h4 text: 'Gender'
     form.fields_radioGroup name: 'user[gender]', value: 'F', childViews: ->(group) do
+      group.fields_radio value: '', label: 'Unknown'
       group.fields_radio value: 'M', label: 'Male'
       group.fields_radio value: 'F', label: 'Female'
     end
   
     form.spacer height: 20
     form.h2 text: 'Single Checkbox'
-    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.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'
@@ -36,7 +38,8 @@ json_ui_page json do |page|
       latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
       longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
 
-    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    form.spacer height: 20
+    form.fields_submit text: 'Submit'
 
   end
 

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

@@ -1,10 +1,20 @@
-json.rows do
+
+# json.rows do
+#   batch_count = 30
+#   batch_count.times do |i|
+#     index = page * batch_count + i
+#     json.child! do
+#       json.template 'thumbnail'
+#       json.title "Item #{index}"
+#     end
+#   end
+# end
+
+section = json_ui_section json
+section.rows builder: ->(row) do
   batch_count = 30
   batch_count.times do |i|
     index = page * batch_count + i
-    json.child! do
-      json.template 'thumbnail'
-      json.title "Item #{index}"
-    end
+    row.thumbnail title: "Item #{index}"
   end
 end

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

@@ -1,23 +1,5 @@
 json.title 'Notifications'
 
-# json.ws({
-#   "socket" => {
-#     "endpoint" => "/socket/websocket",
-#     "params" => {
-#       "vsn": "2.0.0"
-#     }
-#   },
-#   # "topic" => "room:30",
-#   # "event" => "comments_updated",
-#   "topic" => "links",
-#   "event" => "new_link_added",
-#   "header" => {
-#     "user_id" => 2,
-#     "prev_item_id" => nil,
-#     "last_item_id" => nil
-#   }
-# })
-
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
 
@@ -31,31 +13,6 @@ page.list firstSection: ->(section) do
 
     template.thumbnail title: 'WebSocket Real-time Update', onClick: ->(action) do
       action.windows_open url: json_ui_garage_url(path: 'notifications/web_socket')
-      # dialogs_notification title: 'Hello World', message: 'This is a notification', onClick: ->(subaction) do
-      #   subaction.dialogs_alert message: 'Perform action'
-      # end
     end
-
-    # template.thumbnail title: 'Send WebSocket Notification', onClick: ->(action) do
-    #   json.action "ws/push"
-    #   json.topic "links"
-    #   json.event "new_link"
-    #   json.payload({
-    #     "club_id": "2",
-    #     "room_id": "30",
-    #     "user_id": "2"
-    #       #  title: "TITLE",
-    #       #  url: "URL"
-    #   })
-
-    #     # "topic": "room:30",
-    #     # "event": "create_comment",
-    #     # "payload": {
-    #     #   "club_id": "2",
-    #     #   "room_id": "30",
-    #     #   "user_id": "2"
-    #     # }
-
-    # end
   end
 end

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

@@ -14,7 +14,7 @@ json.ws({
   # "topic" => "room:30",
   # "event" => "comments_updated",
   "topic" => "links",
-  "event" => "new_link_added",
+  "events" => ["new_link_added"],
   "header" => {
     "user_id" => 2,
     "prev_item_id" => nil,
@@ -23,31 +23,29 @@ json.ws({
 })
 
 page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, paramNameForFormData: 'formData', onSubmit: ->(action) do
-  # action.dialogs_alert
-  
-    json.action "ws/push"
-    json.topic "links"
-    json.event "new_link"
-    json.payload({
-      "club_id": "2",
-      "room_id": "30",
-      "user_id": "2"
-        #  title: "TITLE",
-        #  url: "URL"
-    })
-
-      # "topic": "room:30",
-      # "event": "create_comment",
-      # "payload": {
-      #   "club_id": "2",
-      #   "room_id": "30",
-      #   "user_id": "2"
-      # }
+  json.action "ws/push"
+  json.topic "links"
+  json.event "new_link"
+  json.payload({
+    "club_id": "2",
+    "room_id": "30",
+    "user_id": "2"
+      #  title: "TITLE",
+      #  url: "URL"
+  })
 
 end, childViews: ->(form) do
+  form.spacer height: 14
+  form.label text: "Message: #{params[:message]}"
+  form.spacer height: 14
+
   form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+
+  # TODO: Change this to radio for selecting alert vs reload response
   form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
   
+  form.fields_hidden name: 'baseUrl', width: 'matchParent', value: json_ui_garage_url(path: 'notifications/web_socket')
+
   form.panels_split width: 'matchParent', content: ->(split) do
     # split.left childViews: ->(left) do
     #   if params[:mode] == 'dialog'

data/app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder

@@ -0,0 +1,39 @@
+
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'tables/autoload_all', page: page_index + 1, section_only: 'v1'),
+  autoload: 'asNeeded'
+}
+
+column_indexes = (1..3)
+if params[:section_only].present?
+  json.nextPage next_page if page_index < 3
+  json_ui_page json do |page|
+    json.sections do
+      json.child! do
+        render 'json_ui/garage/tables/autoload_section', page: page, page_index: page_index, column_indexes: column_indexes
+      end
+    end
+  end
+else
+  json.title 'Tables'
+
+  json_ui_page json do |page|
+    render "#{@path_prefix}/nav_menu", json: json, page: page
+
+    page.table nextPage: next_page, firstSection: ->(section) do
+      section.header cellViews: ->(header) do
+        column_indexes.each do |i|
+          header.label text: "Heading#{i}"
+        end
+      end
+
+      render "#{@path_prefix}/tables/autoload_section", page: page, page_index: page_index, column_indexes: column_indexes
+    end, onScrollToBottom: ->(action) do
+      action.snackbars_alert message: 'Scrolled to Bottom'
+    end, onScrollToTop: ->(action) do
+      action.snackbars_alert message: 'Scrolled to Top'
+    end
+  end
+
+end

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

@@ -17,6 +17,9 @@ json_ui_page json do |page|
       template.thumbnail title: 'Autoload All', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'tables/autoload_all')
       end
+      template.thumbnail title: 'Autoload as Needed', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'tables/autoload_as_needed')
+      end
     end
 
   end

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

@@ -14,4 +14,4 @@ if page_index < 3
       json.points (from.month.ago.to_date..to.month.ago.to_date).map { |d| { x: d, y: 100 + rand(40) } }
     end
   ]
-end
+end

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

@@ -1,34 +1,30 @@
-
-json.events do
-  
-  json.child! do
-    json.start '2018-12-14'
-    json.end '2018-12-17'
-    json.text 'Hackathon'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'At Town Hall'
+section = json_ui_section json
+section.rows builder: ->(row) do
+  row.custom title: 'Hackathon',
+    extra: {
+      start: '2018-12-14',
+      end: '2018-12-17'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'At Town Hall'
     end
-  end
 
-  json.child! do
-    json.start '2018-12-30'
-    json.end '2018-12-30'
-    json.text 'Birthday'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'At home'
+  row.custom title: 'Birthday',
+    extra: {
+      start: '2018-12-30',
+      end: '2018-12-30'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'At home'
     end
-  end
 
-  json.child! do
-    json.start '2018-12-31'
-    json.end '2018-12-31'
-    json.text 'Conference'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'In Perth'
+  row.custom title: 'Conference',
+    extra: {
+      start: '2018-12-31',
+      end: '2019-01-02'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'In Perth'
     end
-  end
 
 end

data/lib/glib-web.rb

@@ -5,3 +5,4 @@ require "glib/json_crawler"
 
 require 'glib/dynamic_text'
 require 'glib/crypt'
+require 'glib/test_helpers'

data/lib/glib/json_crawler.rb

@@ -7,3 +7,4 @@ require_relative './json_crawler/action_crawlers/nav_initiate'
 require_relative './json_crawler/action_crawlers/windows_open'
 require_relative './json_crawler/action_crawlers/action_http'
 require_relative './json_crawler/action_crawlers/forms_submit'
+require_relative './json_crawler/action_crawlers/menu'

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

@@ -0,0 +1,12 @@
+module Glib
+  module JsonCrawler
+    class Menu < ActionCrawler
+      def initialize(http, args, action)
+        super(http)
+
+        @http.router.log action, nil
+        crawl args['buttons']
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Glib
         super(http)
 
         @http = http
-        if (json = @http.get args['url'], action) && (left_drawer = json['leftDrawer'])
+        if (json = (@http.get args['url'], action, args.except('url'))) && (left_drawer = json['leftDrawer'])
           crawl left_drawer['header']&.[]('childViews')
           crawl left_drawer['rows']
         end

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

@@ -4,7 +4,7 @@ module Glib
       def initialize(http, args, action)
         @http = http
         if (url = args['url'])
-          json = @http.get url, action
+          json = @http.get(url, action, args.except('url'))
 
           unless json.nil?
             crawl json['header']&.[]('childViews')
@@ -12,11 +12,16 @@ module Glib
             crawl json['footer']&.[]('childViews')
 
             json['rightNavButtons']&.each do |button|
-              click button
+              if button['buttons'].present?
+                button['buttons'].each do |inner_button|
+                  click inner_button
+                end
+              else
+                click button
+              end
             end
           end
         end
-
       end
     end
   end

data/lib/glib/json_crawler/http.rb

@@ -8,8 +8,8 @@ module Glib
       VALID_RESPONSE_CODES = [
         (200..299).to_a,
         ## Note, the JSON API does not allow redirects
-        401, ## UNAUTHORIZED Should be used for not-logged-in
-        403, ## FORBIDDEN Should be used for logged-in but not allowed to access
+        # 401, ## UNAUTHORIZED Should be used for not-logged-in
+        # 403, ## FORBIDDEN Should be used for logged-in but not allowed to access
       ].flatten
 
       def initialize(context, user, router)
@@ -20,8 +20,8 @@ module Glib
         @router = router
       end
 
-      def get(url, action, inspect_result = true)
-        fetch(:get, url, action, {}, inspect_result)
+      def get(url, action, params = {}, inspect_result = true)
+        fetch(:get, url, action, params, inspect_result)
       end
 
       def post(url, action, params)
@@ -40,14 +40,6 @@ module Glib
         fetch(:delete, url, action, {})
       end
 
-      def controller
-        @context.integration_session.controller
-      end
-
-      def action_name
-        controller.action_name.to_sym
-      end
-
       private
         Response = Struct.new :code, :headers, :media_type, :body do
           def initialize(*)
@@ -66,13 +58,16 @@ module Glib
             history << url
           end
 
-          @context.assert_match(URI_REGEXP, url)
+          if !URI_REGEXP.match(url)
+            raise "Invalid URL: `#{url}`. Make sure to use the absolute URL."
+          end
 
           http_header = {
             'Client-DeviceOS' => user[:device],
             'Client-Version' => user[:version],
             'X-CSRF-Token' => user[:token]
           }
+          http_header.merge!(params[:headers]) if params[:headers].present?
 
           params.each do |name, value|
             params[name] = '' if value.is_a?(Array) && value.size == 0
@@ -83,6 +78,10 @@ module Glib
             @context.send(method, url, params: params, headers: http_header)
             raw_response = @context.response
             response = Response.new(raw_response.code.to_i, raw_response.headers, raw_response.media_type, raw_response.body)
+
+            if (controller = @context.controller)
+              Glib::JsonCrawler::Coverage.coverage_files.add(controller.class.instance_method(controller.action_name).source_location.first)
+            end
           rescue => ex
             if !inspect_result
               case ex
@@ -103,9 +102,10 @@ module Glib
             if (code = response.code) == 302
               redirect_uri = URI(response.headers['Location'])
               redirect_uri.query = [redirect_uri.query, 'format=json'].compact.join('&')
-              get redirect_uri.to_s, action
+              get redirect_uri.to_s, action, params
             else
               response_times << response.headers['X-Runtime'].to_f
+
               @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
               if response.media_type == 'application/json'
                 JSON.parse(response.body)

data/lib/glib/json_crawler/router.rb

@@ -19,10 +19,6 @@ module Glib
       end
 
       def step(http, args)
-        if (controller = http.controller)
-          Glib::JsonCrawler::Coverage.coverage_files.add(controller.class.instance_method(http.action_name).source_location.first)
-        end
-
         case args['view']
         when 'fields/submit-v1', 'fields/submit'
           @depth += 1
@@ -40,7 +36,6 @@ module Glib
 
           if action.present?
             @depth += 1
-            # child = 
             case action
             when 'initiate_navigation'
               @read_only_actions.add([action, params['url']])
@@ -48,6 +43,8 @@ module Glib
             when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open', 'dialogs/open', 'windows/reload'
               @read_only_actions.add([action, params['url']])
               JsonCrawler::WindowsOpen.new(http, params, action)
+            when 'sheets/select-v1', 'sheets/select'
+              JsonCrawler::Menu.new(http, params, action)
             when 'http/post-v1', 'http/post'
               JsonCrawler::ActionHttp.new(:post, http, params, action)
             when 'forms/submit-v1', 'forms/submit'
@@ -73,7 +70,7 @@ module Glib
         @depth += 1
         target_router.read_only_actions.each do |crawler_action|
           action, url = crawler_action
-          http.get url, action, false
+          http.get(url, action, {}, false)
         end
       end
 

data/lib/glib/test_helpers.rb

@@ -0,0 +1,40 @@
+module Glib
+  module TestHelpers
+    def response_assert_equal
+      expected = __get_previous_result_from_git
+      result = __log(response.body)
+      assert_equal JSON.parse(expected), JSON.parse(result), "Result mismatch! #{__git_is_available? ? `git diff #{__log_dir}/#{__log_file}` : ''}"
+    end
+
+    private
+      def __git_is_available?
+        @__git_is_available ||= (`git status 2>&1` =~ /fatal/).nil?
+      end
+
+      def __log_dir
+        if @__log_dir.nil?
+          @__log_dir = File.expand_path("#{Rails.root}/test/controllers/#{self.class.to_s.underscore}_results", File.dirname(__FILE__))
+          unless File.directory?(@__log_dir)
+            FileUtils.mkdir_p(@__log_dir)
+          end
+        end
+        @__log_dir
+      end
+      
+      def __log_file
+        @__log_file ||= "#{self.method_name}.json"
+      end
+      
+      def __log json
+        File.open("#{File.join(__log_dir, __log_file)}", "w") do |f|
+          f << JSON.pretty_generate( JSON.parse(json) )
+        end
+        json
+      end
+      
+      def __get_previous_result_from_git
+        `git checkout -- "#{File.join(__log_dir, __log_file)}" > /dev/null 2>&1` if __git_is_available?
+        File.exists?(File.join(__log_dir, __log_file)) ? File.open(File.join(__log_dir, __log_file)).read : "\{\}"
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - ''
@@ -73,6 +73,7 @@ files:
 - app/controllers/concerns/glib/json/ui.rb
 - app/controllers/concerns/glib/json/validation.rb
 - app/controllers/glib/home_controller.rb
+- app/helpers/glib/app_feature_support_helper.rb
 - app/helpers/glib/dynamic_images_helper.rb
 - app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/forms_helper.rb
@@ -114,6 +115,7 @@ files:
 - app/views/json_ui/garage/actions/_snackbars.json.jbuilder
 - app/views/json_ui/garage/actions/_timeouts.json.jbuilder
 - app/views/json_ui/garage/actions/_windows.json.jbuilder
+- app/views/json_ui/garage/actions/dialogs_oauth_post.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
 - app/views/json_ui/garage/forms/basic.json.jbuilder
@@ -172,6 +174,7 @@ files:
 - app/views/json_ui/garage/services/index.json.jbuilder
 - app/views/json_ui/garage/tables/_autoload_section.json.jbuilder
 - app/views/json_ui/garage/tables/autoload_all.json.jbuilder
+- app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder
 - app/views/json_ui/garage/tables/export_import.json.jbuilder
 - app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder
 - app/views/json_ui/garage/tables/index.json.jbuilder
@@ -207,11 +210,13 @@ files:
 - lib/glib/json_crawler/action_crawler.rb
 - lib/glib/json_crawler/action_crawlers/action_http.rb
 - lib/glib/json_crawler/action_crawlers/forms_submit.rb
+- lib/glib/json_crawler/action_crawlers/menu.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
 - lib/glib/json_crawler/action_crawlers/windows_open.rb
 - lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
+- lib/glib/test_helpers.rb
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake