coprl 3.0.0.beta.5 → 3.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1d61921712f73e4c13f6a206c4499e7bd72f40b82471cf03f741a272f118c1
-  data.tar.gz: 6e6812e4334f47c542b3710cea1d74daa0d6f7b3e803bd0ac334e15cc6192461
+  metadata.gz: 236ae7548578c302ec736e18f4bc4542d37548f4a6f6cea794b80eadb263c61d
+  data.tar.gz: 44da31446c80059812b1839d53ddc36d91d95d8db1ac5f8c09738aae34f9da69
 SHA512:
-  metadata.gz: 384f80e03ad8cb9674d35d3fb5ceb293b6fed3c4b497076efeb3dfd8215394716b6c82db4fc8fc5ffe8d8145a6bc6f5f69adbcd6ecf67245f5f9e7b08c2cdb81
-  data.tar.gz: 15ec4d677bc0ab317e5de06c3c0e499fa22b9fa047c78da589539365e6abc4c8dce33a889d97e6d9f620916ceaf05eb2dc1ec89ad29b9eab1828dfccde9dd15f
+  metadata.gz: c417061bb470e7a028d82b9e699e60c96b24fee025f8fcd16c2301841ac913b6da140dad47a23c8ed7d814cf25044b2a517aff76e9e2720cc0c1bbdb5821d0a7
+  data.tar.gz: cde447a1e215f53bf2aec0854cac8611b05db11d49b2596a52ec1f13bd27249a84e73147a7f375a190e0bc445f17fb1508b033b3b0ad3812fa7e638772dfc3ee

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.7.2-node-browsers
+       - image: circleci/ruby:2.7.4-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -18,28 +18,23 @@ jobs:
 
     steps:
       - checkout
-
-      # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-
+            # when lock file changes, use increasingly general patterns to restore cache
+            - v1-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+            - v1-gem-cache-{{ arch }}-{{ .Branch }}-
+            - v1-gem-cache-{{ arch }}-
+      - run: gem install bundler:2.2.20
+      - run: bundle install
+      - run: bundle clean --force
       - save_cache:
           paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
+            - ~/.bundle
+          key: v1-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
       - run:
           name: 'start integration testing server'
           command: |
-            rackup
+            bundle exec rackup
           background: true
 
       # run tests!

data/.ruby-version

