glib-web 0.5.82 → 0.5.83

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

@@ -1,122 +1,122 @@
-module Glib::Json::NewDynamicText
-  def __json_traversal_register_dynamic_text
-    @__specs = {}
-    @__specs_db = {}
-
-    __json_traversal_on_traverse do |view|
-      extract_spec(view, 'text')
-    end
-
-    __json_traversal_on_complete do |view|
-      if @__specs.keys.size > 0
-        # translated_texts = retrieve_remote_texts(@__specs.keys)
-        translated_texts = retrieve_local_texts(@__specs.keys).merge(retrieve_remote_texts(@__specs.keys))
-        translated_texts.each do |key, value|
-          @__specs[key].each do |spec|
-            spec.substitute_with(value)
-          end
-
-          if @__specs_db[key] && @__specs_db[key].images.attached?
-            @__specs[key].each do |spec|
-              spec.substitute_image_with(@__specs_db[key].images)
-            end
-          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!',
-      'home.json_ui_garage.greeting_with_image' => 'Good day! (with image)',
-    }
-
-    translated_texts = {}
-    keys.each do |key|
-      translated_texts[key] = examples_translations[key]
-    end
-    translated_texts
-  end
-
-  def retrieve_remote_texts(keys)
-    retries = 0
-
-    begin
-      response = RestClient.get(ENV['DTR_URL'], { params: { keys: keys } })
-    rescue Errno::ECONNREFUSED, RestClient::InternalServerError, RestClient::Exceptions::OpenTimeout, RestClient::Exceptions::ReadTimeout
-      if (retries += 1) <= 3
-        puts "Timeout, retrying..."
-        retry
-      else
-        raise
-      end
-    end
-
-    JSON.parse(response)
-  end
-
-  def retrieve_local_texts(keys)
-    translated_texts = {}
-    db_keys = []
-
-    redis = Glib::DynamicText::Config.redis
-    contents = redis.pipelined do
-      keys.each do |key|
-        args = @__specs[key].first.args
-        options = {
-          scope: args.fetch(:scope, 'itinerarybuilder'),
-          lang: args.fetch(:lang, 'en')
-        }
-
-        scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
-        redis.get(scope_key)
-      end
-    end
-
-    keys.each_with_index do |key, index|
-      if content = contents[index]
-        translated_texts[key] = content
-        db_keys << key if content.match(/\{\{image(\d)\}\}/)
-      else
-        db_keys << key
-      end
-    end
-
-    if db_keys.size > 0
-      texts = Glib::Text.where(key: db_keys)
-      texts.each do |text|
-        translated_texts[text.key] = text.content
-        @__specs_db[text.key] = text
-      end
-    end
-
-    translated_texts
-  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
-
-    def substitute_image_with(images)
-      view[prop] = view[prop].gsub(/\{\{image(\d)\}\}/) {
-        if image = images[$1.to_i - 1]
-          ApplicationController.helpers.glib_dynamic_image_url(image.blob.key)
-        else
-          "{{image#{$1}}}"
-        end
-      }
-    end
-  end
-end
+module Glib::Json::NewDynamicText
+  def __json_traversal_register_dynamic_text
+    @__specs = {}
+    @__specs_db = {}
+
+    __json_traversal_on_traverse do |view|
+      extract_spec(view, 'text')
+    end
+
+    __json_traversal_on_complete do |view|
+      if @__specs.keys.size > 0
+        # translated_texts = retrieve_remote_texts(@__specs.keys)
+        translated_texts = retrieve_local_texts(@__specs.keys).merge(retrieve_remote_texts(@__specs.keys))
+        translated_texts.each do |key, value|
+          @__specs[key].each do |spec|
+            spec.substitute_with(value)
+          end
+
+          if @__specs_db[key] && @__specs_db[key].images.attached?
+            @__specs[key].each do |spec|
+              spec.substitute_image_with(@__specs_db[key].images)
+            end
+          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!',
+      'home.json_ui_garage.greeting_with_image' => 'Good day! (with image)',
+    }
+
+    translated_texts = {}
+    keys.each do |key|
+      translated_texts[key] = examples_translations[key]
+    end
+    translated_texts
+  end
+
+  def retrieve_remote_texts(keys)
+    retries = 0
+
+    begin
+      response = RestClient.get(ENV['DTR_URL'], { params: { keys: keys } })
+    rescue Errno::ECONNREFUSED, RestClient::InternalServerError, RestClient::Exceptions::OpenTimeout, RestClient::Exceptions::ReadTimeout
+      if (retries += 1) <= 3
+        puts "Timeout, retrying..."
+        retry
+      else
+        raise
+      end
+    end
+
+    JSON.parse(response)
+  end
+
+  def retrieve_local_texts(keys)
+    translated_texts = {}
+    db_keys = []
+
+    redis = Glib::DynamicText::Config.redis
+    contents = redis.pipelined do
+      keys.each do |key|
+        args = @__specs[key].first.args
+        options = {
+          scope: args.fetch(:scope, 'itinerarybuilder'),
+          lang: args.fetch(:lang, 'en')
+        }
+
+        scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
+        redis.get(scope_key)
+      end
+    end
+
+    keys.each_with_index do |key, index|
+      if content = contents[index]
+        translated_texts[key] = content
+        db_keys << key if content.match(/\{\{image(\d)\}\}/)
+      else
+        db_keys << key
+      end
+    end
+
+    if db_keys.size > 0
+      texts = Glib::Text.where(key: db_keys)
+      texts.each do |text|
+        translated_texts[text.key] = text.content
+        @__specs_db[text.key] = text
+      end
+    end
+
+    translated_texts
+  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
+
+    def substitute_image_with(images)
+      view[prop] = view[prop].gsub(/\{\{image(\d)\}\}/) {
+        if image = images[$1.to_i - 1]
+          ApplicationController.helpers.glib_dynamic_image_url(image.blob.key)
+        else
+          "{{image#{$1}}}"
+        end
+      }
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Glib::Json::Transformation
-  def json_transformation_start
-    if request.format == 'json'
-      @__transformed_json ||= JSON.parse(response.body) rescue nil
-    end
-  end
-
-  def __json_transformation_commit
-    response.body = @__transformed_json.to_json if @__transformed_json
-  end
-end
+module Glib::Json::Transformation
+  def json_transformation_start
+    if request.format == 'json'
+      @__transformed_json ||= JSON.parse(response.body) rescue nil
+    end
+  end
+
+  def __json_transformation_commit
+    response.body = @__transformed_json.to_json if @__transformed_json
+  end
+end

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

