ama_layout 5.12.0 → 6.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68fd224038d65d4b4733ef89e62342eb54616de9
-  data.tar.gz: 1748ef1c697447bbc45b6e0de04feda2f16f6f76
+  metadata.gz: deb2b6ac040de520ac3ff4d6e203bf19c1e25f65
+  data.tar.gz: f1ea2726a83942149deff0ba04478c4b443bfccd
 SHA512:
-  metadata.gz: 03fdbd8ba50676c84aab9634f1476edd64396d483a6d21150f6f002b1f47181066ec1c7467891ae1e872014b56333d24ede29db654a758440bd3f50d85646734
-  data.tar.gz: e96716e1f6c132e99a08ba9b0fd7bb452c2dc3cb3e5abe2d68c1105e13f2465311e664fe75a729c5c1d107e670610916614bb68a028bd35dccd011b4ade57548
+  metadata.gz: 9dc341790258bed5cebf3da1f889adab7b2a0fecfd851e412535cd3fff12a9e8d5fb00147352c1f19d66d7d7a78cfacec8fd321a21abbb699bce713125e28def
+  data.tar.gz: 7f0ea969256317b13dc1321f3a45303e38454143d530c4ae92fa66bf4cf431f4777c2083d7ac286200399253a6ac156473a5d9f8f4e1f3698d4774de3b5ac66f

data/.travis.yml

@@ -2,5 +2,3 @@ language: ruby
 rvm:
   - 2.2.2
 sudo: false
-services:
-  - redis-server

data/ama_layout.gemspec

@@ -4,32 +4,31 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ama_layout/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'ama_layout'
+  spec.name          = "ama_layout"
   spec.version       = AmaLayout::VERSION
-  spec.authors       = ['Michael van den Beuken', 'Ruben Estevez', 'Jordan Babe', 'Mathieu Gilbert', 'Ryan Jones', 'Darko Dosenovic', 'Jonathan Weyermann', 'Adam Melnyk', 'Kayt Campbell', 'Kathleen Robertson', 'Jesse Doyle']
-  spec.email         = ['michael.beuken@gmail.com', 'ruben.a.estevez@gmail.com', 'jorbabe@gmail.com', 'mathieu.gilbert@ama.ab.ca', 'ryan.michael.jones@gmail.com', 'darko.dosenovic@ama.ab.ca', 'jonathan.weyermann@ama.ab.ca', 'adam.melnyk@ama.ab.ca', 'kayt.campbell@ama.ab.ca', 'kathleen.robertson@ama.ab.ca', 'jesse.doyle@ama.ab.ca']
+  spec.authors       = ["Michael van den Beuken", "Ruben Estevez", "Jordan Babe", "Mathieu Gilbert", "Ryan Jones", "Darko Dosenovic", "Jonathan Weyermann", "Adam Melnyk", "Kayt Campbell", "Kathleen Robertson", "Jesse Doyle"]
+  spec.email         = ["michael.beuken@gmail.com", "ruben.a.estevez@gmail.com", "jorbabe@gmail.com", "mathieu.gilbert@ama.ab.ca", "ryan.michael.jones@gmail.com", "darko.dosenovic@ama.ab.ca", "jonathan.weyermann@ama.ab.ca", "adam.melnyk@ama.ab.ca", "kayt.campbell@ama.ab.ca", "kathleen.robertson@ama.ab.ca", "jesse.doyle@ama.ab.ca"]
   spec.summary       = %q{.ama.ab.ca site layouts}
   spec.description   = %q{.ama.ab.ca site layouts}
-  spec.homepage      = 'https://github.com/amaabca/ama_layout'
-  spec.license       = 'MIT'
+  spec.homepage      = ""
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'foundation-rails', '>= 6.4.1.2'
-  spec.add_dependency 'rails', '>= 4.2'
-  spec.add_dependency 'browser', '~> 2.0'
-  spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0.1'
-  spec.add_dependency 'redis-rails'
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '>= 11.0'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_girl'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'combustion'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'timecop'
+  spec.require_paths = ["lib"]
+  spec.add_dependency "foundation-rails", "~> 6.3.1.0"
+  spec.add_dependency "rails", ">= 5.0"
+  spec.add_dependency "activemodel-serializers-xml"
+  spec.add_dependency "draper", "3.0.0.pre1"
+  spec.add_dependency "browser", "~> 2.0"
+  spec.add_dependency "breadcrumbs_on_rails", "~> 3.0.1"
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "combustion"
+  spec.add_development_dependency "sqlite3"
 end

data/app/assets/javascripts/ama_layout/desktop/foundation-custom.js

@@ -1,20 +1,10 @@
 //= require foundation.core.js