@@ -1,2 +1,2 @@
-2.7.2
+2.7.4
 

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+# [3.0.0-beta.9](https://github.com/rx/presenters/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-09-21)
+
+
+### Bug Fixes
+
+* added support for api base base_url ([8f69979](https://github.com/rx/presenters/commit/8f699793de899a450df5cfb8b95015a832200178))
+* fixed bug in context prep for api client ([d0558cf](https://github.com/rx/presenters/commit/d0558cf3966a9bdc91bd9d106dcb0a7ab6f56c34))
+
+# [3.0.0-beta.8](https://github.com/rx/presenters/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-09-17)
+
+
+### Bug Fixes
+
+* added check for engine coprl_presenters_rails_engine_url ([d2ee7b5](https://github.com/rx/presenters/commit/d2ee7b5900a256c30e6715d1246639dec682ff08))
+
+# [3.0.0-beta.7](https://github.com/rx/presenters/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-07-09)
+
+
+### Bug Fixes
+
+* Rails routes automatically made available as helpers ([#322](https://github.com/rx/presenters/issues/322)) ([abb0031](https://github.com/rx/presenters/commit/abb00311940fda8741459f8aafe29cd7bf074b88))
+* view paths issue when using partials with Rails Engine ([#321](https://github.com/rx/presenters/issues/321)) ([2a917e7](https://github.com/rx/presenters/commit/2a917e7076895037e5a069e77525ef53d2ca45f1))
+
+
+### Features
+
+* switch to use Rails built-in watchers and reloader ([#320](https://github.com/rx/presenters/issues/320)) ([53e0ee4](https://github.com/rx/presenters/commit/53e0ee49caa663ce93ff731c280bcd754da73fc1))
+
+# [3.0.0-beta.6](https://github.com/rx/presenters/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-06-23)
+
+
+### Bug Fixes
+
+* fixed typo on if check ([95b3091](https://github.com/rx/presenters/commit/95b3091365a853eee24e4bce0e37b182da1fdc3d))
+* small tweaks to simplify the presenters wrappers ([#319](https://github.com/rx/presenters/issues/319)) ([cbf0c7c](https://github.com/rx/presenters/commit/cbf0c7c4c80d68ecc84a2989934d2d02e8a1a928))
+
 # [3.0.0-beta.5](https://github.com/rx/presenters/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-06-18)
 
 

data/Gemfile

@@ -13,7 +13,7 @@ end
 group :test do
   gem 'rspec'
   gem 'rspec-html-matchers'
-  gem 'watir', '~> 6.16'
+  gem 'watir', '~> 6.19'
   gem 'webdrivers', '~> 4.1'
   gem 'watir-rspec', '~> 3.0'
   gem 'rspec_junit_formatter'

data/Gemfile.lock

@@ -30,7 +30,7 @@ GIT
 
 GIT
   remote: https://github.com/coprl/foo_presenter_plugin.git
-  revision: 7b05a88ac5d34a18401d8dbbb73758927be39cdd
+  revision: 6f1d796bf030bf69fca87777d28bdee63e9880d8
   specs:
     foo_presenter_plugin (0.0.2)
 
@@ -80,11 +80,10 @@ GIT
 PATH
   remote: .
   specs:
-    coprl (1.0.0)
+    coprl (3.0.0.beta.8)
       dry-configurable (> 0.1, <= 7.0)
       dry-container (~> 0.6)
       dry-inflector (~> 0.1)
-      filewatcher (~> 1.1.1)
       ice_nine (~> 0.11)
       redcarpet (~> 3.4)
       sinatra (>= 1.4, < 3.0)
@@ -99,34 +98,30 @@ GEM
     childprocess (3.0.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.9)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.1)
     dotenv (2.7.6)
-    dry-configurable (0.12.1)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    filewatcher (1.1.1)
-      optimist (~> 3.0)
-    gem-release (2.0.1)
+    dry-inflector (0.2.1)
     ice_nine (0.11.2)
     json (2.3.1)
     method_source (0.9.0)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.5.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.7)
-    nokogiri (1.11.4)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.4-x86_64-darwin)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
-    optimist (3.0.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -145,27 +140,27 @@ GEM
       rack (>= 1.0, < 3)
     rake (13.0.1)
     redcarpet (3.5.1)
-    regexp_parser (1.6.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    regexp_parser (2.1.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.10.0)
     rspec-html-matchers (0.9.1)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.4)
-    rubyzip (1.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -183,19 +178,20 @@ GEM
       tilt (~> 2.0)
     thor (1.1.0)
     tilt (2.0.10)
+    timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
-    watir (6.16.5)
-      regexp_parser (~> 1.2)
-      selenium-webdriver (~> 3.6)
+    watir (6.19.1)
+      regexp_parser (>= 1.2, < 3)
+      selenium-webdriver (>= 3.142.7)
     watir-rspec (3.0.0)
       rspec (~> 3.0)
       watir (>= 6.0.0.beta4)
-    webdrivers (4.1.0)
+    webdrivers (4.6.0)
       nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
+      rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
     zeitwerk (2.4.2)
 
@@ -213,7 +209,6 @@ DEPENDENCIES
   coprl!
   dotenv
   foo_presenter_plugin!
-  gem-release (~> 2.0)
   google_maps_presenter_plugin!
   iframe_presenter_plugin!
   image_crop_presenter_plugin!
@@ -233,13 +228,14 @@ DEPENDENCIES
   shotgun (~> 0.9)
   simplecov
   thor (~> 1.1.0)
+  timecop (~> 0.9.4)
   timer_presenter_plugin!
-  watir (~> 6.16)
+  watir (~> 6.19)
   watir-rspec (~> 3.0)
   webdrivers (~> 4.1)
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 2.7.4p191
 
 BUNDLED WITH
    2.2.20

data/README.md

@@ -101,13 +101,13 @@ You need to add the following to your layout to use presenters as a partial alon
 ##### Inside the <head> tag add the following:
 
       <title><%= @pom.page.title if @pom.page %></title>
-      <%= coprl_headers(@base_url, request, @pom) %> 
+      <%= coprl_headers %> 
 
 ##### Inside the &lt;body&gt; tag, around you existing yield add the following:
 
-    <%= partial "body/preamble", :locals => {pom:@pom} %>
+    <%= with_presenters_wrapper do %>
     <%= yield %>
-    <%= partial "body/postamble", :locals => {pom:@pom} %>
+    <%= end %>
 
 ### Rack
 #### 1) To use it, add this line to your Gemfile:

data/app/demo/components/snackbar.pom

@@ -8,10 +8,10 @@ Coprl::Presenters.define(:snackbar) do
 
   indented_grid do
     title 'On Page'
-    body 'You can attach a snackbar on the server side and will render after load.'
+    body 'You can invoke or attach a snackbar on the server side and will render after load.'
     snackbar 'Top Level Important Information!'
-
-    attach :snackbar_attached
+    # This is the same as above -- see POM at end of file
+    # attach :snackbar_attached
 
     title 'As Event'
     button 'Show Snackbar', id: :show_snackbar do
@@ -33,3 +33,9 @@ Coprl::Presenters.define(:snackbar) do
 
   attach :code, file: __FILE__
 end
+
+# Coprl::Presenters.define(:snackbar_attached) do
+#   title 'In Attached'
+#   body  'This can be done in an attached presenter as well'
+#   snackbar 'Attached Snackbar Displayed!'
+# end

data/coprl.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tzinfo', '>=1.1', '< 3.0'
   spec.add_runtime_dependency 'tzinfo-data', '~>1.2018'
   spec.add_runtime_dependency 'redcarpet', '~>3.4'
-  spec.add_runtime_dependency 'filewatcher', '~> 1.1.1'
   spec.add_runtime_dependency 'zeitwerk', '~> 2.1'
 
   spec.add_development_dependency 'thor', '~> 1.1.0'
@@ -38,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.13'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'gem-release', '~> 2.0'
   spec.add_development_dependency 'shotgun', '~> 0.9'
+  spec.add_development_dependency 'timecop', '~> 0.9.4  '
 end

data/lib/coprl/presenters/api/app.rb

@@ -66,9 +66,9 @@ module Coprl
 
         def prepare_context(base_params = params)
           prepare_context = Presenters::Settings.config.presenters.web_client.prepare_context.dup
-          prepare_context.push(method(:scrub_context))
+          prepare_context.push(method(:scrub_context)).push(method(:base_url_context))
           context = base_params.dup
-          prepare_context.reduce(context) do |params, context_proc|
+          context = prepare_context.reduce(context) do |params, context_proc|
             context_proc.call(params, session, env)
           end
           context
@@ -80,6 +80,11 @@ module Coprl
           end
           params
         end
+
+        def base_url_context(params, _session, env)
+          params[:base_url] = "#{request.base_url}#{env['SCRIPT_NAME']}"
+          params
+        end
       end
     end
   end

data/lib/coprl/presenters/dsl/components/base.rb

@@ -75,7 +75,6 @@ module Coprl
 
           alias params context
 
-
           def yield_block
             return @_yield_block_ if @_yield_block_
             @parent.send(:yield_block)

data/lib/coprl/presenters/dsl/definition.rb

@@ -17,8 +17,8 @@ module Coprl
           self
         end
 
-        def expand(router: , context:{}, &block)
-          presenter = UserInterface.new(router: router, context: context,  name: @name, namespace: @namespace, &@block)
+        def expand(router: , context:{}, plugins: [], &block)
+          presenter = UserInterface.new(router: router, context: context, plugins: plugins, name: @name, namespace: @namespace, &@block)
           yield(presenter) if block
           presenter.expand_instance
         end

data/lib/coprl/presenters/dsl/user_interface.rb

@@ -25,7 +25,7 @@ module Coprl
         private :context, :router, :namespace
         alias params context
 
-        def initialize(context:, parent: nil, router: nil, name: nil, namespace: [], &block)
+        def initialize(context:, parent: nil, router: nil, name: nil, plugins: [], namespace: [], &block)
           @parent = parent
           @router = router || @parent&.send(:router)
           @context = context || {}
@@ -36,7 +36,7 @@ module Coprl
           @footer = nil
           @name = name
           @namespace = namespace
-          @plugins = []
+          @plugins = plugins || []
           @csrf_meta_tags = authenticity_token_meta_tags(@context.fetch(:session, nil))
           add_global_helpers
           initialize_plugins

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[:base_url] ? context[:base_url] : context[:request].host_with_port }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,18 +6,20 @@ 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(':', '/')
 
-            path = host ? coprl_presenters_web_client_app_url(params, host: router.base_url) :
-                          coprl_presenters_web_client_app_path(params)
+            path = if defined?(coprl_presenters_rails_engine_url)
+              host ? coprl_presenters_rails_engine_url(params, host: router.base_url) :
+                       coprl_presenters_rails_engine_path(params)
+            else
+              host ? coprl_presenters_web_client_app_url(params, host: router.base_url) :
+                       coprl_presenters_web_client_app_path(params)
+            end
 
             if path.include?('?')
               path = path.sub('?', "#{presenter}?")

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/version.rb

@@ -1,7 +1,7 @@
 module Coprl
   module Presenters
     module Version
-      VERSION = '3.0.0.beta.5'
+      VERSION = '3.0.0.beta.9'
     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/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/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/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/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/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/rails-engine/app/controllers/coprl_controller.rb

@@ -23,21 +23,4 @@ class CoprlController < ApplicationController
       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

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/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>

data/views/mdc/components/buttons/_image.erb

@@ -22,4 +22,4 @@
   <%= partial "components/icon", :locals => {comp: comp.icon, class_name: 'mdc-button__icon', position: [:right, :center]} if comp.icon %>
 </button>
 <%= partial "components/tooltip", :locals => {comp: comp.tooltip, parent_id: comp.id} if comp.tooltip %>
-<%= partial "components/menu", :locals => {comp: comp.menu, parent_id: comp.id} if comp.menus %>
+<%= partial "components/menu", :locals => {comp: comp.menu, parent_id: comp.id} if comp.menu %>

data/views/mdc/layout.erb

@@ -7,12 +7,12 @@
   <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 %>
 </head>
 <body class="mdc-typography">
-    <%= 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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coprl
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.5
+  version: 3.0.0.beta.9
 platform: ruby
 authors:
 - Russell Edens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -140,20 +140,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: filewatcher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -267,33 +253,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: shotgun
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: shotgun
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.4
 description: 
 email:
 - 'rx@russelledens.net
@@ -359,7 +345,6 @@ files:
 - app/demo/components/selects.pom
 - app/demo/components/sliders.pom
 - app/demo/components/snackbar.pom
-- app/demo/components/snackbar_attached.pom
 - app/demo/components/steppers.pom
 - app/demo/components/tab_bars.pom
 - app/demo/components/tables.pom
@@ -598,14 +583,17 @@ files:
 - lib/coprl/presenters/helpers/rails.rb
 - lib/coprl/presenters/helpers/rails/currency.rb
 - lib/coprl/presenters/helpers/rails/model_table.rb
+- lib/coprl/presenters/helpers/rails/routes.rb
 - lib/coprl/presenters/helpers/redact.rb
 - lib/coprl/presenters/helpers/route.rb
 - lib/coprl/presenters/helpers/time.rb
 - lib/coprl/presenters/namespace.rb
 - lib/coprl/presenters/pluggable.rb
 - lib/coprl/presenters/plugins.rb
+- lib/coprl/presenters/rails/concerns/coprl_partial.rb
 - lib/coprl/presenters/rails/engine.rb
 - lib/coprl/presenters/rails/railtie.rb
+- lib/coprl/presenters/rails/reloader.rb
 - lib/coprl/presenters/registry.rb
 - lib/coprl/presenters/router.rb
 - lib/coprl/presenters/settings.rb
@@ -635,6 +623,7 @@ files:
 - lib/coprl/presenters/web_client/helpers/rails/partials.rb
 - lib/coprl/presenters/web_client/helpers/rails/raw.rb
 - lib/coprl/presenters/web_client/helpers/rails/safe_markdown.rb
+- lib/coprl/presenters/web_client/helpers/rails/template_helper.rb
 - lib/coprl/presenters/web_client/helpers/render_component.rb
 - lib/coprl/presenters/web_client/helpers/shared.rb
 - lib/coprl/presenters/web_client/helpers/sinatra.rb
@@ -643,6 +632,7 @@ files:
 - lib/coprl/presenters/web_client/helpers/sinatra/partials.rb
 - lib/coprl/presenters/web_client/helpers/sinatra/raw.rb
 - lib/coprl/presenters/web_client/helpers/sinatra/safe_markdown.rb
+- lib/coprl/presenters/web_client/helpers/sinatra/template_helper.rb
 - lib/coprl/presenters/web_client/helpers/snake_to_camel.rb
 - lib/coprl/presenters/web_client/helpers/transform_hash.rb
 - lib/coprl/presenters/web_client/helpers/unique_id.rb
@@ -684,6 +674,7 @@ files:
 - rails-engine/app/views/layouts/coprl.html.erb
 - rails-engine/config.ru
 - rails-engine/config/initializers/presenters.rb
+- rails-engine/config/initializers/routes.rb
 - rails-engine/config/initializers/session.rb
 - rails-engine/config/routes.rb
 - scripts/build.sh
@@ -815,9 +806,8 @@ files:
 - views/mdc/body/_footer.erb
 - views/mdc/body/_header.erb
 - views/mdc/body/_modal-drawer.erb
-- views/mdc/body/_postamble.erb
-- views/mdc/body/_preamble.erb
 - views/mdc/body/_snackbar.erb
+- views/mdc/body/_wrapper.erb
 - views/mdc/body/drawer/_divider.erb
 - views/mdc/body/drawer/_item.erb
 - views/mdc/body/drawer/_label.erb
@@ -949,7 +939,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: COmmon PResenter Language - A Ruby gem for joyfully writing modern user interfaces

data/app/demo/components/snackbar_attached.pom

@@ -1,6 +0,0 @@
-
-Coprl::Presenters.define(:snackbar_attached) do
-  title 'In Attached'
-  body  'This can be done in an attached presenter as well'
-  snackbar 'Attached Snackbar Displayed!'
-end

data/views/mdc/body/_postamble.erb

@@ -1,17 +0,0 @@
-<%
-  drawer = pom.drawer
-  footer = pom.footer
-%>
-</div>
-</div>
-<% if drawer %>
-  </div>
-  </div>
-  </div>
-<% end %>
-
-<%= partial "body/snackbar" %>
-<% if footer %>
-  <%= partial "body/footer", :locals => {:footer => footer} %>
-<% end %>
-</div>