coprl 3.0.0.beta.2 → 3.0.0.beta.7

data/lib/coprl/presenters/generators/templates/plugin/views/components/application/component.erb.tt

@@ -11,4 +11,4 @@ Any additional data you want to pass to your component javascript should be setu
 -->
 <iframe id="random_fact" class='v-plugin v-input' data-plugin-callback='RandomFacts'
         src="<%%= comp.random_fact %>" height=512
-        <%%= erb :"components/event", :locals => {comp: comp, events: comp.events, parent_id: comp.id} %>></iframe>
+        <%%= partial "components/event", :locals => {comp: comp, events: comp.events, parent_id: comp.id} %>></iframe>

data/lib/coprl/presenters/helpers/rails.rb

@@ -6,12 +6,9 @@ if defined?(Rails)
           include ActionView::Helpers::AssetUrlHelper
           include Coprl::Presenters::Helpers::Rails::Currency
           include Coprl::Presenters::Helpers::Rails::ModelTable
+          include Coprl::Presenters::Helpers::Rails::Routes
           include Namespace
 
-          def default_url_options
-            {}
-          end
-
           def presenters_path(presenter, host: false, **params)
             presenter = _expand_namespace_(presenter, namespace)
             presenter = presenter.gsub(':', '/')

data/lib/coprl/presenters/helpers/rails/routes.rb

@@ -0,0 +1,14 @@
+module Coprl
+  module Presenters
+    module Helpers
+      module Rails
+        module Routes
+          include ::Rails.application.routes.url_helpers
+          def default_url_options
+            ::Rails.application.config.action_controller.default_url_options || { :host => context[:request].host_with_port }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/rails/concerns/coprl_partial.rb

@@ -0,0 +1,51 @@
+module Coprl
+  module Presenters
+    module Rails
+      module Concerns
+        module CoprlPartial
+          extend ActiveSupport::Concern
+
+          included do
+            before_action :set_view_path
+          end
+          
+          module ClassMethods
+            @plugins = []
+            def presenter_plugin(*plugins)
+              @plugins += Array(plugins)
+            end
+
+            def plugins
+              @plugins
+            end
+          end
+
+          def set_view_path
+            paths = Coprl::Presenters::WebClient::PluginViewsPath.new(pom: nil, plugins: self.class.plugins).render
+            paths.each do |path|
+              prepend_view_path path
+            end
+          end
+
+          def prepare_context(base_params = params)
+            prepare_context = Coprl::Presenters::Settings.config.presenters.web_client.prepare_context.dup
+            prepare_context.push(method(:scrub_context))
+            context = base_params.dup.to_unsafe_hash
+            prepare_context.reduce(context) do |params, context_proc|
+              context = context_proc.call(params, session, request.env)
+            end
+            context
+          end
+
+          def scrub_context(params, _session, _env)
+            %i(grid_nesting input_tag).each do |key|
+              params.delete(key) {params.delete(key.to_s)}
+            end
+            params
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/rails/engine.rb

@@ -12,6 +12,11 @@ module Coprl
           # TODO: should rename these since they are common names that are likely going to collide
           app.middleware.use ::ActionDispatch::Static, File.join(root, '..', 'public')
         end
+
+        ActiveSupport.on_load(:action_controller) do
+          include Concerns::CoprlPartial
+        end
+
       end
     end
   end

data/lib/coprl/presenters/rails/railtie.rb

@@ -1,5 +1,3 @@
-require 'filewatcher'
-
 module Coprl
   module Presenters
     module Rails
@@ -15,20 +13,14 @@ module Coprl
 
         WATCH = -> {
           return unless ::Rails.env.development?
+
           path = ::Rails.root.join('app', '**', '*.pom')
-          puts "Watching #{path} for changes..."
-          filewatcher = Filewatcher.new(path)
-          Thread.new(filewatcher) do |fw|
-            fw.watch do |f|
-              puts "Detected updated POM file: #{f}"
-              begin
-                BOOT.call
-              rescue Exception => exc
-                puts exc.backtrace
-                puts exc.message
-              end
-            end
+          file_watcher = ActiveSupport::FileUpdateChecker.new(Dir[path]) do
+            BOOT.call
           end
+
+          ::Rails.application.reloaders << Reloader.new(file_watcher)
+
         } unless defined?(WATCH)
 
         config.after_initialize do

