glib-web 0.5.26 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d252c5420953a389ed9f8b0a981f383a66141bdc936229fc9b5c983265d0eef2
-  data.tar.gz: 1dad156eac314b636f0534011afc82f78e6eced5c1f5c5ea07f0ee7d12a44212
+  metadata.gz: 56bb31a5794bda0312e8b8f9003ec3c04a43db3fdae8d56934edd0a535da9a32
+  data.tar.gz: 4d9011e44c43d8cca90372104ff2bbd240daaa8dc46886ab428be8b7f05afce2
 SHA512:
-  metadata.gz: 675bdae2fffceb43ee5b67bf065103cae5804bdc78a74cfd705f1ca08ac09b2186aac5b74f5f47d3c2cee9a48c9c8b67a3ca7b584e0ba362bf832761ba94685d
-  data.tar.gz: 978559ce9fb7e52d5d2119f6cd45da338e9f0c01c76fe72de16afae59ec48ffaaa7f88d0ab9d3ab6276d9afc1572b78a05057d54680b1ee323e507375330f160
+  metadata.gz: ad38bdfa2517196a9e4a4ea4a86e4805e06b97d6f973b4708ae3cac8214648c4f85f68226452f5e81b9f1546d0f440c9d41a5366c7f187c7481a9ab20c350c1d
+  data.tar.gz: a3824b557aca434cbd17df66e9a6f32cc669993e17e406ce9184aa405ddd6a2c1a8c982099be21350eba82c57993bc90f62473f2386dbde9c346cffd493ca42a

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

