glib-web 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69432dcf32db57ac795c618f216d7e2bd36b564b13872700135271b88e80c02c
-  data.tar.gz: c9adde3694e7663e5dc422bd8271649a9ca07095ba4397f1ccbb80b6b3a4c972
+  metadata.gz: 3d9c8901bfee8243bbc64b4693fbd3f3d2395ce3dacfdf394456204ec5c995c9
+  data.tar.gz: 3c1fbb85bd85b9b2c58eabb5824cac8dbd94a0b97b815e01b442142ebcff9e80
 SHA512:
-  metadata.gz: 9d7b997aa956b6905ee1224f47af35314ed936894acb4f49373c8e0af987c12757e0f9b24983ea6288531bbe64877e9a8dff025c3f38a0e883c592710a4d5097
-  data.tar.gz: 8f749848943c2d2236a174851947238379c874dc4257359f7e0e6348711809972afaebfd29059e14ced9d2a709317bb9988204a192ce39b9c2ca83c19735f52a
+  metadata.gz: 8531f46175119fbc397cda8ee0a7e7c4ad4cecad00a6935973a0d1d25a17b34a8a62680f06e45a099dde054816d6e60c3ed24597b5c2213bb41c1e3658c2a589
+  data.tar.gz: 2b78a224ac48364902f42fbc24f6fcce9478e49665f86137aae30167a1d3892ccabab15ee40bfb3c129378956de037b55c20d8e5d9a2d26fc519fb84ad6a3290

data/app/controllers/concerns/application/json/libs.rb

@@ -1,5 +1,4 @@
-# TODO: Deprecate
-module Application::Json::Libs
+module Concerns::Application::Json::Libs
   extend ActiveSupport::Concern
 
   included do
@@ -28,7 +27,7 @@ module Application::Json::Libs
   def json_ui_app_is_android?
     json_ui_app_device_os == 'android'
   end
-
+  
   def json_ui_app_is_ios?
     json_ui_app_device_os == 'ios'
   end
@@ -42,9 +41,9 @@ module Application::Json::Libs
   module ClassMethods
 
     def json_libs_init(options)
-      include Application::Json::Transformation
-      include Application::Json::Validation
-      include Application::Json::Ui
+      include Concerns::Application::Json::Transformation
+      include Concerns::Application::Json::Validation
+      include Concerns::Application::Json::Ui
 
       before_action :__json_ui_start
 
@@ -55,7 +54,7 @@ module Application::Json::Libs
       after_action :__json_transformation_commit
       after_action :__json_validate_perform
     end
-
+    
     def json_libs_set_locale
       before_action do
         # Need to explicitly fallback to EN
@@ -64,7 +63,7 @@ module Application::Json::Libs
         I18n.locale = :en
       end
     end
-
+    
     def json_libs_force_json_ui
       before_action do
         if params[:_render] != 'v1'
@@ -73,17 +72,17 @@ module Application::Json::Libs
       end
     end
 
-    def json_libs_rescue_csrf
+    def json_libs_rescue_csrf      
       rescue_from ActionController::InvalidAuthenticityToken do |exception|
         sign_out(:user)
 
         respond_to do |format|
           format.json do
-            render json: {
-              onResponse: {
+            render json: { 
+              onResponse: { 
                 action: 'windows/open-v1',
                 url: root_url
-              }
+              } 
             }
           end
         end

data/app/controllers/concerns/application/json/transformation.rb

@@ -1,4 +1,4 @@
-module Application::Json::Transformation
+module Concerns::Application::Json::Transformation
   def json_transformation_start
     if request.format == 'json'
       @__transformed_json ||= JSON.parse(response.body) rescue nil

data/app/controllers/concerns/application/json/ui.rb

@@ -1,10 +1,10 @@
-module Application::Json::Ui
+module Concerns::Application::Json::Ui
   extend ActiveSupport::Concern
 
   included do
     rescue_from ActionController::UnknownFormat do |exception|
       if json_ui_activated?
-        # Tell `__json_ui_start()` to avoid rendering this page while still retaining the `_render` param
+        # Tell `__json_ui_start()` to avoid rendering this page while still retaining the `_render` param 
         # so that the page remains linking to other json_ui pages.
         redirect_to url_for(format: nil, _skip_render: true)
       else
@@ -61,6 +61,6 @@ module Application::Json::Ui
   def __json_ui_vue(hash, options)
     renderer_path = options[:renderer_path]
     @__json_ui_orig_page = response.body
-    response.body = render_to_string(template: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
+    response.body = render_to_string(file: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
   end
 end

data/app/controllers/concerns/application/json/validation.rb

@@ -1,4 +1,4 @@
-module Application::Json::Validation
+module Concerns::Application::Json::Validation
   def __json_validate_perform
     if Rails.env.development? && params[:_validate] == 'true'
       if (hash = json_transformation_start).is_a?(Hash)

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

@@ -18,6 +18,8 @@ module Glib
         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).parse(*args)
       end
       

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

@@ -4,7 +4,7 @@ module Glib
       def method_missing m, *args
         add_singleton_element_v1 'action', m, *args
       end
-
+      
       class Action < JsonUiElement
         def analytics(value)
           if value.is_a?(String)
@@ -43,31 +43,31 @@ module Glib
           string :message
           action :onClose
         end
-
+      
         # class Confirm < Action
         #   string :message
         #   action :onConfirm
         #   action :onCancel
         # end
-
+      
         class Options < Action
           string :message
-
+          
           def buttons(block)
             json.buttons do
               block.call page.menu_builder
             end
           end
         end
-
+        
         class Open < Action
           string :url, cache: true
         end
-
+        
         class Close < Action
           action :onClose
         end
-
+        
         # TODO: Deprecate
         # Consider renaming to ShowSnackbar
         class Snackbar < Action
@@ -76,16 +76,9 @@ module Glib
           string :horizontalPosition
           singleton_array :styleClass, :styleClasses
         end
-
-        class Notification < Action
-          string :title
-          string :body
-          string :tag
-          int :timeout
-        end
-
+      
       end
-
+      
       module Snackbars
         class Alert < Action
           string :message
@@ -95,20 +88,20 @@ module Glib
           string :horizontalPosition
           singleton_array :styleClass, :styleClasses
         end
-
+        
         # class Confirm < Action
         #   string :message
         #   action :onConfirm
         #   action :onCancel
-
+          
         #   string :verticalPosition
         #   string :horizontalPosition
         #   singleton_array :styleClass, :styleClasses
         # end
-
+        
         class Options < Action
           string :message
-
+          
           string :verticalPosition
           string :horizontalPosition
           singleton_array :styleClass, :styleClasses
@@ -118,15 +111,15 @@ module Glib
               block.call page.menu_builder
             end
           end
-
+          
         end
-
+      
       end
 
       module Forms
         class Submit < Action
         end
-
+      
       end
 
       module Windows
@@ -137,16 +130,16 @@ module Glib
         class CloseAll < Action
           action :onClose
         end
-
+      
         class Open < Action
           string :url, cache: true
           action :onOpen
         end
-
+      
         class OpenWeb < Action
           string :url
         end
-
+        
         class Reload < Action
           string :url, cache: true
         end
@@ -158,16 +151,16 @@ module Glib
           string :token
           action :onSave
         end
-
+      
       end
-
+      
       # FUTURE
       module Data
         class SaveCsrfToken < Action
           string :token
           action :onSave
         end
-
+      
         class Clear < Action
         end
       end
@@ -177,17 +170,17 @@ module Glib
           string :url, cache: true
           hash :formData
         end
-
+      
         class Patch < Action
           string :url, cache: true
           hash :formData
         end
-
+      
         class Delete < Action
           string :url, cache: true
           hash :formData
         end
-
+      
       end
 
       ###

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

@@ -38,11 +38,6 @@ module Glib
         def header(options = {})
           json.header do
             page.vertical_content(options)
-
-            # json.padding options[:padding]
-            # json.childViews do
-            #   options[:childViews]&.call page.view_builder
-            # end
           end
         end
 
@@ -62,11 +57,6 @@ module Glib
         def footer(options = {})
           json.footer do
             page.vertical_content(options)
-
-            # json.padding options[:padding]
-            # json.childViews do
-            #   options[:childViews]&.call page.view_builder
-            # end
           end
         end
       end

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

@@ -10,8 +10,10 @@ module Glib
         )
       end
 
-      def json_ui_page json
-        yield Page.new(json, self)
+      def json_ui_page json, &block
+        page = Page.new(json, self)
+        block&.call page
+        page
       end
 
       class Page
@@ -25,7 +27,7 @@ module Glib
           @json = json
           @context = context
 
-          @view_builder = ViewBuilder.new(json, self)
+          @view_builder = ViewBuilder.new(json, self, true)
           @action_builder = ActionBuilder.new(json, self)
           @menu_builder = MenuBuilder.new(json, self)
 
@@ -57,6 +59,14 @@ module Glib
             options[:content]&.call drawer_content_builder
           end
         end
+        
+        def navBar(options = {})
+          json.navBar do
+            json.rightItems do
+              options[:rightItems]&.call @menu_builder
+            end
+          end
+        end
 
         def header(options = {})
           json.header do
@@ -106,6 +116,10 @@ module Glib
           end
         end
 
+        def data(options = {})
+          options[:content].call(ViewBuilder.new(json, self, false))
+        end
+
         def vertical_content(options)
           options = options.reverse_merge(width: 'matchParent')
 

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

@@ -24,13 +24,6 @@ module Glib
           json.right do
             page.vertical_content(options)
           end
-          
-          # json.right do
-          #   json.padding options[:padding]
-          #   json.childViews do
-          #     options[:childViews]&.call page.view_builder
-          #   end
-          # end
         end
       end
       

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

@@ -0,0 +1,19 @@
+class Glib::JsonUi::ViewBuilder
+  module Charts
+    class Line < View
+      hash :nextPage
+      
+      def dataSeries(blocks)
+        json.dataSeries do
+          blocks.each do |block|
+            json.child! do
+              block.call
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -85,6 +85,15 @@ class Glib::JsonUi::ViewBuilder
 
     class Hidden < Text
     end
+    
+    # Benefits of using `fields/submit` over `button`
+    # - On the web, it translates to input[type=submit] which provides builtin functionality such as
+    #   submitting upon pressing enter on a field and remembering values for autofill.
+    # - We can attach name-value param to it. See https://www.w3schools.com/tags/att_button_value.asp
+    # - It has a default onClick so no need to specify `onClick: ->(action) { action.forms_submit }`
+    class Submit < AbstractField
+      string :text
+    end
 
     class CheckGroup < AbstractField
       views :childViews

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

@@ -1,8 +1,18 @@
 module Glib
   module JsonUi
     class ViewBuilder < AbstractBuilder
+      def initialize json, page, multiple
+        super(json, page)
+
+        @multiple = multiple
+      end
+
       def add_view name, *args
-        add_element_to_array_v1 'view', name, *args
+        if @multiple
+          add_element_to_array_v1 'view', name, *args
+        else
+          add_singleton_element_v1 'view', name, *args
+        end
       end
 
       def method_missing m, *args
@@ -61,9 +71,8 @@ module Glib
 
       class P < AbstractText
       end
-
+      
       class Label < AbstractText
-        string :format
         action :onClick
       end
 
@@ -77,7 +86,7 @@ module Glib
         string :url
         action :onClick
       end
-
+      
       class Icon < View
         string :name
         action :onClick
@@ -87,7 +96,7 @@ module Glib
       #   icon :icon
       #   string :text
       # end
-
+      
       class Button < View
         icon :icon, cache: true
         string :text, cache: true
@@ -112,7 +121,7 @@ module Glib
         int :zoom
         string :dataUrl
       end
-
+      
       class Chip < View
         string :text
       end
@@ -120,10 +129,10 @@ module Glib
       class Calendar < View
         string :dataUrl
       end
-
+      
       class TabBar < View
         color :color
-
+        
         def tabButtons(block)
           json.tabButtons do
             block.call page.menu_builder
@@ -141,7 +150,7 @@ module Glib
         #     end
         #   end
         # end
-
+        
       end
 
     end

data/app/views/json_ui/garage/forms/submission_indicator.json.jbuilder

@@ -4,7 +4,11 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
   page.form url: json_ui_garage_url(path: 'forms/submission_indicator_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
-    form.button text: 'This button gets disabled on submit', onClick: ->(action) { action.forms_submit }
+    form.label text: 'These buttons get disabled on submit'
+    form.spacer height: 10
+    form.button text: 'Normal Button', onClick: ->(action) { action.forms_submit }
+    form.spacer height: 10
+    form.fields_submit text: 'Submit Button'
 
     # This needs to be long enough that the FAB is roughly at the bottom of a mobile screen.
     # Ideally the spacer can expand dynamically depending on available space.

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

@@ -2,11 +2,11 @@ json.title 'Notifications'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
-
+  
   page.list firstSection: ->(section) do
     section.rows builder: ->(template) do
       template.thumbnail title: 'Send Desktop Notification', onClick: ->(action) do
-        action.dialogs_notification title: 'Hello World', body: 'Body Message'
+        # TODO: Send and display desktop notification
       end
     end
   end

data/app/views/json_ui/garage/views/_chart_data.json.jbuilder

@@ -0,0 +1,17 @@
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'views/charts', page: page_index + 1, data_only: 'v1'),
+  autoload: 'all'
+}
+
+if page_index < 3
+  builder.charts_line nextPage: next_page, dataSeries: [
+    -> do
+      json.title "Page #{page_index + 1}"
+
+      from = page_index + 1
+      to = page_index
+      json.points (from.month.ago.to_date..to.month.ago.to_date).map { |d| { x: d, y: 100 + rand(40) } }
+    end
+  ]
+end

data/app/views/json_ui/garage/views/charts.json.jbuilder

@@ -1,16 +1,20 @@
-json.title 'Views'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
-  
-  page.scroll padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
-    scroll.h1 text: 'Line Chart'
+if params[:data_only].present?
+  json_ui_page json do |page|
+    page.data content: ->(data) do
+      render "#{@path_prefix}/views/chart_data", json: json, builder: data
+    end
+  end
+else
+  json.title 'Views'
 
-    json.child! do
-      json.view 'charts/line-v1'
-      
-      json.dataSeries do
-        json.child! do
+  json_ui_page json do |page|
+    render "#{@path_prefix}/nav_menu", json: json, page: page
+    
+    page.scroll padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
+      scroll.h1 text: 'Line chart'
+      scroll.charts_line dataSeries: [
+        -> do
           json.title 'Line 1'
 
           points = {
@@ -22,10 +26,9 @@ json_ui_page json do |page|
             'Thu, 15 Nov 2018' => 1,
             'Fri, 16 Nov 2018' => 5,
           }
-          json.dataPoints points.map { |k, v| { x: k, y: v } }
-        end
-        
-        json.child! do
+          json.points points.map { |k, v| { x: k, y: v } }
+        end,
+        -> do
           json.title 'Line 2'
 
           points = {
@@ -37,11 +40,15 @@ json_ui_page json do |page|
             'Thu, 15 Nov 2018' => 5,
             'Fri, 16 Nov 2018' => 1,
           }
-          json.dataPoints points.map { |k, v| { x: k, y: v } }
+          json.points points.map { |k, v| { x: k, y: v } }
         end
+      ]
 
