glib-web 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483dc48299df91d5551fd4ce401fa1dd654e41ef210b6a7d0e4b04ea5e9c48a4
-  data.tar.gz: 2d7c3e9b6a3242099c19e20b110926badee014a6865d1f082f9aadf6bea5f80f
+  metadata.gz: 7c3733c91f64e84316ffc57ca5b343e2e65d4156e626c4f7df1be6733db3f151
+  data.tar.gz: 82242ce70ba7c5be935a9cad09e5fad12ac13e1da8df35fcfe62a0ba1d74d965
 SHA512:
-  metadata.gz: 540ee1e2e471fd0dfae4e5137a09088e668149cb71e03488c0e747b1ca998bab76b75e49703c12d8506cff4149b44f75197a2dd99eaba66d195a967508a982e4
-  data.tar.gz: f641a8945036d40bd336a89b70d41a69a8d26433dda816335c8e1c1f4c2578f3157b2315a63d6d3e021202f1e0bb8d2c86dab76781ee641e130f525488d965b3
+  metadata.gz: 85f494238a126745f03329d2cc45e04e048403b811d0f51d7eb49ab0fe267567094650d477e141ac76d99c2ab445dabac8f29fd9743f163ac1cf2a60f3808bec
+  data.tar.gz: ae42ea1a360b07361f66012f63e41a65a0ae6ad6cc908f656f3cdab5ede1fc6f75f93a3f82e9af18d7d14056377dc6f2d252841fdfb6ee402c5fe0b87823c6db

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

@@ -0,0 +1,103 @@
+module Glib::Json::DynamicText
+  def __json_dynamic_text_perform
+    # if Rails.env.development? && params[:_validate] == 'true'
+      if (hash = json_transformation_start).is_a?(Hash)
+        @__specs = {}
+        
+        crawl hash['header']&.[]('childViews')
+        crawl hash['body']&.[]('childViews')
+        crawl hash['footer']&.[]('childViews')
+
+        translated_texts = retrieve_example_texts(@__specs.keys)
+        translated_texts.each do |key, value|
+          @__specs[key].each do |spec|
+            spec.substitute_with(value)
+          end
+        end
+      end
+    # end
+  end
+
+  def retrieve_example_texts(keys)
+    examples_translations = {
+      'home.json_ui_garage.hello' => 'Hello {{name}}',
+      'home.json_ui_garage.greeting' => 'Good day!',
+    }
+
+    translated_texts = {}
+    keys.each do |key|
+      translated_texts[key] = examples_translations[key]
+    end
+    translated_texts
+  end
+
+  def crawl views
+    Glib::Json::DynamicText::crawl_multiple views, ->(view) do
+      extract_spec(view, 'text')
+    end
+  end
+
+  def extract_spec(view, prop)
+    if (spec = view[prop])
+      if spec.is_a?(Hash) && (key = spec['dt_key'])
+        @__specs[key] ||= []
+        @__specs[key] << TextSpec.new(view, prop, spec)
+      end
+    end
+  end
+
+  TextSpec = Struct.new(:view, :prop, :args) do
+    def substitute_with(text)
+      view[prop] = text.gsub(/\{\{(\w+)\}\}/) { args.fetch($1, "{{#{$1}}}") }
+    end
+  end
+  
+  def self.crawl_multiple views, block
+    if views.is_a? Array
+      views.each do |view|
+        crawl_single view, block
+      end
+
+      # views.each do |view|
+      #   case view['view']
+      #   when 'panels/form-v1'
+      #     @@forms << view
+      #     crawl_single view, block
+      #     @@forms.pop
+      #   else
+      #     crawl_single view, block
+      #   end
+      # end
+    end
+  end
+
+  def self.crawl_vertical_content view, block
+    crawl_multiple view['childViews'], block if view
+  end
+
+  def self.crawl_single view, block
+    block.call view
+
+    # Generic view children
+    crawl_multiple view['childViews'], block
+
+    # panels/split
+    # crawl_multiple view['leftViews'], block
+    # crawl_multiple view['rightViews'], block
+    
+    # Split panel
+    crawl_vertical_content view['left'], block
+    crawl_vertical_content view['center'], block
+    crawl_vertical_content view['right'], block
+
+    # TODO: crawl header and footer
+    # Table/List
+    if (sections = view['sections']).is_a? Array
+      sections.each do |section|
+        # Table
+        crawl_multiple section['rows'], block
+      end
+    end
+  end
+
+end

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

@@ -44,6 +44,7 @@ module Glib::Json::Libs
       include Glib::Json::Transformation
       include Glib::Json::Validation
       include Glib::Json::Ui
+      include Glib::Json::DynamicText
 
       before_action :__json_ui_start
 
@@ -52,6 +53,7 @@ module Glib::Json::Libs
         __json_ui_commit(options)
       end
       after_action :__json_transformation_commit
+      after_action :__json_dynamic_text_perform
       after_action :__json_validate_perform
     end
     

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -14,5 +14,17 @@ module Glib
       content = Glib::Text.get_content(new_key, default_value, options: options)
       content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
     end
+
+    def dt_json(key, default_value = '', **args)
+      new_key = key
+
+      if key.starts_with?('.')
+        new_key = "#{controller_name}.#{action_name}#{key}"
+      end
+
+      {
+        dt_key: new_key
+      }.merge(args)
+    end
   end
 end

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

@@ -133,6 +133,13 @@ module Glib
         end
       end
 
+      # Support either string or dynamic_text hash
+      def self.text propName, options = {}
+        define_method(propName) do |value|
+          json.set! propName, value
+        end
+      end
+
       def self.int propName
         define_method(propName) do |value|
           json.set! propName, value&.to_i

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

@@ -82,7 +82,6 @@ module Glib
           string :body
           string :tag
           int :timeout
-          action :onClick
         end
 
       end

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

@@ -53,7 +53,8 @@ module Glib
 
       class AbstractText < View
         string :textAlign
-        string :text
+        # string :text
+        text :text
         color :color
       end
 
@@ -69,6 +70,12 @@ module Glib
       class H4 < AbstractText
       end
 
+      class H5 < AbstractText
+      end
+      
+      class H6 < AbstractText
+      end
+
       class P < AbstractText
       end
 

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

@@ -157,9 +157,10 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class Column < View
-      int :lg
-      int :md
-      int :sm
+      # int :lg
+      # int :md
+      # int :sm
+      hash :lg
       views :childViews
     end
 

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

@@ -38,6 +38,10 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
         action.windows_open url: json_ui_garage_url(path: 'tables/index')
       end
 
+      menu.button text: 'Dynamic Texts', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'dynamic_texts/index')
+      end
+
       menu.divider
       menu.label text: 'Misc Menu'
       

data/app/views/json_ui/garage/dynamic_texts/basic.json.jbuilder

@@ -0,0 +1,11 @@
+json.title 'Dynamic Texts'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+    scroll.h3 text: dt_json('.hello', name: 'John')
+    scroll.label text: dt_json('.greeting')
+  end
+
+end

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

@@ -0,0 +1,14 @@
+json.title 'Dynamic Texts'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
+  
+  page.list firstSection: ->(section) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Basic', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'dynamic_texts/basic')
+      end
+    end
+
+  end
+end

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

@@ -6,9 +6,7 @@ json_ui_page json do |page|
   page.list firstSection: ->(section) do
     section.rows builder: ->(template) do
       template.thumbnail title: 'Send Desktop Notification', onClick: ->(action) do
-        action.dialogs_notification title: 'Hello World', body: 'Body Message', onClick: ->(action) do
-          action.dialogs_alert message: 'TODO'
-        end
+        action.dialogs_notification title: 'Hello World', body: 'Body Message'
       end
     end
   end

data/app/views/json_ui/garage/panels/responsive.json.jbuilder

@@ -9,7 +9,7 @@ json_ui_page json do |page|
     scroll.spacer height: 20
     scroll.h2 text: 'Responsive panel with 12 columns'
     scroll.spacer height: 6
-    scroll.panels_responsive childViews: ->(horizontal) do
+    scroll.panels_responsive width: 'matchParent', childViews: ->(horizontal) do
       horizontal.panels_column lg: 8, backgroundColor: '#c3cad2', childViews: ->(column) do
         column.button text: '1'
       end
@@ -21,7 +21,7 @@ json_ui_page json do |page|
     scroll.spacer height: 20
     scroll.h2 text: 'Responsive panel with more than 12 columns'
     scroll.spacer height: 6
-    scroll.panels_responsive childViews: ->(horizontal) do
+    scroll.panels_responsive width: 'matchParent', childViews: ->(horizontal) do
       horizontal.panels_column lg: 4, backgroundColor: '#c3cad2', childViews: ->(column) do
         column.button text: '1'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - ''
@@ -40,6 +40,7 @@ files:
 - app/controllers/concerns/application/json/transformation.rb
 - app/controllers/concerns/application/json/ui.rb
 - app/controllers/concerns/application/json/validation.rb
+- app/controllers/concerns/glib/json/dynamic_text.rb
 - app/controllers/concerns/glib/json/libs.rb
 - app/controllers/concerns/glib/json/transformation.rb
 - app/controllers/concerns/glib/json/ui.rb
@@ -65,6 +66,8 @@ files:
 - app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
+- app/views/json_ui/garage/dynamic_texts/basic.json.jbuilder
+- app/views/json_ui/garage/dynamic_texts/index.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
 - app/views/json_ui/garage/forms/basic.json.jbuilder
 - app/views/json_ui/garage/forms/basic_post.json.jbuilder