-//= require foundation.util.box.js
-//= require foundation.util.imageLoader.js
-//= require foundation.util.keyboard.js
-//= require foundation.util.mediaQuery.js
-//= require foundation.util.motion.js
-//= require foundation.util.nest.js
-//= require foundation.util.timer.js
-//= require foundation.util.timerAndImageLoader.js
-//= require foundation.util.triggers.js
 //= require foundation.abide.js
 //= require foundation.accordion.js
 //= require foundation.drilldown.js
 //= require foundation.dropdown.js
 //= require foundation.dropdownMenu.js
 //= require foundation.equalizer.js
-//= require foundation.interchange.js
 //= require foundation.offcanvas.js
 //= require foundation.responsiveMenu.js
 //= require foundation.responsiveToggle.js
@@ -22,3 +12,11 @@
 //= require foundation.tabs.js
 //= require foundation.toggler.js
 //= require foundation.tooltip.js
+//= require foundation.util.box.js
+//= require foundation.util.keyboard.js
+//= require foundation.util.mediaQuery.js
+//= require foundation.util.motion.js
+//= require foundation.util.nest.js
+//= require foundation.util.timerAndImageLoader.js
+//= require foundation.util.triggers.js
+//= require foundation.interchange.js

data/app/assets/javascripts/ama_layout/desktop/index.js

@@ -5,4 +5,3 @@
 //= require ./cookie.ready
 //= require ../mailcheck/index
 //= require ../real_date_picker
-//= require ../notifications

data/app/helpers/ama_layout_path_helper.rb

@@ -6,7 +6,11 @@ module AmaLayoutPathHelper
   def youraccount_dashboard_path
     "#{Rails.configuration.youraccount_site}/dashboard"
   end
-  
+
+  def youraccount_help_path
+    "#{Rails.configuration.youraccount_site}/help"
+  end
+
   def youraccount_billing_path
     "#{Rails.configuration.youraccount_site}/billing"
   end
@@ -59,10 +63,6 @@ module AmaLayoutPathHelper
     "#{Rails.configuration.membership_site}/reward_cards"
   end
 
-  def membership_renew_path
-    "#{Rails.configuration.membership_site}/renews/new"
-  end
-
   def driveredonline_path
     Rails.configuration.driveredonline_site
   end

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

@@ -2,10 +2,6 @@
   <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"), "https://www.ama.ab.ca", class: "title-bar__logo") %>
-    <a href="#" data-toggle="offCanvasRight" data-notifications-toggle>
-      <i class="fa fa-2x fa-bell notification__icon"></i>
-      <%= navigation.notification_badge %>
-    </a>
   </div>
   <div class="top-bar" id="main-menu">
     <div class="top-bar-left">
@@ -13,9 +9,8 @@
     </div>
     <div class="top-bar-right">
       <ul class="menu" data-responsive-menu="drilldown medium-dropdown">
-        <%= navigation.notifications %>
         <li>
-          <a href="https://albertamotorassociation.zendesk.com/hc/en-us" target="_blank">Help</a>
+          <a href="<%= Rails.configuration.gatekeeper_site %>/help" target="_blank">Help</a>
         </li>
         <li>
           <a href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
@@ -39,7 +34,7 @@
         <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>
+        <a class="side-nav__link" href="<%= Rails.configuration.gatekeeper_site %>/help" 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>
@@ -48,7 +43,7 @@
     </ul>
   </div>
 </div>
-<%= navigation.notification_sidebar %>
+
 <div class="javascript_errors error_notification" hidden></div>
 <noscript>
   <div class="mt1 large-12 columns text-center error_notification">

data/lib/ama_layout.rb

@@ -1,33 +1,25 @@
-require 'ama_layout/version'
-require 'rails/all'
-require 'foundation-rails'
-require 'browser'
-require 'breadcrumbs_on_rails'
-require 'redis-rails'
-require 'ama_layout/draper_replacement'
-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'
-require 'ama_layout/controllers/action_controller'
-require 'ama_layout/notifications/abstract_store'
-require 'ama_layout/notifications/redis_store'
-require 'ama_layout/notification'
-require 'ama_layout/decorators/notification_decorator'
-require 'ama_layout/notification_scrubber'
-require 'ama_layout/notification_set'
-require 'ama_layout/notifications'
+require "ama_layout/version"
+require "rails/all"
+require "foundation-rails"
+require "draper"
+require "browser"
+require "breadcrumbs_on_rails"
+require "ama_layout/breadcrumb_builder"
+require "ama_layout/moneris"
+require "ama_layout/navigation"
+require "ama_layout/navigation_item"
+require "ama_layout/decorators/moneris_decorator"
+require "ama_layout/decorators/navigation_decorator"
+require "ama_layout/decorators/navigation_item_decorator"
+require "ama_layout/controllers/action_controller"
 
 module AmaLayout
