ama_layout 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c84576ab846039685676fea5a445c6bde97a418
-  data.tar.gz: 898f53f578677836a9f708c44117142217b49d3e
+  metadata.gz: c9d464241916a44feae3e3484c748db498c538d2
+  data.tar.gz: bb46402967e1dc1550edb662e0ce9454e8266d7a
 SHA512:
-  metadata.gz: 1d15a754ed97115d0312f123885c591bb28498f6c7f17a99b00e5316256026ec9e2e0a25ca8a468a0fea441b26a8ebc0a622a6bd4b8c3e66f4df480254fa4fb2
-  data.tar.gz: 0fc6b11bd21ee5739d94dc2e3188bf9030302bdcb5eff52c4ffbf364e90045da1ec01d7bb9ab252deac6ffdb418203c543814c149ed51173cd1948091acfa505
+  metadata.gz: b96bdea23b834ba5c23aae70e2c84c1e6580878ed350935eb0ac9a36be20ff94b5c84baa249e3e8490126f9ee06de4c6d97423ee2f6373b2ef6d439df9e9b1a1
+  data.tar.gz: 1b28881f58e8bf7eeefe277974d73e633ce7cbaae809002c15d978083dc7af3e4b03fc95a6a6a3b1a77f4d4458e1753ad9dcf3e5fe6c22a8637404763a0340d7

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

@@ -1,7 +1,7 @@
 <div class="header">
   <div class="title-bar" data-responsive-toggle="main-menu" data-hide-for="large">
     <button class="menu-icon" type="button" data-toggle="offCanvasLeft"></button>
-    <%= link_to(image_tag("ama-logo.png", class: "title-bar__logo"), "https://www.ama.ab.ca") %>
+    <%= link_to(image_tag("ama-logo.png"), "https://www.ama.ab.ca", class: "title-bar__logo") %>
   </div>
   <div class="top-bar" id="main-menu">
     <div class="top-bar-left">

data/lib/ama_layout.rb

@@ -9,6 +9,7 @@ require 'ama_layout/breadcrumb_builder'
 require 'ama_layout/moneris'
 require 'ama_layout/navigation'
 require 'ama_layout/navigation_item'
+require 'ama_layout/navigation_helper'
 require 'ama_layout/decorators/moneris_decorator'
 require 'ama_layout/decorators/navigation_decorator'
 require 'ama_layout/decorators/navigation_item_decorator'

data/lib/ama_layout/navigation.rb

@@ -13,12 +13,15 @@ module AmaLayout
     cattr_accessor :member do
       "member"
     end
+
     cattr_accessor :non_member do
       "non-member"
     end
+
     cattr_accessor :member_in_renewal do
       "member-in-renewal"
     end
+
     cattr_accessor :member_in_renewal_late do
       "member-in-renewal-late"
     end

data/lib/ama_layout/navigation.yml

@@ -81,11 +81,78 @@ non-member:
     link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
     icon: "fa-cogs"
 member-in-renewal:
