glib-web 0.5.56 → 0.5.61

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

data/app/controllers/glib/home_controller.rb

@@ -1,16 +1,54 @@
-module Glib
-  class HomeController < ApplicationController
-    if try(:glib_auth_inited?)
-      skip_before_action :glib_load_resource
-      skip_before_action :glib_authorize_resource
-    end
-
-    def json_ui_garage
-      @path_prefix = 'json_ui/garage'
-
-      # We can't use prepend_view_path because it affects the app, not the gem
-      path = "#{@path_prefix}/#{params[:path] || 'home/index'}"
-      render path
-    end
-  end
-end
+module Glib
+  class HomeController < ApplicationController
+    if try(:glib_auth_inited?)
+      skip_before_action :glib_load_resource
+      skip_before_action :glib_authorize_resource
+    end
+
+    def json_ui_garage
+      init_orders
+
+      @path_prefix = 'json_ui/garage'
+
+      # We can't use prepend_view_path because it affects the app, not the gem
+      path = "#{@path_prefix}/#{params[:path] || 'home/index'}"
+      render path
+    end
+
+    def init_orders
+      @order_headings = {}
+      @orders = params[:orders] || []
+      @orders.each do |order|
+        prop_name, direction = order.split('-')
+        index_order(prop_name, direction)
+      end
+    end
+
+    def index_order(prop_name, direction)
+      # In a real app, apply ordering to the model. For example:
+      # @users = @users.order(prop_name => direction)
+
+      # Garage example
+      @order_headings[prop_name] = direction
+    end
+
+    def reversed_order(order)
+      order.to_sym == :asc ? :desc : :asc
+    end
+
+    def reversed_order_params(prop_name)
+      prop_value = :asc
+      remaining = @orders.reject do |o|
+        tuple = o.split('-')
+        if tuple.first == prop_name.to_s
+          prop_value = reversed_order(tuple.second)
+          true
+        end
+      end
+      # Sort the params to produce predictable URLs which are useful for SEO
+      (["#{prop_name}-#{prop_value}"] + remaining).sort
+    end
+
+    helper_method :reversed_order_params
+  end
+end

data/app/helpers/glib/app_feature_support_helper.rb

@@ -1,16 +1,16 @@
-module Glib
-  module AppFeatureSupportHelper
-    def glib_app_feature_supported?(name, app_version, dictionary)
-      device = (app_device_os || :default).to_sym
-
-      version = dictionary[name.to_sym].try(:[], device)
-      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
-
-      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
-    end
-
-    def glib_app_version_gte(feature_version, app_version)
-      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
-    end
-  end
-end
+module Glib
+  module AppFeatureSupportHelper
+    def glib_app_feature_supported?(name, app_version, dictionary)
+      device = (app_device_os || :default).to_sym
+
+      version = dictionary[name.to_sym].try(:[], device)
+      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
+
+      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
+    end
+
+    def glib_app_version_gte(feature_version, app_version)
+      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
+    end
+  end
+end

data/app/helpers/glib/dynamic_images_helper.rb

