ama_layout 6.10.0.pre → 7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d916fc4391d6da9e16396a302ffd07345566779b
-  data.tar.gz: 85c756a461a179396cd619ba12a38e1b53b998e6
+  metadata.gz: b6b9a4cdafc68754b4b609a395a2a320ffd1be61
+  data.tar.gz: 70892459cd1d3e4b09d9304ccf2ed15a3f678611
 SHA512:
-  metadata.gz: 722d5c576646f4d9e1959e2c647446d271a64c34b34e11e3999b4694a14a69f81512287123f25ca2f894cad93ce96afd4eec6382981f4e73775e543f0da32996
-  data.tar.gz: 67e035cda98f69a883ecbdbc2f4229d3d750b4fa2a4f7e82c0bc8e52b0c72c28b5bbd558c013b69fa1172ef1740bfc51bdcb73cc1ad7ceec6d84247ca3cea23d
+  metadata.gz: 856dbbca7af3686fa5fd57b873c0ab448b3df411d9e1ba66abbb1a2194bb480033eb4ac4997ec6e708ad446265545a0a30e600dfd2c85c1405bf0a8303dc4600
+  data.tar.gz: 9fd42c8bf9c50e2e5eb01564759977b6b17e118cb7d5b8ff5c41c834bd94e4781241916f56d74fec5f1bf9e302fca19a5c728adede34214fc66a85638bb231e4

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+### PR Review Checklist
+To be completed by the person who opens the PR. Use strikethroughs for items that are not applicable in list.
+- [ ] I have reviewed my own PR to check syntax & logic, removed unnecessary/old code, made sure everything aligns with our style guide and BEM.
+- [ ] I've added new components to the style guide (or have a PR in to add them).
+- [ ] Any applicable version numbers have been updated.
+- [ ] I've tested on mobile, tablet, and desktop, as well as across all of the browsers we support.
+- [ ] I've proof-read all text for legibility, proper grammar, punctuation, and capitalization (titlecase).
+- [ ] I have written a detailed PR message explaining what is being changed and why
+- [ ] I’ve linked to any relevant VSTS tickets
+- [ ] I’ve added the appropriate review symbols to my PR - (elephant) for dev review, (art) for design

data/ama_layout.gemspec

@@ -17,12 +17,11 @@ Gem::Specification.new do |spec|
   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', '>= 5.0'
-  spec.add_dependency 'activemodel-serializers-xml'
-  spec.add_dependency 'draper', '>= 3.0.0'
+  spec.add_dependency 'rails', '>= 4.2'
   spec.add_dependency 'browser', '~> 2.0'
-  spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
+  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'

data/app/helpers/ama_layout_path_helper.rb

@@ -6,7 +6,7 @@ module AmaLayoutPathHelper
   def youraccount_dashboard_path
     "#{Rails.configuration.youraccount_site}/dashboard"
   end
-
+  
   def youraccount_billing_path
     "#{Rails.configuration.youraccount_site}/billing"
   end

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

@@ -0,0 +1,3 @@
+<li class="side-nav__item">
+  <a class="side-nav__link" href="/logout">Sign Out</a>
+</li>

data/lib/ama_layout.rb

@@ -1,10 +1,10 @@
 require 'ama_layout/version'
 require 'rails/all'
 require 'foundation-rails'
-require 'draper'
 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'
@@ -25,6 +25,7 @@ require 'ama_layout/notifications'
 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
     end

data/lib/ama_layout/decorators/moneris_decorator.rb

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

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -1,20 +1,19 @@
 module AmaLayout
-  class NavigationDecorator < Draper::Decorator
-    delegate_all
+  class NavigationDecorator
+    include AmaLayout::DraperReplacement
+    extend AmaLayout::DraperReplacement
 
     def items
       object.items.map { |i| i.decorate }
     end
 
     def display_name_text
-      name_or_email.truncate(30)
+      name_or_email.try(:truncate,30)
     end
 
     def sign_out_link
       return "" unless user
-      h.content_tag :li, class: "side-nav__item" do
-        h.concat h.link_to "Sign Out", "/logout", class: "side-nav__link"
-      end
+      h.render partial: "ama_layout/sign_out_link"
     end
 
     def top_nav

data/lib/ama_layout/decorators/navigation_item_decorator.rb

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

data/lib/ama_layout/decorators/notification_decorator.rb

@@ -1,6 +1,7 @@
 module AmaLayout