+  - text: "My Account Overview"
+    link: "<%= Rails.configuration.gatekeeper_site %>/"
+    icon: "fa-tachometer"
+  - text: "My Membership"
+    link: "<%= Rails.configuration.membership_site %>/membership/overview"
+    icon: "fa-credit-card"
+    sub_nav:
+      - text: "Membership Overview"
+        link: "<%= Rails.configuration.membership_site %>/membership/overview"
+      - text: "Renew Membership"
+        link: "<%= Rails.configuration.membership_site %>/renews/new"
+        icon: "fa-credit-card"
+      - text: "Manage Membership"
+        link: "<%= Rails.configuration.membership_site %>/membership/manage"
+      - text: "Billing Options"
+        link: "<%= Rails.configuration.youraccount_site %>/billing"
+      - text: "Print/Request New Card"
+        link: "<%= Rails.configuration.youraccount_site %>/membership"
+  - text: "My Roadside Assistance"
+    link: "<%= Rails.configuration.automotive_site %>/"
+    icon: "fa-car"
+    sub_nav:
+      - text: "Roadside Assistance Overview"
+        link: "<%= Rails.configuration.automotive_site %>/"
+  - text: "My Driver Education"
+    link: "<%= Rails.configuration.driveredonline_site %>/"
+    icon: "fa-car"
+    sub_nav:
+      - text: "Driver Education Overview"
+        link: "<%= Rails.configuration.driveredonline_site %>/"
+      - text: "New Driver Online Program"
+        link: "<%= Rails.configuration.driveredonline_site %>/dashboard"
+  - text: "My AMA Rewards"
+    link: "<%= Rails.configuration.youraccount_site %>/rewards"
+    icon: "fa-usd"
+    sub_nav:
+      - text: "Rewards Overview"
+        link: "<%= Rails.configuration.youraccount_site %>/rewards"
+      - text: "Gift Cards"
+        link: "<%= Rails.configuration.membership_site %>/reward_cards"
+      - text: "Transaction History"
+        link: "<%= Rails.configuration.youraccount_site %>/reward_dollars"
+      - text: "Pizza 73 Coupon Codes"
+        link: "<%= Rails.configuration.youraccount_site %>/pizza73"
+  - text: "My Registries"
+    link: "<%= Rails.configuration.registries_site %>/"
+    icon: "fa-folder-open"
+    sub_nav:
+      - text: "Registries Overview"
+        link: "<%= Rails.configuration.registries_site %>/"
+      - text: "Vehicle Registration Auto-Renew"
+        link: "<%= Rails.configuration.registries_site %>/order/registrations/new"
+  - text: "My Travel"
+    link: "<%= Rails.configuration.travel_site %>"
+  - text: "My Account Settings"
+    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    icon: "fa-cogs"
+    sub_nav:
+      - text: "Change Email/Password"
+        link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+      - text: "Email Subscriptions"
+        link: "<%= Rails.configuration.youraccount_site %>/subscriptions"
+      - text: "AMA Insider Magazine"
+        link: "<%= Rails.configuration.youraccount_site %>/amainsider"
+      - text: "Change Address"
+        link: "<%= Rails.configuration.youraccount_site %>/membership_update/new"
+member-in-renewal-late:
   - text: "Account Dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Renew"
-    link: "<%= Rails.configuration.youraccount_site %>/renew"
+    link: "<%= Rails.configuration.membership_site %>/renews/new"
     icon: "fa-credit-card"
   - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"
@@ -95,11 +162,11 @@ member-in-renewal:
         link: "<%= Rails.configuration.driveredonline_site %>/"
       - text: "New Driver Online Program"
         link: "<%= Rails.configuration.driveredonline_site %>/dashboard"
-member-in-renewal-late:
+member-with-outstanding-balance:
   - text: "Account Dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
-  - text: "Renew"
+  - text: "Pay Outstanding Balance"
     link: "<%= Rails.configuration.youraccount_site %>/renew"
     icon: "fa-credit-card"
   - text: "Driver Education"

data/lib/ama_layout/navigation_helper.rb

@@ -0,0 +1,25 @@
+module AmaLayout
+  module NavigationHelper
+    def navigation
+      return AmaLayout::Navigation.non_member unless member?
+      case
+      when _in_renewal_late?
+        AmaLayout::Navigation.member_in_renewal_late
+      when _in_renewal?
+        AmaLayout::Navigation.member_in_renewal
+      else
+        AmaLayout::Navigation.member
+      end
+    end
+
+    private
+
+    def _in_renewal?
+      in_renewal
+    end
+
+    def _in_renewal_late?
+      status == "AL"
+    end
+  end
+end

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
 end

data/spec/ama_layout/navigation_helper_spec.rb

