glib-web 0.5.43 → 0.5.44

data/app/helpers/glib/dynamic_images_helper.rb

@@ -1,55 +1,55 @@
-module Glib
-  module DynamicImagesHelper
-    # NOTE: The bucket should probably be set as a parameter for json_libs
-    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
-      return unless blob_key.present?
-
-      full_params_hash = {
-        bucket_name: bucket,
-        blob_key: blob_key,
-        w: width,
-        h: height,
-        fit: fit,
-        # expires: 1.hours.from_now.to_i
-        expires: 1.month.from_now.end_of_month.to_i
-      }
-
-      request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
-
-      if (private_key = signature_key)
-        encryption_service = EncryptionService.new(bucket, private_key)
-        # This produces different signature every time.
-        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
-        signature = encryption_service.encrypt(full_params_hash)
-        request_params_hash = request_params_hash.merge(signature: signature)
-      end
-
-      uri = URI::HTTPS.build(
-        host: 'imageserver-demo.herokuapp.com',
-        path: "/image/#{bucket}/#{blob_key}",
-        query: request_params_hash.to_param
-      )
-
-      uri.to_s
-    end
-
-    EncryptionService = Struct.new(:salt, :private_key) do
-      def encrypt(value)
-        encryptor.encrypt_and_sign(value)
-      end
-
-      def decrypt(value)
-        encryptor.decrypt_and_verify(value)
-      end
-
-      private
-        def encryptor
-          @encryptor ||= begin
-            key_len = ActiveSupport::MessageEncryptor.key_len
-            key = ActiveSupport::KeyGenerator.new(private_key).generate_key(salt, key_len)
-            ActiveSupport::MessageEncryptor.new(key)
-          end
-        end
-    end
-  end
-end
+module Glib
+  module DynamicImagesHelper
+    # NOTE: The bucket should probably be set as a parameter for json_libs
+    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
+      return unless blob_key.present?
+
+      full_params_hash = {
+        bucket_name: bucket,
+        blob_key: blob_key,
+        w: width,
+        h: height,
+        fit: fit,
+        # expires: 1.hours.from_now.to_i
+        expires: 1.month.from_now.end_of_month.to_i
+      }
+
+      request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
+
+      if (private_key = signature_key)
+        encryption_service = EncryptionService.new(bucket, private_key)
+        # This produces different signature every time.
+        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
+        signature = encryption_service.encrypt(full_params_hash)
+        request_params_hash = request_params_hash.merge(signature: signature)
+      end
+
+      uri = URI::HTTPS.build(
+        host: 'imageserver-demo.herokuapp.com',
+        path: "/image/#{bucket}/#{blob_key}",
+        query: request_params_hash.to_param
+      )
+
+      uri.to_s
+    end
+
+    EncryptionService = Struct.new(:salt, :private_key) do
+      def encrypt(value)
+        encryptor.encrypt_and_sign(value)
+      end
+
+      def decrypt(value)
+        encryptor.decrypt_and_verify(value)
+      end
+
+      private
+        def encryptor
+          @encryptor ||= begin
+            key_len = ActiveSupport::MessageEncryptor.key_len
+            key = ActiveSupport::KeyGenerator.new(private_key).generate_key(salt, key_len)
+            ActiveSupport::MessageEncryptor.new(key)
+          end
+        end
+    end
+  end
+end

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -1,42 +1,42 @@
-module Glib
-  module DynamicTextsHelper
-    def dt(key, default_value = '', **args)
-      new_key = key
-      options = {
-        scope: args.fetch(:scope, 'itinerarybuilder'),
-        lang: args.fetch(:lang, 'en')
-      }
-
-      if key.starts_with?('.')
-        new_key = "#{controller_name}.#{action_name}#{key}"
-      end
-
-      content, text_object = Glib::Text.get_content(new_key, default_value, options: options)
-      content = content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
-
-      if text_object.images.attached?
-        content = content.gsub(/\{\{image(\d)\}\}/) {
-          if image = text_object.images[$1.to_i - 1]
-            glib_dynamic_image_url(image.blob.key)
-          else
-            "{{image#{$1}}}"
-          end
-        }
-      end
-
-      content
-    end
-
-    def dt_json(key, default_value = '', **args)
-      new_key = key
-
-      if key.starts_with?('.')
-        new_key = "#{controller_name}.#{action_name}#{key}"
-      end
-
-      {
-        dt_key: new_key
-      }.merge(args)
-    end
-  end
-end
+module Glib
+  module DynamicTextsHelper
+    def dt(key, default_value = '', **args)
+      new_key = key
+      options = {
+        scope: args.fetch(:scope, 'itinerarybuilder'),
+        lang: args.fetch(:lang, 'en')
+      }
+
+      if key.starts_with?('.')
+        new_key = "#{controller_name}.#{action_name}#{key}"
+      end
+
+      content, text_object = Glib::Text.get_content(new_key, default_value, options: options)
+      content = content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
+
+      if text_object.images.attached?
+        content = content.gsub(/\{\{image(\d)\}\}/) {
+          if image = text_object.images[$1.to_i - 1]
+            glib_dynamic_image_url(image.blob.key)
+          else
+            "{{image#{$1}}}"
+          end
+        }
+      end
+
+      content
+    end
+
+    def dt_json(key, default_value = '', **args)
+      new_key = key
+
+      if key.starts_with?('.')
+        new_key = "#{controller_name}.#{action_name}#{key}"
+      end
+
+      {
+        dt_key: new_key
+      }.merge(args)
+    end
+  end
+end