-      end
+      scroll.spacer height: 20
+      scroll.h1 text: 'Line chart using remote data'
+      render "#{@path_prefix}/views/chart_data", json: json, builder: scroll
 
     end
   end
+
 end

data/lib/glib/json_crawler/http.rb

@@ -30,7 +30,7 @@ module Glib
         # # Allow repeating urls because excluding them makes the test results really hard to analyze.
         # # if history.include?(url)
 
-        # if url.blank?
+        # if url.blank? 
         #   nil
         # else
         #   @context.assert_match URI_REGEXP, url
@@ -52,6 +52,7 @@ module Glib
         #     end
         #   end
         # end
+        
       end
 
       def post(url, controller, params)
@@ -103,13 +104,14 @@ module Glib
           else
             response_times << response.headers['X-Runtime'].to_f
             @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
-            if response.media_type == 'application/json'
+            if response.content_type == 'application/json'
               JSON.parse(response.body)
             else
               nil
             end
           end
         end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - ''
@@ -14,22 +14,16 @@ dependencies:
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 description: 
 email: ''
 executables: []
@@ -40,12 +34,7 @@ files:
 - app/controllers/concerns/application/json/transformation.rb
 - app/controllers/concerns/application/json/ui.rb
 - app/controllers/concerns/application/json/validation.rb
