glib-web 0.5.43 → 0.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b8d44468bb10a4b5bd570d12d233ea3a0057be5e666466575204e7e445de360
-  data.tar.gz: 3f9d79903871a7a8f59a786c637d42f7e33bba1dfccc8c652544201e9df77ae9
+  metadata.gz: be151df878c71087ac47e699e53ce1e6d3f7458f820f2b53a7789ea8afd1ecdf
+  data.tar.gz: 58b1a34b76ef8972a4d566913723469a8dffe38c3b30ae1a25d016cede6d5a6a
 SHA512:
-  metadata.gz: 5dbedf4e29bc182bce5af77d0c9b392100e030a21fd8ed03dcd56bf1bb2c1c70f3f5d72cda358454e0058a88df16e1a2e83017bf983f42083c57da0f9187f1db
-  data.tar.gz: 1d80db9408c05b6ce3a2a9356e0aa01aa3f6489276424543996f0f248afe2366b687fc3127c4eda8f3e336d92b3479c88225f619d69df7ed1c9b2c52e1f921db
+  metadata.gz: c1523fbe38addf2a78f02c9c5c44a21987cfd7277bec6e9468358dfe45e0fb5f1cfcee6fc309d5ade153694ab114290e4e2b9e4bf93fa0f0e5fb7bb4fbeec281
+  data.tar.gz: d12f4bda96c1aa67e6d2fd92dee70adae999bf47e8cbbc962c7f5fff2d07cfcbd200d04287a8d51c297555202e26704a3fa53a8feb2e62503bc3a254f1240d33

data/app/controllers/concerns/glib/analytics/funnel.rb

@@ -1,61 +1,61 @@
-module Glib::Analytics
-  module Funnel
-    extend ActiveSupport::Concern
-
-    included do
-      # include Overrides
-      extend ClassMethods
-
-      helper_method :glib_analytics_feature_segment
-      helper_method :glib_analytics_feature_referer
-      helper_method :glib_analytics_included?
-    end
-
-    # module Overrides
-
-    #   # Expose protected method
-    #   public  # Override
-    #   def policy_scope(*args)
-    #     super
-    #   end
-    # end
-
-    def glib_analytics_included?
-      true
-    end
-
-    def glib_analytics_feature_segment
-      # To be overridden
-      nil
-    end
-
-    def glib_analytics_feature_referer
-      group = request.headers['GApp-Analytics-Referer-Group']
-      action = request.headers['GApp-Analytics-Referer-Action']
-      segment = request.headers['GApp-Analytics-Referer-Segment']
-      placement = request.headers['GApp-Analytics-Referer-Placement']
-
-      if group && action
-        return { group: group, action: action, segment: segment, placement: placement }
-      end
-
-      nil
-    end
-
-
-
-    module ClassMethods
-      # def glib_auth_inited?
-      #   @@__glib_auth_init ||= false
-      # end
-
-      # def glib_analytics_init
-      #   @@__glib_analytics_init = true
-      # end
-
-      # def glib_analytics_inited?
-      #   @@__glib_analytics_init ||= false
-      # end
-    end
-  end
-end
+module Glib::Analytics
+  module Funnel
+    extend ActiveSupport::Concern
+
+    included do
+      # include Overrides
+      extend ClassMethods
+
+      helper_method :glib_analytics_feature_segment
+      helper_method :glib_analytics_feature_referer
+      helper_method :glib_analytics_included?
+    end
+
+    # module Overrides
+
+    #   # Expose protected method
+    #   public  # Override
+    #   def policy_scope(*args)
+    #     super
+    #   end
+    # end
+
+    def glib_analytics_included?
+      true
+    end
+
+    def glib_analytics_feature_segment
+      # To be overridden
+      nil
+    end
+
+    def glib_analytics_feature_referer
+      group = request.headers['GApp-Analytics-Referer-Group']
+      action = request.headers['GApp-Analytics-Referer-Action']
+      segment = request.headers['GApp-Analytics-Referer-Segment']
+      placement = request.headers['GApp-Analytics-Referer-Placement']
+
+      if group && action
+        return { group: group, action: action, segment: segment, placement: placement }
+      end
+
+      nil
+    end
+
+
+
+    module ClassMethods
+      # def glib_auth_inited?
+      #   @@__glib_auth_init ||= false
+      # end
+
+      # def glib_analytics_init
+      #   @@__glib_analytics_init = true
+      # end
+
+      # def glib_analytics_inited?
+      #   @@__glib_analytics_init ||= false
+      # end
+    end
+  end
+end