-  class NotificationDecorator < Draper::Decorator
-    delegate_all
+  class NotificationDecorator
+    include AmaLayout::DraperReplacement
+    extend AmaLayout::DraperReplacement
 
     ICONS = {
       notice: {

data/lib/ama_layout/draper_replacement.rb

@@ -0,0 +1,27 @@
+module AmaLayout
+  module DraperReplacement
+    attr_accessor :object
+
+    def h
+      ActionView::Base.new(::ActionController::Base.view_paths, {}, ::ApplicationController.new)
+    end
+
+    def initialize(args = {})
+      self.object = args
+    end
+
+    def self.decorate_collection(objects = {})
+      objects.map { |o| self.new(o) }
+    end
+
+    def method_missing(method, *args, &block)
+      return super unless delegatable?(method)
+
+      (object || DraperReplacement).send(method, *args, &block)
+    end
+
+    def delegatable?(method)
+      object.respond_to?(method) || DraperReplacement.respond_to?(method)
+    end
+  end
+end

data/lib/ama_layout/moneris.rb

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

data/lib/ama_layout/navigation.rb

@@ -1,7 +1,10 @@
 module AmaLayout
   class Navigation
     include ActiveModel::Model
-    include Draper::Decoratable
+
+    def decorate
+      AmaLayout::NavigationDecorator.new(self)
+    end
 
     attr_accessor :user, :current_url, :nav_file_path, :display_name
 

data/lib/ama_layout/navigation_item.rb

@@ -1,7 +1,10 @@
 module AmaLayout
   class NavigationItem
     include ActiveModel::Model
-    include Draper::Decoratable
+
+    def decorate
+      AmaLayout::NavigationItemDecorator.new(self)
+    end
 
     attr_accessor :text, :icon, :link, :target, :alt, :sub_nav, :current_url
 

data/lib/ama_layout/notification.rb

@@ -1,7 +1,5 @@
 module AmaLayout
   class Notification
-    include Draper::Decoratable
-
     TYPES = %i[notice warning alert].freeze
     DEFAULT_LIFESPAN = 1.year.freeze
     FORMAT_VERSION = '1.0.0'.freeze

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '6.10.0.pre'
+  VERSION = '7.0.pre'
 end

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -94,8 +94,9 @@ describe AmaLayout::NavigationDecorator do
     context "with items" do
       it "renders the partial" do
         allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-        allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
-        expect(navigation_presenter.top_nav).to eq "render"
+        allow(Rails.configuration).to receive(:amaabca_site).and_return("amaabca.example.com")
+        allow(navigation_presenter).to receive(:sign_out_link).and_return("sign_out_link")
+        expect(navigation_presenter.top_nav).to include("AMA Road Reports", "http://auth.waffles.ca")
       end
     end
 
@@ -110,8 +111,7 @@ describe AmaLayout::NavigationDecorator do
     context "with items" do
       it "renders the partial" do
         allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-        allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
-        expect(navigation_presenter.sidebar).to eq "render"
+        expect(navigation_presenter.sidebar).to include("Online Account", "Membership Overview", "Rewards Overview")
       end
     end
 
@@ -125,8 +125,7 @@ describe AmaLayout::NavigationDecorator do
   context "account toggle" do
     it "in ama_layout it renders a blank partial" do
       allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-      allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
-      expect(navigation_presenter.account_toggle).to eq "render"
+      expect(navigation_presenter.account_toggle).to eq ""
     end
   end
 
@@ -153,8 +152,7 @@ describe AmaLayout::NavigationDecorator do
 
     describe '#notifications' do
       it 'renders the content to the page' do
-        expect(subject.h).to receive(:render).once.and_return true
-        expect(subject.notifications).to be true
+        expect(subject.notifications).to include("data-notifications-toggle")
       end
     end
 
@@ -217,8 +215,7 @@ describe AmaLayout::NavigationDecorator do
 
     describe '#notification_sidebar' do
       it 'renders content to the page' do
-        expect(subject.h).to receive(:render).once.and_return true
-        expect(subject.notification_sidebar).to be true
+        expect(subject.notification_sidebar).to include("Sign up now","off-canvas position-right")
       end
     end
 

data/spec/ama_layout/decorators/navigation_item_decorator_spec.rb

@@ -39,8 +39,7 @@ describe AmaLayout::NavigationItemDecorator do
     context "with items" do
       it "renders the partial" do
         navigation_item.sub_nav = items
-        allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
-        expect(navigation_item_presenter.top_sub_nav).to eq "render"
+        expect(navigation_item_presenter.top_sub_nav).to include("Othersite Overview", "http://othersite.com")
       end
     end
 
@@ -55,8 +54,7 @@ describe AmaLayout::NavigationItemDecorator do
     context "with items" do
       it "renders the partial" do
         navigation_item.sub_nav = items
-        allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
-        expect(navigation_item_presenter.sidebar_sub_nav).to eq "render"
+        expect(navigation_item_presenter.sidebar_sub_nav).to include(">Othersite Overview", "http://othersite.com")
       end
     end
 

data/spec/spec_helper.rb

@@ -18,8 +18,6 @@ ActionView::TestCase::TestController.instance_eval do
   helper Rails.application.routes.url_helpers
 end
 
-Draper::ViewContext.test_strategy :fast
-
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.include Rails.application.routes.url_helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 6.10.0.pre
+  version: 7.0.pre
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails
@@ -40,42 +40,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel-serializers-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: draper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -94,16 +66,16 @@ dependencies:
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: redis-rails
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +239,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- PULL_REQUEST_TEMPLATE.md
 - README.md
 - Rakefile
 - ama_layout.gemspec
@@ -306,6 +279,7 @@ files:
 - app/views/ama_layout/_notification_sidebar.html.erb
 - app/views/ama_layout/_notifications.html.erb
 - app/views/ama_layout/_sidebar.html.erb
+- app/views/ama_layout/_sign_out_link.html.erb
 - app/views/ama_layout/_siteheader.html.erb
 - app/views/ama_layout/_sub_nav.html.erb
 - app/views/ama_layout/_sub_nav_item.html.erb
@@ -322,6 +296,7 @@ files:
 - lib/ama_layout/decorators/navigation_decorator.rb
 - lib/ama_layout/decorators/navigation_item_decorator.rb
 - lib/ama_layout/decorators/notification_decorator.rb
+- lib/ama_layout/draper_replacement.rb
 - lib/ama_layout/moneris.rb
 - lib/ama_layout/moneris/textbox.txt
 - lib/ama_layout/navigation.rb
@@ -390,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ".ama.ab.ca site layouts"