glib-web 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d1149ca462352763a72cb6e58287a4de0769c92fd2ffda66bf7e2b63569890
-  data.tar.gz: 8e0abe7b68f2e8a43c7b43bf792e288453978f77549415f6854ecf516e7e8ade
+  metadata.gz: '00370028bd3cdc3097c1b40e128c34ec08271d2858b5a83d2c54ebceb5f18c6e'
+  data.tar.gz: 5021c723ca5ef541455c0497fc0a25f86945b7d99383698fb76d587d034f2f9b
 SHA512:
-  metadata.gz: ad4d63d5f450b027d2648d1fa5af30935e98174e01974a6a7c2db1f674bc441361fcde1d843cb821667659e71605696606950432944c74a3253b09326740c5e9
-  data.tar.gz: a1d88def9320774a923f6805b259d3faaaf08e39407133c078e6ac1a2def4d4f100477bfec4c70c305f61adfae695f0b03cf7b7b064100b1f087e67873587c16
+  metadata.gz: f7cc0a4fa5a08a8673e3306dfb91ca07e341c395b4a3f1e4cce985b7da72e394844ff5596087e657b15a1c610366aa34f5958446b40ba27c7a3ce3fc9afbd253
+  data.tar.gz: 9c4b027e7025dcb06a7734839fde49dc8138ae5865e442faebe0f0e715dc9d3077747f1e52b6f5198337d36635de9af89f52970abcf82a24929dc23ee5877948

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

@@ -1,21 +1,22 @@
 module Glib::Json::DynamicText
   def __json_dynamic_text_perform
-    # if Rails.env.development? && params[:_validate] == 'true'
-      if (hash = json_transformation_start).is_a?(Hash)
-        @__specs = {}
-        
-        crawl hash['header']&.[]('childViews')
-        crawl hash['body']&.[]('childViews')
-        crawl hash['footer']&.[]('childViews')
+    if (hash = json_transformation_start).is_a?(Hash)
+      @__specs = {}
+      
+      crawl hash['header']&.[]('childViews')
+      crawl hash['body']&.[]('childViews')
+      crawl hash['footer']&.[]('childViews')
 
-        translated_texts = retrieve_example_texts(@__specs.keys)
-        translated_texts.each do |key, value|
-          @__specs[key].each do |spec|
-            spec.substitute_with(value)
-          end
+      # TODO: retrieve texts from dynamictextreader
+      # translated_texts = retrieve_remote_texts(@__specs.keys)
+
+      translated_texts = retrieve_example_texts(@__specs.keys)
+      translated_texts.each do |key, value|
+        @__specs[key].each do |spec|
+          spec.substitute_with(value)
         end
       end
-    # end
+    end
   end
 
   def retrieve_example_texts(keys)

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -11,8 +11,18 @@ module Glib
         new_key = "#{controller_name}.#{action_name}#{key}"
       end
 
-      content = Glib::Text.get_content(new_key, default_value, options: options)
+      content, text_object = Glib::Text.get_content(new_key, default_value, options: options)
       content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
+
+      if text_object.images.attached?
+        content.gsub(/\{\{image(\d)\}\}/) {
+          if image = text_object.images[$1.to_i - 1]
+            image_server_url(image.blob.key)
+          else
+            "{{image#{$1}}}"
+          end
+        }
+      end
     end
 
     def dt_json(key, default_value = '', **args)
@@ -26,5 +36,17 @@ module Glib
         dt_key: new_key
       }.merge(args)
     end
+
+    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/models/glib/text.rb

@@ -1,5 +1,7 @@
 module Glib
   class Text < Glib::DynamicTextRecord
+    has_many_attached :images
+
     validates :scope, presence: true
     validates :lang, presence: true
     validates :key, presence: true, uniqueness: { scope: [:scope, :lang] }
@@ -10,18 +12,20 @@ module Glib
     def self.get_content(key, default_value, options:)
       scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
 
-      unless content = $dt_redis.get(scope_key)
+      if content = $dt_redis.get(scope_key)
+        text = find_by(scope: options[:scope], lang: options[:lang], key: key)
+      else
         if text = find_by(scope: options[:scope], lang: options[:lang], key: key)
           update_content(scope_key, text.content)
           content = text.content
         else
-          create(scope: options[:scope], lang: options[:lang], key: key, content: default_value)
+          text = create(scope: options[:scope], lang: options[:lang], key: key, content: default_value)
           update_content(scope_key, default_value)
           content = default_value
         end
       end
 
-      content
+      [content, text]
     end
 
     private

data/app/views/json_ui/garage/dynamic_texts/basic.json.jbuilder

@@ -5,6 +5,7 @@ json_ui_page json do |page|
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     scroll.h3 text: dt_json('.hello', name: 'John')
+    scroll.spacer height: 6
     scroll.label text: dt_json('.greeting')
   end
 

data/lib/generators/glib/install_generator.rb

@@ -8,9 +8,14 @@ module Glib
       class_option :app_name, type: :string, default: Rails.application.class.parent_name
 
       def copy_initializer
-        template '20191017062519_create_texts.rb', 'db/dynamic_text_migrate/20191017062519_create_texts.rb'
-        template '20191024063257_add_scope_to_texts.rb', 'db/dynamic_text_migrate/20191024063257_add_scope_to_texts.rb'
-        template '20191112095018_add_lang_to_texts.rb', 'db/dynamic_text_migrate/20191112095018_add_lang_to_texts.rb'
+        [
+          '20191017062519_create_texts.rb',
+          '20191024063257_add_scope_to_texts.rb',
+          '20191112095018_add_lang_to_texts.rb',
+          '20191126071051_create_active_storage_tables.active_storage.rb'
+        ].each do |migration_file|
+          template migration_file, "db/dynamic_text_migrate/#{migration_file}"
+        end
         template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
         template 'database.yml', 'config/database.yml'
       end

data/lib/generators/templates/20191126071051_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,27 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - ''
@@ -133,6 +133,7 @@ files:
 - lib/generators/templates/20191017062519_create_texts.rb
 - lib/generators/templates/20191024063257_add_scope_to_texts.rb
 - lib/generators/templates/20191112095018_add_lang_to_texts.rb
+- lib/generators/templates/20191126071051_create_active_storage_tables.active_storage.rb
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb