glib-web 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e7303d43cb79ad1bb67de2ee06a41928010ba7
-  data.tar.gz: f9152dfd8538f68686e6bfbf3a26bfa8514715d0
+  metadata.gz: 3f1f2c691c60bbb4eaa96f531d11385e007d59a6
+  data.tar.gz: c86e3560a6c66421d717dd3b4527a041ad6e8109
 SHA512:
-  metadata.gz: 7fefed6116c08f30ef5f042d7dc58f2d63d48d1050f61209664d371b438d6c6058e8f79afa9013b9bcf9c479d9ef3c5d140393e7cf07a4e994c0d034921e2828
-  data.tar.gz: a75b13fead8a276bb14aee83e329b95ceee3ad4eef35aed8bd4e614891f27ece990d0f59367c9819f774fc5b1fd025b2898893f43863927127ba6d95349c8d61
+  metadata.gz: d1e4c57ee97b85249b859605919eb50ada249aea3cd59618c59e2d6e9799e5f08cb5557c80513ac031b591177f6a57a481754e2f660af74bc4797c99e8b66e00
+  data.tar.gz: 1245782f81ef3925b007b27384d6e8928a3ef68dffeb6f174e92371486078badb4d477b91057f588cdddcfc8d4db38ea091f9aaf4e2146a0d12b108190207631

data/app/controllers/glib/home_controller.rb

@@ -0,0 +1,23 @@
+module Glib
+  class HomeController < ApplicationController
+
+    def json_ui_garage
+      @path_prefix = 'json_ui/garage'
+      @sample_image_url = 'https://cdn-images-1.medium.com/max/1200/1*Qc0XxYm-qAZL-7tjjlNfrg.png'
+
+      # We can't use prepend_view_path because it affects the app, not the gem
+      path = "#{@path_prefix}/#{params[:path] || 'home/index'}"
+      render path
+    end
+
+    def json_ui_garage_url(options = {})
+      Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
+        host: request.host, 
+        port: request.port, 
+        _render: params[:_render], format: params[:format])
+      )
+    end
+
+    helper_method :json_ui_garage_url
+  end
+end

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

@@ -0,0 +1,108 @@
+module Glib
+  module JsonUi
+    class AbstractBuilder
+      attr_reader :json, :page
+
+      def initialize json, page
+        @json = json
+        @page = page
+      end
+
+      private
+
+      def capitalize_first_letter_and_leave_others_alone(str)
+        str.slice(0,1).capitalize + str.slice(1..-1)
+      end
+
+      def add_singleton_element type, name, *args
+        name_components = name.to_s.split('_')
+        json.set! type, "#{name_components.join('/')}-v1" if type
+        args = [yield] if block_given?
+        "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).parse(*args)
+      end
+      
+      def add_element_to_array type, name, *args
+        json.child! do
+          add_singleton_element type, name, *args
+        end
+      end
+    end
+
+    class JsonUiElement
+      attr_reader :json, :page
+
+      def initialize json, page
+        @json = json
+        @page = page
+      end
+
+      def parse args = {}
+        @args = args
+        
+        if args.is_a? Hash
+          args.each do |k, v|
+            send(k, v)
+          end
+        end
+      end
+
+      private
+
+      def self.string propName
+        define_method(propName) do |value| 
+          json.set! propName, value&.to_s
+        end
+      end
+
+      def self.int propName
+        define_method(propName) do |value|
+          json.set! propName, value&.to_i
+        end
+      end
+
+      def self.float propName
+        define_method(propName) do |value|
+          json.set! propName, value&.to_f
+        end
+      end
+
+      def self.bool propName
+        define_method(propName) do |value|
+          json.set! propName, value == true
+        end
+      end
+
+      def self.icon propName
+        define_method(propName) do |value| 
+          json.set!(propName) do
+            json.materialName value
+          end
+        end
+      end
+      
+      def self.action propName
+        define_method(propName) do |value| 
+          json.set!(propName) { value.call(page.action_builder) } 
+        end
+      end
+
+      def self.views propName
+        define_method(propName) do |value| 
+          json.set!(propName) { value.call(page.view_builder) } 
+        end
+      end
+
+      def self.array propName
+        define_method(propName) do |value| 
+          json.set! propName, value&.to_a
+        end
+      end
+
+      def self.hash propName
+        define_method(propName) do |value|
+          json.set! propName, value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module Glib
+  module JsonUi
+    class ActionBuilder < AbstractBuilder
+      def method_missing m, *args
+        add_singleton_element 'action', m, *args
+      end
+      
+      class Action < JsonUiElement
+      end
+
+      ### Action definitions
+
+      module Dialogs
+        class Alert < Action
+          string :message
+          action :onClose
+        end
+      
+        class Options < Action
+          string :message
+          
+          def buttons(block)
+            json.buttons do
+              block.call page.menu_builder
+            end
+          end
+        end
+      end
+
+      module Forms
+        class Submit < Action
+        end
+      
+      end
+
+      module Windows
+        class CloseAll < Action
+          action :onClose
+        end
+      
+        class Open < Action
+          string :url
+        end
+      
+      end
+
+      module Auth
+        class SaveCsrfToken < Action
+          string :token
+          action :onSave
+        end
+      
+      end
+
+      module Http
+        class Post < Action
+          string :url
+          hash :formData
+        end
+      
+        class Patch < Action
+          string :url
+          hash :formData
+        end
+      
+        class Delete < Action
+          string :url
+          hash :formData
+        end
+      
+      end
+
+      ###
+    end
+  end
+end

