ADO 17518: Support Rails 6

See: https://dev.azure.com/AMA-Ent/AMA-Ent/_workitems/edit/17518

* use Draper instead of copying what Draper does. Draper is updated
  for Rails 6, and it just showed that we don't have a great upgrade
  path right now
* fixes related to Rails 6 support changes

ama_layout.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
   spec.add_dependency 'browser', '~> 2.0'
+  spec.add_dependency 'draper'
   spec.add_dependency 'foundation-rails', '<= 6.4.3.0'
   spec.add_dependency 'rails', '>= 4.2'
   spec.add_dependency 'redis-rails'

app/views/ama_layout/agent/_sidebar.html.erb

@@ -2,7 +2,7 @@
   <h2 class="side-nav__header">Online Account</h2>
   <div class="side-nav__content">
     <ul class="side-nav__list">
-      <%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
+      <%= render partial: ama_layout_partial('main_nav_item'), collection: navigation.items, as: :nav_item %>
     </ul>
   </div>
 </aside>

app/views/ama_layout/v2/_sidebar.html.erb

@@ -2,7 +2,7 @@
   <h2 class="side-nav__header">Online Account</h2>
   <div class="side-nav__content">
     <ul class="side-nav__list">
-      <%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
+      <%= render partial: ama_layout_partial('main_nav_item'), collection: navigation.items, as: :nav_item %>
     </ul>
   </div>
 </aside>

app/views/ama_layout/v2/_siteheader.html.erb

@@ -17,7 +17,6 @@
         <li>
           <a href="<%= Rails.configuration.amaabca_site %>/contact">Contact Us</a>
         </li>
-        <%= navigation.account_toggle(self) %>
         <%= navigation.top_nav %>
       </ul>
     </div>

app/views/ama_layout/v2/_sub_nav.html.erb

@@ -1,3 +1,3 @@
 <ul class="side-nav__child-list">
-  <%= render partial: "ama_layout/sub_nav_item", collection: sub_nav, as: :nav_item %>
+  <%= render partial: ama_layout_partial('sub_nav_item'), collection: sub_nav, as: :nav_item %>
 </ul>

app/views/ama_layout/v2/_top_sub_nav.html.erb

@@ -1,3 +1,3 @@
 <ul class="submenu menu vertical" data-submenu>
-  <%= render partial: "ama_layout/top_sub_nav_item", collection: sub_nav, as: :nav_item %>
+  <%= render partial: ama_layout_partial('top_sub_nav_item'), collection: sub_nav, as: :nav_item %>
 </ul>

app/views/ama_layout/v3/_sidebar.html.erb

@@ -2,7 +2,7 @@
   <h2 class="side-nav__header">Online Account</h2>
   <div class="side-nav__content">
     <ul class="side-nav__list">
-      <%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
+      <%= render partial: ama_layout_partial('main_nav_item'), collection: navigation.items, as: :nav_item %>
     </ul>
   </div>
 </aside>

app/views/ama_layout/v3/_siteheader.html.erb

@@ -17,7 +17,6 @@
         <li>
           <a href="<%= Rails.configuration.amaabca_site %>/contact">Contact Us</a>
         </li>
-        <%= navigation.account_toggle(self) %>
         <%= navigation.top_nav %>
       </ul>
     </div>

app/views/ama_layout/v3/_sub_nav.html.erb

@@ -1,3 +1,3 @@
 <ul class="side-nav__child-list">
-  <%= render partial: "ama_layout/sub_nav_item", collection: sub_nav, as: :nav_item %>
+  <%= render partial: ama_layout_partial('sub_nav_item'), collection: sub_nav, as: :nav_item %>
 </ul>

app/views/ama_layout/v3/_top_sub_nav.html.erb

@@ -1,3 +1,3 @@
 <ul class="submenu menu vertical" data-submenu>
-  <%= render partial: "ama_layout/top_sub_nav_item", collection: sub_nav, as: :nav_item %>
+  <%= render partial: ama_layout_partial('top_sub_nav_item'), collection: sub_nav, as: :nav_item %>
 </ul>

lib/ama_layout.rb

@@ -3,9 +3,9 @@
 require 'foundation-rails'
 require 'browser'
 require 'breadcrumbs_on_rails'