data/lib/coprl/presenters/rails/reloader.rb

@@ -0,0 +1,15 @@
+module Coprl
+  module Presenters
+    module Rails
+      class Reloader
+        def initialize(file_watcher)
+          @file_watcher = file_watcher
+        end
+
+        def updated?
+          @file_watcher.execute_if_updated
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/settings.rb

@@ -32,7 +32,7 @@ unless defined?(Coprl::Presenters::Settings)
             setting :custom_css, '../public/presenters'
             setting :protect_from_forgery, false
           end
-          setting :plugins, [:google_maps]
+          setting :plugins, []
           setting :components do
             setting :defaults do
               setting :datetime do

data/lib/coprl/presenters/version.rb

@@ -1,7 +1,7 @@
 module Coprl
   module Presenters
     module Version
-      VERSION = '3.0.0.beta.2'
+      VERSION = '3.0.0.beta.7'
     end
   end
 end

data/lib/coprl/presenters/web_client/helpers/headers.rb

@@ -2,16 +2,18 @@ module Coprl::Presenters::WebClient::Helpers
   module Headers
     include Coprl::Presenters::WebClient::Helpers::HtmlSafe
 
-    def coprl_headers(base_url, request, pom)
+    def coprl_headers
+      return unless @pom
+
       html_safe (<<~HEADERS)
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
         <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
         <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
-        <link rel="stylesheet" href="#{ base_url }/#{ request.env['SCRIPT_NAME'] }bundle.css">
-        <script defer src="#{ base_url }/#{ request.env['SCRIPT_NAME'] }bundle.js"></script>
-        #{plugin_headers(pom)}
-        #{custom_css(request.env['REQUEST_PATH'], base_url)}
-        #{pom.csrf_meta_tags}
+        <link rel="stylesheet" href="#{ @base_url }/#{ request.env['SCRIPT_NAME'] }bundle.css">
+        <script defer src="#{ @base_url }/#{ request.env['SCRIPT_NAME'] }bundle.js"></script>
+        #{plugin_headers(@pom)}
+        #{custom_css(request.env['REQUEST_PATH'], @base_url)}
+        #{@pom.csrf_meta_tags}
       HEADERS
     end
 

data/lib/coprl/presenters/web_client/helpers/rails.rb

@@ -8,5 +8,6 @@ module Coprl::Presenters::WebClient::Helpers
     include Namespaced
     include Raw
     include EscapeHtml
+    include TemplateHelper
   end
 end

data/lib/coprl/presenters/web_client/helpers/rails/template_helper.rb

@@ -0,0 +1,10 @@
+module Coprl::Presenters::WebClient::Helpers::Rails
+  module TemplateHelper
+    def with_presenters_wrapper(&block)
+      render partial: 'body/wrapper', locals: {
+        body_content: capture(&block), header: @pom&.header, drawer: @pom&.drawer,
+        footer: @pom&.footer
+      }
+    end
+  end
+end

data/lib/coprl/presenters/web_client/helpers/sinatra.rb

@@ -7,5 +7,6 @@ module Coprl::Presenters::WebClient::Helpers
     include SafeMarkdown
     include Raw
     include EscapeHtml
+    include TemplateHelper
   end
 end

data/lib/coprl/presenters/web_client/helpers/sinatra/template_helper.rb

@@ -0,0 +1,20 @@
+module Coprl::Presenters::WebClient::Helpers::Sinatra
+  module TemplateHelper
+    def with_presenters_wrapper(&block)
+      buffer << partial("body/wrapper", locals: {
+        body_content: capture(buffer, &block), header: @pom&.header, drawer: @pom&.drawer,
+        footer: @pom&.footer
+      })
+    end
+
+    def buffer()
+      @_out_buf
+    end
+
+    def capture(buffer)
+      pos = buffer.size
+      yield
+      buffer.slice!(pos..buffer.size)
+    end
+  end
+end

data/lib/coprl/presenters/web_client/plugin_views_path.rb

@@ -8,17 +8,17 @@ module Coprl
         extend Pluggable
         include_plugins(:WebClientComponents)
 
-        def initialize(pom:)
+        def initialize(pom: nil, plugins: nil)
           @pom = pom
+          @plugins = plugins || []
           initialize_plugins
         end
 
         def render
           results = []
-          ((@plugins||[]) + Coprl::Presenters::Settings.config.presenters.plugins).each do |plugin|
+          (@plugins + Coprl::Presenters::Settings.config.presenters.plugins).each do |plugin|
             view_dir_method = :"view_dir_#{plugin}"
-            results << send(view_dir_method,
-                 @pom) if respond_to?(view_dir_method)
+            results << send(view_dir_method, @pom) if respond_to?(view_dir_method)
           end
           results
         end
@@ -26,7 +26,7 @@ module Coprl
         private
 
         def initialize_plugins
-          @plugins = @pom.send(:plugins)
+          @plugins += @pom.send(:plugins) if @pom
           self.class.include_plugins(:WebClientComponents, plugins: @plugins)
         end
       end

data/public/bundle.js

@@ -48739,9 +48739,7 @@ var VPosts = function (_VBase) {
                 }
             }
 
-            var paramCount = Array.from(formData).length;
-
-            if (paramCount < 1) {
+            if (this.paramCount(formData) < 1) {
                 console.warn('Creating request with no data!' + ' Are you sure you\'ve hooked everything up correctly?');
             }
 
@@ -48910,9 +48908,17 @@ var VPosts = function (_VBase) {
                 }
 
                 // Send our FormData object; HTTP headers are set automatically
-                httpRequest.send(formData);
+                // Rack 2.2 will throw an exception https://github.com/rack/rack/issues/1603
+                // if we set the header as multi-part form data with no data in the body
+                // So we set the body to null in this case.
+                httpRequest.send(_this2.paramCount(formData) < 1 ? null : formData);
             });
         }
+    }, {
+        key: 'paramCount',
+        value: function paramCount(formData) {
+            return Array.from(formData).length;
+        }
     }, {
         key: 'isForm',
         value: function isForm() {

data/public/wc.js

@@ -34213,9 +34213,7 @@ var VPosts = function (_VBase) {
                 }
             }
 
-            var paramCount = Array.from(formData).length;
-
-            if (paramCount < 1) {
+            if (this.paramCount(formData) < 1) {
                 console.warn('Creating request with no data!' + ' Are you sure you\'ve hooked everything up correctly?');
             }
 
@@ -34384,9 +34382,17 @@ var VPosts = function (_VBase) {
                 }
 
                 // Send our FormData object; HTTP headers are set automatically
-                httpRequest.send(formData);
+                // Rack 2.2 will throw an exception https://github.com/rack/rack/issues/1603
+                // if we set the header as multi-part form data with no data in the body
+                // So we set the body to null in this case.
+                httpRequest.send(_this2.paramCount(formData) < 1 ? null : formData);
             });
         }
+    }, {
+        key: 'paramCount',
+        value: function paramCount(formData) {
+            return Array.from(formData).length;
+        }
     }, {
         key: 'isForm',
         value: function isForm() {

data/rails-engine/app/controllers/coprl_controller.rb

@@ -12,7 +12,7 @@ class CoprlController < ApplicationController
     fq_presenter_name = [presenter_name, 'index'].compact.join(':')
     presenter_name = fq_presenter_name if Coprl::Presenters::App.registered?(fq_presenter_name)
     presenter = Coprl::Presenters::App[presenter_name].call
-    context = params.dup.to_unsafe_hash
+    context = prepare_context(params)
     router = Coprl::Presenters::WebClient::Router.new(base_url: request.base_url)
     @pom = presenter.expand(router: router, context: context)
   end

data/rails-engine/app/views/layouts/coprl.html.erb

@@ -7,14 +7,14 @@
   <title><%= @pom.page.title if @pom.page %></title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <%= coprl_headers(@base_url, request, @pom) %>
+  <%= coprl_headers %>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag if defined?(csp_meta_tag) %>
 </head>
 <body>
-<%= partial "body/preamble", :locals => {pom:@pom} %>
-<%= yield %>
-<%= partial "body/postamble", :locals => {pom:@pom} %>
+<%= with_presenters_wrapper do %>
+  <%= yield %>
+<% end %>
 <noscript><p>JavaScript must be enabled to continue.</p></noscript>
 </body>
 </html>

data/rails-engine/config/initializers/presenters.rb

@@ -28,9 +28,11 @@ class CoprlTemplateHandler
         # otherwise we need to get the presenter name built from params
         presenter_name = local_assigns[:presenter] ? presenter : namespaced_presenter(params)
         presenter = Coprl::Presenters::App[presenter_name].call
-        context = params.dup.to_unsafe_hash
+        context = self.controller.prepare_context(params)
         router = Coprl::Presenters::WebClient::Router.new(base_url: request.base_url)
-        @pom = presenter.expand(router: router, context: context)
+        plugins = self.controller.class.plugins
+      
+        @pom = presenter.expand(router: router, context: context, plugins: plugins)
       end
       #{source}
       end

data/rails-engine/config/initializers/routes.rb

@@ -0,0 +1,5 @@
+Rails.application.config.to_prepare do
+  Coprl::Presenters::Settings.configure do |config|
+    config.presenters.helpers << Coprl::Presenters::Helpers::Rails
+  end
+end

data/rails-engine/config/initializers/session.rb

@@ -0,0 +1,8 @@
+Rails.application.config.to_prepare do
+  Coprl::Presenters::Settings.configure do |config|
+    config.presenters.web_client.prepare_context.prepend ->(context, session, _env) {
+      context.merge(request: Rack::Request.new(_env),
+                    session: session)
+    }
+  end
+end

data/views/mdc/assets/js/components/events/posts.js

@@ -59,13 +59,10 @@ export class VPosts extends VBase {
             formData.append(name, encode(value));
         }
 
-        const paramCount = Array.from(formData).length;
-
-        if (paramCount < 1) {
+        if (this.paramCount(formData) < 1) {
             console.warn(
                 'Creating request with no data!'
-                + ' Are you sure you\'ve hooked everything up correctly?',
-            );
+                + ' Are you sure you\'ve hooked everything up correctly?');
         }
 
         let errors = this.validate(formData);
@@ -185,10 +182,17 @@ export class VPosts extends VBase {
             }
 
             // Send our FormData object; HTTP headers are set automatically
-            httpRequest.send(formData);
+            // Rack 2.2 will throw an exception https://github.com/rack/rack/issues/1603
+            // if we set the header as multi-part form data with no data in the body
+            // So we set the body to null in this case.
+            httpRequest.send(this.paramCount(formData) < 1 ? null : formData);
         });
     }
 
+    paramCount(formData){
+        return Array.from(formData).length;
+    }
+
     isForm() {
         var parentElement = this.parentElement();
         return parentElement && parentElement.elements;

data/views/mdc/body/{_preamble.erb → _wrapper.erb}

@@ -1,15 +1,10 @@
 <%
-  header = pom.header
-  drawer = pom.drawer
-  footer = pom.footer
-
   root_classes = []
   root_classes << 'v-root--header-present' if header
   root_classes << 'v-root--drawer-present' if drawer
   root_classes << 'v-root--footer-present' if footer
 %>
 <div class="v-root compatibility-wrapper mdc-typography <%= root_classes.join(' ') %>">
-
   <% if drawer %>
     <div class="drawer-frame-root">
       <%= partial "body/dismissable-drawer", :locals => {drawer: drawer} %>
@@ -22,5 +17,21 @@
     <div class="drawer-main-content">
       <%= partial "body/modal-drawer", :locals => {drawer: drawer} %>
   <% end %>
+
+  <%= body_content %>
+
   <div class="v-page-content page-content">
     <div class="v-errors">
+    </div>
+  </div>
+  <% if drawer %>
+    </div>
+    </div>
+    </div>
+  <% end %>
+
+  <%= partial "body/snackbar" %>
+  <% if footer %>
+    <%= partial "body/footer", :locals => {:footer => footer} %>
+  <% end %>
+</div>