@@ -0,0 +1,55 @@
+describe AmaLayout::NavigationHelper do
+  subject { FactoryGirl.create(:user) }
+
+  describe '#navigation' do
+    before(:each) do
+      subject.class.include(AmaLayout::NavigationHelper).new
+    end
+
+    context 'non-member' do
+      subject { FactoryGirl.create(:user, :non_member) }
+
+      it 'shows non-member sidebar menu' do
+        expect(subject.navigation).to eq 'non-member'
+      end
+    end
+
+    context 'member' do
+      it 'shows member sidebar menu' do
+        expect(subject.navigation).to eq 'member'
+      end
+    end
+
+    context 'member with accr' do
+      subject { FactoryGirl.create(:user, :with_accr) }
+
+      it 'shows member sidebar menu' do
+        expect(subject.navigation).to eq 'member'
+      end
+    end
+
+    context 'member with mpp' do
+      subject { FactoryGirl.create(:user, :with_mpp) }
+
+      it 'shows member sidebar menu' do
+        expect(subject.navigation).to eq 'member'
+      end
+    end
+
+    context 'member in-renewal' do
+      subject { FactoryGirl.create(:user, :in_renewal) }
+
+      it 'shows in-renewal sidebar menu' do
+        expect(subject.navigation).to eq 'member-in-renewal'
+      end
+    end
+
+    context 'member in-renewal late' do
+      subject { FactoryGirl.create(:user, :in_renewal_late) }
+
+      it 'shows in-renewal-late sidebar menu' do
+        expect(subject.navigation).to eq 'member-in-renewal-late'
+      end
+    end
+  end
+end

data/spec/ama_layout/navigation_spec.rb

@@ -66,37 +66,7 @@ describe AmaLayout::Navigation do
 
     context "member" do
       context "subnavs" do
-        context "automotive" do
-          let(:automotive_subnav) { subject.items[2].sub_nav }
-
-          it "returns the subnav items" do
-            expect(automotive_subnav[0].text).to eq "Roadside Assistance Overview"
-            expect(automotive_subnav[0].link).to eq "#{automotive_site}/"
-          end
-        end
-
-        context "driver education" do
-          let(:driver_education_subnav) { subject.items[3].sub_nav }
-
-          it "return the subnav items" do
-            expect(driver_education_subnav[0].text).to eq "Driver Education Overview"
-            expect(driver_education_subnav[0].link).to eq "#{driveredonline_site}/"
-
-            expect(driver_education_subnav[1].text).to eq "New Driver Online Program"
-            expect(driver_education_subnav[1].link).to eq "#{driveredonline_site}/dashboard"
-          end
-        end
-
-        context "registries" do
-          let(:registries_subnav) { subject.items[5].sub_nav }
-
-          it "returns the subnav items" do
-            expect(registries_subnav[0].text).to eq "Registries Overview"
-            expect(registries_subnav[0].link).to eq "#{registries_site}/"
-            expect(registries_subnav[1].text).to eq "Vehicle Registration Auto-Renew"
-            expect(registries_subnav[1].link).to eq "#{registries_site}/order/registrations/new"
-          end
-        end
+        include_examples "member_navigation"
       end
     end
 
@@ -121,24 +91,37 @@ describe AmaLayout::Navigation do
 
     context "member-in-renewal" do
       context "subnavs" do
-        context "driver education" do
-          before(:each) do
-            subject.user = OpenStruct.new navigation: "member-in-renewal"
-          end
-          let(:driver_education_subnav) { subject.items[2].sub_nav }
+        before(:each) do
+          subject.user = OpenStruct.new navigation: "member-in-renewal"
+        end
 
-          it "return the subnav items" do
-            expect(driver_education_subnav[0].text).to eq "Driver Education Overview"
-            expect(driver_education_subnav[0].link).to eq "#{driveredonline_site}/"
+        include_examples "member_navigation"
 
-            expect(driver_education_subnav[1].text).to eq "New Driver Online Program"
-            expect(driver_education_subnav[1].link).to eq "#{driveredonline_site}/dashboard"
+        context "membership" do
+          let(:membership_subnav) { subject.items[1].sub_nav }
+
+          it "has the correct subnav items" do
+            expect(membership_subnav[1].text).to eq "Renew Membership"
+            expect(membership_subnav[1].link).to eq "#{membership_site}/renews/new"
           end
         end
       end
     end
 
     context "member-in-renewal-late" do
+      before(:each) do
+        subject.user = OpenStruct.new navigation: "member-in-renewal-late"
+      end
+
+      context "main nav" do
+        it "return the main nav items" do
+          expect(subject.items[0].text).to eq "Account Dashboard"
+          expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
+          expect(subject.items[1].text).to eq "Renew"
+          expect(subject.items[1].link).to eq "#{membership_site}/renews/new"
+        end
+      end
+
       context "subnavs" do
         context "driver education" do
           before(:each) do

data/spec/factories/users.rb

@@ -0,0 +1,35 @@
+FactoryGirl.define do
+  factory :user, class: Class.new(OpenStruct) do
+    in_renewal false
+    member_type 'P'
+    renew_type 'R'
+    status 'A'
+    has_outstanding_balance false
+    member? true
+
+    trait :non_member do
+      member? false
+    end
+
+    trait :with_accr do
+      renew_type 'A'
+    end
+
+    trait :with_mpp do
+      renew_type 'M'
+    end
+
+    trait :in_renewal do
+      in_renewal true
+    end
+
+    trait :in_renewal_late do
+      in_renewal true
+      status 'AL'
+    end
+
+    trait :outstanding_balance do
+      has_outstanding_balance true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'rspec/rails'
 require 'combustion'
 require 'timecop'
 
-ENV['RAILS_ENV'] ||= 'test'
+ENV['RAILS_ENV'] = 'test'
 
 Combustion.initialize! :all
 

data/spec/support/shared_examples/member_navigation.rb

@@ -0,0 +1,105 @@
+shared_examples 'member_navigation' do
+
+  context 'overview' do
+    it 'has the correct overview text and url' do
+      expect(subject.items[0].text).to eq 'My Account Overview'
+      expect(subject.items[0].link).to eq "#{gatekeeper_site}/"
+    end
+  end
+
+  context "membership" do
+    let(:membership_subnav) { subject.items[1].sub_nav }
+
+    it "returns the subnav items" do
+      length = membership_subnav.length
+
+      expect(membership_subnav[0].text).to eq 'Membership Overview'
+      expect(membership_subnav[0].link).to eq "#{membership_site}/membership/overview"
+
+      expect(membership_subnav[length - 3].text).to eq 'Manage Membership'
+      expect(membership_subnav[length - 3].link).to eq "#{membership_site}/membership/manage"
+
+      expect(membership_subnav[length - 2].text).to eq 'Billing Options'
+      expect(membership_subnav[length - 2].link).to eq "#{youraccount_site}/billing"
+
+      expect(membership_subnav.last.text).to eq 'Print/Request New Card'
+      expect(membership_subnav.last.link).to eq "#{youraccount_site}/membership"
+    end
+  end
+
+  context 'automotive' do
+    let(:automotive_subnav) { subject.items[2].sub_nav }
+
+    it 'returns the subnav items' do
+      expect(automotive_subnav[0].text).to eq 'Roadside Assistance Overview'
+      expect(automotive_subnav[0].link).to eq "#{automotive_site}/"
+    end
+  end
+
+  context 'driver education' do
+    let(:driver_education_subnav) { subject.items[3].sub_nav }
+
+    it 'return the subnav items' do
+      expect(driver_education_subnav[0].text).to eq 'Driver Education Overview'
+      expect(driver_education_subnav[0].link).to eq "#{driveredonline_site}/"
+
+      expect(driver_education_subnav[1].text).to eq 'New Driver Online Program'
+      expect(driver_education_subnav[1].link).to eq "#{driveredonline_site}/dashboard"
+    end
+  end
+
+  context 'rewards' do
+    let(:rewards_subnav) { subject.items[4].sub_nav }
+
+    it 'returns the subnav items' do
+      expect(rewards_subnav[0].text).to eq 'Rewards Overview'
+      expect(rewards_subnav[0].link).to eq "#{youraccount_site}/rewards"
+
+      expect(rewards_subnav[1].text).to eq 'Gift Cards'
+      expect(rewards_subnav[1].link).to eq "#{membership_site}/reward_cards"
+
+      expect(rewards_subnav[2].text).to eq 'Transaction History'
+      expect(rewards_subnav[2].link).to eq "#{youraccount_site}/reward_dollars"
+
+      expect(rewards_subnav[3].text).to eq 'Pizza 73 Coupon Codes'
+      expect(rewards_subnav[3].link).to eq "#{youraccount_site}/pizza73"
+    end
+  end
+
+  context 'registries' do
+    let(:registries_subnav) { subject.items[5].sub_nav }
+
+    it 'returns the subnav items' do
+      expect(registries_subnav[0].text).to eq 'Registries Overview'
+      expect(registries_subnav[0].link).to eq "#{registries_site}/"
+
+      expect(registries_subnav[1].text).to eq 'Vehicle Registration Auto-Renew'
+      expect(registries_subnav[1].link).to eq "#{registries_site}/order/registrations/new"
+    end
+  end
+
+  context 'travel' do
+    it 'has the correct travel text and url' do
+      expect(subject.items[6].text).to eq 'My Travel'
+      expect(subject.items[6].link).to eq "#{travel_site}"
+    end
+  end
+
+  context 'my account' do
+    let(:my_account_subnav) { subject.items[7].sub_nav }
+
+    it 'returns the subnav items' do
+      expect(my_account_subnav[0].text).to eq 'Change Email/Password'
+      expect(my_account_subnav[0].link).to eq "#{gatekeeper_site}/user/edit"
+
+      expect(my_account_subnav[1].text).to eq 'Email Subscriptions'
+      expect(my_account_subnav[1].link).to eq "#{youraccount_site}/subscriptions"
+
+      expect(my_account_subnav[2].text).to eq 'AMA Insider Magazine'
+      expect(my_account_subnav[2].link).to eq "#{youraccount_site}/amainsider"
+
+      expect(my_account_subnav[3].text).to eq 'Change Address'
+      expect(my_account_subnav[3].link).to eq "#{youraccount_site}/membership_update/new"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails
@@ -305,6 +305,7 @@ files:
 - lib/ama_layout/moneris/textbox.txt
 - lib/ama_layout/navigation.rb
 - lib/ama_layout/navigation.yml