data/app/helpers/glib/{web → json_ui}/json_ui_helper.rb

@@ -1,5 +1,6 @@
 module Glib
-  module Web
+  module JsonUi
+    # TODO: Remove (deprecated)
     module JsonUiHelper
       class Builder
         def initialize(json)

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

@@ -0,0 +1,51 @@
+module Glib
+  module JsonUi
+    module ListBuilders
+      class Template < AbstractBuilder
+        def method_missing m, *args
+          add_element_to_array 'template', m, *args
+        end
+      
+        class AbstractTemplate < JsonUiElement
+          def editButtons(block)
+            json.editButtons do
+              block.call page.menu_builder
+            end
+          end
+        
+        end
+        
+        class Thumbnail < AbstractTemplate
+          string :title
+          string :subtitle
+          action :onClick
+        end
+      end
+      
+      class Section < AbstractBuilder
+        def header(options = {})
+          json.header do
+            json.padding options[:padding]
+            json.subviews do
+              yield page.view_builder
+            end
+          end
+        end
+
+        def rows(array = nil)
+          template = page.list_template_builder
+          json.rows do
+            if array
+              array.each do |row|
+                yield template, row
+              end
+            else
+              yield template
+            end
+          end
+        end
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Glib
+  module JsonUi
+    class MenuBuilder < AbstractBuilder
+      def method_missing m, *args
+        add_element_to_array nil, m, *args
+      end
+
+      class MenuItem < JsonUiElement
+      end
+      
+      class Button < MenuItem
+        string :title
+        icon :icon
+        action :onClick
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+module Glib
+  module JsonUi
+    module PageHelper
+      def json_ui_page json
+        yield Page.new(json, self)
+      end
+
+      class Page
+        attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
+        attr_reader :list_section_builder, :list_template_builder
+        attr_reader :table_section_builder, :table_template_builder
+
+        def initialize json, context
+          @json = json
+          @context = context
+
+          @view_builder = ViewBuilder.new(json, self)
+          @action_builder = ActionBuilder.new(json, self)
+          @menu_builder = MenuBuilder.new(json, self)
+          @list_section_builder = ListBuilders::Section.new(json, self)
+          @list_template_builder = ListBuilders::Template.new(json, self)
+          @table_section_builder = TableBuilders::Section.new(json, self)
+          @table_template_builder = TableBuilders::Template.new(json, self)
+        end
+        
+        def rightNavButtons
+          json.rightNavButtons do
+            yield @menu_builder
+          end
+        end
+
+        def header(options = {})
+          json.header do
+            json.padding options[:padding]
+            json.backgroundColor options[:backgroundColor]
+            json.subviews do
+              options[:childViews]&.call @view_builder
+            end
+          end
+        end
+
+        def list(options = {})
+          json.content do
+            json.subviews do
+              @view_builder.add_view('panels_list', options.reverse_merge(width: 'matchParent'))
+            end
+          end
+        end
+        
+        def table(options = {})
+          json.content do
+            json.subviews do
+              @view_builder.add_view('panels_table', options.reverse_merge(width: 'matchParent'))
+            end
+          end
+        end
+        
+        def scroll(options = {})
+          json.content do
+            json.subviews do
+              @view_builder.add_view('panels_scroll', options.reverse_merge(width: 'matchParent'))
+            end
+          end
+        end
+
+        def form(options = {})
+          scroll subviews: ->(scroll) do
+            @view_builder.add_view('panels_form', options.reverse_merge(width: 'matchParent'))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Glib
+  module JsonUi
+    module ResponseHelper
+      def json_ui_response json
+        json.onResponse do
+          response = Response.new(json, self)
+          yield response.action_builder
+        end
+      end
+      
+      class Response
+        attr_reader :action_builder
+
+        def initialize json, context
+          @json = json
+          @context = context
+
+          @action_builder = ActionBuilder.new(json, self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Glib
+  module JsonUi
+    module TableBuilders
+      class Template < AbstractBuilder
+        def method_missing m, *args
+          add_element_to_array 'template', m, *args
+        end
+      
+        class AbstractTemplate < JsonUiElement
+
+          def editButtons(block)
+            json.editButtons do
+              block.call page.menu_builder
+            end
+          end
+        
+        end
+        
+        class Default < AbstractTemplate
+          views :cellViews
+          action :onClick
+        end
+      end
+      
+      class Section < AbstractBuilder
+        def header(options = {})
+          json.header do
+            json.backgroundColor options[:backgroundColor]
+            json.cellViews do
+              options[:cellViews]&.call page.view_builder
+            end
+          end
+        end
+
+        def rows(array = nil)
+          template = page.table_template_builder
+          json.rows do
+            if array
+              array.each do |row|
+                yield template, row
+              end
+            else
+              yield template
+            end
+          end
+        end
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,167 @@
+module Glib
+  module JsonUi
+    class ViewBuilder < AbstractBuilder
+      def add_view name, *args
+        add_element_to_array 'view', name, *args
+      end
+
+      def method_missing m, *args
+        add_view m, *args
+      end
+
+      class View < JsonUiElement
+        string :width
+        string :height
+        string :backgroundColor
+        hash :padding
+      end
+
+      ### View definitions
+
+      class H1 < View
+        string :text
+      end
+
+      class H2 < View
+        string :text
+      end
+
+      class H3 < View
+        string :text
+      end
+
+      class Br < View
+      end
+
+      class Hr < View
+      end
+
+      class Button < View
+        icon :icon
+        string :text
+        action :onClick
+      end
+
+      class Fab < View
+        icon :icon
+        action :onClick
+      end
+
+      class Image < View
+        string :url
+      end
+      
+      class Label < View
+        string :text
+      end
+
+      module Fields
+        class AbstractField < View
+          string :name
+          string :label
+          string :value
+        end
+
+        class Text < AbstractField
+        end
+        
+        class Email < Text
+        end
+        
+        class Password < Text
+        end
+        
+        class Hidden < Text
+        end
+
+        class Country < AbstractField
+          hash :region
+        end
+      
+        class Select < AbstractField
+          array :options
+        end
+      
+        class RadioGroup < View
+          string :name
+          views :childViews
+        end
+      
+        class Radio < View
+          string :label
+          string :value
+        end
+      end
+      
+      module Panels
+        class Form < View
+          string :url
+          string :method
+          # boolean :local
+      
+          def subviews(block)
+            # insert_method_field = false
+            # method = @args[:method].to_sym
+            # case method
+            # when :patch, :put, :delete
+            #   json.method :post
+            #   insert_method_field = true
+            # else
+            #   json.method method
+            # end
+      
+            json.subviews do
+              json.child! do
+                json.view 'fields/hidden-v1'
+                json.name 'authenticity_token'
+                json.value page.context.form_authenticity_token
+              end
+      
+              # if insert_method_field
+              #   json.child! do
+              #     json.view 'fields/hidden-v1'
+              #     json.name '_method'
+              #     json.value method
+              #   end
+              # end
+        
+              block.call(page.view_builder)
+            end
+          end
+        end
+        
+        class List < View
+          hash :nextPage
+      
+          def firstSection(block)
+            json.sections [1] do
+              block.call page.list_section_builder
+            end
+          end
+        end
+        
+        class Table < View
+          def firstSection(block)
+            json.sections [1] do
+              block.call page.table_section_builder
+            end
+          end
+        end
+
+        class Scroll < View
+          views :subviews
+        end
+        
+        class Split < View
+          views :leftViews
+          views :rightViews
+        end
+        
+        class Vertical < View
+        end
+      
+      end
+      
+    end
+  end
+end

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

@@ -1,25 +1,37 @@
 json.title 'Actions'
 
-render './nav_menu', json: json
+render "#{@path_prefix}/nav_menu", json: json
 
-json_body_with_list json do
-  json.rows do
-    json.child! do
-      json.template 'default-v1'
-      json.title 'Alert'
-      json.onClick do
-        json.action 'dialogs/alert-v1'
-        json.message 'This is an alert'
-      end
-    end
-
-    # json.child! do
-    #   json.template 'default-v1'
-    #   json.title 'Remote Content'
-    #   json.onClick do
-    #     json.action 'dialogs/open-v1'
-    #     json.url ''
+json_ui_page json do |page|
+  
+  page.list firstSection: ->(section) do
+    # section.header(padding: { top: 12, left: 16, right: 16, bottom: 12 }) do |header|
+    #   header.panels_split width: 'matchParent', leftViews: ->(split) do
+    #     split.label text: 'Left'
+    #   end, rightViews: ->(split) do
+    #     split.label text: 'Right'
     #   end
+
+    #   header.fab icon: 'add', onClick: ->(action) { action.alert(message: 'TODO: edit name') }
     # end
+
+    section.rows do |row|
+      row.thumbnail title: 'dialogs/alert', onClick: ->(action) do
+        action.dialogs_alert message: 'This is an alert'
+      end
+
+      row.thumbnail title: 'dialogs/option', onClick: ->(action) do
+        action.dialogs_options message: 'Select one', buttons: ->(menu) do
+          menu.button title: 'Option1', onClick: ->(action) do 
+            action.dialogs_alert message: 'Option 1'
+          end
+          menu.button title: 'Option2', onClick: ->(action) do 
+            action.dialogs_alert message: 'Option 2'
+          end
+          menu.button title: 'Cancel'
+        end
+      end
+    end
+    
   end
-end
+end

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

@@ -33,8 +33,8 @@ json_body_with_form json, nil, nil, options do
     json.view 'panels/split-v1'
     json.width 'matchParent'
 
-    json.content do
-      json.right do
+    json.rightViews do
+      json.child! do
         json.view 'button-v1'
         json.text 'Submit'
         json.onClick do

data/config/routes.rb

@@ -1,4 +1,6 @@
 Glib::Web::Engine.routes.draw do
-  get 'json_ui_garage', to: 'home#json_ui_garage'
-  post 'json_ui_garage', to: 'home#json_ui_garage'
+  scope module: :glib do
+    get 'json_ui_garage', to: 'home#json_ui_garage'
+    post 'json_ui_garage', to: 'home#json_ui_garage'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - ''
@@ -34,8 +34,16 @@ files:
 - app/controllers/concerns/application/json/transformation.rb
 - app/controllers/concerns/application/json/ui.rb
 - app/controllers/concerns/application/json/validation.rb
-- app/controllers/home_controller.rb
-- app/helpers/glib/web/json_ui_helper.rb
+- app/controllers/glib/home_controller.rb
+- app/helpers/glib/json_ui/abstract_builder.rb
+- app/helpers/glib/json_ui/action_builder.rb
+- app/helpers/glib/json_ui/json_ui_helper.rb
+- app/helpers/glib/json_ui/list_builders.rb
+- app/helpers/glib/json_ui/menu_builder.rb
+- app/helpers/glib/json_ui/page_helper.rb
+- app/helpers/glib/json_ui/response_helper.rb
+- app/helpers/glib/json_ui/table_builders.rb
+- app/helpers/glib/json_ui/view_builder.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

data/app/controllers/home_controller.rb

@@ -1,21 +0,0 @@
-class HomeController < ApplicationController
-
-  def json_ui_garage
-    @path_prefix = 'json_ui/garage'
-    @sample_image_url = 'https://cdn-images-1.medium.com/max/1200/1*Qc0XxYm-qAZL-7tjjlNfrg.png'
-
-    # We can't use prepend_view_path because it affects the app, not the gem
-    path = "#{@path_prefix}/#{params[:path] || 'home/index'}"
-    render path
-  end
-
-  def json_ui_garage_url(options = {})
-    Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-      host: request.host, 
-      port: request.port, 
-      _render: params[:_render], format: params[:format])
-    )
-  end
-
-  helper_method :json_ui_garage_url
-end