glib-web 0.4.66 → 0.4.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79b0d05fad96e500e336fd3705ed09ff53199d4d
-  data.tar.gz: 6cec3284142a09fb31f2d65f797047be7909e769
+  metadata.gz: 904b947a5cea2a83a12ee5b084f11a54ad980616
+  data.tar.gz: 72bec3f5842e7a94d3cf1d89b6c818386a596309
 SHA512:
-  metadata.gz: c8b9ab890ab1d8826d0839f1363102731a203ad82682e2846cb27a11e0caddb3144f9f10cb87d624a01837deb56a42878e5e81dd1d81e85ff46a1df60551b135
-  data.tar.gz: 5dadd52713ca918d748c1a57d574eb048b0667b4e69dfe9d0d8f764e14589c538d36f70522a95feb27ac3a5a81381f1cf90b2c9bbfa3cb7ac0241b4635602614
+  metadata.gz: 68095f45e47b78a3b2e8d060e74caca8857ac71e74fbece088d8285d7113e4e43776f23799e877e8c135832234891d882dc2a77687677a7d1c31a95929b5c05d
+  data.tar.gz: 8a15b95af63a3268152c8fa3dcd399c1c64238cea18b7347fcbed1b0f5ca6bd92c305424237ba1d212d97a0a9dfbfa726ccbd7c3a6fc56b41102e5f1d7310e3f

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

@@ -170,6 +170,12 @@ module Glib
           raise "Invalid properties: #{options.keys}" if options.size > 0
         end
 
+        def onLoad(options = {})
+          json.onLoad do
+            yield @action_builder
+          end
+        end
+
       end
     end
   end

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

@@ -12,12 +12,14 @@ json_ui_page json do |page|
       selectedOptions: [ { value: 'id3', text: 'Item 3' } ],
       url: json_ui_garage_url(path: 'forms/dynamic_select_data')
 
+    form.spacer height: 14
     form.fields_dynamicSelect name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', 
       # value: ['id3', 'id5'], multiple: true,
       selectedOptions: [ { value: 'id3', text: 'Item 3' }, { value: 'id5', text: 'Item 5' } ],
       url: json_ui_garage_url(path: 'forms/dynamic_select_data'),
       multiple: true
 
+    form.spacer height: 14
     form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
   end
 end

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

@@ -13,28 +13,11 @@ json.rows do
     json.child! do
       index = page * count_per_page + i
       json.template 'thumbnail'
-      json.title "City #{index}"
+      json.title "City #{index} (#{params[:q]})"
       json.subtitle "State #{index}"
       json.subsubtitle "Country #{index}"
       json.value "id#{index}"
       json.text "Item #{index}"
     end
   end
-
-  # languages = {
-  #   'zh-HK' => 'Hong Kong',
-  #   'zh-TW' => 'Taiwan',
-  #   'zh-CN' => 'China',
-  #   'ja-JP' => 'Japan',
-  #   'ko-KR' => 'Korea',
-  #   'ru-RU' => 'Russian',
-  #   'en-PH' => 'Philippines'
-  # }
-  # languages.each do |k, v|
-  #   json.child! do
-  #     json.value k
-  #     json.text v
-  #   end
-  # end
-
 end

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

@@ -2,18 +2,18 @@ json.title 'Pages'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
-  
+
   page.list sections: [
     ->(section) do
       section.rows builder: ->(template) do
         template.thumbnail title: 'Hamburger Layout', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/layout')
         end
-        
+
         template.thumbnail title: 'Full Width/Height', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/full_width_height')
         end
-        
+
         template.thumbnail title: 'Tab Bar', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/tab_bar')
         end
@@ -21,6 +21,10 @@ json_ui_page json do |page|
         template.thumbnail title: 'Nav Buttons', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/nav_buttons')
         end
+
+        template.thumbnail title: 'Loading Indicator', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'pages/loading_indicator')
+        end
       end
     end,
     ->(section) do
@@ -32,12 +36,12 @@ json_ui_page json do |page|
         template.thumbnail title: 'Flat Centered', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/flat_centered')
         end
-        
+
         template.thumbnail title: 'Full Width', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'pages/full_width')
         end
       end
     end
   ]
