glib-web 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1f2c691c60bbb4eaa96f531d11385e007d59a6
-  data.tar.gz: c86e3560a6c66421d717dd3b4527a041ad6e8109
+  metadata.gz: 3fd40c51d30eb80d809c785033ed7ae244c56fa8
+  data.tar.gz: 5577321d92ee52eccd81fc97de0f8552a7a2d2de
 SHA512:
-  metadata.gz: d1e4c57ee97b85249b859605919eb50ada249aea3cd59618c59e2d6e9799e5f08cb5557c80513ac031b591177f6a57a481754e2f660af74bc4797c99e8b66e00
-  data.tar.gz: 1245782f81ef3925b007b27384d6e8928a3ef68dffeb6f174e92371486078badb4d477b91057f588cdddcfc8d4db38ea091f9aaf4e2146a0d12b108190207631
+  metadata.gz: 5c9485ad5172ba38aa1eb01f22b2955f1c0716e5b71da5988370ef726a525cc78e46c4b481e954c1dbee163e2560e6ec90af9670830ccbf3a33260cce5919b00
+  data.tar.gz: 7da06f64e20890dc823d5d0ebf39fad5f1594bdb1a6c4544a16cc0588cfdd69a85d15a03ddadab3ea8c77d18b4a3530ae2be3ec4dce06dfb3c6a9f2567d91f69

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

@@ -44,6 +44,8 @@ module Glib
             send(k, v)
           end
         end
+        
+        created
       end
 
       private
@@ -103,6 +105,11 @@ module Glib
           json.set! propName, value
         end
       end
+
+      def created
+        # To be overridden
+      end
+
     end
   end
 end

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

@@ -17,7 +17,7 @@ module Glib
       def json_body_with_list(json, header = nil, footer = nil, options = {})
         json.header header
         json.content do
-          json.subviews [1] do
+          json.childViews [1] do
             json.view 'panels/list-v1'
             json.width 'matchParent'
             json.nextPage options[:nextPage]
@@ -34,7 +34,7 @@ module Glib
         
         json.header header
         json.content do
-          json.subviews [1] do
+          json.childViews [1] do
             json.view 'panels/scroll-v1'
             json.width 'matchParent'
 
@@ -67,7 +67,7 @@ module Glib
 
             json.padding options[:padding]
             json.local options[:local]
-            json.subviews do
+            json.childViews do
               json.child! do
                 json.view 'fields/hidden-v1'
                 json.name 'authenticity_token'

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

@@ -26,7 +26,7 @@ module Glib
         def header(options = {})
           json.header do
             json.padding options[:padding]
-            json.subviews do
+            json.childViews do
               yield page.view_builder
             end
           end

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

@@ -10,6 +10,9 @@ module Glib
         attr_reader :list_section_builder, :list_template_builder
         attr_reader :table_section_builder, :table_template_builder
 
+        # See Panels::Form
+        attr_accessor :current_form
+
         def initialize json, context
           @json = json
           @context = context
@@ -33,7 +36,7 @@ module Glib
           json.header do
             json.padding options[:padding]
             json.backgroundColor options[:backgroundColor]
-            json.subviews do
+            json.childViews do
               options[:childViews]&.call @view_builder
             end
           end
@@ -41,7 +44,7 @@ module Glib
 
         def list(options = {})
           json.content do
-            json.subviews do
+            json.childViews do
               @view_builder.add_view('panels_list', options.reverse_merge(width: 'matchParent'))
             end
           end
@@ -49,7 +52,7 @@ module Glib
         
         def table(options = {})
           json.content do
-            json.subviews do
+            json.childViews do
               @view_builder.add_view('panels_table', options.reverse_merge(width: 'matchParent'))
             end
           end
@@ -57,14 +60,14 @@ module Glib
         
         def scroll(options = {})
           json.content do
-            json.subviews do
+            json.childViews do
               @view_builder.add_view('panels_scroll', options.reverse_merge(width: 'matchParent'))
             end
           end
         end
 
         def form(options = {})
-          scroll subviews: ->(scroll) do
+          scroll childViews: ->(scroll) do
             @view_builder.add_view('panels_form', options.reverse_merge(width: 'matchParent'))
           end
         end

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

@@ -0,0 +1,63 @@
+class Glib::JsonUi::ViewBuilder
+  module Fields
+    class AbstractField < View
+      string :label
+      
+      def name(name)
+        @name = name
+      end
+
+      def value(value)
+        @value = value
+      end
+
+      def prop(prop)
+        if (form = page.current_form)
+          @name ||= form.field_name(prop)
+          @value ||= form.field_value(prop)
+        end
+      end
+
+      # Override
+      def created
+        json.name @name
+        json.value @value
+      end
+  
+    end
+
+    class Text < AbstractField
+    end
+    
+    class Email < Text
+    end
+    
+    class Password < Text
+    end
+    
+    class Hidden < Text
+    end
+
+    class Textarea < 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
+end
+      

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

@@ -0,0 +1,117 @@
+class Glib::JsonUi::ViewBuilder
+  module Panels
+    class Form < View
+      # boolean :local
+
+      def field_name(prop)
+        "#{@model_name}[#{prop}]"
+      end
+
+      def field_value(prop)
+        @model.send(prop)
+      end
+
+      def url(url)
+        @url = url
+      end
+
+      def method(method)
+        @method = method
+      end
+
+      def as(model_name)
+        @model_name = model_name
+      end
+
+      def model(models)
+        @model = models.is_a?(Array) ? models.last : models 
+        @model_name ||= @model.class.model_name.singular 
+        @url ||= page.context.polymorphic_url(models)
+        @method ||= if @model.persisted?
+          :patch
+        else
+          :post
+        end
+      end
+
+      # Override
+      def created
+        json.url @url
+        json.method @method
+      end
+  
+      def childViews(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.childViews 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
+
+          # NOTE: this pattern will not work for views that can be nested. Luckily forms shouldn't be nested anyway.
+          page.current_form = self
+          block.call(page.view_builder)
+          page.current_form = nil
+        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 :childViews
+    end
+    
+    class Split < View
+      views :leftViews
+      views :centerViews
+      views :rightViews
+    end
+    
+    class Vertical < View
+      views :childViews
+      string :distribution
+    end
+  
+    class Horizontal < View
+      views :childViews
+      string :distribution
+    end
+
+  end
+end
+  

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

@@ -55,113 +55,6 @@ module Glib
         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

@@ -5,16 +5,6 @@ render "#{@path_prefix}/nav_menu", json: json
 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'

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

@@ -2,60 +2,86 @@ json.title 'Home'
 
 render "#{@path_prefix}/nav_menu", json: json
 
-json_body_with_list json do
-  json.rows do
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Pages'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'pages/index')
+json_ui_page json do |page|
+  page.list firstSection: ->(section) do
+    section.rows do |row|
+      row.thumbnail title: 'Pages', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'pages/index')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Lists'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'lists/index')
+      row.thumbnail title: 'Lists', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'lists/index')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Forms'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'forms/index')
+      row.thumbnail title: 'Forms', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'forms/index')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Panels'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'panels/index')
+      row.thumbnail title: 'Panels', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'panels/index')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Views'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'views/index')
+      row.thumbnail title: 'Views', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'views/index')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Actions'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'actions/index')
+      row.thumbnail title: 'Actions', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'actions/index')
       end
     end
+
   end
 end
+
+# json_body_with_list json do
+#   json.rows do
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Pages'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'pages/index')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Lists'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'lists/index')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Forms'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'forms/index')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Panels'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'panels/index')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Views'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'views/index')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Actions'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'actions/index')
+#       end
+#     end
+#   end
+# end