glib-web 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb86f56770b733b9e6dffe8f2b2b1dce9786a5cff9609429832402f4883d505f
-  data.tar.gz: 6331df9c323c531df8ce4c8e1ca2b812d26e9f7fe7ff17e65b77c1bb15fcf77e
+  metadata.gz: a63a2f6c1b4ea589344292ac196fa72d98c006e1e582dbb06dff681ff650dc0c
+  data.tar.gz: 74a40e9a319791847c2f4431ffa98e19cbf28786ae0118fdba14c46aafc3c765
 SHA512:
-  metadata.gz: 6c314405ef3d50d97ef4deb4056f3f2ff53d1d046c1f9c31c90503762597d80cb013863c2b3d55cc1bd5569ea6b79b9a1da94deb5405856f544f2a540084f704
-  data.tar.gz: a677e65a2b3338688be9f1c9b157da94edbd90a1b4b2507fe2c71f3b8fd36cac5205c30e81bf3fdb9a91d97f2809efb01f5208292950abb27388a1974888e57b
+  metadata.gz: f5efb0e23eae6e10dacae4da8b755e0a0bd008091f1565b0129d2fbe0b14ee420cfe218ccafd7a44c0d3d7830acb152255f284bd5e8e6d9f49e48722f0f1d72b
+  data.tar.gz: 7f5b7da282fb4fe63899e0f63b073fca258b418d7b5aeda085caab7a3b99cd8852e8c589e677ba9fff0d07c4156e165e6e4e5b95864376100906ae49403c03c5

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

@@ -1,60 +1,90 @@
 module Glib::Json::DynamicText
-  def __json_dynamic_text_perform
-    if (hash = json_transformation_start).is_a?(Hash)
-      @__specs = {}
+  def __json_traversal_register_dynamic_text
+    @__specs = {}
+    @__specs_db = {}
 
-      crawl hash['header']&.[]('childViews')
-      crawl hash['body']&.[]('childViews')
-      crawl hash['footer']&.[]('childViews')
+    __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_remote_texts(@__specs.keys)
-
-        # translated_texts = retrieve_example_texts(@__specs.keys)
+        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_example_texts(keys)
-    examples_translations = {
-      'home.json_ui_garage.hello' => 'Hello {{name}}',
-      'home.json_ui_garage.greeting' => 'Good day!',
-    }
-
-    translated_texts = {}
-    keys.each do |key|
-      translated_texts[key] = examples_translations[key]
-    end
-    translated_texts
+  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 crawl(views)
-    Glib::Json::Crawler.new.crawl_multiple views, ->(view) do
-      extract_spec(view, 'text')
-    end
-  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])
@@ -69,57 +99,28 @@ module Glib::Json::DynamicText
     def substitute_with(text)
       view[prop] = text.gsub(/\{\{(\w+)\}\}/) { args.fetch($1, "{{#{$1}}}") }
     end
-  end
-end
-
-class Glib::Json::Crawler
-  attr_reader :forms
 
-  def initialize
-    @forms = []
-  end
-
-  def crawl_multiple(views, block)
-    if views.is_a? Array
-      views.each do |view|
-        case view['view']
-        when 'panels/form-v1'
-          @forms << view
-          crawl_single view, block
-          @forms.pop
+    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
-          crawl_single view, block
+          "{{image#{$1}}}"
         end
-      end
+      }
     end
-  end
-
-  def crawl_vertical_content(view, block)
-    crawl_multiple view['childViews'], block if view
-  end
 
-  def crawl_single(view, block)
-    block.call view
+    # TODO: Reuse method from DynamicTextsHelper
+    def image_server_url(blob_key, w: 100, h: 100)
+      return unless blob_key.present?
 
-    # Generic view children
-    crawl_multiple view['childViews'], block
+      uri = URI::HTTPS.build(
+        host: 'imageserver-demo.herokuapp.com',
+        path: "/image/#{ENV['AWS_S3_BUCKET']}/#{blob_key}",
+        query: { w: w, h: h }.to_param
+      )
 
-    # panels/split
-    # crawl_multiple view['leftViews'], block
-    # crawl_multiple view['rightViews'], block
-
-    # Split panel
-    crawl_vertical_content view['left'], block
-    crawl_vertical_content view['center'], block
-    crawl_vertical_content view['right'], block
-
-    # TODO: crawl header and footer
-    # Table/List
-    if (sections = view['sections']).is_a? Array
-      sections.each do |section|
-        # Table
-        crawl_multiple section['rows'], block
-      end
+      uri.to_s
     end
   end
 end

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

@@ -1,4 +1,3 @@
-# TODO: Remove old DynamicText
 module Glib::Json::NewDynamicText
   def __json_traversal_register_dynamic_text
     @__specs = {}
@@ -62,7 +61,8 @@ module Glib::Json::NewDynamicText
     translated_texts = {}
     db_keys = []
 