data/app/helpers/glib/enum_helper.rb

@@ -1,8 +1,8 @@
-module Glib
-  module EnumHelper
-    def glib_enum_options(clazz, enum_field, keys = nil)
-      keys ||= clazz.send("#{enum_field}s").keys
-      keys.map { |i| { text: clazz.glib_enum_humanize(enum_field, i), value: i } }
-    end
-  end
-end
+module Glib
+  module EnumHelper
+    def glib_enum_options(clazz, enum_field, keys = nil)
+      keys ||= clazz.send("#{enum_field}s").keys
+      keys.map { |i| { text: clazz.glib_enum_humanize(enum_field, i), value: i } }
+    end
+  end
+end

data/app/helpers/glib/forms_helper.rb

@@ -1,15 +1,15 @@
-module Glib
-  module FormsHelper
-    def glib_form_field_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.label", args.merge(default: nil)) || I18n.t("activerecord.attributes.#{model_name}.#{prop}", args)
-    end
-
-    def glib_form_hint_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.hint", args.merge(default: nil))
-    end
-
-    def glib_form_placeholder_label(model_name, prop, args = {})
-      I18n.t("dt_models.#{model_name}.#{prop}.placeholder", args.merge(default: nil))
-    end
-  end
-end
+module Glib
+  module FormsHelper
+    def glib_form_field_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.label", args.merge(default: nil)) || I18n.t("activerecord.attributes.#{model_name}.#{prop}", args)
+    end
+
+    def glib_form_hint_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.hint", args.merge(default: nil))
+    end
+
+    def glib_form_placeholder_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.placeholder", args.merge(default: nil))
+    end
+  end
+end

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

@@ -1,294 +1,294 @@
-module Glib
-  module JsonUi
-    class AbstractBuilder
-      attr_reader :json, :page
-
-      def initialize(json, page)
-        @json = json
-        @page = page
-      end
-
-      private
-        def capitalize_first_letter_and_leave_others_alone(str)
-          str.slice(0, 1).capitalize + str.slice(1..-1)
-        end
-
-        def add_singleton_element(type, name, *args)
-          name_components = name.to_s.split('_')
-          json.set! type, "#{name_components.join('/')}" if type
-          args = [yield] if block_given?
-
-          # TODO: consider caching these instances
-          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
-        end
-
-        def add_element_to_array(type, name, *args)
-          json.child! do
-            add_singleton_element type, name, *args
-          end
-        end
-
-        # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_singleton_element_v1(type, name, *args)
-          name_components = name.to_s.split('_')
-          json.set! type, "#{name_components.join('/')}-v1" if type
-          args = [yield] if block_given?
-          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
-        end
-
-        # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_element_to_array_v1(type, name, *args)
-          json.child! do
-            add_singleton_element_v1 type, name, *args
-          end
-        end
-
-    end
-
-    class JsonUiElement
-      attr_reader :json, :page
-
-      def initialize(json, page)
-        @json = json
-        @page = page
-      end
-
-      def props(args = {})
-        @args = args
-
-        if args.is_a? Hash
-          args.each do |k, v|
-            send(k, v)
-          end
-        else
-          raise "Invalid properties: #{args}"
-        end
-
-        created
-      end
-
-      private
-        def self.any(propName)
-          define_method(propName) do |value|
-            json.set! propName, value
-          end
-        end
-
-        def self.date(propName)
-          define_method(propName) do |value|
-            json.set! propName, value&.to_date
-
-            # if (value = value&.to_s)
-            #   if !Rails.env.production?
-            #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
-            #   end
-
-            #   json.set! propName, value
-            # end
-          end
-        end
-
-        def self.date_time(propName)
-          define_method(propName) do |value|
-            json.set! propName, value&.to_datetime
-
-            # if (value = value&.to_s)
-            #   if !Rails.env.production?
-            #     try Date.parse(value) rescue raise "Invalid date: #{value}"
-            #   end
-
-            #   json.set! propName, value
-            # end
-          end
-        end
-
-        def self.color(propName)
-          define_method(propName) do |value|
-            if (value = value&.to_s)
-              if !Rails.env.production?
-                if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
-                  raise "Invalid color: #{value}"
-                end
-              end
-
-              json.set! propName, value
-            end
-          end
-        end
-
-        def self.length(propName)
-          define_method(propName) do |value|
-            if value
-              if !Rails.env.production?
-                case value
-                when 'matchParent'
-                when 'wrapContent'
-                else
-                  if !value.is_a? Integer
-                    raise "Invalid length: #{value}"
-                  end
-                end
-              end
-
-              json.set! propName, value
-            end
-          end
-        end
-
-        def self.string(propName, options = {})
-          define_method(propName) do |value|
-            str = value&.to_s
-            instance_variable_set("@#{propName}", str) if options[:cache]
-            json.set! propName, str
-          end
-        end
-
-        # Support either string or dynamic_text hash
-        def self.text(propName, options = {})
-          define_method(propName) do |value|
-            if value.is_a?(Hash)
-              json.set! propName, value
-            else
-              json.set! propName, value&.to_s
-            end
-          end
-        end
-
-        def self.int(propName)
-          define_method(propName) do |value|
-            json.set! propName, value&.to_i
-          end
-        end
-
-        def self.float(propName)
-          define_method(propName) do |value|
-            json.set! propName, value&.to_f
-          end
-        end
-
-        def self.bool(propName, options = {})
-          define_method(propName) do |value|
-            bool = value == true
-            instance_variable_set("@#{propName}", bool) if options[:cache]
-            json.set! propName, bool
-          end
-        end
-
-        def self.icon(propName, options = {})
-          define_method(propName) do |value|
-
-            if value.is_a?(Hash)
-              data = value
-              name = data[:name]
-            else
-              data = {}
-              name = value
-              # data = { material: { name: value } }
-
-              # name = value
-
-              # TODO: deprecated
-              # json.set!(propName) do
-              #   json.name name
-              # end
-            end
-
-            json.set!(propName) do
-              if name
-                data[:material] ||= {}
-                data[:material][:name] = name
-              end
-
-              if (material = data[:material])
-                json.material do
-                  json.name material[:name]
-                  json.size material[:size] if material[:size]
-                end
-              end
-
-              if (fa = data[:fa])
-                json.fa do
-                  json.name fa[:name]
-                  json.size fa[:size] if fa[:size]
-                end
-              end
-
-              if (custom = data[:custom])
-                json.custom do
-                  json.name custom[:name]
-                  json.size custom[:size] if custom[:size]
-                end
-              end
-
-              if (badge = data[:badge])
-                if badge.is_a?(Hash)
-                  json.badge badge
-                else
-                  json.badge do
-                    json.text badge
-                  end
-                end
-              end
-
-            end
-
-            # raise "Invalid properties: #{options.keys}" if options.size > 0
-
-            # instance_variable_set("@#{propName}", name) if options[:cache]
-
-          end
-        end
-
-        def self.action(propName)
-          define_method(propName) do |value|
-            json.set!(propName) { value.call(page.action_builder) }
-          end
-        end
-
-        def self.views(propName)
-          define_method(propName) do |value|
-            json.set!(propName) { value.call(page.view_builder) }
-          end
-        end
-
-        def self.array(propName)
-          define_method(propName) do |value|
-            json.set! propName, value&.to_a
-          end
-        end
-
-        def self.hash(propName)
-          define_method(propName) do |value|
-            json.set! propName, value
-          end
-        end
-
-        def self.menu(propName)
-          define_method(propName) do |value|
-            json.set! propName do
-              value.call(page.menu_builder)
-            end
-          end
-        end
-
-        def self.singleton_array(singletonName, arrayName)
-          array arrayName
-
-          define_method(singletonName) do |value|
-            json.set! arrayName, [value]
-          end
-        end
-
-        def self.panels_builder(propName, *panelNames)
-          define_method(propName) do |value|
-            value.call(page.content_builder(panelNames))
-          end
-        end
-
-        def created
-          # To be overridden
-        end
-
-    end
-  end
-end
+module Glib
+  module JsonUi
+    class AbstractBuilder
+      attr_reader :json, :page
+
+      def initialize(json, page)
+        @json = json
+        @page = page
+      end
+
+      private
+        def capitalize_first_letter_and_leave_others_alone(str)
+          str.slice(0, 1).capitalize + str.slice(1..-1)
+        end
+
+        def add_singleton_element(type, name, *args)
+          name_components = name.to_s.split('_')
+          json.set! type, "#{name_components.join('/')}" if type
+          args = [yield] if block_given?
+
+          # TODO: consider caching these instances
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+        end
+
+        def add_element_to_array(type, name, *args)
+          json.child! do
+            add_singleton_element type, name, *args
+          end
+        end
+
+        # TODO: Consider removing this in favour of non 'v1' suffix
+        def add_singleton_element_v1(type, name, *args)
+          name_components = name.to_s.split('_')
+          json.set! type, "#{name_components.join('/')}-v1" if type
+          args = [yield] if block_given?
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+        end
+
+        # TODO: Consider removing this in favour of non 'v1' suffix
+        def add_element_to_array_v1(type, name, *args)
+          json.child! do
+            add_singleton_element_v1 type, name, *args
+          end
+        end
+
+    end
+
+    class JsonUiElement
+      attr_reader :json, :page
+
+      def initialize(json, page)
+        @json = json
+        @page = page
+      end
+
+      def props(args = {})
+        @args = args
+
+        if args.is_a? Hash
+          args.each do |k, v|
+            send(k, v)
+          end
+        else
+          raise "Invalid properties: #{args}"
+        end
+
+        created
+      end
+
+      private
+        def self.any(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
+        end
+
+        def self.date(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_date
+
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
+            #   end
+
+            #   json.set! propName, value
+            # end
+          end
+        end
+
+        def self.date_time(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_datetime
+
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     try Date.parse(value) rescue raise "Invalid date: #{value}"
+            #   end
+
+            #   json.set! propName, value
+            # end
+          end
+        end
+
+        def self.color(propName)
+          define_method(propName) do |value|
+            if (value = value&.to_s)
+              if !Rails.env.production?
+                if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
+                  raise "Invalid color: #{value}"
+                end
+              end
+
+              json.set! propName, value
+            end
+          end
+        end
+
+        def self.length(propName)
+          define_method(propName) do |value|
+            if value
+              if !Rails.env.production?
+                case value
+                when 'matchParent'
+                when 'wrapContent'
+                else
+                  if !value.is_a? Integer
+                    raise "Invalid length: #{value}"
+                  end
+                end
+              end
+
+              json.set! propName, value
+            end
+          end
+        end
+
+        def self.string(propName, options = {})
+          define_method(propName) do |value|
+            str = value&.to_s
+            instance_variable_set("@#{propName}", str) if options[:cache]
+            json.set! propName, str
+          end
+        end
+
+        # Support either string or dynamic_text hash
+        def self.text(propName, options = {})
+          define_method(propName) do |value|
+            if value.is_a?(Hash)
+              json.set! propName, value
+            else
+              json.set! propName, value&.to_s
+            end
+          end
+        end
+
+        def self.int(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_i
+          end
+        end
+
+        def self.float(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_f
+          end
+        end
+
+        def self.bool(propName, options = {})
+          define_method(propName) do |value|
+            bool = value == true
+            instance_variable_set("@#{propName}", bool) if options[:cache]
+            json.set! propName, bool
+          end
+        end
+
+        def self.icon(propName, options = {})
+          define_method(propName) do |value|
+
+            if value.is_a?(Hash)
+              data = value
+              name = data[:name]
+            else
+              data = {}
+              name = value
+              # data = { material: { name: value } }
+
+              # name = value
+
+              # TODO: deprecated
+              # json.set!(propName) do
+              #   json.name name
+              # end
+            end
+
+            json.set!(propName) do
+              if name
+                data[:material] ||= {}
+                data[:material][:name] = name
+              end
+
+              if (material = data[:material])
+                json.material do
+                  json.name material[:name]
+                  json.size material[:size] if material[:size]
+                end
+              end
+
+              if (fa = data[:fa])
+                json.fa do
+                  json.name fa[:name]
+                  json.size fa[:size] if fa[:size]
+                end
+              end
+
+              if (custom = data[:custom])
+                json.custom do
+                  json.name custom[:name]
+                  json.size custom[:size] if custom[:size]
+                end
+              end
+
+              if (badge = data[:badge])
+                if badge.is_a?(Hash)
+                  json.badge badge
+                else
+                  json.badge do
+                    json.text badge
+                  end
+                end
+              end
+
+            end
+
+            # raise "Invalid properties: #{options.keys}" if options.size > 0
+
+            # instance_variable_set("@#{propName}", name) if options[:cache]
+
+          end
+        end
+
+        def self.action(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.action_builder) }
+          end
+        end
+
+        def self.views(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.view_builder) }
+          end
+        end
+
+        def self.array(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_a
+          end
+        end
+
+        def self.hash(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
+        end
+
+        def self.menu(propName)
+          define_method(propName) do |value|
+            json.set! propName do
+              value.call(page.menu_builder)
+            end
+          end
+        end
+
+        def self.singleton_array(singletonName, arrayName)
+          array arrayName
+
+          define_method(singletonName) do |value|
+            json.set! arrayName, [value]
+          end
+        end
+
+        def self.panels_builder(propName, *panelNames)
+          define_method(propName) do |value|
+            value.call(page.content_builder(panelNames))
+          end
+        end
+
+        def created
+          # To be overridden
+        end
+
+    end
+  end
+end