ama_layout 8.0.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba422e9a28b42d0d5b030db721a5f73bc55733ef
-  data.tar.gz: 354156b125b79739e813462d65b4fea6b435191d
+  metadata.gz: '05548c0c4d9d43880761679cbfd8f8f1ce52ef1f'
+  data.tar.gz: a1eec1a2d699f9f3ae9d0d972b332ed88daece13
 SHA512:
-  metadata.gz: 30bd40fa39479ff6a31c1c628720701e65fe7955f6afc1bfff473059e49b86858af2c19cd5d41022be4e6a8be95f3322afe2e9833280272c6b15906a8b8d97ad
-  data.tar.gz: 880d1ae33fc28d6ae6158a18570d4301529b41ede09eefa64b02935d620039029218df8c4a6cfcd468fbb736624e85c9ef9dc5ee449c7917876810d9054c4ea7
+  metadata.gz: de302c59d56d01e9456ea3e566df7dfca6ab9cf4b74d832cf0f48d5cb71ebdebf4c1defc5511a1027e03275281d5431ee272d9cc79a1d67c1ecc9b392a1f6c35
+  data.tar.gz: 4c2b91ea3e0aa168a30043cd2799632e0726f947d22da484ae3b0ec8cf595159b255c8d15a4c6e7b0949bc7178551b3b5fe087bbdd4f72d56b33f85dae0b59e5

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

@@ -0,0 +1,22 @@
+<div class="off-canvas position-left" id="offCanvasLeft" data-off-canvas>
+  <h2 class="side-nav__header">Online Account</h2>
+  <div class="side-nav__content">
+    <ul class="side-nav__list">
+      <li class="side-nav__item">
+        <%= link_to 'Sign In', "#{Rails.configuration.gatekeeper_site}/login", class: 'side-nav__link' %>
+      </li>
+      <li class="side-nav__item">
+        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>">AMA Website</a>
+      </li>
+      <li class="side-nav__item">
+        <a class="side-nav__link" href="http://amaroadreports.ca/">AMA Road Reports</a>
+      </li>
+      <li class="side-nav__item">
+        <a class="side-nav__link" href="https://albertamotorassociation.zendesk.com/hc/en-us" target="_blank">Help</a>
+      </li>
+      <li class="side-nav__item">
+        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
+      </li>
+    </ul>
+  </div>
+</div>

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

@@ -23,28 +23,7 @@
     </div>
   </div>
 </div>
-<div class="off-canvas position-left" id="offCanvasLeft" data-off-canvas>
-  <h2 class="side-nav__header">Online Account</h2>
-  <div class="side-nav__content">
-    <ul class="side-nav__list">
-      <%= navigation.account_toggle(self) %>
-      <%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
-      <li class="side-nav__item">
-        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>">AMA Website</a>
-      </li>
-      <li class="side-nav__item">
-        <a class="side-nav__link" href="http://amaroadreports.ca/">AMA Road Reports</a>
-      </li>
-      <li class="side-nav__item">
-        <a class="side-nav__link" href="https://albertamotorassociation.zendesk.com/hc/en-us" target="_blank">Help</a>
-      </li>
-      <li class="side-nav__item">
-        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
-      </li>
-      <%= navigation.sign_out_link %>
-    </ul>
-  </div>
-</div>
+<%= navigation.mobile_links %>
 <%= navigation.notification_sidebar %>
 <div class="javascript_errors error_notification" hidden></div>
 <noscript>

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -43,6 +43,10 @@ module AmaLayout
       end
     end
 
+    def mobile_links
+      h.render 'ama_layout/mobile_links' unless user
+    end
+
     def notification_badge
       if new_notifications?
         h.content_tag(

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '8.0.2'
+  VERSION = '9.0.0'
 end

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -1,26 +1,18 @@
 describe AmaLayout::NavigationDecorator do
   let(:navigation) { FactoryGirl.build(:navigation) }
   let(:navigation_presenter) { navigation.decorate }
-  let(:gatekeeper_site) { "http://auth.waffles.ca" }
-  let(:youraccount_site) { "http://youraccount.waffles.ca" }
-  let(:insurance_site) { "http://insurance.waffles.ca" }
-  let(:membership_site) { "http://membership.waffles.ca" }
-  let(:driveredonline_site) { "http://driveredonline.waffles.ca" }
-  let(:registries_site) { "http://registries.waffles.ca" }
-  let(:automotive_site) { "http://automotive.waffles.ca" }
-  let(:travel_site) { "http://travel.waffles.ca" }
-  let(:travel_login_url) { "http://travel.waffles.ca/MyAccount" }
 
   before(:each) do
-    allow(Rails.configuration).to receive(:gatekeeper_site).and_return(gatekeeper_site)
-    allow(Rails.configuration).to receive(:youraccount_site).and_return(youraccount_site)
-    allow(Rails.configuration).to receive(:insurance_site).and_return(insurance_site)
-    allow(Rails.configuration).to receive(:membership_site).and_return(membership_site)
-    allow(Rails.configuration).to receive(:driveredonline_site).and_return(driveredonline_site)
-    allow(Rails.configuration).to receive(:registries_site).and_return(registries_site)
-    allow(Rails.configuration).to receive(:automotive_site).and_return(automotive_site)
-    allow(Rails.configuration).to receive(:travel_site).and_return(travel_site)
-    allow(Rails.configuration).to receive(:travel_login_url).and_return(travel_login_url)
+    Rails.configuration.gatekeeper_site = 'http://auth.waffles.ca'
+    Rails.configuration.youraccount_site = 'http://youraccount.waffles.ca'
+    Rails.configuration.insurance_site = 'http://insurance.waffles.ca'
+    Rails.configuration.membership_site = 'http://membership.waffles.ca'
+    Rails.configuration.driveredonline_site = 'http://driveredonline.waffles.ca'
+    Rails.configuration.registries_site = 'http://registries.waffles.ca'
+    Rails.configuration.automotive_site = 'http://automotive.waffles.ca'
+    Rails.configuration.travel_site = 'http://travel.waffles.ca'
+    Rails.configuration.travel_login_url = 'http://travel.waffles.ca/MyAccount'
+    Rails.configuration.amaabca_site = 'http://test.ama.ab.ca/'
   end
 
   describe "#display_name_text" do
@@ -77,6 +69,24 @@ describe AmaLayout::NavigationDecorator do
     end
   end
 
+  describe '#mobile_links' do
+    context 'with user' do
+      before(:each) do
+        navigation_presenter.object = OpenStruct.new(user: true)
+      end
+
+      it 'returns nil' do
+        expect(navigation_presenter.mobile_links).to be_nil
+      end
+    end
+
+    context 'without user' do
+      it 'renders an offcanvas menu' do
+        expect(navigation_presenter.mobile_links).to include('off-canvas')
+      end
+    end
+  end
+
   describe "#sign_out_link" do
     context "with user" do
       it "returns link" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 9.0.0
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails
@@ -273,6 +273,7 @@ files:
 - app/views/ama_layout/_footer.html.erb
 - app/views/ama_layout/_main_nav_item.html.erb
 - app/views/ama_layout/_main_top_nav_item.html.erb
+- app/views/ama_layout/_mobile_links.html.erb
 - app/views/ama_layout/_mobile_notification_icon.html.erb
 - app/views/ama_layout/_notice.html.erb
 - app/views/ama_layout/_notices.html.erb