-    contents = $dt_redis.pipelined do
+    redis = Glib::DynamicText::Config.redis
+    contents = redis.pipelined do
       keys.each do |key|
         args = @__specs[key].first.args
         options = {
@@ -71,7 +71,7 @@ module Glib::Json::NewDynamicText
         }
 
         scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
-        $dt_redis.get(scope_key)
+        redis.get(scope_key)
       end
     end
 
@@ -112,24 +112,24 @@ module Glib::Json::NewDynamicText
     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)
+          ApplicationController.helpers.dt_image_server_url(image.blob.key)
         else
           "{{image#{$1}}}"
         end
       }
     end
 
-    # TODO: Reuse method from DynamicTextsHelper
-    def image_server_url(blob_key, w: 100, h: 100)
-      return unless blob_key.present?
+    # # 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 = 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
+    #   uri.to_s
+    # end
   end
 end

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -42,14 +42,43 @@ module Glib
     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: { w: w, h: h }.to_param
+        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/action_builder.rb

@@ -68,13 +68,16 @@ module Glib
           action :onClose
         end
 
-        # TODO: Deprecate
-        # Consider renaming to ShowSnackbar
-        class Snackbar < Action
+        class Oauth < Action
+          hash :provider
+          action :onSuccess
+          string :providerParamName
+          string :callbackUrlParamName
+        end
+
+        class Alert < Action
           string :message
-          string :verticalPosition
-          string :horizontalPosition
-          singleton_array :styleClass, :styleClasses
+          action :onClose
         end
 
         class Notification < Action

data/app/models/glib/text.rb

@@ -60,10 +60,14 @@ module Glib
 
     after_save :update_to_redis
 
+    def self.redis
+      Glib::DynamicText::Config.redis
+    end
+
     def self.get_content(key, default_value, options:)
       scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
 
-      content = $dt_redis.get(scope_key)
+      content = redis.get(scope_key)
       text = find_by(scope: options[:scope], lang: options[:lang], key: key)
 
       if !(content && text)
@@ -82,7 +86,7 @@ module Glib
 
     private
       def self.update_content(scope_key, content)
-        $dt_redis.set(scope_key, content)
+        redis.set(scope_key, content)
       end
 
       def update_to_redis

data/app/views/json_ui/garage/actions/index.json.jbuilder

@@ -12,15 +12,15 @@ json_ui_page json do |page|
       section.rows builder: ->(template) do
         template.thumbnail title: 'dialogs/alert', onClick: ->(action) do
           action.dialogs_alert message: 'This is an alert dialog', onClose: ->(action) do
-            action.dialogs_snackbar message: 'Closed'
+            action.snackbars_alert message: 'Closed'
           end
         end
 
         # template.thumbnail title: 'dialogs/confirm (Experimental)', onClick: ->(action) do
         #   action.dialogs_confirm message: 'This is a confirm dialog', onCancel: ->(action) do
-        #     action.dialogs_snackbar message: 'Canceled'
+        #     action.snackbars_alert message: 'Canceled'
         #   end, onConfirm: ->(action) do
-        #     action.dialogs_snackbar message: 'Confirmed'
+        #     action.snackbars_alert message: 'Confirmed'
         #   end
         # end
 
@@ -40,8 +40,18 @@ json_ui_page json do |page|
           action.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
         end
 
-        template.thumbnail title: 'dialogs/snackbar (Legacy)', onClick: ->(action) do
-          action.dialogs_snackbar message: 'This is a default snackbar'
+        template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
+          provider = {
+            name: "facebook",
+            webRequestUrl: "https://www.facebook.com/v3.1/dialog/oauth?auth_type=rerequest&client_id=CLIENT_ID&redirect_uri=http%3A%2F%2Fwww.lvh.me%3A3000%2Foauth_callback%2Ffacebook&response_type=code&scope=email",
+            requestUrl: "https://www.facebook.com/v3.1/dialog/oauth",
+            clientId: "CLIENT_ID",
+            redirectUrl: "http://www.lvh.me:3000/oauth_callback/facebook.json"
+          }
+
+          action.dialogs_oauth provider: provider, providerParamName: "session[oauth_provider]", callbackUrlParamName: "session[[oauth_callback_url]", onSuccess: ->(action) do
+            action.http_post url: 'TODO: post params to server'
+          end
         end
 
       end

data/lib/glib/dynamic_text/config.rb

@@ -7,7 +7,8 @@ module Glib
       def self.redis
         if @@redis.nil?
           redis_url = ENV.fetch('DT_REDIS_URL', 'redis://localhost:6379')
-          @@redis = Redis.new(url: redis_url)
+          # Allow application to specify their own $dt_redis
+          @@redis = $dt_redis || Redis.new(url: redis_url)
         end
         @@redis
       end

metadata

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