glib-web 0.4.62 → 0.4.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f8e86292395e22c1ee9ef711abdf5fbd9b9115
-  data.tar.gz: 3181f098ac9d09879b8ee8fa84dfe2f173317d90
+  metadata.gz: 476424036977faf25b0358602efe85377258d2f6
+  data.tar.gz: d0e7c51ee8a6bc550d91251fd0a178821d5b15b9
 SHA512:
-  metadata.gz: 6138e1485e762613e802890ab940a6bf82078f074909bd1fc6af4b50c4602b4a5918f8fde84162d4dfb525c166bf7945cb5c0adb7fc3b6a2277c74aeb3f50acf
-  data.tar.gz: e3757f1d6da865c8d4b3dfdfc962b5e04d5d52b3d0acc7a8fc4cedefb211490d9d8101eca06f62018c52c0a32451319657d21f8704feecfda88fd7507785e96f
+  metadata.gz: b81e49f36b5c37d4cd0b5058b8047c956f7d253a15e436aa514d1b10084a1aa4e7e61dfc3384f3abdac0d08dc756986d3ee3a815b2c448e48153ef618932e8db
+  data.tar.gz: 740a4c70fdb8d48f9ce39c4109f71cd75dd132bc7731fe8abd454d816dd7a77df389a5d20f56ca106196636afc06ea591565d9c3e70dfc7220c257d3f447fc03

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

@@ -58,7 +58,9 @@ module Glib::Json::Libs
       include Glib::Json::Traversal
       include Glib::Json::NewDynamicText
 
-      before_action :__json_ui_start
+      before_action do
+        __json_ui_start(options)
+      end
 
       # Note that after_action gets executed in reverse
       after_action do

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

@@ -31,15 +31,15 @@ module Glib::Json::Ui
     @__json_ui_activated
   end
 
-  def __json_ui_start
+  def __json_ui_start(options)
     @__json_ui_activated = false
-    @__json_ui_rendering = false
-    if params[:_render].present?
+    @__json_ui_rendering = nil
+    if options[:when] == :always || params[:_render] == 'v1'
       @__json_ui_activated = true
       request.variant = :ui
 
       if request.format.html? && params[:_skip_render] != 'true'
-        @__json_ui_rendering = true
+        @__json_ui_rendering = :vue
         request.format = 'json'
       end
     end
@@ -48,14 +48,12 @@ module Glib::Json::Ui
   def __json_ui_commit(options)
     return if response.status >= 300
 
-    if @__json_ui_rendering
-      case params[:_render]
-      when 'v1'
-        if (hash = json_transformation_start).is_a?(Hash)
-          __json_ui_vue(hash, options)
-        else
-          raise "Invalid JSON UI payload: #{hash}"
-        end
+    case @__json_ui_rendering
+    when :vue
+      if (hash = json_transformation_start).is_a?(Hash)
+        __json_ui_vue(hash, options)
+      else
+        raise "Invalid JSON UI payload: #{hash}"
       end
     end
   end

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 (Web Only)'
+    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

@@ -15,9 +15,6 @@ module Glib
         @depth = -1
         @logger = logger
         @visitor = Glib::Json::Traversal::Visitor.new
-
-        # @store_action = store_action
-
         @read_only_actions = Set.new
       end
 
@@ -36,15 +33,10 @@ module Glib
             @depth += 1
             child = case action
             when 'initiate_navigation'
-              # @@crawler_actions.add([action, params['url']]) if @@store_action
               @read_only_actions.add([action, params['url']])
               JsonCrawler::NavInitiate.new(http, params, action)
             when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
-              # TODO: Shouldn't dialog be crawled as well?
-              # unless action == 'dialogs/open-v1'
-                # @@crawler_actions.add([action, params['url']]) if @@store_action
-                @read_only_actions.add([action, params['url']])
-              # end
+              @read_only_actions.add([action, params['url']])
               JsonCrawler::WindowsOpen.new(http, params, action)
             when 'http/post-v1'
               JsonCrawler::ActionHttp.new(:post, http, params, action)
@@ -54,7 +46,6 @@ module Glib
               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
                 @read_only_actions.add([action, params['url']])
               end
               self.log action, params['url']

metadata

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