ama_layout 3.2.2 → 4.0.0

data/lib/ama_layout/navigation.rb

@@ -3,7 +3,7 @@ module AmaLayout
     include ActiveModel::Model
     include Draper::Decoratable
 
-    attr_accessor :user, :current_url, :nav_file_path
+    attr_accessor :user, :current_url, :nav_file_path, :display_name
 
     def initialize(args = {})
       args = defaults.merge args
@@ -29,11 +29,16 @@ module AmaLayout
       end
     end
 
-  private
     def navigation_items
       YAML.load ERB.new(File.read nav_file_path).result
     end
 
+    def email
+      user.email
+    end
+
+  private
+
     def defaults
       {
         nav_file_path: File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "navigation.yml")

data/lib/ama_layout/navigation.yml

@@ -1,10 +1,9 @@
 member:
   - text: "My Account Overview"
-    alt: "Back to my dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "My Membership"
-    link: "#"
+    link: "<%= Rails.configuration.membership_site %>/membership/overview"
     icon: "fa-credit-card"
     sub_nav:
       - text: "Membership Overview"
@@ -16,7 +15,7 @@ member:
       - text: "Print/Request New Card"
         link: "<%= Rails.configuration.youraccount_site %>/membership"
   - text: "My Driver Education"
-    link: "#"
+    link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
       - text: "Driver Education Overview"
@@ -24,7 +23,7 @@ member:
       - text: "New Driver Online Program"
         link: "<%= Rails.configuration.driveredonline_site %>/dashboard"
   - text: "My AMA Rewards"
-    link: "#"
+    link: "<%= Rails.configuration.youraccount_site %>/rewards"
     icon: "fa-usd"
     sub_nav:
       - text: "Rewards Overview"
@@ -34,7 +33,7 @@ member:
       - text: "Transaction History"
         link: "<%= Rails.configuration.youraccount_site %>/reward_dollars"
   - text: "My Registries"
-    link: "#"
+    link: "<%= Rails.configuration.registries_site %>/"
     icon: "fa-folder-open"
     sub_nav:
       - text: "Registries Overview"
@@ -42,7 +41,7 @@ member:
       - text: "Vehicle Registration Auto-Renew"
         link: "<%= Rails.configuration.registries_site %>/order/registrations/new"
   - text: "My Account Settings"
-    link: "#"
+    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
     icon: "fa-cogs"
     sub_nav:
       - text: "Change Email/Password"
@@ -55,15 +54,13 @@ member:
         link: "<%= Rails.configuration.youraccount_site %>/membership_update/new"
 non-member:
   - text: "Account Dashboard"
-    alt: "Back to my dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Join AMA"
-    alt: "Join AMA"
     link: "<%= Rails.configuration.membership_site %>"
     icon: "fa-credit-card"
   - text: "Driver Education"
-    link: "#"
+    link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
       - text: "Driver Education Overview"
@@ -75,14 +72,13 @@ non-member:
     icon: "fa-cogs"
 member-in-renewal:
   - text: "Account Dashboard"
-    alt: "Back to my dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Renew"
     link: "<%= Rails.configuration.youraccount_site %>/renew"
     icon: "fa-credit-card"
   - text: "Driver Education"
-    link: "#"
+    link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
       - text: "Driver Education Overview"
@@ -91,14 +87,13 @@ member-in-renewal:
         link: "<%= Rails.configuration.driveredonline_site %>/dashboard"
 member-in-renewal-late:
   - text: "Account Dashboard"
-    alt: "Back to my dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Renew"
     link: "<%= Rails.configuration.youraccount_site %>/renew"
     icon: "fa-credit-card"
   - text: "Driver Education"
-    link: "#"
+    link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
       - text: "Driver Education Overview"

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '3.2.2'
+  VERSION = '4.0.0'
 end

data/spec/ama_layout/breadcrumb_builder_spec.rb

@@ -0,0 +1,32 @@
+describe AmaLayout::BreadcrumbBuilder do
+  let(:view_context) { ActionView::Base.new }
+  let(:foo_crumb) { BreadcrumbsOnRails::Breadcrumbs::Element.new('Foo', '/foo') }
+  let(:bar_crumb) { BreadcrumbsOnRails::Breadcrumbs::Element.new('Bar', '/foo/bar') }
+  let(:crumbs) { [foo_crumb, bar_crumb] }
+
+  describe '#render' do
+    let(:builder) { AmaLayout::BreadcrumbBuilder.new(view_context, crumbs) }
+
+    context 'no separator specified' do
+      it 'returns the breadcrumb HTML without any separator' do
+        expect(builder.render).to eq('<li><a href="/foo">Foo</a></li><li><a href="/foo/bar">Bar</a></li>')
+      end
+    end
+
+    context 'with a separator of " > "' do
+      let(:builder) { AmaLayout::BreadcrumbBuilder.new(view_context, crumbs, separator: ' > ') }
+
+      it 'returns the breadcrumb HTML with the proper separator' do
+        expect(builder.render).to eq('<li><a href="/foo">Foo</a></li> > <li><a href="/foo/bar">Bar</a></li>')
+      end
+    end
+
+    context 'with a disabled element' do
+      let(:bar_crumb) { BreadcrumbsOnRails::Breadcrumbs::Element.new('Bar', '/foo/bar', disabled: true) }
+
+      it 'adds the appropriate disabled attributes to the element' do
+        expect(builder.render).to match /breadcrumbs__link--disabled/
+      end
+    end
+  end
+end

data/spec/ama_layout/decorators/moneris_decorator_spec.rb

@@ -5,7 +5,7 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
   describe "#textbox" do
     it "return textbox style file" do
       expect(moneris_presenter.textbox).to include "-webkit-appearance: none;"
-      expect(moneris_presenter.textbox).to include "-webkit-box-shadow: rgba(0, 0, 0, 0.0980392) 0px 1px 2px 0px inset;"
+      expect(moneris_presenter.textbox).to include "-webkit-box-shadow: none;"
       expect(moneris_presenter.textbox).to include "-webkit-rtl-ordering: logical;"
       expect(moneris_presenter.textbox).to include "-webkit-transition-delay: 0s, 0s;"
       expect(moneris_presenter.textbox).to include "-webkit-transition-duration: 0.45s, 0.45s;"
@@ -14,28 +14,24 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "-webkit-user-select: text;"
       expect(moneris_presenter.textbox).to include "-webkit-writing-mode: horizontal-tb;"
       expect(moneris_presenter.textbox).to include "background-color: rgb(255, 255, 255);"
-      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(204, 204, 204);"
-      expect(moneris_presenter.textbox).to include "border-bottom-left-radius: 3px;"
-      expect(moneris_presenter.textbox).to include "border-bottom-right-radius: 3px;"
+      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(229, 229, 229);"
       expect(moneris_presenter.textbox).to include "border-bottom-style: solid;"
-      expect(moneris_presenter.textbox).to include "border-bottom-width: 1px;"
+      expect(moneris_presenter.textbox).to include "border-bottom-width: 2px;"
       expect(moneris_presenter.textbox).to include "border-image-outset: 0px;"
       expect(moneris_presenter.textbox).to include "border-image-repeat: stretch;"
       expect(moneris_presenter.textbox).to include "border-image-slice: 100%;"
       expect(moneris_presenter.textbox).to include "border-image-source: none;"
       expect(moneris_presenter.textbox).to include "border-image-width: 1;"
-      expect(moneris_presenter.textbox).to include "border-left-color: rgb(204, 204, 204);"
+      expect(moneris_presenter.textbox).to include "border-left-color: rgb(229, 229, 229);"
       expect(moneris_presenter.textbox).to include "border-left-style: solid;"
-      expect(moneris_presenter.textbox).to include "border-left-width: 1px;"
-      expect(moneris_presenter.textbox).to include "border-right-color: rgb(204, 204, 204);"
+      expect(moneris_presenter.textbox).to include "border-left-width: 2px;"
+      expect(moneris_presenter.textbox).to include "border-right-color: rgb(229, 229, 229);"
       expect(moneris_presenter.textbox).to include "border-right-style: solid;"
-      expect(moneris_presenter.textbox).to include "border-right-width: 1px;"
-      expect(moneris_presenter.textbox).to include "border-top-color: rgb(204, 204, 204);"
-      expect(moneris_presenter.textbox).to include "border-top-left-radius: 3px;"
-      expect(moneris_presenter.textbox).to include "border-top-right-radius: 3px;"
+      expect(moneris_presenter.textbox).to include "border-right-width: 2px;"
+      expect(moneris_presenter.textbox).to include "border-top-color: rgb(229, 229, 229);"
       expect(moneris_presenter.textbox).to include "border-top-style: solid;"
-      expect(moneris_presenter.textbox).to include "border-top-width: 1px;"
-      expect(moneris_presenter.textbox).to include "box-shadow: rgba(0, 0, 0, 0.0980392) 0px 1px 2px 0px inset;"
+      expect(moneris_presenter.textbox).to include "border-top-width: 2px;"
+      expect(moneris_presenter.textbox).to include "box-shadow: none;"
       expect(moneris_presenter.textbox).to include "box-sizing: border-box;"
       expect(moneris_presenter.textbox).to include "color: rgba(0, 0, 0, 0.74902);"
       expect(moneris_presenter.textbox).to include "cursor: auto;"
@@ -43,7 +39,7 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;font-size: 14px;"
       expect(moneris_presenter.textbox).to include "font-style: normal;font-variant: normal;"
       expect(moneris_presenter.textbox).to include "font-weight: normal;"
