glib-web 0.5.64 → 0.5.66

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

@@ -1,126 +1,126 @@
-module Glib::Json::DynamicText
-  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_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_texts
-    # TODO: Check local memory
-    # TODO: Then check DTR
-  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]
-          image_server_url(image.blob.key)
-        else
-          "{{image#{$1}}}"
-        end
-      }
-    end
-
-    # TODO: Reuse method from DynamicTextsHelper
-    def image_server_url(blob_key)
-      return unless blob_key.present?
-
-      uri = URI::HTTPS.build(
-        host: 'imageserver-demo.herokuapp.com',
-        path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",
-        query: { w: 100, h: 100 }.to_param
-      )
-
-      uri.to_s
-    end
-  end
-end
+module Glib::Json::DynamicText
+  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_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_texts
+    # TODO: Check local memory
+    # TODO: Then check DTR
+  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]
+          image_server_url(image.blob.key)
+        else
+          "{{image#{$1}}}"
+        end
+      }
+    end
+
+    # TODO: Reuse method from DynamicTextsHelper
+    def image_server_url(blob_key)
+      return unless blob_key.present?
+
+      uri = URI::HTTPS.build(
+        host: 'imageserver-demo.herokuapp.com',
+        path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",
+        query: { w: 100, h: 100 }.to_param
+      )
+
+      uri.to_s
+    end
+  end
+end

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

