ama_layout 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca2feaab21a5bf26eb756b0e47f33f9062e894b
-  data.tar.gz: 39d8c33eb56c90afd51ca405542493fbf5e33e31
+  metadata.gz: d1a9ad2f7ef87e3b1464aa180876d6d204053473
+  data.tar.gz: df05f8193fb1540b9e3d1082dbb6862ac307d5a4
 SHA512:
-  metadata.gz: 08711a7f214bccc53a373fc1dee33ee8da8999b5282d86b8809b412519532f2a942a0c00f2a753eb8c63b82a8465a26af8ccd0d9df4a986d8d3df98098b7cd40
-  data.tar.gz: 9fd1f9eb34ed8e3340a81de82a9693024ce14476441589cafbc327c8778fd59875c939d1a74a16789dd4cfb7c7503e7f5e857daeda1a66b395dcde6f90a84e84
+  metadata.gz: 6f000569a3ab7c8bac593ab429cd1b2051e02bc9f1aea6cd371946e28319b033175e3a32aa5701de2a7bb406ecc0f4164b41fd78410ff96268fc9f7062834998
+  data.tar.gz: ec90b510eaeb659fb231e0187d7cbdcd1616bc2737ab106cd57ce470497bcf5a1cb1a62dcfffcf2d8248fd7207a7ca032bbaad8420e650afd684a0727d5ad6aa

data/lib/ama_layout/decorators/agent/navigation_decorator.rb

@@ -2,7 +2,6 @@ module AmaLayout
   module Agent
     class NavigationDecorator
       include AmaLayout::DraperReplacement
-      extend AmaLayout::DraperReplacement
 
       def items
         object.items.map(&:decorate)

data/lib/ama_layout/decorators/moneris_decorator.rb

@@ -1,7 +1,6 @@
 module AmaLayout
   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,7 +1,6 @@
 module AmaLayout
   class NavigationDecorator
     include AmaLayout::DraperReplacement
-    extend AmaLayout::DraperReplacement
 
     def items
       object.items.map { |i| i.decorate }

data/lib/ama_layout/decorators/navigation_item_decorator.rb

@@ -1,7 +1,6 @@
 module AmaLayout
   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,7 +1,6 @@
 module AmaLayout
   class NotificationDecorator
     include AmaLayout::DraperReplacement
-    extend AmaLayout::DraperReplacement
 
     ICONS = {
       notice: {

data/lib/ama_layout/draper_replacement.rb

@@ -1,27 +1,31 @@
 module AmaLayout
   module DraperReplacement
-    attr_accessor :object, :controller
+    extend ActiveSupport::Concern
 
-    def h(view_data = {})
-      AmaLayoutView.new(view_data: view_data)
-    end
+    included do
+      attr_accessor :object, :controller
 
-    def initialize(args = {})
-      self.object = args
-    end
+      def h(view_data = {})
+        AmaLayoutView.new(view_data: view_data)
+      end
 
-    def self.decorate_collection(objects = {})
-      objects.map { |o| self.new(o) }
-    end
+      def initialize(args = {})
+        self.object = args
+      end
 
-    def method_missing(method, *args, &block)
-      return super unless delegatable?(method)
+      def method_missing(method, *args, &block)
+        return super unless delegatable?(method)
 
-      (object || DraperReplacement).send(method, *args, &block)
-    end
+        (object || DraperReplacement).send(method, *args, &block)
+      end
+
+      def delegatable?(method)
+        object.respond_to?(method) || DraperReplacement.respond_to?(method)
+      end
 
-    def delegatable?(method)
-      object.respond_to?(method) || DraperReplacement.respond_to?(method)
+      def self.decorate_collection(objects = {})
+        objects.map { |o| self.new(o) }
+      end
     end
   end
 end

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '7.0.1'
+  VERSION = '7.0.2'
 end

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -229,8 +229,16 @@ describe AmaLayout::NavigationDecorator do
     end
 
     describe '#notification_sidebar' do
+      before(:each) do
+        user.notifications.create(
+          type: :warning,
+          header: 'decorated_notification',
+          content: 'decorated_notification'
+        )
+      end
+
       it 'renders content to the page' do
-        expect(subject.notification_sidebar).to include("Sign up now","off-canvas position-right")
+        expect(subject.notification_sidebar).to include('decorated_notification')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails