glib-web 0.4.50 → 0.4.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2879893523ba9889fedf7a2bcd3e51958a99ad7
-  data.tar.gz: 0e6f5cf4958c64131c2194cdc9bc76b9d6d63ca9
+  metadata.gz: 2d1e6bb6de1d215afd3d12655b76d6a4adcce163
+  data.tar.gz: 17b20a7da5dec1b330c81799c05be288ab4c2b67
 SHA512:
-  metadata.gz: 5726baf5d47827701fafb0966161ff9650a49cab9ce60322d19a2d8ed23ab8f5ab33b58bf1927e67198bbb0797135f0cbca5a164a751f12f6bab0c175741d9a6
-  data.tar.gz: c906379501cd1be2ff58f881583e1e4471109eb343d8ac41ece00d6a8d78b0cf4015711480a111901ed23b8ca7fe9c82a7340dbd0f3b60b70bd7ed25c734d588
+  metadata.gz: d51c2d223f1f90902035d9169d64c7155c727feb5edefa25b148e6cb8299b9670bf9f904b10620390e97d00cdfac1974422c69ea39874f8b5733b2651bfaed10
+  data.tar.gz: d87768d62d3d2d5c7967551a2d2d43afeb173e4737858c47766c81c665de0cc8d22265d15a617fef271fe173225041bac389d4049dc28aa6aa9002d950e52bba

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

@@ -111,13 +111,13 @@ module Glib::Json::DynamicText
     end
 
     # TODO: Reuse method from DynamicTextsHelper
-    def image_server_url(blob_key, w: 100, h: 100)
+    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: w, h: h }.to_param
+        query: { w: 100, h: 100 }.to_param
       )
 
       uri.to_s

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

@@ -118,18 +118,5 @@ module Glib::Json::NewDynamicText
         end
       }
     end
-
-    # # TODO: Reuse method from DynamicTextsHelper
-    # def image_server_url(blob_key, w: 100, h: 100)
-    #   return unless blob_key.present?
-
-    #   uri = URI::HTTPS.build(
-    #     host: 'imageserver-demo.herokuapp.com',
-    #     path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",
-    #     query: { w: w, h: h }.to_param
-    #   )
-
-    #   uri.to_s
-    # end
   end
 end

data/app/helpers/glib/dynamic_images_helper.rb

@@ -1,26 +1,14 @@
 module Glib
   module DynamicImagesHelper
-    # # TODO: The bucket should probably be set as a parameter for json_libs
-    # def dynamic_image_url(blob_key, w: 100, h: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket))
-    #   return unless blob_key.present?
-
-    #   uri = URI::HTTPS.build(
-    #     host: 'imageserver-demo.herokuapp.com',
-    #     path: "/image/#{bucket}/#{blob_key}",
-    #     query: { w: w, h: h, fit: fit }.to_param
-    #   )
-
-    #   uri.to_s
-    # end
-
-    def dynamic_image_url(blob_key, w: 100, h: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket))
+    # NOTE: The bucket should probably be set as a parameter for json_libs
+    def dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket))
       return unless blob_key.present?
 
       full_params_hash = {
         bucket_name: bucket,
         blob_key: blob_key,
-        w: w,
-        h: h,
+        w: width,
+        h: height,
         fit: fit,
         expires: 1.hours.from_now.to_i
       }

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -38,47 +38,5 @@ module Glib
         dt_key: new_key
       }.merge(args)
     end
-
-    # def dt_image_server_url(blob_key, w: 100, h: 100)
-    #   return unless blob_key.present?
-
-    #   encryption_service = EncryptionService.new(ENV['AWS_S3_BUCKET'], ENV['PRIVATE_API_KEY'])
-    #   params_hash = {
-    #     bucket_name: ENV['AWS_S3_BUCKET'],
-    #     blob_key: blob_key,
-    #     w: w,
-    #     h: h,
-    #     expires: 1.hours.from_now.to_i
-    #   }
-    #   signature = encryption_service.encrypt(params_hash)
-
-    #   # TODO: This should probably be set as a parameter for json_libs
-    #   uri = URI::HTTPS.build(
-    #     host: 'imageserver-demo.herokuapp.com',
-    #     path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",
-    #     query: params_hash.except(:bucket_name, :blob_key).merge(signature: signature).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/json_ui/abstract_builder.rb

@@ -141,7 +141,11 @@ module Glib
       # Support either string or dynamic_text hash
       def self.text propName, options = {}
         define_method(propName) do |value|