@@ -1,55 +1,55 @@
-module Glib
-  module DynamicImagesHelper
-    # NOTE: The bucket should probably be set as a parameter for json_libs
-    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
-      return unless blob_key.present?
-
-      full_params_hash = {
-        bucket_name: bucket,
-        blob_key: blob_key,
-        w: width,
-        h: height,
-        fit: fit,
-        # expires: 1.hours.from_now.to_i
-        expires: 1.month.from_now.end_of_month.to_i
-      }
-
-      request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
-
-      if (private_key = signature_key)
-        encryption_service = EncryptionService.new(bucket, private_key)
-        # This produces different signature every time.
-        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
-        signature = encryption_service.encrypt(full_params_hash)
-        request_params_hash = request_params_hash.merge(signature: signature)
-      end
-
-      uri = URI::HTTPS.build(
-        host: 'imageserver-demo.herokuapp.com',
-        path: "/image/#{bucket}/#{blob_key}",
-        query: request_params_hash.to_param
-      )
-
-      uri.to_s
-    end
-
-    EncryptionService = Struct.new(:salt, :private_key) do
-      def encrypt(value)
-        encryptor.encrypt_and_sign(value)
-      end
-
-      def decrypt(value)
-        encryptor.decrypt_and_verify(value)
-      end
-
-      private
-        def encryptor
-          @encryptor ||= begin
-            key_len = ActiveSupport::MessageEncryptor.key_len
-            key = ActiveSupport::KeyGenerator.new(private_key).generate_key(salt, key_len)
-            ActiveSupport::MessageEncryptor.new(key)
-          end
-        end
-    end
-  end
-end
+module Glib
+  module DynamicImagesHelper
+    # NOTE: The bucket should probably be set as a parameter for json_libs
+    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
+      return unless blob_key.present?
+
+      full_params_hash = {
+        bucket_name: bucket,
+        blob_key: blob_key,
+        w: width,
+        h: height,
+        fit: fit,
+        # expires: 1.hours.from_now.to_i
+        expires: 1.month.from_now.end_of_month.to_i
+      }
+
+      request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
+
+      if (private_key = signature_key)
+        encryption_service = EncryptionService.new(bucket, private_key)
+        # This produces different signature every time.
+        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
+        signature = encryption_service.encrypt(full_params_hash)
+        request_params_hash = request_params_hash.merge(signature: signature)
+      end
+
+      uri = URI::HTTPS.build(
+        host: 'imageserver-demo.herokuapp.com',
+        path: "/image/#{bucket}/#{blob_key}",
+        query: request_params_hash.to_param
+      )
+
+      uri.to_s
+    end
+
+    EncryptionService = Struct.new(:salt, :private_key) do
+      def encrypt(value)
+        encryptor.encrypt_and_sign(value)
+      end
+
+      def decrypt(value)
+        encryptor.decrypt_and_verify(value)
+      end
+
+      private
+        def encryptor
+          @encryptor ||= begin
+            key_len = ActiveSupport::MessageEncryptor.key_len
+            key = ActiveSupport::KeyGenerator.new(private_key).generate_key(salt, key_len)
+            ActiveSupport::MessageEncryptor.new(key)
+          end
+        end
+    end
+  end
+end

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -1,42 +1,42 @@
-module Glib
-  module DynamicTextsHelper
-    def dt(key, default_value = '', **args)
-      new_key = key
-      options = {
-        scope: args.fetch(:scope, 'itinerarybuilder'),
-        lang: args.fetch(:lang, 'en')
-      }
-
-      if key.starts_with?('.')
-        new_key = "#{controller_name}.#{action_name}#{key}"
-      end
-
-      content, text_object = Glib::Text.get_content(new_key, default_value, options: options)
-      content = content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
-
-      if text_object.images.attached?
-        content = content.gsub(/\{\{image(\d)\}\}/) {
-          if image = text_object.images[$1.to_i - 1]
-            glib_dynamic_image_url(image.blob.key)
-          else
-            "{{image#{$1}}}"
-          end
-        }
-      end
-
-      content
-    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
+module Glib
+  module DynamicTextsHelper
+    def dt(key, default_value = '', **args)
+      new_key = key
+      options = {
+        scope: args.fetch(:scope, 'itinerarybuilder'),
+        lang: args.fetch(:lang, 'en')
+      }
+
+      if key.starts_with?('.')
+        new_key = "#{controller_name}.#{action_name}#{key}"
+      end
+
+      content, text_object = Glib::Text.get_content(new_key, default_value, options: options)
+      content = content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
+
+      if text_object.images.attached?
+        content = content.gsub(/\{\{image(\d)\}\}/) {
+          if image = text_object.images[$1.to_i - 1]
+            glib_dynamic_image_url(image.blob.key)
+          else
+            "{{image#{$1}}}"
+          end
+        }
+      end
+
+      content
+    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