@@ -112,7 +112,7 @@ module Glib::Json::NewDynamicText
     def substitute_image_with(images)
       view[prop] = view[prop].gsub(/\{\{image(\d)\}\}/) {
         if image = images[$1.to_i - 1]
-          ApplicationController.helpers.dynamic_image_url(image.blob.key)
+          ApplicationController.helpers.glib_dynamic_image_url(image.blob.key)
         else
           "{{image#{$1}}}"
         end

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -17,7 +17,7 @@ module Glib
       if text_object.images.attached?
         content = content.gsub(/\{\{image(\d)\}\}/) {
           if image = text_object.images[$1.to_i - 1]
-            dynamic_image_url(image.blob.key)
+            glib_dynamic_image_url(image.blob.key)
           else
             "{{image#{$1}}}"
           end

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

@@ -68,6 +68,14 @@ module Glib
 
         class Restart < Action
         end
+
+        class CreditCard < Action
+          string :publicKey
+          string :clientSecret
+          action :onSuccess
+          action :onFailure
+          bool :setupOnly
+        end
       end
 
       module Devices

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

@@ -1,18 +1,38 @@
 class Glib::JsonUi::ActionBuilder
   module Http
-    class Post < Action
+    class AbstractHttp < Action
       string :url, cache: true
-      hash :formData
+
+      def formData(hash)
+        form_data = {}
+        hash.each do |key, value|
+          flatten_nested_params(form_data, key, value)
+        end
+        json.formData form_data
+      end
+
+      def flatten_nested_params(form_data, key, value)
+        if value.is_a?(Hash)
+          value.each do |nested_key, nested_value|
+            flatten_nested_params(form_data, "#{key}[#{nested_key}]", nested_value)
+          end
+        else
+          form_data[key] = value
+        end
+      end
     end
 
-    class Patch < Action
-      string :url, cache: true
-      hash :formData
+    class Post < AbstractHttp
     end
 
-    class Delete < Action
-      string :url, cache: true
-      hash :formData
+    class Patch < AbstractHttp
+      # string :url, cache: true
+      # hash :formData
+    end
+
+    class Delete < AbstractHttp
+    #   string :url, cache: true
+    #   hash :formData
     end
 
   end

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

@@ -104,6 +104,9 @@ module Glib
         bool :previewVideo
       end
 
+      class Html < AbstractText
+      end
+
       class Label < AbstractText
         # string :format
         action :onClick

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

@@ -207,7 +207,7 @@ class Glib::JsonUi::ViewBuilder
       date_time :max
     end
 
-    class LatLong < AbstractField
+    class Location < AbstractField
       hash :latitudeField
       hash :longitudeField
       hash :zoomField
@@ -217,5 +217,8 @@ class Glib::JsonUi::ViewBuilder
       string :publicKey
     end
 
+    class CreditCard < AbstractField
+      string :publicKey
+    end
   end
 end

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

@@ -97,7 +97,9 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class List < View
-      hash :ws
+      hash :phoenixSocket
+      hash :actionCable
+
       hash :nextPage
       action :onScrollToTop
       action :onScrollToBottom

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

@@ -6,7 +6,7 @@ end
 section.rows builder: ->(template) do
   template.thumbnail title: 'http/post', onClick: ->(action) do
     action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
-      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { user: { name: { first: 'New', last: 'Joe' } } }
     end
   end
 

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

@@ -76,6 +76,12 @@ json_ui_page json do |page|
         template.thumbnail title: 'Rich Text Editor', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/rich_text')
         end
+      end
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'New Rich Text Editor', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/new_rich_text')
+        end
 
       end
     end, ->(section) do

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

@@ -0,0 +1,40 @@
+json.title 'Forms'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
+    form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+
+    # images = [
+    #   {
+    #     value: "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4",
+    #     fileUrl: "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
+    #   }
+    # ]
+    # form.fields_richText name: 'user[bio]', width: 'matchParent', label: 'Content', images: images, value: '<p>Test {{image1}}</p>'
+
+    json.child! do
+      json.view 'fields/newRichText-v1'
+      json.width 'matchParent'
+      json.label 'Content'
+      json.name 'user[bio]'
+      json.value '<p>Test {{image1}}</p>'
+
+      json.images do
+        json.child! do
+          json.value "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4"
+          # json.fileTitle "hita i hanom hg.jpg"
+          json.fileUrl "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
+        end
+      end
+
+      json.imageUploader do
+        json.accepts(fileType: "image/*", maxFileSize: 5000)
+        json.directUploadUrl rails_direct_uploads_url
+      end
+    end
+
+    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+  end
+end

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

@@ -34,10 +34,10 @@ json_ui_page json do |page|
     form.spacer height: 20
     form.h2 text: 'Map'
     form.spacer height: 6
-    form.fields_latLong name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
-      latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
-      longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true },
-      zoomField: { name: 'user[zoom]', label: 'Zoom' }
+    form.fields_location name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
+      latitudeField: { view: 'fields/text', name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
+      longitudeField: { view: 'fields/text', name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true },
+      zoomField: { view: 'fields/text', name: 'user[zoom]', label: 'Zoom' }
 
     form.spacer height: 20
     form.fields_submit text: 'Submit'

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

@@ -2,12 +2,12 @@ json.title 'Forms'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
 
     # images = [
-    #   { 
+    #   {
     #     value: "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4",
     #     fileUrl: "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
     #   }
@@ -28,7 +28,7 @@ json_ui_page json do |page|
           json.fileUrl "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
         end
       end
-      
+
       json.imageUploader do
         json.accepts(fileType: "image/*", maxFileSize: 5000)
         json.directUploadUrl rails_direct_uploads_url

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

@@ -12,21 +12,22 @@ json_ui_page json do |page|
     form.spacer height: 14
     form.fields_textarea name: 'user[bio]', width: 'matchParent', label: 'Bio', placeholder: 'Enter your bio', styleClasses: ['outlined']
 
+    # form.spacer height: 14
+    # form.fields_stripeToken name: 'user[stripe_token_outlined]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'outlined'
+
+    # form.spacer height: 14
+    # form.fields_stripeToken name: 'user[stripe_token_individual]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'individual'
+
     form.spacer height: 14
-    form.fields_stripeToken name: 'user[stripe_token_outlined]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'outlined'
+    form.fields_creditCard name: 'user[stripe_token_outlined]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'outlined'
 
     form.spacer height: 14
-    form.fields_stripeToken name: 'user[stripe_token_individual]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'individual'
+    form.fields_creditCard name: 'user[stripe_token_individual]', width: 'matchParent', publicKey: 'pk_test_TYooMQauvdEDq54NiTphI7jx', styleClass: 'individual'
 
     form.spacer height: 14
     form.panels_split width: 'matchParent', content: ->(split) do
-      # split.left childViews: ->(left) do
-      #   if params[:mode] == 'dialog'
-      #     left.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
-      #   end
-      # end
       split.right childViews: ->(right) do
-        right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+        right.fields_submit text: 'Submit'
       end
     end
 

data/app/views/json_ui/garage/lists/chat_ui.json.jbuilder

@@ -5,7 +5,7 @@ liked = params[:liked] == 'true'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-json.ws({
+json.phoenixSocket({
   "socket" => {
     "endpoint" => "/socket/websocket",
     "params" => {
@@ -24,7 +24,7 @@ json.ws({
 })
 
 list_ws = { topic: 'rooms', events: ['comments_updated'] }
-page.list ws: list_ws, firstSection: ->(section) do
+page.list phoenixSocket: list_ws, firstSection: ->(section) do
   section.header padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(header) do
     header.h3 text: 'Chat with John Doe'
   end
@@ -71,25 +71,6 @@ page.list ws: list_ws, firstSection: ->(section) do
 end
 
 page.footer padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(footer) do
-  # json.ws({
-  #   "socket" => {
-  #     "endpoint" => "/socket/websocket",
-  #     "params" => {
-  #       vsn: '2.0.0',
-  #       token: 'TOKEN'
-  #     }
-  #   },
-  #   # "topic" => "room:30",
-  #   # "event" => "comments_updated",
-  #   "topic" => "links",
-  #   "events" => ["new_link_added"],
-  #   "header" => {
-  #     "user_id" => 2,
-  #     "prev_item_id" => nil,
-  #     "last_item_id" => nil
-  #   }
-  # })
-
   footer.panels_form width: 'matchParent', url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, paramNameForFormData: 'formData', onSubmit: ->(action) do
     json.action "ws/push"
     json.topic "rooms"

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

@@ -3,7 +3,7 @@ json.title 'Forms'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-json.ws({
+json.phoenixSocket({
   "socket" => {
     "endpoint" => "/socket/websocket",
     "params" => {
@@ -43,7 +43,7 @@ end, childViews: ->(form) do
 
   # TODO: Change this to radio for selecting alert vs reload response
   form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
-  
+
   form.fields_hidden name: 'baseUrl', width: 'matchParent', value: json_ui_garage_url(path: 'notifications/web_socket')
 
   form.panels_split width: 'matchParent', content: ->(split) do
@@ -56,5 +56,5 @@ end, childViews: ->(form) do
       right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
   end
-  
+
 end

data/lib/glib-web.rb

@@ -6,3 +6,4 @@ require 'glib/json_crawler'
 require 'glib/dynamic_text'
 require 'glib/crypt'
 require 'glib/test_helpers'
+require 'glib/mailer_tester'

data/lib/glib/json_crawler/router.rb

@@ -81,6 +81,9 @@ module Glib
       end
 
       def tear_down
+        # NOTE: Experimental, to address issue where sometimes changes don't get saved.
+        @logger.flush
+
         @logger.close
       end
 

data/lib/glib/mailer_tester.rb

@@ -0,0 +1,36 @@
+module Glib
+  module MailerTester
+    extend ActiveSupport::Concern
+
+    included do
+      project_root = Rails.root
+      paths = Dir.glob(project_root + 'test/mailers/previews/*')
+      paths.each do |file|
+        require file
+      end
+
+      ActionMailer::Preview.subclasses.each do |preview_class|
+        preview = preview_class.new
+
+        preview_class.instance_methods(false).each do |mailer_method|
+          test "mailer for #{preview_class}##{mailer_method}" do
+            preview.send(mailer_method).deliver_now
+
+            logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
+
+            # Use rstrip to avoid trailing space issues
+            expected = File.exist?(logfile) ? File.read(logfile).rstrip : ''
+            last_delivery = ActionMailer::Base.deliveries.last
+            result = last_delivery.html_part.body.raw_source.rstrip
+
+            logger = File.open(logfile, 'w')
+            logger.puts result
+            logger.close
+
+            assert_equal expected, result, "Result mismatch! #{logfile.sub(/\.txt$/, '')}"
+          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.5.26
+  version: 0.5.31
 platform: ruby
 authors:
 - ''
@@ -131,6 +131,7 @@ files:
 - app/views/json_ui/garage/forms/generic_post.json.jbuilder
 - app/views/json_ui/garage/forms/get_request.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
+- app/views/json_ui/garage/forms/new_rich_text.json.jbuilder
 - app/views/json_ui/garage/forms/pickers.json.jbuilder
 - app/views/json_ui/garage/forms/rich_text.json.jbuilder
 - app/views/json_ui/garage/forms/selects.json.jbuilder
@@ -224,6 +225,7 @@ files:
 - lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
+- lib/glib/mailer_tester.rb
 - lib/glib/test_helpers.rb
 - lib/glib/value.rb
 - lib/glib/version.rb