-    
+
 end

data/app/views/json_ui/garage/pages/loading_indicator.json.jbuilder

@@ -0,0 +1,10 @@
+sleep 1
+
+json.title 'Pages'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.label text: 'On the web, the loading indicator should be show on the browser tab.'
+end

data/lib/glib/json_crawler/action_crawler.rb

@@ -5,11 +5,11 @@ module Glib
         @http = http
       end
 
-      def click object
+      def click(object)
         @http.router.step(@http, object)
       end
 
-      def crawl views
+      def crawl(views)
         @http.router.crawl_multiple views, ->(view) do
           click view
         end
@@ -17,4 +17,4 @@ module Glib
     end
 
   end
-end
+end

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

@@ -1,16 +1,22 @@
 module Glib
   module JsonCrawler
     class FormsSubmit < ActionCrawler
-      def initialize(http, params, action, form)
+      def initialize(http, form)
         super(http)
 
+        raise 'Submit action needs to be inside a form' unless form
+
         @http = http
 
-        case form['method']
+        method = form['method']
+        action = "forms/#{method}"
+
+        case method
         when 'patch', 'put'
           submit_update(form, action)
         else
-          http.router.log action, params['url']
+          url = form['url']
+          http.router.log action, url
         end
       end
 
@@ -19,16 +25,24 @@ module Glib
         fields = []
         params = {}
         @http.router.crawl_multiple view['childViews'], ->(child) do
-          if child['view'].start_with?('fields/')
+          name = child['view']
+          if name.start_with?('fields/')
             fields << child
-            params[child['name']] = child['value']
+
+            include_params = case name
+            when 'fields/check', 'fields/check-v1'
+              child['checked']
+            else
+              true
+            end
+
+            params[child['name']] = child['value'] if include_params
           end
         end
 
         json = @http.patch url, action, params
         click(json)
       end
-
     end
   end
 end

data/lib/glib/json_crawler/router.rb

@@ -23,6 +23,15 @@ module Glib
           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
+          forms = @visitor.forms
+          JsonCrawler::FormsSubmit.new(http, forms.last)
+          @depth -= 1
+          return
+        end
+
         if args.is_a?(Hash) && args['rel'] != 'nofollow'
           if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
             action = onClick['action']
@@ -31,27 +40,31 @@ module Glib
 
           if action.present?
             @depth += 1
-            child = case action
+            # child = 
+            case action
             when 'initiate_navigation'
               @read_only_actions.add([action, params['url']])
               JsonCrawler::NavInitiate.new(http, params, action)
-            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
+            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 'http/post-v1'
+            when 'http/post-v1', 'http/post'
               JsonCrawler::ActionHttp.new(:post, http, params, action)
-            when 'forms/submit-v1'
+            when 'forms/submit-v1', 'forms/submit'
               forms = @visitor.forms
-              raise 'Submit action needs to be inside a form' if forms.size < 1
-              JsonCrawler::FormsSubmit.new(http, params, action, forms.last)
+              # raise 'Submit action needs to be inside a form' if forms.size < 1
+              JsonCrawler::FormsSubmit.new(http, forms.last)
             else
-              unless ['http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1'].include?(action)
+              unless [
+                'http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1',
+                'http/delete', 'dialogs/oauth', 'windows/openWeb'
+              ].include?(action)
                 @read_only_actions.add([action, params['url']])
               end
               self.log action, params['url']
             end
             @depth -= 1
-            child
+            # child
           end
         end
       end
@@ -74,4 +87,3 @@ module Glib
     end
   end
 end
-  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.66
+  version: 0.4.67
 platform: ruby
 authors:
 - ''
@@ -147,6 +147,7 @@ files:
 - app/views/json_ui/garage/pages/full_width_height.json.jbuilder
 - app/views/json_ui/garage/pages/index.json.jbuilder
 - app/views/json_ui/garage/pages/layout.json.jbuilder
+- app/views/json_ui/garage/pages/loading_indicator.json.jbuilder
 - app/views/json_ui/garage/pages/nav_buttons.json.jbuilder
 - app/views/json_ui/garage/pages/tab_bar.json.jbuilder
 - app/views/json_ui/garage/panels/_styled.json.jbuilder