-- app/controllers/concerns/glib/json/libs.rb
-- app/controllers/concerns/glib/json/transformation.rb
-- app/controllers/concerns/glib/json/ui.rb
-- app/controllers/concerns/glib/json/validation.rb
 - app/controllers/glib/home_controller.rb
-- app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/json_ui/abstract_builder.rb
 - app/helpers/glib/json_ui/action_builder.rb
 - app/helpers/glib/json_ui/list_builders.rb
@@ -57,10 +46,9 @@ files:
 - app/helpers/glib/json_ui/table_builders.rb
 - app/helpers/glib/json_ui/view_builder.rb
 - app/helpers/glib/json_ui/view_builder/banners.rb
+- app/helpers/glib/json_ui/view_builder/charts.rb
 - app/helpers/glib/json_ui/view_builder/fields.rb
 - app/helpers/glib/json_ui/view_builder/panels.rb
-- app/models/glib/dynamic_text_record.rb
-- app/models/glib/text.rb
 - app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
@@ -112,6 +100,7 @@ files:
 - app/views/json_ui/garage/tables/export_import.json.jbuilder
 - app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder
 - app/views/json_ui/garage/tables/index.json.jbuilder
+- app/views/json_ui/garage/views/_chart_data.json.jbuilder
 - app/views/json_ui/garage/views/banners.json.jbuilder
 - app/views/json_ui/garage/views/calendar_data.json.jbuilder
 - app/views/json_ui/garage/views/carousels.json.jbuilder
@@ -124,12 +113,6 @@ files:
 - app/views/json_ui/garage/views/misc.json.jbuilder
 - app/views/json_ui/garage/views/texts.json.jbuilder
 - config/routes.rb
-- lib/generators/glib/install_generator.rb
-- 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/database.yml
-- lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
 - lib/glib/engine.rb
 - lib/glib/json_crawler.rb

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

@@ -1,93 +0,0 @@
-module Glib::Json::Libs
-  extend ActiveSupport::Concern
-
-  included do
-    extend ClassMethods
-
-    helper_method :json_ui_app_bundle_id, :json_ui_app_build_version, :json_ui_app_device_os
-    helper_method :json_ui_app_is_android?, :json_ui_app_is_ios?, :json_ui_app_is_web?
-  end
-
-  def json_ui_app_bundle_id
-    @json_ui_app_bundle_id ||= request.headers['JsonUiApp-Bundle-Id']
-  end
-
-  def json_ui_app_build_version
-    @json_ui_app_build_version ||= request.headers['JsonUiApp-Build-Version']
-    @json_ui_app_build_version = params[:build_version] if @json_ui_app_build_version.nil? && Rails.env.development?  # For easy testing
-    @json_ui_app_build_version
-  end
-
-  def json_ui_app_device_os
-    @json_ui_app_device_os ||= request.headers['JsonUiApp-Device-Os']
-    @json_ui_app_device_os = params[:device_os] if @json_ui_app_device_os.nil? && Rails.env.development?  # For easy testing
-    @json_ui_app_device_os || 'web'
-  end
-
-  def json_ui_app_is_android?
-    json_ui_app_device_os == 'android'
-  end
-  
-  def json_ui_app_is_ios?
-    json_ui_app_device_os == 'ios'
-  end
-
-  def json_ui_app_is_web?
-    json_ui_app_device_os == 'web'
-  end
-
-
-
-  module ClassMethods
-
-    def json_libs_init(options)
-      include Glib::Json::Transformation
-      include Glib::Json::Validation
-      include Glib::Json::Ui
-
-      before_action :__json_ui_start
-
-      # Note that after_action gets executed in reverse
-      after_action do
-        __json_ui_commit(options)
-      end
-      after_action :__json_transformation_commit
-      after_action :__json_validate_perform
-    end
-    
-    def json_libs_set_locale
-      before_action do
-        # Need to explicitly fallback to EN
-        I18n.locale = params[:_locale] || :en
-      rescue
-        I18n.locale = :en
-      end
-    end
-    
-    def json_libs_force_json_ui
-      before_action do
-        if params[:_render] != 'v1'
-          redirect_to url_for(params.to_unsafe_h.merge(_render: 'v1'))
-        end
-      end
-    end
-
-    def json_libs_rescue_csrf      
-      rescue_from ActionController::InvalidAuthenticityToken do |exception|
-        sign_out(:user)
-
-        respond_to do |format|
-          format.json do
-            render json: { 
-              onResponse: { 
-                action: 'windows/open-v1',
-                url: root_url
-              } 
-            }
-          end
-        end
-      end
-    end
-
-  end
-end

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

