glib-web 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 36ac8042a2934608affdfa3ac546ca2efd6caff2f03eb2a1a02d7c9e3c145443
-  data.tar.gz: dbeaafdbf9ae36aeb6419cdba60c7676489eef6830076d8a9c84cdb26c98ef12
+SHA1:
+  metadata.gz: 919e24aa78e80169bcf2f2b032b8145c01bd385c
+  data.tar.gz: 4230c28a6afcf2d6e4f72e38b5fbc6c8ac0cad13
 SHA512:
-  metadata.gz: 3b528ad5eeb7613ae09e83f31e74951b7b40e64424e5086d75022039f66dc0a44624e4dc9818eddd7a205afe97d74ba298a4072ae0a568ea5b29f8ae28245c0f
-  data.tar.gz: eda842d4c68a7c74b9d3d59c663c4725eae8c7342b5dc9f7bdacbb9769b26850ce7a6f8739316047265c031d8936ce2edc98887619e2c9c9475ab42876b90edb
+  metadata.gz: d24491fd6b6c200bce6d845a6af29c0ca4a43175dc120ca6ac35df385a5f0c9a64698d72d95c7ce760be3a0ee731887442973f7784245dda957ccc5b977d6757
+  data.tar.gz: 223bbe0bc42013949637b2cd0afe679bf1f80582310eb9f1a0850b13603dff401b451a165d195c8ffd92258da983946bf5715e36944c1f7187a4eb6d471cf93f

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

@@ -1,94 +1,94 @@
-# TODO: Deprecate
-module Application::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 Application::Json::Transformation
-      include Application::Json::Validation
-      include Application::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
+# # TODO: Deprecate
+# module Application::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 Application::Json::Transformation
+#       include Application::Json::Validation
+#       include Application::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/application/json/transformation.rb

@@ -1,11 +1,11 @@
-module Application::Json::Transformation
-  def json_transformation_start
-    if request.format == 'json'
-      @__transformed_json ||= JSON.parse(response.body) rescue nil
-    end
-  end
+# module Application::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
+#   def __json_transformation_commit
+#     response.body = @__transformed_json.to_json if @__transformed_json
+#   end
+# end

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

@@ -1,66 +1,66 @@
-module Application::Json::Ui
-  extend ActiveSupport::Concern
+# module Application::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
+#   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
+#   # 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[:format] = :json if request.format == :json
-    options
-  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_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
+#   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
+#       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
+#   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
+#   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
+#   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/application/json/validation.rb

@@ -1,13 +1,13 @@
-module Application::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 Application::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/concerns/glib/auth/policy.rb

@@ -12,7 +12,7 @@ module Glib::Auth
       # TODO: Ultimately we want to uncomment this line, but:
       # - Need to be able to set aside some time to run rspec tests to ensure nothing gets broken
       # - Need to find a solution where we can reuse a single public policy
-#      after_action :verify_authorized
+      # after_action :verify_authorized
 
       helper_method :policy, :can?, :cannot?
 

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

@@ -14,7 +14,7 @@ module Glib::Json::Ui
   end
 
   # Override
-  def form_authenticity_token
+  def form_authenticity_token(*args)
     Rails.env.test? ? 'test_token' : super
   end
 

data/app/controllers/glib/home_controller.rb

@@ -8,16 +8,5 @@ module Glib
       path = "#{@path_prefix}/#{params[:path] || 'home/index'}"
       render path
     end
-
-    # def json_ui_garage_url(options = {})
-    #   Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-    #     protocol: (Rails.application.config.force_ssl ? 'https' : 'http'),
-    #     host: request.host,
-    #     port: request.port,
-    #     _render: params[:_render], format: params[:format])
-    #   )
-    # end
-
-    # helper_method :json_ui_garage_url
   end
 end

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

@@ -3,7 +3,7 @@ module Glib
     module PageHelper
       def json_ui_garage_url(options = {})
         return Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-          protocol: (Rails.application.config.force_ssl ? 'https' : 'http'),
+          protocol: request.protocol,
           host: request.host,
           port: request.port,
           _render: params[:_render], format: params[:format])

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

@@ -1,13 +1,13 @@
 module Glib
   module JsonUi
     class ViewBuilder < AbstractBuilder
-      def initialize json, page, multiple
+      def initialize(json, page, multiple)
         super(json, page)
 
         @multiple = multiple
       end
 
