mtl 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 428963389c75ff1c66fda33c1e8c17c3baa70c31
-  data.tar.gz: f33cece0832c200004a076e203381eebc7ad00ea
+  metadata.gz: 44b92a6793c60cb944ae9c28cd6f9150822fd50a
+  data.tar.gz: f3835d1ab87ff6bfa760afbb412968199d8fab2c
 SHA512:
-  metadata.gz: ba1357900bcad16026ea726a049c637a614963f3e04c48be22d0c533ebc1bf5e7bfc27a756a9ab74c0f1a8c2c651143040aafbe99be524ce20ff86cc2be5c40a
-  data.tar.gz: bf18bb5f6f05d03d12d02006d16b9b7cfa48a8e3bf8a79fa78e40cd2617e80c279b6ecfa9a4457c861368347f0f805edfb8541a1c28c6e98752c3f85c4277398
+  metadata.gz: 64d0e8d7462b7047f29674d0cdfd5983e7a86e7191d1cd2f26bd2f212721b14b5391f5b23617a90e0e123590ce0273d6285dda6e8a086c8501a2f54bd210b403
+  data.tar.gz: 8525dc5946545f84f4dd750b24f5b59b8397acbeefe3ebd71f8f95a085224d1d42778690387bcaf130f0618c1091cceb4b1b195a8bd2b35c85668270e705865a

data/app/views/mtl/header.html.erb

@@ -1,25 +1,23 @@
 <header class="<%= mtl_class %>">
-  <nav>
-    <div class="nav-wrapper">
-      <%- if mtl_back  %>
-        <%= link_to mtl_back, class: 'mtl-layout-default-header-back left' do %>
-          <i class="material-icons">arrow_back</i>
-        <%- end %>
-      <%- elsif mtl_menu %>
-        <%= link_to "##{mtl_menu}", class: 'mtl-layout-default-header-toggle left hide-on-large-only', 'data-activates': mtl_menu, 'data-mtl-nav': 'side' do %>
-          <i class="material-icons">menu</i>
-        <%- end %>
+  <%= mtl_navbar fixed: mtl_fixed do |nav| %>
+    <%- if mtl_back  %>
+      <%= link_to mtl_back, class: 'mtl-layout-default-header-back left' do %>
+        <i class="material-icons">arrow_back</i>
       <%- end %>
-
-      <%- if mtl_title %>
-      <h1 class="page-title">
-        <%= mtl_title %>
-      </h1>
+    <%- elsif mtl_menu %>
+      <%= link_to "##{mtl_menu}", class: 'mtl-layout-default-header-toggle left hide-on-large-only', 'data-activates': mtl_menu, 'data-mtl-nav': 'side' do %>
+        <i class="material-icons">menu</i>
       <%- end %>
+    <%- end %>
 
-      <%- if mtl_content %>
-        <%= mtl_content %>
-      <%- end %>
-    </div>
-  </nav>
+    <%- if mtl_title %>
+    <h1 class="page-title">
+      <%= mtl_title %>
+    </h1>
+    <%- end %>
+
+    <%- if mtl_content %>
+      <%= capture(nav, &mtl_content) %>
+    <%- end %>
+  <%- end %>
 </header>

data/lib/mtl/rails/navbar_presenter.rb

@@ -0,0 +1,41 @@
+module Mtl
+  module Rails
+    # Private
+    # Specialised renderer for the navbar element
+    class NavbarPresenter
+      attr_reader :view
+
+      def initialize(view)
+        @view = view
+        @extended_options = {}
+        @extended_block = nil
+      end
+
+      def render(options = {}, &block)
+        nav = view.content_tag :nav, view.safe_join([render_main(options, &block),
+                                                     render_extended(@extended_options, &@extended_block)].compact),
+                               class: @extended_block ? 'nav-extended' : nil
+
+        nav = view.content_tag :div, nav, class: 'navbar-fixed' if options[:fixed]
+        nav
+      end
+
+      def extended(options = {}, &block)
+        @extended_options = options
+        @extended_block = block
+        nil
+      end
+
+      private
+
+      def render_main(options = {}, &block)
+        view.content_tag(:div, view.capture(self, &block), class: [options[:class], 'nav-wrapper'].flatten.compact)
+      end
+
+      def render_extended(options = {}, &block)
+        return unless block_given?
+        view.content_tag(:div, view.capture(&block), class: [options[:class], 'nav-content'].flatten.compact)
+      end
+    end
+  end
+end

data/lib/mtl/rails/view_helpers.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'mtl/rails/card_file_presenter'
+require 'mtl/rails/navbar_presenter'
 
 module Mtl
   module Rails
@@ -260,6 +261,37 @@ module Mtl
     #     data-method="delete" data-confirm="Sure?">close</i>
     # </a>
     # ```
+    #
+    # # Navbars
+    #
+    # Basic usage:
+    #
+    # ```haml
+    # = mtl_navbar do
+    #   Hello
+    # ```
+    #
+    # Fixed navbar:
+    # ```haml
+    # = mtl_navbar fixed: true do
+    #   Hello
+    # ```
+    #
+    # Extended navbar:
+    # ```haml
+    # = mtl_navbar do |nav|
+    #   Hello
+    #   = nav.extended do
+    #     Hellobis
+    # ```
+    #
+    # Extended and fixed navbar:
+    # ```haml
+    # = mtl_navbar fixed: true do |nav|
+    #   Hello
+    #   = nav.extended do
+    #     Hellobis
+    # ```
     module ViewHelpers
       # Renders a flat button which does not visually lift like the raised buttons.
       #
@@ -325,17 +357,18 @@ module Mtl
       #   nav menu to show / hide on mobile devices. The default used is `nav-menu`.
       #   When set to `false`, this button is skipped.
       # @param class [String, Array] (HTML CLASS) additional, custom css class on header
-      # @yield Additional content to be rendered as part of the header
+      # @yield Additional content to be rendered as part of the header, with a navbar object as argument,
+      #        to also build the extended navigation if needed (by passing another block to nav.extended)
       # @return [String] HTML safe string
       def mtl_header(title = translate('.title', default: 'Menu'), **options, &block)
-        mtl_content = block_given? ? capture(&block) : nil
         mtl_class = ['mtl-layout-default-header', options[:class]].compact.flatten.join(' ')
 
         render file: 'mtl/header', locals: {
-          mtl_content: mtl_content,
+          mtl_content: block,
           mtl_title: title.presence,
           mtl_back: options.fetch(:back, false),
           mtl_menu: options.fetch(:menu, 'nav-menu'),
+          mtl_fixed: options.fetch(:fixed, false),
           mtl_class: mtl_class
         }
       end
@@ -404,8 +437,21 @@ module Mtl
       # @option options [String] :data-mtl-delete URL to use as the delete action, if any
       # @param options [Hash] additional options passed to `content_tag`
       # @return [String] HTML safe String
-      def mtl_card_file(filename, href, params = {})
-        CardFilePresenter.new(self).render(filename, href, params)
+      def mtl_card_file(filename, href, options = {})
+        CardFilePresenter.new(self).render(filename, href, options)
+      end
+
+      # Renders a navbar, wrapping the given block as content. Options also allows to fix the navbar and/or include
+      # an extended navigation
+      #
+      # @option options [Boolean] :fixed Define if the header has to be fixed or not
+      # @option options [String/Array] :class Additional class to add the to nav-wrapper
+      # @yield Content to be rendered into the navbar, with a navbar object as argument, to also build the
+      #        extended navigation if needed (by passing another block to nav.extended)
+      # @option yield.extended options [String/Array] :class Additional class to add the to nav-extended
+      # @return [String] HTML safe String
+      def mtl_navbar(options = {}, &block)
+        NavbarPresenter.new(self).render(options, &block)
       end
     end
   end

data/lib/mtl/version.rb

@@ -1,5 +1,5 @@
 module Mtl
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.4'.freeze
   MATERIALIZE_VERSION = '0.98.0'.freeze
   ICONS_VERSION = '2.2.3'.freeze
   LODASH_VERSION = '4.14.1'.freeze

data/mtl.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mtl/version'

data/spec/mtl/rails/navbar_presenter_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+require 'action_view'
+require 'mtl/rails/navbar_presenter'
+require 'mtl/rails/view_helpers'
+
+RSpec.describe Mtl::Rails::NavbarPresenter, dom: true do
+  let(:view) { ActionView::Base.new }
+  subject { described_class.new(view) }
+
+  before do
+    view.send(:extend, Mtl::Rails::ViewHelpers)
+  end
+
+  context '#render' do
+    it 'renders a basic navbar with the given content' do
+      expect(subject.render { 'Hello' }).to match_dom <<-HTML
+        <nav>
+          <div class="nav-wrapper">
+            Hello
+          </div>
+        </nav>
+      HTML
+    end
+
+    it 'renders a basic navbar with the given content and some custom class on the wrapper' do
+      expect(subject.render(class: 'custom-class') { 'Hello' }).to match_dom <<-HTML
+        <nav>
+          <div class="custom-class nav-wrapper">
+            Hello
+          </div>
+        </nav>
+      HTML
+    end
+
+    it 'renders a fixed navbar with the given content' do
+      expect(subject.render(fixed: true) { 'Hello' }).to match_dom <<-HTML
+        <div class="navbar-fixed">
+          <nav>
+            <div class="nav-wrapper">
+              Hello
+            </div>
+          </nav>
+        </div>
+      HTML
+    end
+
+    it 'renders a navbar with the given content and the extended content' do
+      expect(subject.render do |nav|
+        nav.extended do
+          'Hellobis'
+        end
+
+        'Hello'
+      end).to match_dom <<-HTML
+        <nav class="nav-extended">
+          <div class="nav-wrapper">
+            Hello
+          </div>
+          <div class="nav-content">
+            Hellobis
+          </div>
+        </nav>
+      HTML
+    end
+
+    it 'renders a navbar with the given content and the extended content and some custom class on the ext wrapper' do
+      expect(subject.render do |nav|
+        nav.extended(class: 'custom-bis') do
+          'Hellobis'
+        end
+
+        'Hello'
+      end).to match_dom <<-HTML
+        <nav class="nav-extended">
+          <div class="nav-wrapper">
+            Hello
+          </div>
+          <div class="custom-bis nav-content">
+            Hellobis
+          </div>
+        </nav>
+      HTML
+    end
+
+    it 'renders a fixed navbar with the given content and the extended content' do
+      expect(subject.render(fixed: true) do |nav|
+        nav.extended do
+          'Hellobis'
+        end
+
+        'Hello'
+      end).to match_dom <<-HTML
+        <div class="navbar-fixed">
+          <nav class="nav-extended">
+            <div class="nav-wrapper">
+              Hello
+            </div>
+            <div class="nav-content">
+              Hellobis
+            </div>
+          </nav>
+        </div>
+      HTML
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtl
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Marco Plüss
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -171,12 +171,14 @@ files:
 - lib/generators/mtl/templates/simple_form.rb
 - lib/mtl.rb
 - lib/mtl/rails/card_file_presenter.rb
+- lib/mtl/rails/navbar_presenter.rb
 - lib/mtl/rails/view_helpers.rb
 - lib/mtl/simple_form/suffix.rb
 - lib/mtl/version.rb
 - mtl.gemspec
 - package.json
 - spec/mtl/rails/card_file_presenter_spec.rb
+- spec/mtl/rails/navbar_presenter_spec.rb
 - spec/mtl/rails/view_helpers_spec.rb
 - spec/mtl/simple_form/suffix_spec.rb
 - spec/mtl_spec.rb