+require 'draper'
 require 'redis-rails'
-require 'ama_layout/ama_layout_view'
-require 'ama_layout/draper_replacement'
+require_relative '../app/helpers/ama_layout_partial_helper'
 require 'ama_layout/breadcrumb_builder'
 require 'ama_layout/moneris'
 require 'ama_layout/navigation'

lib/ama_layout/decorators/agent/navigation_decorator.rb

@@ -2,8 +2,10 @@
 
 module AmaLayout
   module Agent
-    class NavigationDecorator
-      include AmaLayout::DraperReplacement
+    class NavigationDecorator < Draper::Decorator
+      include AmaLayoutPartialHelper
+
+      delegate_all
 
       def items
         object.items.map(&:decorate)
@@ -22,13 +24,13 @@ def sign_out_link
       def top_nav
         return '' unless user
 
-        h.render partial: ama_layout_partial('agent/top_nav'), locals: { navigation: self }
+        h.render partial: 'ama_layout/agent/top_nav', locals: { navigation: self }
       end
 
       def sidebar
         return '' unless user
 
-        h.render partial: ('sidebar'), locals: { navigation: self }
+        h.render partial: 'ama_layout/agent/sidebar', locals: { navigation: self }
       end
 
       def cash_drawer_name

lib/ama_layout/decorators/moneris_decorator.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module AmaLayout
-  class MonerisDecorator
-    include AmaLayout::DraperReplacement
+  class MonerisDecorator < Draper::Decorator
+    delegate_all
 
     def textbox
       h.raw File.read textbox_style_file

lib/ama_layout/decorators/navigation_decorator.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module AmaLayout
-  class NavigationDecorator
-    include AmaLayout::DraperReplacement
+  class NavigationDecorator < Draper::Decorator
+    include AmaLayoutPartialHelper
+
+    delegate_all
 
     def items
       object.items.map(&:decorate)
@@ -40,10 +42,6 @@ def name_or_email
       display_name.present? ? "Welcome, #{display_name.titleize}" : email
     end
 
-    def account_toggle(view_data = {})
-      h(view_data).render partial: 'account_toggle'
-    end
-
     def notification_icon
       return '' unless user
 

lib/ama_layout/decorators/navigation_item_decorator.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module AmaLayout
-  class NavigationItemDecorator
-    include AmaLayout::DraperReplacement
+  class NavigationItemDecorator < Draper::Decorator
+    include AmaLayoutPartialHelper
+
+    delegate_all
 
     def sub_nav
       object.sub_nav.map { |sn| sn.decorate }
@@ -11,11 +15,11 @@ def sub_nav_class
     end
 
     def top_sub_nav
-      h.render partial: "ama_layout/top_sub_nav", locals: { sub_nav: sub_nav } if sub_nav.any?
+      h.render partial: ama_layout_partial('top_sub_nav'), locals: { sub_nav: sub_nav } if sub_nav.any?
     end
 
     def sidebar_sub_nav
-      h.render partial: "ama_layout/sub_nav", locals: { sub_nav: sub_nav } if sub_nav.any?
+      h.render partial: ama_layout_partial('sub_nav'), locals: { sub_nav: sub_nav } if sub_nav.any?
     end
 
     def active_class

lib/ama_layout/decorators/notification_decorator.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module AmaLayout
-  class NotificationDecorator
-    include AmaLayout::DraperReplacement
+  class NotificationDecorator < Draper::Decorator
+    include AmaLayoutPartialHelper
+
+    delegate_all
 
     ICONS = {
       notice: {

lib/ama_layout/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AmaLayout
-  VERSION = '11.3.1'
+  VERSION = '12.0.0'
 end

spec/agent/navigation_spec.rb

@@ -11,7 +11,7 @@
         File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "spec", "ama_layout", "fixtures", "agent_navigation.yml")
       end
       let(:user) { double("user") }
-      let(:subject) { described_class.new(user: user, nav_file_path: file_path, current_url: '/') }
+      subject { described_class.new(user: user, nav_file_path: file_path, current_url: '/') }
 
       it "uses the overridden file path" do
         expect(subject.items.first.text).to eq "Waffles"