-  class Engine < Rails::Engine
-    initializer('ama_layout') do
-      Rails.configuration.view_paths = File.join(self.root, 'app', 'views')
-      I18n.load_path << File.join(self.root, 'app', 'config', 'locales', 'en.yml')
-      ::ActionController::Base.send :include, AmaLayout::ActionController
+  module Rails
+    class Engine < ::Rails::Engine
+      initializer('ama_layout') do
+        I18n.load_path << File.join(self.root, 'app', 'config', 'locales', 'en.yml')
+        ::ActionController::Base.send :include, AmaLayout::ActionController
+      end
     end
   end
 end

data/lib/ama_layout/decorators/moneris_decorator.rb

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

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -1,19 +1,20 @@
 module AmaLayout
-  class NavigationDecorator
-    include AmaLayout::DraperReplacement
-    extend AmaLayout::DraperReplacement
+  class NavigationDecorator < Draper::Decorator
+    delegate_all
 
     def items
       object.items.map { |i| i.decorate }
     end
 
     def display_name_text
-      name_or_email.try(:truncate,30)
+      name_or_email.truncate(30)
     end
 
     def sign_out_link
       return "" unless user
-      h.render partial: "ama_layout/sign_out_link"
+      h.content_tag :li, class: "side-nav__item" do
+        h.concat h.link_to "Sign Out", "/logout", class: "side-nav__link"
+      end
     end
 
     def top_nav
@@ -31,52 +32,5 @@ module AmaLayout
     def account_toggle
       h.render partial: "account_toggle"
     end
-
-    def notifications
-      if user
-        h.render 'ama_layout/notifications', notifications: user.notifications, navigation: self
-      end
-    end
-
-    def notification_badge
-      if new_notifications?
-        h.content_tag(
-          :div,
-          active_notification_count,
-          class: 'notification__badge',
-          data: {
-            notification_count: true
-          }
-        )
-      end
-    end
-
-    def notification_sidebar
-      if user
-        h.render 'ama_layout/notification_sidebar', navigation: self, notifications: decorated_notifications
-      end
-    end
-
-    def notifications_heading
-      if user.notifications.any?
-        h.content_tag :p, 'Most Recent Notifications', class: 'mt1'
-      else
-        h.content_tag :p, 'No Recent Notifications', class: 'mt1 italic'
-      end
-    end
-
-    private
-
-    def decorated_notifications
-      AmaLayout::NotificationDecorator.decorate_collection(user.notifications)
-    end
-
-    def active_notification_count
-      user && user.notifications.active.size || 0
-    end
-
-    def new_notifications?
-      active_notification_count > 0
-    end
   end
 end

data/lib/ama_layout/decorators/navigation_item_decorator.rb

@@ -1,7 +1,6 @@
 module AmaLayout
-  class NavigationItemDecorator
-    include AmaLayout::DraperReplacement
-    extend AmaLayout::DraperReplacement
+  class NavigationItemDecorator < Draper::Decorator
+    delegate_all
 
     def sub_nav
       object.sub_nav.map { |sn| sn.decorate }

data/lib/ama_layout/moneris.rb

@@ -1,10 +1,7 @@
 module AmaLayout
   class Moneris
     include ActiveModel::Model
-
-    def decorate
-      AmaLayout::MonerisDecorator.new(self)
-    end
+    include Draper::Decoratable
 
     attr_accessor :textbox_style_file
 

data/lib/ama_layout/navigation.rb

@@ -1,10 +1,7 @@
 module AmaLayout
   class Navigation
     include ActiveModel::Model
-
-    def decorate
-      AmaLayout::NavigationDecorator.new(self)
-    end
+    include Draper::Decoratable
 
     attr_accessor :user, :current_url, :nav_file_path, :display_name
 
@@ -16,15 +13,12 @@ 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,31 +81,13 @@ non-member:
     link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
     icon: "fa-cogs"
 member-in-renewal:
-  - text: "My Account Overview"
+  - text: "Account Dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
-  - text: "My Membership"
-    link: "<%= Rails.configuration.membership_site %>/membership/overview"
+  - text: "Renew"
+    link: "<%= Rails.configuration.youraccount_site %>/renew"
     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"
+  - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
@@ -113,46 +95,12 @@ member-in-renewal:
         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.membership_site %>/renews/new"
+    link: "<%= Rails.configuration.youraccount_site %>/renew"
     icon: "fa-credit-card"
   - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"
@@ -167,7 +115,7 @@ member-with-outstanding-balance:
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Pay Outstanding Balance"
-    link: "<%= Rails.configuration.membership_site %>/renews/new"
+    link: "<%= Rails.configuration.youraccount_site %>/renew"
     icon: "fa-credit-card"
   - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"