data/app/controllers/concerns/glib/auth/policy.rb

@@ -1,148 +1,148 @@
-require 'pundit'
-
-module Glib::Auth
-  module Policy
-    extend ActiveSupport::Concern
-
-    included do
-      include Pundit
-      include Overrides
-      extend ClassMethods
-
-      # 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
-
-      helper_method :policy, :can?, :cannot?
-    end
-
-    module Overrides
-
-      public  # Override
-      def policy(record, policy_name = nil)
-        policy_name ||= record
-
-        @__pundit_policies ||= {}
-        return @__pundit_policies[policy_name] if @__pundit_policies[policy_name]
-
-        if policy_name.is_a?(Symbol) && policy_name.to_s.ends_with?('_admin')
-          policy_class = CommonAdminPolicy
-        else
-          policy_class = Pundit::PolicyFinder.new(policy_name).policy
-        end
-
-        raise "Policy not found for #{policy_name.is_a?(Symbol) || policy_name.is_a?(Class) ? policy_name : policy_name.class}" unless policy_class
-
-        @__pundit_policies[policy_name] = policy_class.new(current_user, record, policy_name, self, request, params, *policy_class.args_builder.call(self))
-      end
-
-      # Expose protected method
-      public  # Override
-      def policy_scope(*args)
-        super
-      end
-    end
-
-    private
-    def raise_access_denied(record, policy)
-      raise UnauthorizedError.new(record: record, policy: policy, query: "#{action_name}?")
-    end
-
-    public
-    def can?(action, record)
-      policy(record).send("#{action}?")
-    end
-
-    public
-    def cannot?(action, record)
-      !policy(record).send("#{action}?")
-    end
-
-    # Inspired from https://github.com/ryanb/cancan/wiki/Non-RESTful-Controllers
-    public
-    def glib_authorize_resource(*args)
-      options = args.extract_options!
-      resource_name = args.first
-
-      resource_name ||= controller_name.split('/').last.singularize
-
-      if (resource_key = options[:class]).nil?
-        policy_name = resource_name.camelize.constantize
-      else
-        policy_name = case resource_key
-        when false
-          resource_name.to_sym
-        when Symbol, Class
-          resource_key
-        else
-          raise "Invalid resource class: #{resource_key}"
-        end
-      end
-
-      resource_instance = instance_variable_get("@#{resource_name}") || policy_name
-
-      query = "#{action_name}?"
-      policy_instance = policy(resource_instance, policy_name)
-      raise_access_denied(resource_instance, policy_instance) unless policy_instance.public_send(query)
-    end
-
-
-
-    class UnauthorizedError < Pundit::NotAuthorizedError
-    end
-
-
-
-    module ClassMethods
-      def glib_auth_init
-        @@__glib_auth_init = true
-
-        before_action :glib_load_resource
-        before_action :glib_authorize_resource
-      end
-
-      def glib_auth_inited?
-        @@__glib_auth_init ||= false
-      end
-
-      # TODO: Consider deprecating
-      public
-      def authorize_resource(*args)
-        options = args.extract_options!
-        resource_name = args.first
-
-        self.before_action(options.slice(:only, :except, :if, :unless)) do |controller|
-          resource_name ||= resource_name_from_controller
-
-          begin
-            if !(resource_key = options[:class]).nil?
-              resource = case resource_key
-              when false
-                resource_name.to_sym
-              when Symbol, Class
-                resource_key
-              else
-                raise "Invalid resource class: #{resource_key}"
-              end
-
-              authorize resource
-            elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
-              authorize resource_instance
-            else
-              authorize resource_name.camelize.constantize
-            end
-          rescue Pundit::NotAuthorizedError => e
-            raise_access_denied(e.record, e.policy)
-          end
-
-          verify_authorized
-        end
-      end
-    end
-
-    def resource_name_from_controller
-      params[:controller].split('/').last.singularize
-    end
-  end
-end
+require 'pundit'
+
+module Glib::Auth
+  module Policy
+    extend ActiveSupport::Concern
+
+    included do
+      include Pundit
+      include Overrides
+      extend ClassMethods
+
+      # 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
+
+      helper_method :policy, :can?, :cannot?
+    end
+
+    module Overrides
+
+      public  # Override
+      def policy(record, policy_name = nil)
+        policy_name ||= record
+
+        @__pundit_policies ||= {}
+        return @__pundit_policies[policy_name] if @__pundit_policies[policy_name]
+
+        if policy_name.is_a?(Symbol) && policy_name.to_s.ends_with?('_admin')
+          policy_class = CommonAdminPolicy
+        else
+          policy_class = Pundit::PolicyFinder.new(policy_name).policy
+        end
+
+        raise "Policy not found for #{policy_name.is_a?(Symbol) || policy_name.is_a?(Class) ? policy_name : policy_name.class}" unless policy_class
+
+        @__pundit_policies[policy_name] = policy_class.new(current_user, record, policy_name, self, request, params, *policy_class.args_builder.call(self))
+      end
+
+      # Expose protected method
+      public  # Override
+      def policy_scope(*args)
+        super
+      end
+    end
+
+    private
+    def raise_access_denied(record, policy)
+      raise UnauthorizedError.new(record: record, policy: policy, query: "#{action_name}?")
+    end
+
+    public
+    def can?(action, record)
+      policy(record).send("#{action}?")
+    end
+
+    public
+    def cannot?(action, record)
+      !policy(record).send("#{action}?")
+    end
+
+    # Inspired from https://github.com/ryanb/cancan/wiki/Non-RESTful-Controllers
+    public
+    def glib_authorize_resource(*args)
+      options = args.extract_options!
+      resource_name = args.first
+
+      resource_name ||= controller_name.split('/').last.singularize
+
+      if (resource_key = options[:class]).nil?
+        policy_name = resource_name.camelize.constantize
+      else
+        policy_name = case resource_key
+        when false
+          resource_name.to_sym
+        when Symbol, Class
+          resource_key
+        else
+          raise "Invalid resource class: #{resource_key}"
+        end
+      end
+
+      resource_instance = instance_variable_get("@#{resource_name}") || policy_name
+
+      query = "#{action_name}?"
+      policy_instance = policy(resource_instance, policy_name)
+      raise_access_denied(resource_instance, policy_instance) unless policy_instance.public_send(query)
+    end
+
+
+
+    class UnauthorizedError < Pundit::NotAuthorizedError
+    end
+
+
+
+    module ClassMethods
+      def glib_auth_init
+        @@__glib_auth_init = true
+
+        before_action :glib_load_resource
+        before_action :glib_authorize_resource
+      end
+
+      def glib_auth_inited?
+        @@__glib_auth_init ||= false
+      end
+
+      # TODO: Consider deprecating
+      public
+      def authorize_resource(*args)
+        options = args.extract_options!
+        resource_name = args.first
+
+        self.before_action(options.slice(:only, :except, :if, :unless)) do |controller|
+          resource_name ||= resource_name_from_controller
+
+          begin
+            if !(resource_key = options[:class]).nil?
+              resource = case resource_key
+              when false
+                resource_name.to_sym
+              when Symbol, Class
+                resource_key
+              else
+                raise "Invalid resource class: #{resource_key}"
+              end
+
+              authorize resource
+            elsif (resource_instance = controller.instance_variable_get("@#{resource_name}"))
+              authorize resource_instance
+            else
+              authorize resource_name.camelize.constantize
+            end
+          rescue Pundit::NotAuthorizedError => e
+            raise_access_denied(e.record, e.policy)
+          end
+
+          verify_authorized
+        end
+      end
+    end
+
+    def resource_name_from_controller
+      params[:controller].split('/').last.singularize
+    end
+  end
+end

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