glib-web 0.4.59 → 0.4.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d8906b4ef965875d75a600b81d440ad34b32bb
-  data.tar.gz: 40d4203cecc000335fb49303f7f41c569213d56d
+  metadata.gz: 7e115e3000243622421f51568643954470a02eb1
+  data.tar.gz: cf697c88ba64ac3ce3731fbdb49a69f993d87f9e
 SHA512:
-  metadata.gz: 7f8d68129838007a4844863e5120e78f8006d33c9b7bd275c2afe61e186942503d56d9aff8d377405d2e08d3a4f3602dd1cce0dea2ffaa08b46dc1e81bc37ae2
-  data.tar.gz: a9c1d10c6e926951e31a2a62c0f212d179effaabeb26f7f965f2967659b783b50cc0a5ad91738ab35a8e0e6d5c07b31420b3f462813dd1530eb5445cef379d44
+  metadata.gz: 738eaed2dd23bb59903ed80a1e1c05cc06d95928a9e68ae8a24ee6137739d5d181fb40076aa1d60a3a766546d987da50271076f499d28a67ab7d2437b1f620d0
+  data.tar.gz: 98be8ec4b19300946473005aa238bec89e1c02b0146ea0ecafb29b2dd32faf5719112562db95055813f8804da2cf893622182a10d9057ec67bde33ee8db8c54a

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

@@ -189,23 +189,13 @@ module Glib
           end
 
           json.set!(propName) do
-            if name
-              data[:material] ||= {}
-              data[:material][:name] = name 
-            end
+            data[:material] ||= {}
+            data[:material][:name] = name if name
 
-            if (material = data[:material])
-              json.material do
-                json.name material[:name]
-                json.size material[:size] if material[:size]
-              end
-            end
-
-            if (fa = data[:fa])
-              json.fa do
-                json.name fa[:name]
-                json.size fa[:size] if fa[:size]
-              end
+            material = data[:material]
+            json.material do
+              json.name material[:name]
+              json.size material[:size] if material[:size]
             end
 
             if (custom = data[:custom])

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

@@ -80,7 +80,6 @@ module Glib
       end
 
       class Markdown < AbstractText
-        bool :previewVideo
       end
 
       class Label < AbstractText

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

@@ -5,7 +5,7 @@ json_ui_page json do |page|
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     scroll.spacer height: 20
-    scroll.h2 text: 'Markdown'
+    scroll.h2 text: 'Paragraph'
     scroll.spacer height: 6
     scroll.markdown text:
       '# h1 Heading' + "\n" +
@@ -25,17 +25,6 @@ json_ui_page json do |page|
       "\n" +
       '_This is italic text_' + "\n" +
       "\n" +
-      '~~Strikethrough~~' + "\n" +
-      "\n" +
-      'https://www.google.com' + "\n"
-
-    scroll.spacer height: 20
-    scroll.h2 text: 'Markdown with preview'
-    scroll.spacer height: 6
-    scroll.markdown text: 'Here is the video: https://www.youtube.com/watch?v=947op8yKJRY', previewVideo: true
-
-    scroll.spacer height: 10
-    scroll.markdown text: 'Some videos: https://youtu.be/ATnpEOo3GJA, https://www.youtube.com/watch?v=947op8yKJRY', previewVideo: true
-
+      '~~Strikethrough~~' + "\n"
   end
 end

data/lib/glib/json_crawler/action_crawler.rb

@@ -1,12 +1,16 @@
 module Glib
   module JsonCrawler
     class ActionCrawler
+      def initialize(http)
+        @http = http
+      end
+
       def click object
-        JsonCrawler::Router.step(@http, object)
+        @http.router.step(@http, object)
       end
 
       def crawl views
-        JsonCrawler::Router::crawl_multiple views, ->(view) do
+        @http.router.crawl_multiple views, ->(view) do
           click view
         end
       end

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

@@ -1,28 +1,30 @@
 module Glib
   module JsonCrawler
     class FormsSubmit < ActionCrawler
-      def initialize http, params, action, form
+      def initialize(http, params, action, form)
+        super(http)
+
         @http = http
 
         case form['method']
         when 'patch', 'put'
           submit_update(form, action)
         else
-          JsonCrawler::Router.log action, params['url']
+          http.router.log action, params['url']
         end
       end
-      
+
       def submit_update(view, action)
         url = view['url']
         fields = []
         params = {}
-        JsonCrawler::Router.crawl_multiple view['childViews'], ->(child) do
+        @http.router.crawl_multiple view['childViews'], ->(child) do
           if child['view'].start_with?('fields/')
             fields << child
             params[child['name']] = child['value']
           end
         end
-        
+
         json = @http.patch url, action, params
         click(json)
       end

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

@@ -1,7 +1,9 @@
 module Glib
   module JsonCrawler
     class NavInitiate < ActionCrawler
-      def initialize http, args, controller
+      def initialize(http, args, controller)
+        super(http)
+        
         @http = http
         if (json = @http.get args['url'], controller) && (left_drawer = json['leftDrawer'])
           crawl left_drawer['header']&.[]('childViews')

data/lib/glib/json_crawler/http.rb

@@ -2,7 +2,7 @@
 module Glib
   module JsonCrawler
     class Http
-      attr_accessor :history, :response_times, :user
+      attr_accessor :history, :response_times, :user, :router
 
       URI_REGEXP = /\A#{URI::regexp}\z/
 
