glib-web 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c6f0412005aeff7117e83650cd6df244565451044f9813d04914bb5ade0b57
-  data.tar.gz: d7ab3a02df1aaef6aeaf9edfd24744c5ceb334067f37958fd1da50fd1663f3ae
+  metadata.gz: 69432dcf32db57ac795c618f216d7e2bd36b564b13872700135271b88e80c02c
+  data.tar.gz: c9adde3694e7663e5dc422bd8271649a9ca07095ba4397f1ccbb80b6b3a4c972
 SHA512:
-  metadata.gz: bd5d4772eac30d21ab0cec9d81eb2445f7e752de2d29cb8e94118a823bbcaae2cfe77219bf2f77441e0929adbb4d31fcda9de9ed1694fca9122c34540e9acfd3
-  data.tar.gz: a28093f3bea1e7deaa8a9f992f4c7a3f589a9fc7730ef712163349187fd5977f22bb385ed9cd10bd04c74863c42527b6b8cc73c40db4f900da52d1df205bc975
+  metadata.gz: 9d7b997aa956b6905ee1224f47af35314ed936894acb4f49373c8e0af987c12757e0f9b24983ea6288531bbe64877e9a8dff025c3f38a0e883c592710a4d5097
+  data.tar.gz: 8f749848943c2d2236a174851947238379c874dc4257359f7e0e6348711809972afaebfd29059e14ced9d2a709317bb9988204a192ce39b9c2ca83c19735f52a

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

@@ -1,4 +1,5 @@
-module Concerns::Application::Json::Libs
+# TODO: Deprecate
+module Application::Json::Libs
   extend ActiveSupport::Concern
 
   included do
@@ -27,7 +28,7 @@ module Concerns::Application::Json::Libs
   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
@@ -41,9 +42,9 @@ module Concerns::Application::Json::Libs
   module ClassMethods
 
     def json_libs_init(options)
-      include Concerns::Application::Json::Transformation
-      include Concerns::Application::Json::Validation
-      include Concerns::Application::Json::Ui
+      include Application::Json::Transformation
+      include Application::Json::Validation
+      include Application::Json::Ui
 
       before_action :__json_ui_start
 
@@ -54,7 +55,7 @@ module Concerns::Application::Json::Libs
       after_action :__json_transformation_commit
       after_action :__json_validate_perform
     end
-    
+
     def json_libs_set_locale
       before_action do
         # Need to explicitly fallback to EN
@@ -63,7 +64,7 @@ module Concerns::Application::Json::Libs
         I18n.locale = :en
       end
     end
-    
+
     def json_libs_force_json_ui
       before_action do
         if params[:_render] != 'v1'
@@ -72,17 +73,17 @@ module Concerns::Application::Json::Libs
       end
     end
 
-    def json_libs_rescue_csrf      
+    def json_libs_rescue_csrf
       rescue_from ActionController::InvalidAuthenticityToken do |exception|
         sign_out(:user)
 
         respond_to do |format|
           format.json do
-            render json: { 
-              onResponse: { 
+            render json: {
+              onResponse: {
                 action: 'windows/open-v1',
                 url: root_url
-              } 
+              }
             }
           end
         end

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

@@ -1,4 +1,4 @@
-module Concerns::Application::Json::Transformation
+module Application::Json::Transformation
   def json_transformation_start
     if request.format == 'json'
       @__transformed_json ||= JSON.parse(response.body) rescue nil

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

@@ -1,4 +1,4 @@
-module Concerns::Application::Json::Ui
+module Application::Json::Ui
   extend ActiveSupport::Concern
 
   included do

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

@@ -1,4 +1,4 @@
-module Concerns::Application::Json::Validation
+module Application::Json::Validation
   def __json_validate_perform
     if Rails.env.development? && params[:_validate] == 'true'
       if (hash = json_transformation_start).is_a?(Hash)

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

@@ -0,0 +1,93 @@
+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['JsonUiApp-Bundle-Id']
+  end
+
+  def json_ui_app_build_version
+    @json_ui_app_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['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
+
+
+
+  module ClassMethods
+
+    def json_libs_init(options)
+      include Glib::Json::Transformation
+      include Glib::Json::Validation
+      include Glib::Json::Ui
+
+      before_action :__json_ui_start
+
+      # 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
+    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 do
+        if params[:_render] != 'v1'
+          redirect_to url_for(params.to_unsafe_h.merge(_render: 'v1'))
+        end
+      end
+    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
+
+  end
+end

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

@@ -0,0 +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

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

@@ -0,0 +1,66 @@
+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
+    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[:format] = :json if request.format == :json
+    options
+  end
+
+  def json_ui_activated?
+    @__json_ui_activated
+  end
+
+  def __json_ui_start
+    @__json_ui_activated = false
+    @__json_ui_rendering = false
+    if params[:_render].present?
+      @__json_ui_activated = true
+      request.variant = :ui
+
+      if request.format.html? && params[:_skip_render] != 'true'
+        @__json_ui_rendering = true
+        request.format = 'json'
+      end
+    end
+  end
+
+  def __json_ui_commit(options)
+    if @__json_ui_rendering
+      if (hash = json_transformation_start).is_a?(Hash)
+        case params[:_render]
+        when 'v1'
+          __json_ui_vue(hash, options)
+        end
+      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: false, content_type: 'text/html', locals: { page: hash, options: options })
+  end
+end

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

@@ -0,0 +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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - ''
@@ -14,16 +14,22 @@ dependencies:
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 description: 
 email: ''
 executables: []
@@ -34,6 +40,10 @@ 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/libs.rb
+- app/controllers/concerns/glib/json/transformation.rb
+- app/controllers/concerns/glib/json/ui.rb
+- app/controllers/concerns/glib/json/validation.rb
 - app/controllers/glib/home_controller.rb
 - app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/json_ui/abstract_builder.rb