-      def add_view name, *args
+      def add_view(name, *args)
         if @multiple
           add_element_to_array_v1 'view', name, *args
         else
@@ -15,7 +15,7 @@ module Glib
         end
       end
 
-      def method_missing m, *args
+      def method_missing(m, *args)
         add_view m, *args
       end
 
@@ -72,7 +72,7 @@ module Glib
 
       class H5 < AbstractText
       end
-      
+
       class H6 < AbstractText
       end
 

data/app/policies/glib/application_policy.rb

@@ -1,148 +1,148 @@
-# The main purpose of this is for security. If it is important to display useful error message or to provide a "banana", then
-# it's better to perform an explicit check (e.g. as a validation in the model or using a before_action).
-module Glib
-  class ApplicationPolicy
-    attr_reader :user, :record, :controller, :request, :params
-
-    private
-    def initialize(user, record, controller, request, params)
-      @user = user
-      @record = record
-      @controller = controller
-      @request = request
-      # Don't get params from request because we might not have a proper request object. This might execute in Sidekiq. 
-      # See Presenter::Model::inside_mock_controller()
-      @params = params
-    end
-    
-    class << self
-      attr_reader :catch_all
-
-      # This is to define the authorization logic for an action (or a group of actions). It's different from controller's 
-      # authorize().
-      private  # Used by child
-      def authorize(*actions, &block)
-        actions.each do |action|
-          if action == :manage
-            # Serve as a catch-all to all actions that have not been specified in the policy.
-            @catch_all = block
-          else
-            method_name = "#{action}?"
-            # Avoid accidentally redefining multiple times from child policies. But it's okay if the child policy
-            # wants to override the parent's authorization method.
-            raise "Action authorization has been declared: #{action}" if instance_methods(false).include?(method_name.to_sym)
-            define_method method_name, &block
-          end
-        end
-      end
-    end
-    
-    private
-    def catch_all
-      self.class.catch_all
-    end
-    
-    private
-    # To ensure the block is called on the policy's instance instead class.
-    def call_catch_all
-      instance_eval(&catch_all)
-    end
-
-    authorize :index do
-      # We need this line because in `index` action, this method will be called instead of method_missing().
-      # Having this line ensures that the catch_all behaviour works according to the priority below:
-      # - child_policy#index?
-      # - child_policy#manage? -- catch_all
-      # - application_policy@index?
-      return call_catch_all if catch_all
-
-      false
-    end
-
-    authorize :show do
-      return call_catch_all if catch_all
-
-      scope.where(id: record.id).exists?
-    end
-
-    authorize :create do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    authorize :new do
-      return call_catch_all if catch_all
-      
-      create?
-    end
-
-    authorize :update do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    authorize :edit do
-      return call_catch_all if catch_all
-      
-      update?
-    end
-
-    authorize :destroy do
-      return call_catch_all if catch_all
-      
-      false
-    end
-
-    public
-    def method_missing(name, *args, &block)
-      if name.to_s.end_with?('?') && catch_all
-        call_catch_all
-      else
-        super
-      end
-    end
-
-    public
-    def scope
-      Pundit.policy_scope!(user, record.class)
-    end
-
-    private  # Used by child
-    def public?
-      true
-    end
-
-    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
-    # private  # Used by child
-    # def not_deleted_unless_owner_or_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
-    # end
-
-    # private  # Used by child
-    # def not_deleted_unless_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && block.call(@record))
-    # end
-
-    public
-    def self.args_builder
-      Proc.new { |controller| [] }
-    end
-    
-    class Scope
-      attr_reader :user, :scope
-
-      def initialize(user, scope)
-        @user = user
-        @scope = scope
-      end
-
-      def resolve
-        scope
-      end
-    end
-  end
-end
+# The main purpose of this is for security. If it is important to display useful error message or to provide a "banana", then
+# it's better to perform an explicit check (e.g. as a validation in the model or using a before_action).
+module Glib
+  class ApplicationPolicy
+    attr_reader :user, :record, :controller, :request, :params
+
+    private
+    def initialize(user, record, controller, request, params)
+      @user = user
+      @record = record
+      @controller = controller
+      @request = request
+      # Don't get params from request because we might not have a proper request object. This might execute in Sidekiq. 
+      # See Presenter::Model::inside_mock_controller()
+      @params = params
+    end
+    
+    class << self
+      attr_reader :catch_all
+
+      # This is to define the authorization logic for an action (or a group of actions). It's different from controller's 
+      # authorize().
+      private  # Used by child
+      def authorize(*actions, &block)
+        actions.each do |action|
+          if action == :manage
+            # Serve as a catch-all to all actions that have not been specified in the policy.
+            @catch_all = block
+          else
+            method_name = "#{action}?"
+            # Avoid accidentally redefining multiple times from child policies. But it's okay if the child policy
+            # wants to override the parent's authorization method.
+            raise "Action authorization has been declared: #{action}" if instance_methods(false).include?(method_name.to_sym)
+            define_method method_name, &block
+          end
+        end
+      end
+    end
+    
+    private
+    def catch_all
+      self.class.catch_all
+    end
+    
+    private
+    # To ensure the block is called on the policy's instance instead class.
+    def call_catch_all
+      instance_eval(&catch_all)
+    end
+
+    authorize :index do
+      # We need this line because in `index` action, this method will be called instead of method_missing().
+      # Having this line ensures that the catch_all behaviour works according to the priority below:
+      # - child_policy#index?
+      # - child_policy#manage? -- catch_all
+      # - application_policy@index?
+      return call_catch_all if catch_all
+
+      false
+    end
+
+    authorize :show do
+      return call_catch_all if catch_all
+
+      scope.where(id: record.id).exists?
+    end
+
+    authorize :create do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    authorize :new do
+      return call_catch_all if catch_all
+      
+      create?
+    end
+
+    authorize :update do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    authorize :edit do
+      return call_catch_all if catch_all
+      
+      update?
+    end
+
+    authorize :destroy do
+      return call_catch_all if catch_all
+      
+      false
+    end
+
+    public
+    def method_missing(name, *args, &block)
+      if name.to_s.end_with?('?') && catch_all
+        call_catch_all
+      else
+        super
+      end
+    end
+
+    public
+    def scope
+      Pundit.policy_scope!(user, record.class)
+    end
+
+    private  # Used by child
+    def public?
+      true
+    end
+
+    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
+    # private  # Used by child
+    # def not_deleted_unless_owner_or_moderator?(&block)
+    #   block ||= lambda { |unused_arg| @user.moderator? }
+    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
+    # end
+
+    # private  # Used by child
+    # def not_deleted_unless_moderator?(&block)
+    #   block ||= lambda { |unused_arg| @user.moderator? }
+    #   !@record.deleted? || (@user && block.call(@record))
+    # end
+
+    public
+    def self.args_builder
+      Proc.new { |controller| [] }
+    end
+    
+    class Scope
+      attr_reader :user, :scope
+
+      def initialize(user, scope)
+        @user = user
+        @scope = scope
+      end
+
+      def resolve
+        scope
+      end
+    end
+  end
+end

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