@@ -1,92 +1,92 @@
-module Glib::Json::Traversal
-  def __json_traversal_on_traverse(&block)
-    @__json_traversal_on_traverses ||= []
-    @__json_traversal_on_traverses << block
-  end
-
-  def __json_traversal_on_complete(&block)
-    @__json_traversal_on_completes ||= []
-    @__json_traversal_on_completes << block
-  end
-
-  def __json_traversal_perform
-    if (hash = json_transformation_start).is_a?(Hash)
-      traverse hash['header']&.[]('childViews')
-      traverse hash['body']&.[]('childViews')
-      traverse hash['footer']&.[]('childViews')
-
-      @__json_traversal_on_completes.each do |block|
-        block.call
-      end
-    end
-  end
-
-  def traverse(views)
-    Visitor.new.traverse_multiple views, ->(view) do
-      @__json_traversal_on_traverses.each do |block|
-        block.call(view)
-      end
-    end
-  end
-
-
-
-  class Visitor
-    # Used in test crawler
-    attr_reader :forms
-
-    def initialize
-      @forms = []
-    end
-
-    def traverse_multiple(views, block)
-      if views.is_a? Array
-        views.each do |view|
-          case view['view']
-          when 'panels/form-v1'
-            @forms << view
-            traverse_single view, block
-            @forms.pop
-          else
-            traverse_single view, block
-          end
-        end
-      end
-    end
-
-    def traverse_vertical_content(view, block)
-      traverse_multiple view['childViews'], block if view
-    end
-
-    def traverse_single(view, block)
-      block.call view
-
-      # Generic view children
-      traverse_multiple view['childViews'], block
-
-      # Generic menu buttons
-      traverse_multiple view['buttons'], block
-      traverse_multiple view['childButtons'], block
-
-      # Split panel
-      traverse_vertical_content view['left'], block
-      traverse_vertical_content view['center'], block
-      traverse_vertical_content view['right'], block
-
-      # List template
-      traverse_multiple view['editButtons'], block
-      traverse_multiple view['leftButtons'], block
-      traverse_multiple view['rightButtons'], block
-
-      # TODO: crawl header and footer
-      # Table/List
-      if (sections = view['sections']).is_a? Array
-        sections.each do |section|
-          traverse_vertical_content section['header'], block
-          traverse_multiple section['rows'], block
-          traverse_vertical_content section['footer'], block
-        end
-      end
-    end
-  end
-end
+module Glib::Json::Traversal
+  def __json_traversal_on_traverse(&block)
+    @__json_traversal_on_traverses ||= []
+    @__json_traversal_on_traverses << block
+  end
+
+  def __json_traversal_on_complete(&block)
+    @__json_traversal_on_completes ||= []
+    @__json_traversal_on_completes << block
+  end
+
+  def __json_traversal_perform
+    if (hash = json_transformation_start).is_a?(Hash)
+      traverse hash['header']&.[]('childViews')
+      traverse hash['body']&.[]('childViews')
+      traverse hash['footer']&.[]('childViews')
+
+      @__json_traversal_on_completes.each do |block|
+        block.call
+      end
+    end
+  end
+
+  def traverse(views)
+    Visitor.new.traverse_multiple views, ->(view) do
+      @__json_traversal_on_traverses.each do |block|
+        block.call(view)
+      end
+    end
+  end
+
+
+
+  class Visitor
+    # Used in test crawler
+    attr_reader :forms
+
+    def initialize
+      @forms = []
+    end
+
+    def traverse_multiple(views, block)
+      if views.is_a? Array
+        views.each do |view|
+          case view['view']
+          when 'panels/form-v1'
+            @forms << view
+            traverse_single view, block
+            @forms.pop
+          else
+            traverse_single view, block
+          end
+        end
+      end
+    end
+
+    def traverse_vertical_content(view, block)
+      traverse_multiple view['childViews'], block if view
+    end
+
+    def traverse_single(view, block)
+      block.call view
+
+      # Generic view children
+      traverse_multiple view['childViews'], block
+
+      # Generic menu buttons
+      traverse_multiple view['buttons'], block
+      traverse_multiple view['childButtons'], block
+
+      # Split panel
+      traverse_vertical_content view['left'], block
+      traverse_vertical_content view['center'], block
+      traverse_vertical_content view['right'], block
+
+      # List template
+      traverse_multiple view['editButtons'], block
+      traverse_multiple view['leftButtons'], block
+      traverse_multiple view['rightButtons'], block
+
+      # TODO: crawl header and footer
+      # Table/List
+      if (sections = view['sections']).is_a? Array
+        sections.each do |section|
+          traverse_vertical_content section['header'], block
+          traverse_multiple section['rows'], block
+          traverse_vertical_content section['footer'], block
+        end
+      end
+    end
+  end
+end

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