@@ -1,149 +1,149 @@
-module Glib::Json::Libs
-  extend ActiveSupport::Concern
-
-  included do
-    extend ClassMethods
-
-    helper_method :json_ui_app_bundle_id, :json_ui_app_build_version, :json_ui_app_device_os
-    helper_method :json_ui_app_is_android?, :json_ui_app_is_ios?, :json_ui_app_is_web?
-  end
-
-  def json_ui_app_bundle_id
-    @json_ui_app_bundle_id ||= request.headers['GApp-Bundle-Id'] || request.headers['JsonUiApp-Bundle-Id']
-  end
-
-  def json_ui_app_build_version
-    @json_ui_app_build_version ||= request.headers['GApp-Build-Version'] || request.headers['JsonUiApp-Build-Version']
-    @json_ui_app_build_version = params[:build_version] if @json_ui_app_build_version.nil? && Rails.env.development?  # For easy testing
-    @json_ui_app_build_version
-  end
-
-  def json_ui_app_device_os
-    @json_ui_app_device_os ||= request.headers['GApp-Device-Os'] || request.headers['JsonUiApp-Device-Os']
-    @json_ui_app_device_os = params[:device_os] if @json_ui_app_device_os.nil? && Rails.env.development?  # For easy testing
-    @json_ui_app_device_os || 'web'
-  end
-
-  def json_ui_app_is_android?
-    json_ui_app_device_os == 'android'
-  end
-
-  def json_ui_app_is_ios?
-    json_ui_app_device_os == 'ios'
-  end
-
-  def json_ui_app_is_web?
-    json_ui_app_device_os == 'web'
-  end
-
-  def json_ui_render(template, args = {})
-    JSON.parse(render_to_string(template, locals: args))
-  end
-
-  def glib_force_json_ui
-    if params[:_render] != 'v1'
-      redirect_to url_for(params.to_unsafe_h.merge(_render: 'v1'))
-    end
-  end
-
-  def glib_json_handle_403
-    render file: Rails.root.join('public', '404.html'), status: :forbidden
-  end
-
-  def glib_json_handle_404
-    raise ActionController::RoutingError.new('Not Found')
-
-    # if json_ui_activated?
-    #   render file: Rails.root.join('public', '404.html'), status: :not_found
-    # else
-    #   raise exception
-    # end
-  end
-
-  def glib_json_handle_500(exception)
-    if json_ui_activated? && Rails.env.production?
-      Rollbar.error(exception, :use_exception_level_filters => true) if defined?(Rollbar)
-      render file: Rails.root.join('public', '500.html'), status: :internal_server_error
-    else
-      raise exception
-    end
-  end
-
-  def glib_json_redirect_to(url)
-    render json: {
-      onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
-    }
-  end
-
-  module ClassMethods
-
-    def json_libs_init(options)
-      include Glib::Json::Transformation
-      include Glib::Json::Validation
-      include Glib::Json::Ui
-
-      include Glib::Json::Traversal
-      include Glib::Json::NewDynamicText
-
-      before_action do
-        __json_ui_start(options)
-      end
-
-      # Note that after_action gets executed in reverse
-      after_action do
-        __json_ui_commit(options)
-      end
-      after_action :__json_transformation_commit
-      after_action :__json_validate_perform
-
-      after_action :__json_traversal_perform
-      after_action :__json_traversal_register_dynamic_text
-    end
-
-    def json_libs_set_locale
-      before_action do
-        # Need to explicitly fallback to EN
-        I18n.locale = params[:_locale] || :en
-      rescue
-        I18n.locale = :en
-      end
-    end
-
-    def json_libs_force_json_ui
-      before_action :glib_force_json_ui
-    end
-
-    def json_libs_rescue_csrf
-      rescue_from ActionController::InvalidAuthenticityToken do |exception|
-        sign_out(:user)
-
-        respond_to do |format|
-          format.json do
-            render json: {
-              onResponse: {
-                action: 'windows/open-v1',
-                url: root_url
-              }
-            }
-          end
-        end
-      end
-    end
-
-    # Call this before other rescues. Later rescue_from statements will take precedence, so more specific
-    # rescues have to be declared later.
-    def json_libs_rescue_500
-      rescue_from StandardError do |exception|
-        glib_json_handle_500(exception)
-      end
-    end
-
-    def json_libs_rescue_404
-      # Removed because it doesn't seem to offer anything extra
-      # rescue_from ActiveRecord::RecordNotFound do |exception|
-      #   glib_json_handle_404
-      # end
-    end
-
-  end
-end
+module Glib::Json::Libs
+  extend ActiveSupport::Concern
+
+  included do
+    extend ClassMethods
+
+    helper_method :json_ui_app_bundle_id, :json_ui_app_build_version, :json_ui_app_device_os
+    helper_method :json_ui_app_is_android?, :json_ui_app_is_ios?, :json_ui_app_is_web?
+  end
+
+  def json_ui_app_bundle_id
+    @json_ui_app_bundle_id ||= request.headers['GApp-Bundle-Id'] || request.headers['JsonUiApp-Bundle-Id']
+  end
+
+  def json_ui_app_build_version
+    @json_ui_app_build_version ||= request.headers['GApp-Build-Version'] || request.headers['JsonUiApp-Build-Version']
+    @json_ui_app_build_version = params[:build_version] if @json_ui_app_build_version.nil? && Rails.env.development?  # For easy testing
+    @json_ui_app_build_version
+  end
+
+  def json_ui_app_device_os
+    @json_ui_app_device_os ||= request.headers['GApp-Device-Os'] || request.headers['JsonUiApp-Device-Os']
+    @json_ui_app_device_os = params[:device_os] if @json_ui_app_device_os.nil? && Rails.env.development?  # For easy testing
+    @json_ui_app_device_os || 'web'
+  end
+
+  def json_ui_app_is_android?
+    json_ui_app_device_os == 'android'
+  end
+
+  def json_ui_app_is_ios?
+    json_ui_app_device_os == 'ios'
+  end
+
+  def json_ui_app_is_web?
+    json_ui_app_device_os == 'web'
+  end
+
+  def json_ui_render(template, args = {})
+    JSON.parse(render_to_string(template, locals: args))
+  end
+
+  def glib_force_json_ui
+    if params[:_render] != 'v1'
+      redirect_to url_for(params.to_unsafe_h.merge(_render: 'v1'))
+    end
+  end
+
+  def glib_json_handle_403
+    render file: Rails.root.join('public', '404.html'), status: :forbidden
+  end
+
+  def glib_json_handle_404
+    raise ActionController::RoutingError.new('Not Found')
+
+    # if json_ui_activated?
+    #   render file: Rails.root.join('public', '404.html'), status: :not_found
+    # else
+    #   raise exception
+    # end
+  end
+
+  def glib_json_handle_500(exception)
+    if json_ui_activated? && Rails.env.production?
+      Rollbar.error(exception, :use_exception_level_filters => true) if defined?(Rollbar)
+      render file: Rails.root.join('public', '500.html'), status: :internal_server_error
+    else
+      raise exception
+    end
+  end
+
+  def glib_json_redirect_to(url)
+    render json: {
+      onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
+    }
+  end
+
+  module ClassMethods
+
+    def json_libs_init(options)
+      include Glib::Json::Transformation
+      include Glib::Json::Validation
+      include Glib::Json::Ui
+
+      include Glib::Json::Traversal
+      include Glib::Json::NewDynamicText
+
+      before_action do
+        __json_ui_start(options)
+      end
+
+      # Note that after_action gets executed in reverse
+      after_action do
+        __json_ui_commit(options)
+      end
+      after_action :__json_transformation_commit
+      after_action :__json_validate_perform
+
+      after_action :__json_traversal_perform
+      after_action :__json_traversal_register_dynamic_text
+    end
+
+    def json_libs_set_locale
+      before_action do
+        # Need to explicitly fallback to EN
+        I18n.locale = params[:_locale] || :en
+      rescue
+        I18n.locale = :en
+      end
+    end
+
+    def json_libs_force_json_ui
+      before_action :glib_force_json_ui
+    end
+
+    def json_libs_rescue_csrf
+      rescue_from ActionController::InvalidAuthenticityToken do |exception|
+        sign_out(:user)
+
+        respond_to do |format|
+          format.json do
+            render json: {
+              onResponse: {
+                action: 'windows/open-v1',
+                url: root_url
+              }
+            }
+          end
+        end
+      end
+    end
+
+    # Call this before other rescues. Later rescue_from statements will take precedence, so more specific
+    # rescues have to be declared later.
+    def json_libs_rescue_500
+      rescue_from StandardError do |exception|
+        glib_json_handle_500(exception)
+      end
+    end
+
+    def json_libs_rescue_404
+      # Removed because it doesn't seem to offer anything extra
+      # rescue_from ActiveRecord::RecordNotFound do |exception|
+      #   glib_json_handle_404
+      # end
+    end
+
+  end
+end