+- lib/ama_layout/navigation_helper.rb
 - lib/ama_layout/navigation_item.rb
 - lib/ama_layout/notification.rb
 - lib/ama_layout/notification_set.rb
@@ -321,6 +322,7 @@ files:
 - spec/ama_layout/fixtures/real_date_picker.html
 - spec/ama_layout/javascripts/real_date_picker_spec.coffee
 - spec/ama_layout/moneris_spec.rb
+- spec/ama_layout/navigation_helper_spec.rb
 - spec/ama_layout/navigation_item_spec.rb
 - spec/ama_layout/navigation_spec.rb
 - spec/ama_layout/notification_set_spec.rb
@@ -330,6 +332,7 @@ files:
 - spec/ama_layout/notifications_spec.rb
 - spec/factories/navigation.rb
 - spec/factories/navigation_item.rb
+- spec/factories/users.rb
 - spec/helpers/ama_layout_breadcrumb_helper_spec.rb
 - spec/helpers/ama_layout_content_helper_spec.rb
 - spec/helpers/ama_layout_path_helper_spec.rb
@@ -341,6 +344,7 @@ files:
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
 - spec/spec_helper.rb
+- spec/support/shared_examples/member_navigation.rb
 homepage: https://github.com/amaabca/ama_layout
 licenses:
 - MIT
@@ -361,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: ".ama.ab.ca site layouts"
@@ -375,6 +379,7 @@ test_files:
 - spec/ama_layout/fixtures/real_date_picker.html
 - spec/ama_layout/javascripts/real_date_picker_spec.coffee
 - spec/ama_layout/moneris_spec.rb
+- spec/ama_layout/navigation_helper_spec.rb
 - spec/ama_layout/navigation_item_spec.rb
 - spec/ama_layout/navigation_spec.rb
 - spec/ama_layout/notification_set_spec.rb
@@ -384,6 +389,7 @@ test_files:
 - spec/ama_layout/notifications_spec.rb
 - spec/factories/navigation.rb
 - spec/factories/navigation_item.rb
+- spec/factories/users.rb
 - spec/helpers/ama_layout_breadcrumb_helper_spec.rb
 - spec/helpers/ama_layout_content_helper_spec.rb
 - spec/helpers/ama_layout_path_helper_spec.rb
@@ -395,3 +401,4 @@ test_files:
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
 - spec/spec_helper.rb
+- spec/support/shared_examples/member_navigation.rb