@@ -1,88 +1,88 @@
-module Glib::Json::Ui
-  extend ActiveSupport::Concern
-
-  included do
-    rescue_from ActionController::UnknownFormat do |exception|
-      if json_ui_activated?
-        # Tell `__json_ui_start()` to avoid rendering this page while still retaining the `_render` param
-        # so that the page remains linking to other json_ui pages.
-        redirect_to url_for(format: nil, _skip_render: true)
-      else
-        raise exception
-      end
-    end
-  end
-
-  # Override
-  def form_authenticity_token(*args)
-    Rails.env.test? ? 'test_token' : super
-  end
-
-  # NOTE: Override default_url_options and call this method
-  def json_ui_url_options
-    options = {}
-    options[:_render] = params[:_render]
-    options[:_locale] = params[:_locale]
-    options[:_preview] = params[:_preview]
-    options[:format] = :json if request.format == :json
-    options
-  end
-
-  def json_ui_activated?
-    @__json_ui_activated
-  end
-
-  def json_ui_page_lifecycle_prop(name)
-    if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
-      hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
-      hash[name]['childActions']
-    end
-  end
-
-  def json_ui_response_lifecycle_prop
-    prop_name = 'onResponse'
-    if (hash = json_transformation_start).is_a?(Hash) && hash[prop_name]  # A valid response
-      if hash[prop_name]['action'] != 'runMultiple'
-        childActions = [hash[prop_name]]
-        hash[prop_name] = { 'action' => 'runMultiple', 'childActions' => childActions }
-        childActions
-      end
-    end
-  end
-
-  def __json_ui_start(options)
-    @__json_ui_activated = false
-    @__json_ui_rendering = nil
-    if options[:when] == :always || params[:_render] == 'v1'
-      @__json_ui_activated = true
-      request.variant = :ui
-
-      # Some bots (e.g. Line and DuckDuckGo) passes `*/*` in the `Accept` header
-      is_html = request.format.html? || request.format == '*/*'
-      if is_html && params[:_skip_render] != 'true'
-        @__json_ui_rendering = :vue
-        request.format = 'json'
-      end
-    end
-  end
-
-  def __json_ui_commit(options)
-    return if response.status >= 300
-
-    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
-
-  private
-    def __json_ui_vue(hash, options)
-      renderer_path = options[:renderer_path]
-      @__json_ui_orig_page = response.body
-      response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
-    end
-end
+module Glib::Json::Ui
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActionController::UnknownFormat do |exception|
+      if json_ui_activated?
+        # Tell `__json_ui_start()` to avoid rendering this page while still retaining the `_render` param
+        # so that the page remains linking to other json_ui pages.
+        redirect_to url_for(format: nil, _skip_render: true)
+      else
+        raise exception
+      end
+    end
+  end
+
+  # Override
+  def form_authenticity_token(*args)
+    Rails.env.test? ? 'test_token' : super
+  end
+
+  # NOTE: Override default_url_options and call this method
+  def json_ui_url_options
+    options = {}
+    options[:_render] = params[:_render]
+    options[:_locale] = params[:_locale]
+    options[:_preview] = params[:_preview]
+    options[:format] = :json if request.format == :json
+    options
+  end
+
+  def json_ui_activated?
+    @__json_ui_activated
+  end
+
+  def json_ui_page_lifecycle_prop(name)
+    if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
+      hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
+      hash[name]['childActions']
+    end
+  end
+
+  def json_ui_response_lifecycle_prop
+    prop_name = 'onResponse'
+    if (hash = json_transformation_start).is_a?(Hash) && hash[prop_name]  # A valid response
+      if hash[prop_name]['action'] != 'runMultiple'
+        childActions = [hash[prop_name]]
+        hash[prop_name] = { 'action' => 'runMultiple', 'childActions' => childActions }
+        childActions
+      end
+    end
+  end
+
+  def __json_ui_start(options)
+    @__json_ui_activated = false
+    @__json_ui_rendering = nil
+    if options[:when] == :always || params[:_render] == 'v1'
+      @__json_ui_activated = true
+      request.variant = :ui
+
+      # Some bots (e.g. Line and DuckDuckGo) passes `*/*` in the `Accept` header
+      is_html = request.format.html? || request.format == '*/*'
+      if is_html && params[:_skip_render] != 'true'
+        @__json_ui_rendering = :vue
+        request.format = 'json'
+      end
+    end
+  end
+
+  def __json_ui_commit(options)
+    return if response.status >= 300
+
+    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
+
+  private
+    def __json_ui_vue(hash, options)
+      renderer_path = options[:renderer_path]
+      @__json_ui_orig_page = response.body
+      response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
+    end
+end

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

@@ -1,13 +1,13 @@
-module Glib::Json::Validation
-  def __json_validate_perform
-    if Rails.env.development? && params[:_validate] == 'true'
-      if (hash = json_transformation_start).is_a?(Hash)
-        json_validate = JSONValidate.new(hash)
-        response_message = json_validate.valid?
-        hash[:_json] = {
-          validationErrors: response_message
-        }
-      end
-    end
-  end
-end
+module Glib::Json::Validation
+  def __json_validate_perform
+    if Rails.env.development? && params[:_validate] == 'true'
+      if (hash = json_transformation_start).is_a?(Hash)
+        json_validate = JSONValidate.new(hash)
+        response_message = json_validate.valid?
+        hash[:_json] = {
+          validationErrors: response_message
+        }
+      end
+    end
+  end
+end