-      expect(moneris_presenter.textbox).to include "height: 37px;"
+      expect(moneris_presenter.textbox).to include "height: 44px;"
       expect(moneris_presenter.textbox).to include "letter-spacing: normal;"
       expect(moneris_presenter.textbox).to include "line-height: normal;"
       expect(moneris_presenter.textbox).to include "margin-bottom: 0px;"

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -17,6 +17,43 @@ describe AmaLayout::NavigationDecorator do
     allow(Rails.configuration).to receive(:registries_site).and_return(registries_site)
   end
 
+  describe "#display_name_text" do
+    let(:user) { OpenStruct.new(email: 'john.doe@test.com') }
+
+    context "name is provided" do
+      let(:name) { "John D" }
+      let(:nav) { AmaLayout::Navigation.new(user: user, display_name: name).decorate }
+
+      it "has a welcome message" do
+        expect(nav.display_name_text).to eq "Welcome, John D"
+      end
+
+      context "long name given" do
+        let(:name) { "A Really Really Really Really Long Name" }
+
+        it "trucates to a total of 30 characters" do
+          expect(nav.display_name_text).to eq "Welcome, #{name.titleize}".truncate(30)
+        end
+      end
+    end
+
+    context "name is not provided" do
+      let(:nav) { AmaLayout::Navigation.new(user: user).decorate }
+
+      it "returns the user's email address" do
+        expect(nav.display_name_text).to eq user.email
+      end
+
+      context "a really long email" do
+        let(:user) { OpenStruct.new(email: 'areallyreallyreallylongemail@test.com') }
+
+        it "trucates to a total of 30 characters" do
+          expect(nav.display_name_text).to eq user.email.truncate(30)
+        end
+      end
+    end
+  end
+
   describe "#items" do
     before(:each) do
       allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))

data/spec/ama_layout/decorators/navigation_item_decorator_spec.rb

@@ -1,7 +1,7 @@
 describe AmaLayout::NavigationItemDecorator do
   let(:navigation_item) { FactoryGirl.build(:navigation_item) }
   let(:navigation_item_presenter) { navigation_item.decorate }
-  let(:items) { [{ text: "Othersite Overview", link: "othersite.com"}] }
+  let(:items) { [{ text: "Othersite Overview", link: "http://othersite.com"}] }
 
   describe "#sub_nav" do
     before(:each) do
@@ -68,11 +68,26 @@ describe AmaLayout::NavigationItemDecorator do
   end
 
   describe "#active_class" do
+    context "#current_url is an invalid URI" do
+      it "fails silently" do
+        navigation_item.current_url = "othersite.com"
+        navigation_item.sub_nav = items
+        expect(navigation_item_presenter.active_class).to eq nil
+      end
+    end
+
     context "with active_link" do
       it "return the class" do
-        navigation_item.current_url = "othersite.com"
+        navigation_item.current_url = "http://othersite.com"
+
+        navigation_item.sub_nav = items
+        expect(navigation_item_presenter.active_class).to eq "side-nav__child-link--active-page"
+      end
+
+      it "ignores query string parameters" do
+        navigation_item.current_url = "http://othersite.com?foo=bar"
         navigation_item.sub_nav = items
-        expect(navigation_item_presenter.active_class).to eq "activepage"
+        expect(navigation_item_presenter.active_class).to eq "side-nav__child-link--active-page"
       end
     end
 

data/spec/ama_layout/navigation_spec.rb

@@ -36,38 +36,31 @@ describe AmaLayout::Navigation do
   end
 
   describe "#items" do
-    context "member" do
-      before(:each) do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-      end
-
-      it "returns member navigation items" do
-        expect(subject.items[0].text).to eq "My Account Overview"
-        expect(subject.items[0].alt).to eq "Back to my dashboard"
-        expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
-        expect(subject.items[0].icon).to eq "fa-tachometer"
+    before(:each) do
+      subject.user = OpenStruct.new navigation: "member"
+    end
 
-        expect(subject.items[1].text).to eq "My Membership"
-        expect(subject.items[1].link).to eq "#"
-        expect(subject.items[1].icon).to eq "fa-credit-card"
+    it "does not remove nil #navigation_items" do
+      expect(subject.items.collect {|i| i.alt }).to include nil
+    end
 
-        expect(subject.items[2].text).to eq "My Driver Education"
-        expect(subject.items[2].link).to eq "#"
-        expect(subject.items[2].icon).to eq "fa-car"
+    it "displays links " do
+      expect(subject.items.collect {|i| i.link }).to eq subject.navigation_items[subject.user.navigation].collect {|i| i["link"] }
+    end
 
-        expect(subject.items[3].text).to eq "My AMA Rewards"
-        expect(subject.items[3].link).to eq "#"
-        expect(subject.items[3].icon).to eq "fa-usd"
+    it "contains text" do
+      expect(subject.items.collect {|i| i.text }).to eq subject.navigation_items[subject.user.navigation].collect {|i| i["text"] }
+    end
 