@@ -1,11 +0,0 @@
-module Glib::Json::Transformation
-  def json_transformation_start
-    if request.format == 'json'
-      @__transformed_json ||= JSON.parse(response.body) rescue nil
-    end
-  end
-
-  def __json_transformation_commit
-    response.body = @__transformed_json.to_json if @__transformed_json
-  end
-end

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

@@ -1,66 +0,0 @@
-module Glib::Json::Ui
-  extend ActiveSupport::Concern
-
-  included do
-    rescue_from ActionController::UnknownFormat do |exception|
-      if json_ui_activated?
-        # Tell `__json_ui_start()` to avoid rendering this page while still retaining the `_render` param
-        # so that the page remains linking to other json_ui pages.
-        redirect_to url_for(format: nil, _skip_render: true)
-      else
-        raise exception
-      end
-    end
-  end
-
-  # Override
-  def form_authenticity_token
-    Rails.env.test? ? 'test_token' : super
-  end
-
-  # NOTE: Override default_url_options and call this method
-  def json_ui_url_options
-    options = {}
-    options[:_render] = params[:_render]
-    options[:_locale] = params[:_locale]
-    options[:format] = :json if request.format == :json
-    options
-  end
-
-  def json_ui_activated?
-    @__json_ui_activated
-  end
-
-  def __json_ui_start
-    @__json_ui_activated = false
-    @__json_ui_rendering = false
-    if params[:_render].present?
-      @__json_ui_activated = true
-      request.variant = :ui
-
-      if request.format.html? && params[:_skip_render] != 'true'
-        @__json_ui_rendering = true
-        request.format = 'json'
-      end
-    end
-  end
-
-  def __json_ui_commit(options)
-    if @__json_ui_rendering
-      if (hash = json_transformation_start).is_a?(Hash)
-        case params[:_render]
-        when 'v1'
-          __json_ui_vue(hash, options)
-        end
-      end
-    end
-  end
-
-  private
-
-  def __json_ui_vue(hash, options)
-    renderer_path = options[:renderer_path]
-    @__json_ui_orig_page = response.body
-    response.body = render_to_string(template: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
-  end
-end

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

@@ -1,13 +0,0 @@
-module Glib::Json::Validation
-  def __json_validate_perform
-    if Rails.env.development? && params[:_validate] == 'true'
-      if (hash = json_transformation_start).is_a?(Hash)
-        json_validate = JSONValidate.new(hash)
-        response_message = json_validate.valid?
-        hash[:_json] = {
-          validationErrors: response_message
-        }
-      end
-    end
-  end
-end

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -1,18 +0,0 @@
-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 = Glib::Text.get_content(new_key, default_value, options: options)
-      content.gsub(/\{\{(\w+)\}\}/) { args.fetch($1.to_sym, "{{#{$1}}}") }
-    end
-  end
-end

data/app/models/glib/dynamic_text_record.rb

@@ -1,6 +0,0 @@
-module Glib
-  class DynamicTextRecord < ActiveRecord::Base
-    self.abstract_class = true
-    connects_to database: { writing: :dynamic_text, reading: :dynamic_text }
-  end
-end

data/app/models/glib/text.rb

@@ -1,36 +0,0 @@
-module Glib
-  class Text < Glib::DynamicTextRecord
-    validates :scope, presence: true
-    validates :lang, presence: true
-    validates :key, presence: true, uniqueness: { scope: [:scope, :lang] }
-    validates :content, presence: true
-
-    after_save :update_to_redis
-
-    def self.get_content(key, default_value, options:)
-      scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
-
-      unless content = $dt_redis.get(scope_key)
-        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)
-          update_content(scope_key, default_value)
-          content = default_value
-        end
-      end
-
-      content
-    end
-
-    private
-      def self.update_content(scope_key, content)
-        $dt_redis.set(scope_key, content)
-      end
-
-      def update_to_redis
-        Glib::Text.update_content("#{scope}.#{lang}.#{key}", content)
-      end
-  end
-end