-          json.set! propName, value
+          if value.is_a?(Hash)
+            json.set! propName, value
+          else
+            json.set! propName, value&.to_s
+          end
         end
       end
 

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

@@ -54,7 +54,6 @@ module Glib
 
       class AbstractText < View
         string :textAlign
-        # string :text
         text :text
         color :color
       end

data/app/views/json_ui/garage/services/image.json.jbuilder

@@ -10,38 +10,38 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   # TODO: This needs fixing
   scroll.h1 text: 'Original size'
   scroll.spacer height: 6
-  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, w: nil, h: nil)
+  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, width: nil, height: nil)
 
   scroll.h1 text: 'fit: clip (default) to width'
   scroll.spacer height: 6
-  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, w: 100, h: nil)
+  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, width: 100, height: nil)
 
   scroll.spacer height: 20
   scroll.h1 text: 'fit: clip (default) to height'
   scroll.spacer height: 6
-  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, w: nil, h: 100)
+  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, width: nil, height: 100)
 
   scroll.spacer height: 20
   scroll.h1 text: 'fit: crop to width'
   scroll.spacer height: 6
-  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'crop', w: 100, h: nil)
+  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'crop', width: 100, height: nil)
 
   scroll.spacer height: 20
   scroll.h1 text: 'fit: crop to height'
   scroll.spacer height: 6
-  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'crop', w: nil, h: 100)
+  scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'crop', width: nil, height: 100)
 
   # Currently this doesn't behave the same way as https://docs.imgix.com/apis/url/size/fit#fill
   #
   # scroll.spacer height: 20
   # scroll.h1 text: 'fit: fill to width'
   # scroll.spacer height: 6
-  # scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'fill', w: 2000, h: nil)
+  # scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'fill', width: 2000, height: nil)
 
   # Currently this doesn't behave the same way as https://docs.imgix.com/apis/url/size/fit#fill
   #
   # scroll.spacer height: 20
   # scroll.h1 text: 'fit: fill to height'
   # scroll.spacer height: 6
-  # scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'fill', w: nil, h: 2000)
+  # scroll.image url: dynamic_image_url(glib_json_image_blob_key, bucket: bucket, fit: 'fill', width: nil, height: 2000)
 end

data/app/views/json_ui/garage/tables/export_import.json.jbuilder

@@ -1,31 +1,29 @@
 json.title 'Tables'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.table export: { label: 'Export', fileName: 'output' }, import: { submitUrl: json_ui_garage_url(path: 'forms/generic_post'), paramName: 'user' }, firstSection: ->(section) do
-    section.header cellViews: ->(header) do
-      header.label text: 'field1'
-      header.label text: 'field2'
-      header.label text: 'field3'
-      header.label text: 'field4'
-      header.label text: 'field5'
-      header.label text: 'field6'
-    end
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-    items = [1, 2, 3]
-    section.rows objects: items, builder: ->(row, item, index) do
-      row.default cellViews: ->(cell) do
-        cell.label text: "Data #{item}"
-        cell.label text: "Data 'A' #{item}"
-        cell.label text: 'Data "B"' + " #{item}"
-        cell.label text: "Data , #{item}"
-        cell.label text: "Line A#{item}\nLine B#{item}"
-        cell.label text: "Line A#{item}\rLine B#{item}"
-      end, onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'home/blank')
-      end
-    end
+page.table export: { label: 'Export', fileName: 'output' }, import: { submitUrl: json_ui_garage_url(path: 'forms/generic_post'), paramName: 'user' }, firstSection: ->(section) do
+  section.header cellViews: ->(header) do
+    header.label text: 'field1'
+    header.label text: 'field2'
+    header.label text: 'field3'
+    header.label text: 'field4'
+    header.label text: 'field5'
+    header.label text: 'field6'
   end
 
+  items = [1, 2, 3]
+  section.rows objects: items, builder: ->(row, item, index) do
+    row.default cellViews: ->(cell) do
+      cell.label text: "Data #{item}"
+      cell.label text: "Data 'A' #{item}"
+      cell.label text: 'Data "B"' + " #{item}"
+      cell.label text: "Data , #{item}"
+      cell.label text: "Line A#{item}\nLine B#{item}"
+      cell.label text: "Line A#{item}\rLine B#{item}"
+    end, onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.50
+  version: 0.4.51
 platform: ruby
 authors:
 - ''