glib-web 0.4.13 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5a76adac60e9d744d6b9e1fdd348ee233584c8e
-  data.tar.gz: 19353084048592e6c0104e1f7201ed932f9928dd
+SHA256:
+  metadata.gz: cb86f56770b733b9e6dffe8f2b2b1dce9786a5cff9609429832402f4883d505f
+  data.tar.gz: 6331df9c323c531df8ce4c8e1ca2b812d26e9f7fe7ff17e65b77c1bb15fcf77e
 SHA512:
-  metadata.gz: ca0356a4a7914a86a6a922be89384f5a14a867d0b4c16f5dff254835373b9eaab4ab9bc8209ace2e85ef103c96cd39b9d106fdaf0f1f1ff99ca3bbe8620cea1c
-  data.tar.gz: 36f955ab0f5c83d3b05c342f16ef6b4fe6fea60bf81a1933bddc23e1a88c79c1720753d5ad1c3f79f6af62494d61d16bf446d33663d3f9693ad64f854a96ba52
+  metadata.gz: 6c314405ef3d50d97ef4deb4056f3f2ff53d1d046c1f9c31c90503762597d80cb013863c2b3d55cc1bd5569ea6b79b9a1da94deb5405856f544f2a540084f704
+  data.tar.gz: a677e65a2b3338688be9f1c9b157da94edbd90a1b4b2507fe2c71f3b8fd36cac5205c30e81bf3fdb9a91d97f2809efb01f5208292950abb27388a1974888e57b

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

@@ -34,7 +34,19 @@ module Glib::Json::DynamicText
   end
 
   def retrieve_remote_texts(keys)
-    response = RestClient.get(ENV['DTR_URL'], { params: { keys: 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
 

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

@@ -42,7 +42,19 @@ module Glib::Json::NewDynamicText
   end
 
   def retrieve_remote_texts(keys)
-    response = RestClient.get(ENV['DTR_URL'], { params: { keys: 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
 

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/lib/glib/dynamic_text/config.rb

@@ -2,7 +2,7 @@ module Glib
   module DynamicText
     class Config
       @@redis = nil
-      @@database_url = ENV['DT_DATABASE_URL']
+      @@database_url = nil
 
       def self.redis
         if @@redis.nil?
@@ -13,7 +13,7 @@ module Glib
       end
 
       def self.database_url
-        @@database_url
+        @@database_url ||= ENV['DT_DATABASE_URL']
       end
     end
   end

metadata

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