@@ -13,11 +13,12 @@ module Glib
         403, ## FORBIDDEN Should be used for logged-in but not allowed to access
       ].flatten
 
-      def initialize(context, user)
+      def initialize(context, user, router)
         @context = context
         @history = []
         @response_times = []
         @user = user
+        @router = router
       end
 
       def get(url, controller)
@@ -40,6 +41,10 @@ module Glib
         fetch(:delete, url, controller, {})
       end
 
+      # def log(controller, url, response)
+      #   @router.log(controller, url, response)
+      # end
+
       def controller
         @context.integration_session.controller
       end
@@ -77,7 +82,7 @@ module Glib
             raise
           end
           response = @context.response
-          JsonCrawler::Router.log(controller, url, response)
+          @router.log(controller, url, response)
 
           if (code = response.code.to_i) == 302
             redirect_uri = URI(response.headers['Location'])

data/lib/glib/json_crawler/router.rb

@@ -1,63 +1,84 @@
-module Glib
-  module JsonCrawler
-    class Router
-      def self.log(action, url, response = nil)
-        @@logger.puts '  ' * @@depth + [
-          action,
-          response.present? ? response.code : nil,
-          url
-        ].compact.join(' :: ')
-      end
-
-      def self.set_up(logger)
-        @@depth = -1
-        @@logger = logger
-        @@visitor = Glib::Json::Traversal::Visitor.new
-      end
-
-      def self.step(http, args)
-        if controller = http.controller
-          Glib::JsonCrawler::Coverage.coverage_files.add(http.controller.class.instance_method(http.action_name).source_location.first)
-        end
-
-        if args.is_a?(Hash) && args['rel'] != 'nofollow'
-          if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
-            action = onClick['action']
-            params = onClick
-          end
-
-          if action.present?
-            @@depth += 1
-            child = case action
-            when 'initiate_navigation'
-              JsonCrawler::NavInitiate.new(http, params, action)
-            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
-              JsonCrawler::WindowsOpen.new(http, params, action)
-            # when 'http/delete-v1'
-            #   JsonCrawler::ActionHttp.new(:delete, http, params, action)
-            when 'http/post-v1'
-              JsonCrawler::ActionHttp.new(:post, http, params, action)
-            when 'forms/submit-v1'
-              forms = @@visitor.forms
-              raise 'Submit action needs to be inside a form' if forms.size < 1
-              JsonCrawler::FormsSubmit.new(http, params, action, forms.last)
-            else
-              self.log action, params['url']
-            end
-            @@depth -= 1
-            child
-          end
-        end
-      end
-
-      def self.tear_down
-        @@logger.close
-      end
-
-      def self.crawl_multiple(views, block)
-        @@visitor.traverse_multiple views, block
-      end
-
-    end
-  end
-end
+
+module Glib
+  module JsonCrawler
+    class Router
+      # @@crawler_actions = Set.new
+      # @@store_action = false
+
+      # def self.crawler_actions
+      #   @@crawler_actions
+      # end
+
+      def log(action, url, response = nil)
+        @logger.puts '  ' * @depth + [
+          action,
+          response.present? ? response.code : nil,
+          url
+        ].compact.join(' :: ')
+      end
+
+      def initialize(logger, store_action)
+        # @@depth = -1
+        # @@logger = logger
+        # @@visitor = Glib::Json::Traversal::Visitor.new
+        # @@store_action = store_action
+
+        @depth = -1
+        @logger = logger
+        @visitor = Glib::Json::Traversal::Visitor.new
+        @store_action = store_action
+      end
+
+      def step(http, args)
+        if (controller = http.controller)
+          Glib::JsonCrawler::Coverage.coverage_files.add(http.controller.class.instance_method(http.action_name).source_location.first)
+        end
+
+        if args.is_a?(Hash) && args['rel'] != 'nofollow'
+          if (onClick = (args.fetch('onClick', nil) || args.fetch('onResponse', nil)))
+            action = onClick['action']
+            params = onClick
+          end
+
+          if action.present?
+            @depth += 1
+            child = case action
+            when 'initiate_navigation'
+              # @@crawler_actions.add([action, params['url']]) if @@store_action
+              JsonCrawler::NavInitiate.new(http, params, action)
+            when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
+              unless action == 'dialogs/open-v1'
+                # @@crawler_actions.add([action, params['url']]) if @@store_action
+              end
+              JsonCrawler::WindowsOpen.new(http, params, action)
+            # when 'http/delete-v1'
+            #   JsonCrawler::ActionHttp.new(:delete, http, params, action)
+            when 'http/post-v1'
+              JsonCrawler::ActionHttp.new(:post, http, params, action)
+            when 'forms/submit-v1'
+              forms = @visitor.forms
+              raise 'Submit action needs to be inside a form' if forms.size < 1
+              JsonCrawler::FormsSubmit.new(http, params, action, forms.last)
+            else
+              unless ['http/delete-v1', 'dialogs/oauth-v1', 'windows/openWeb-v1'].include?(action)
+                # @@crawler_actions.add([action, params['url']]) if @@store_action
+              end
+              self.log action, params['url']
+            end
+            @depth -= 1
+            child
+          end
+        end
+      end
+
+      def tear_down
+        @logger.close
+      end
+
+      def crawl_multiple(views, block)
+        @visitor.traverse_multiple views, block
+      end
+
+    end
+  end
+end

metadata

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