data/lib/generators/glib/install_generator.rb

@@ -1,19 +0,0 @@
-module Glib
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
-
-      class_option :redis_env_key, type: :string, default: 'DT_REDIS_URL'
-      class_option :database_env_key, type: :string, default: 'DT_DATABASE_URL'
-      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'
-        template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
-        template 'database.yml', 'config/database.yml'
-      end
-    end
-  end
-end

data/lib/generators/templates/20191017062519_create_texts.rb

@@ -1,12 +0,0 @@
-class CreateTexts < ActiveRecord::Migration[6.0]
-  def change
-    create_table :texts do |t|
-      t.string :key
-      t.text :content
-
-      t.timestamps
-    end
-
-    add_index :texts, :key, unique: true
-  end
-end

data/lib/generators/templates/20191024063257_add_scope_to_texts.rb

@@ -1,7 +0,0 @@
-class AddScopeToTexts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :texts, :scope, :string
-    remove_index :texts, :key
-    add_index :texts, [:scope, :key], unique: true
-  end
-end

data/lib/generators/templates/20191112095018_add_lang_to_texts.rb

@@ -1,7 +0,0 @@
-class AddLangToTexts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :texts, :lang, :string
-    remove_index :texts, [:scope, :key]
-    add_index :texts, [:scope, :lang, :key], unique: true
-  end
-end

data/lib/generators/templates/database.yml

@@ -1,107 +0,0 @@
-# PostgreSQL. Versions 9.1 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On OS X with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
-  host: <%= "\<\%\= ENV.fetch(\"DATABASE_HOST\") {} \%\>" %>
-  username: <%= "\<\%\= ENV.fetch(\"DATABASE_USER\") {} \%\>" %>
-  password: <%= "\<\%\= ENV.fetch(\"DATABASE_PASSWORD\") {} \%\>" %>
-
-development:
-  primary:
-    <<: *default
-    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_development\" \%\>" %>
-  dynamic_text:
-    <<: *default
-    migrations_paths: db/dynamic_text_migrate
-    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_development\" \%\>" %>
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user that initialized the database.
-  #username: ItineraryBuilder
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  primary:
-    <<: *default
-    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_test\" \%\>" %>
-  dynamic_text:
-    <<: *default
-    migrations_paths: db/dynamic_text_migrate
-    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_test\" \%\>" %>
-
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= "\<\%\= ENV[\'DATABASE_URL\'] \%\>" %>
-#
-
-production_default: &production_default
-  adapter: postgresql
-  encoding: unicode
-  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
-
-production:
-  primary:
-    <<: *production_default
-    url: <%= "\<\%\= ENV[\"DATABASE_URL\"] \%\>" %>
-  dynamic_text:
-    <<: *production_default
-    migrations_paths: db/dynamic_text_migrate
-    url: <%= "\<\%\= ENV[\"#{options[:database_env_key]}\"] \%\>" %>

data/lib/generators/templates/dynamic_text.rb

@@ -1,2 +0,0 @@
-dt_redis_url = ENV.fetch('<%= options[:redis_env_key] %>', 'redis://localhost:6379')
-$dt_redis = Redis.new(url: dt_redis_url)