coprl 3.0.0.beta.5 → 3.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1d61921712f73e4c13f6a206c4499e7bd72f40b82471cf03f741a272f118c1
-  data.tar.gz: 6e6812e4334f47c542b3710cea1d74daa0d6f7b3e803bd0ac334e15cc6192461
+  metadata.gz: 7d5886d0ba61fa0e7a694b0463ef695007c3c64e3c601344b96e9d6cdcd74e14
+  data.tar.gz: c6acd24734fb08dfa86e416cefecf8936e816ee390fe2eb150be085c6e0b7552
 SHA512:
-  metadata.gz: 384f80e03ad8cb9674d35d3fb5ceb293b6fed3c4b497076efeb3dfd8215394716b6c82db4fc8fc5ffe8d8145a6bc6f5f69adbcd6ecf67245f5f9e7b08c2cdb81
-  data.tar.gz: 15ec4d677bc0ab317e5de06c3c0e499fa22b9fa047c78da589539365e6abc4c8dce33a889d97e6d9f620916ceaf05eb2dc1ec89ad29b9eab1828dfccde9dd15f
+  metadata.gz: e5b77286cfd3b3ee1df288e8a9394dbc16d3bae8ccb148dec73b90af4021c653b4266ca5f8cdc404268d7d6e118b5dd1f9a13fe34b1db4bad8e3aa2b7ba9159a
+  data.tar.gz: 0b8b5ce497af6367a3c48b1f82dae262441ef125e9908cd29c37d08e8f371cfe2e3c187b851fdc497cc7f7573d84a13d480569d0967d1e26a904157a1556516c

data/.circleci/config.yml

@@ -18,28 +18,22 @@ 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: 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/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [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)
 
@@ -99,7 +99,7 @@ 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)
@@ -113,18 +113,17 @@ GEM
     dry-inflector (0.2.0)
     filewatcher (1.1.1)
       optimist (~> 3.0)
-    gem-release (2.0.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)
@@ -145,27 +144,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)
+    rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -183,19 +182,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 +213,6 @@ DEPENDENCIES
   coprl!
   dotenv
   foo_presenter_plugin!
-  gem-release (~> 2.0)
   google_maps_presenter_plugin!
   iframe_presenter_plugin!
   image_crop_presenter_plugin!
@@ -233,8 +232,9 @@ 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)
 

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

@@ -38,6 +38,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/version.rb

@@ -1,7 +1,7 @@
 module Coprl
   module Presenters
     module Version
-      VERSION = '3.0.0.beta.5'
+      VERSION = '3.0.0.beta.6'
     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/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/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.6
 platform: ruby
 authors:
 - Russell Edens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -267,33 +267,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 +359,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
@@ -635,6 +634,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 +643,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
@@ -815,9 +816,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

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>