@@ -56,7 +56,7 @@ json_ui_page json do |page|
             action.dialogs_alert message: 'Closed'
           end
         end
-        
+
         # template.thumbnail title: 'snackbars/confirm (Experimental)', onClick: ->(action) do
         #   action.snackbars_confirm message: 'This is a confirm dialog', onCancel: ->(action) do
         #     action.dialogs_alert message: 'Canceled'
@@ -64,7 +64,7 @@ json_ui_page json do |page|
         #     action.dialogs_alert message: 'Confirmed'
         #   end
         # end
-        
+
         template.thumbnail title: 'snackbars/options', onClick: ->(action) do
           action.snackbars_options message: 'Select one', buttons: ->(menu) do
             menu.button text: 'Option1', onClick: ->(action) do
@@ -94,7 +94,7 @@ json_ui_page json do |page|
           end
         end
       end
-      
+
       section.rows builder: ->(template) do
         template.thumbnail title: 'windows/open', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'home/blank')
@@ -117,7 +117,7 @@ json_ui_page json do |page|
         template.thumbnail title: "windows/reload (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
           action.windows_reload
         end
-        
+
         reload_counter = params[:reload_counter].to_i
         template.thumbnail title: "windows/reload with URL (counter: #{reload_counter})", onClick: ->(action) do
           action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
@@ -126,4 +126,4 @@ json_ui_page json do |page|
       end
     end
   ]
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - ''
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ''