glib-web 0.4.58 → 0.4.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bf76c52f94ec06c17e2fd9f77872274d543d084
-  data.tar.gz: 22360685e95d144e2a6507a25064b39f9b898155
+  metadata.gz: 43d8906b4ef965875d75a600b81d440ad34b32bb
+  data.tar.gz: 40d4203cecc000335fb49303f7f41c569213d56d
 SHA512:
-  metadata.gz: 625bf8b69fa353e6766726a86f2a1876f72d65bb12a848f0914c941616160ddb3dd058a2e8e82b55d21f104835dc95356082d3db224cafc72a9a4c03808846b8
-  data.tar.gz: f4a282069197813a3e9e715cc349d8348bad37f35362b262092096e6dc26f638a8e63007712fb7478148c7f0e3e61fc421211e5f56022e78c92b18c822577f28
+  metadata.gz: 7f8d68129838007a4844863e5120e78f8006d33c9b7bd275c2afe61e186942503d56d9aff8d377405d2e08d3a4f3602dd1cce0dea2ffaa08b46dc1e81bc37ae2
+  data.tar.gz: a9c1d10c6e926951e31a2a62c0f212d179effaabeb26f7f965f2967659b783b50cc0a5ad91738ab35a8e0e6d5c07b31420b3f462813dd1530eb5445cef379d44

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

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

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

@@ -80,6 +80,7 @@ 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: 'Paragraph'
+    scroll.h2 text: 'Markdown'
     scroll.spacer height: 6
     scroll.markdown text:
       '# h1 Heading' + "\n" +
@@ -25,6 +25,17 @@ json_ui_page json do |page|
       "\n" +
       '_This is italic text_' + "\n" +
       "\n" +
-      '~~Strikethrough~~' + "\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
+
   end
 end

data/lib/glib/json_crawler/router.rb

@@ -1,13 +1,6 @@
 module Glib
   module JsonCrawler
     class Router
-      @@crawler_actions = Set.new
-      @@store_action = false
-
-      def self.crawler_actions
-        @@crawler_actions
-      end
-
       def self.log(action, url, response = nil)
         @@logger.puts '  ' * @@depth + [
           action,
@@ -16,11 +9,10 @@ module Glib
         ].compact.join(' :: ')
       end
 
-      def self.set_up(logger, store_action)
+      def self.set_up(logger)
         @@depth = -1
         @@logger = logger
         @@visitor = Glib::Json::Traversal::Visitor.new
-        @@store_action = store_action
       end
 
       def self.step(http, args)
@@ -38,12 +30,8 @@ module Glib
             @@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)
@@ -54,9 +42,6 @@ module Glib
               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

metadata

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