-        expect(subject.items[4].text).to eq "My Registries"
-        expect(subject.items[4].link).to eq "#"
-        expect(subject.items[4].icon).to eq "fa-folder-open"
+    it "contains icons" do
+      expect(subject.items.collect {|i| i.icon }).to eq subject.navigation_items[subject.user.navigation].collect {|i| i["icon"] }
+    end
 
-        expect(subject.items[5].text).to eq "My Account Settings"
-        expect(subject.items[5].link).to eq "#"
-        expect(subject.items[5].icon).to eq "fa-cogs"
-      end
+    it "contains alt text" do
+      expect(subject.items.collect {|i| i.alt }).to eq subject.navigation_items[subject.user.navigation].collect {|i| i["alt"] }
+    end
 
+    context "member" do
       context "subnavs" do
         context "driver education" do
           let(:driver_education_subnav) { subject.items[2].sub_nav }
@@ -95,30 +88,6 @@ describe AmaLayout::Navigation do
     end
 
     context "non-member" do
-      before(:each) do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "non-member"))
-      end
-
-      it "returns non-member navigation items" do
-        expect(subject.items[0].text).to eq "Account Dashboard"
-        expect(subject.items[0].alt).to eq "Back to my dashboard"
-        expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
-        expect(subject.items[0].icon).to eq "fa-tachometer"
-
-        expect(subject.items[1].text).to eq "Join AMA"
-        expect(subject.items[1].alt).to eq "Join AMA"
-        expect(subject.items[1].link).to eq membership_site
-        expect(subject.items[1].icon).to eq "fa-credit-card"
-
-        expect(subject.items[2].text).to eq "Driver Education"
-        expect(subject.items[2].link).to eq "#"
-        expect(subject.items[2].icon).to eq "fa-car"
-
-        expect(subject.items[3].text).to eq "Change Email/Password"
-        expect(subject.items[3].link).to eq "#{gatekeeper_site}/user/edit"
-        expect(subject.items[3].icon).to eq "fa-cogs"
-      end
-
       context "subnavs" do
         context "driver education" do
           let(:driver_education_subnav) { subject.items[2].sub_nav }
@@ -135,25 +104,6 @@ describe AmaLayout::Navigation do
     end
 
     context "member-in-renewal" do
-      before(:each) do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member-in-renewal"))
-      end
-
-      it "returns member-in-renewal navigation items" do
-        expect(subject.items[0].text).to eq "Account Dashboard"
-        expect(subject.items[0].alt).to eq "Back to my dashboard"
-        expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
-        expect(subject.items[0].icon).to eq "fa-tachometer"
-
-        expect(subject.items[1].text).to eq "Renew"
-        expect(subject.items[1].link).to eq "#{youraccount_site}/renew"
-        expect(subject.items[1].icon).to eq "fa-credit-card"
-
-        expect(subject.items[2].text).to eq "Driver Education"
-        expect(subject.items[2].link).to eq "#"
-        expect(subject.items[2].icon).to eq "fa-car"
-      end
-
       context "subnavs" do
         context "driver education" do
           let(:driver_education_subnav) { subject.items[2].sub_nav }
@@ -170,25 +120,6 @@ describe AmaLayout::Navigation do
     end
 
     context "member-in-renewal-late" do
-      before(:each) do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member-in-renewal-late"))
-      end
-
-      it "returns member-in-renewal-late navigation items" do
-        expect(subject.items[0].text).to eq "Account Dashboard"
-        expect(subject.items[0].alt).to eq "Back to my dashboard"
-        expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
-        expect(subject.items[0].icon).to eq "fa-tachometer"
-
-        expect(subject.items[1].text).to eq "Renew"
-        expect(subject.items[1].link).to eq "#{youraccount_site}/renew"
-        expect(subject.items[1].icon).to eq "fa-credit-card"
-
-        expect(subject.items[2].text).to eq "Driver Education"
-        expect(subject.items[2].link).to eq "#"
-        expect(subject.items[2].icon).to eq "fa-car"
-      end
-
       context "subnavs" do
         context "driver education" do
           let(:driver_education_subnav) { subject.items[2].sub_nav }

data/spec/helpers/ama_layout_breadcrumb_helper_spec.rb

@@ -0,0 +1,9 @@
+describe AmaLayoutBreadcrumbHelper do
+  describe "#show_breadcrumbs" do
+    it "renders breadcrumbs" do
+      helper.extend BreadcrumbsOnRails::ActionController::HelperMethods
+      helper.add_breadcrumb "Ama Online Account", "#"
+      expect(helper.show_breadcrumbs).to include "<a href=\"#\">Ama Online Account</a>"
+    end
+  end
+end