rails_layout 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a81da5a5b87f9b5caef0f99f4ca16d6dc6b18fd
-  data.tar.gz: b3fcb507662f6b38a9e718f368756059aa19d202
+  metadata.gz: f21c2a60c00dc216f735e4d41816cef36680cd53
+  data.tar.gz: 9c4863ea26a9f464790a40820927f589b899543f
 SHA512:
-  metadata.gz: fb3a46aef15cd0c0d0cbc24829e9d6af3d44dd4b274ba8f94622229c0678e74153c75629382a9a70aca51e35320451ea76a631adb41e5261bae02beeadef0c45
-  data.tar.gz: 860e87b2b84cb74c7bb21d19147ce97dca96bdba1c4dbe2af378ca9433f7810f8f27659b1749d4358030a4bcc9cfb61db905c1f1c24c605c30b3c4cd2f0bd728
+  metadata.gz: fbfc011348bbfd0f2c281392f0a6c7803f6fa14a70185aef2674e352dd352369381663fefddb43e644a80c6844819104079473e7c436d9c355982a3d421f1287
+  data.tar.gz: 9c727bb16379730aa9653146c9209b351d1e799ffb4376b03c90e5059e6eb1bd1c2ddd6de68aaf1d910335e56dad1d3e201f2dc57f966070b65c7fa872ce1441

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.1

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.30 September 4, 2016
+
+* add support for Bootstrap 4
+
 h3. 1.0.29 November 23, 2015
 
 * add navlink for an admin interface if Thoughbot Administrate gem was selected in Rails Composer

data/README.textile

@@ -3,6 +3,7 @@ h1. !http://railsapps.github.io/images/rails-36x36.jpg(RailsLayout Gem)! RailsLa
 Use this gem to set up layout files for your choice of front-end framework:
 
 * Zurb Foundation 5.3
+* Bootstrap 4.0
 * Bootstrap 3.3
 
 It also will set up "Devise":https://github.com/plataformatec/devise views with styling for Bootstrap or Foundation.
@@ -27,6 +28,7 @@ h4. Generate Application Layout, Navigation, and Flash Message Files
 
 * @$ rails generate layout:install foundation5@
 * @$ rails generate layout:install foundation4@
+* @$ rails generate layout:install bootstrap4@
 * @$ rails generate layout:install bootstrap3@
 * @$ rails generate layout:install bootstrap2@
 * @$ rails generate layout:install simple@
@@ -35,6 +37,7 @@ h4. Generate Application Layout, Navigation, and Flash Message Files
 h4. Add Links to the Navigation File
 
 * @$ rails generate layout:navigation@
+* @$ rails generate layout:navigation bootstrap4@
 
 h4. Generate Devise Views
 
@@ -67,6 +70,12 @@ gem 'compass-rails'
 gem 'zurb-foundation'
 </pre>
 
+h4. Bootstrap 4.0
+
+<pre>
+gem 'bootstrap', '~> 4.0.0.alpha3.1'
+</pre>
+
 h4. Bootstrap 3.3
 
 <pre>
@@ -142,6 +151,7 @@ You can generate layout files suitable for use with the following front-end fram
 
 * @foundation5@ - Zurb Foundation 5.3
 * @foundation4@ - Zurb Foundation 4.0
+* @bootstrap4@ - Bootstrap 4.0
 * @bootstrap3@ - Bootstrap 3.3
 * @bootstrap2@ - Bootstrap 2.3
 * @simple@ - simple layout
@@ -168,7 +178,7 @@ h4. Note About the Navigation Partials
 
 The *_navigation.html.erb* file contains framework-specific styling. Separating the files makes it easy to change the front-end framework without disturbing the links.
 
-The *_navigation_links.html.erb* file is only a list of links. You can add additional links to this file as needed. It contains no framework-specific styling.
+The *_navigation_links.html.erb* file is only a list of links. You can add additional links to this file as needed. It contains no framework-specific styling (except if you are using Bootstrap 4).
 
 The *_nav_links_for_auth.html.erb* file is created if Devise or OmniAuth is installed.
 
@@ -265,7 +275,13 @@ and modify the file:
 
 * "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-application.js
 
-h3. Bootstrap 3.3 Layout
+h3. Bootstrap 3.3 or 4.0 Layout
+
+To create layout files for use with Bootstrap 4.0:
+
+<pre>
+$ rails generate layout:install bootstrap4
+</pre>
 
 To create layout files for use with Bootstrap 3.3:
 

data/lib/generators/layout/install/install_generator.rb

@@ -37,6 +37,11 @@ module Layout
             copy_file 'bootstrap-application.js', 'app/assets/javascripts/application.js'
             remove_file 'app/assets/stylesheets/simple.css'
             remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
+          when 'bootstrap4'
+            copy_file 'bootstrap4_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
+            copy_file 'bootstrap-application.js', 'app/assets/javascripts/application.js'
+            remove_file 'app/assets/stylesheets/simple.css'
+            remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
           when 'foundation4'
             copy_file 'foundation4_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
             copy_file 'foundation4-application.js', 'app/assets/javascripts/application.js'
@@ -66,6 +71,8 @@ module Layout
             # TODO
           when 'bootstrap3'
             append_file 'app/assets/stylesheets/1st_load_framework.css.scss', File.read("#{dir}/bootstrap3-forms.css.scss")
+          when 'bootstrap4'
+            append_file 'app/assets/stylesheets/1st_load_framework.css.scss', File.read("#{dir}/bootstrap4-forms.css.scss")
           when 'foundation4'
             # TODO
           when 'foundation5'
@@ -94,8 +101,23 @@ module Layout
         end
       end
 
+      # Add navigation links
+      def add_navigation_links_for_bootstrap4
+        return unless framework_name == 'bootstrap4'
+        app = ::Rails.application
+        ext = app.config.generators.options[:rails][:template_engine] || :erb
+        unless framework_name == 'none'
+          # ABOUT
+          append_file 'app/views/layouts/_navigation_links.html.erb', "<li class='nav-item'><%= link_to 'About', page_path('about'), class: 'nav-link' %></li>\n" if File.exists?("app/views/pages/about.html.#{ext}")
+          # CONTACT
+          append_file 'app/views/layouts/_navigation_links.html.erb', "<li class='nav-item'><%= link_to 'Contact', new_contact_path, class: 'nav-link' %></li>
+\n" if File.exists?("app/views/contacts/new.html.#{ext}")
+        end
+      end
+
       # Add navigation links
       def add_navigation_links
+        return if framework_name == 'bootstrap4'
         app = ::Rails.application
         ext = app.config.generators.options[:rails][:template_engine] || :erb
         unless framework_name == 'none'

data/lib/generators/layout/install/templates/bootstrap3-messages.html.erb

@@ -1,7 +1,7 @@
 <%# Rails flash messages styled for Bootstrap 3.0 %>
 <% flash.each do |name, msg| %>
   <% if msg.is_a?(String) %>
-    <div class="alert alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
+    <div class="alert alert-dismissible alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
       <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
       <%= content_tag :div, msg, :id => "flash_#{name}" %>
     </div>

data/lib/generators/layout/install/templates/bootstrap3-messages.html.haml

@@ -1,6 +1,6 @@
 -# Rails flash messages styled for Bootstrap 3.0
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    %div{:class => "alert alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"}
+    %div{:class => "alert alert-dismissible alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"}
       %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} ×
       = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/install/templates/bootstrap3-messages.html.slim

@@ -1,6 +1,6 @@
 / Rails flash messages styled for Bootstrap 3.0
 - flash.each do |name, msg|
   - if msg.is_a?(String)
-    div class="alert alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"
+    div class="alert alert-dismissible alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"
       button.close[type="button" data-dismiss="alert" aria-hidden="true"] ×
       = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/install/templates/bootstrap4-application.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name.underscore.titleize %>" %></title>
+    <meta name="description" content="<%%= content_for?(:description) ? yield(:description) : "<%= app_name.underscore.titleize %>" %>">
+    <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%%= csrf_meta_tags %>
+  </head>
+  <body>
+    <header>
+      <%%= render 'layouts/navigation' %>
+    </header>
+    <main role="main">
+       <%%= render 'layouts/messages' %>
+       <%%= yield %>
+    </main>
+  </body>
+</html>

data/lib/generators/layout/install/templates/bootstrap4-application.html.haml

@@ -0,0 +1,15 @@
+!!!
+%html
+  %head
+    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
+    %title= content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
+    %meta{:name => "description", :content => "#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"}
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = csrf_meta_tags
+  %body
+    %header
+      = render 'layouts/navigation'
+    %main{:role => "main"}
+      = render 'layouts/messages'
+      = yield

data/lib/generators/layout/install/templates/bootstrap4-application.html.slim

@@ -0,0 +1,16 @@
+doctype html
+html
+  head
+    meta[name="viewport" content="width=device-width, initial-scale=1.0"]
+    title
+      = content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
+    meta name="description" content="#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"
+    == stylesheet_link_tag "application", :media => 'all', 'data-turbolinks-track' => true
+    == javascript_include_tag 'application', 'data-turbolinks-track' => true
+    == csrf_meta_tags
+  body
+    header
+      == render 'layouts/navigation'
+    main[role="main"]
+      == render 'layouts/messages'
+      == yield

data/lib/generators/layout/install/templates/bootstrap4-forms.css.scss

@@ -0,0 +1,36 @@
+
+// Styles for form views
+// using Bootstrap
+// generated by the rails_layout gem
+.authform {
+  padding-top: 30px;
+  max-width: 320px;
+  margin: 0 auto;
+}
+.authform form {
+  @extend .well;
+  @extend .well-lg;
+  padding-bottom: 40px;
+}
+.authform .right {
+  float: right !important;
+}
+.authform .button {
+  @extend .btn;
+  @extend .btn-primary;
+}
+.authform fieldset {
+  @extend .well;
+}
+#error_explanation:not(:empty) {
+  @extend .alert;
+  @extend .alert-danger;
+}
+#error_explanation h2 {
+  font-size: 16px;
+}
+.button-xs {
+  @extend .btn;
+  @extend .btn-primary;
+  @extend .btn-xs;
+}

data/lib/generators/layout/install/templates/bootstrap4-messages.html.erb

@@ -0,0 +1,9 @@
+<%# Rails flash messages styled for Bootstrap 4.0 %>
+<% flash.each do |name, msg| %>
+  <% if msg.is_a?(String) %>
+    <div class="alert alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>" role="alert">
+      <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+      <%= content_tag :div, msg, :id => "flash_#{name}" %>
+    </div>
+  <% end %>
+<% end %>

data/lib/generators/layout/install/templates/bootstrap4-messages.html.haml

@@ -0,0 +1,6 @@
+-# Rails flash messages styled for Bootstrap 4.0
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    %div{:class => "alert alert-#{name.to_s == 'notice' ? 'success' : 'danger'}", :role  => "alert"}
+      %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} ×
+      = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/install/templates/bootstrap4-messages.html.slim

@@ -0,0 +1,6 @@
+/ Rails flash messages styled for Bootstrap 4.0
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    div class="alert alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"
+      button.close[type="button" data-dismiss="alert" aria-hidden="true"] ×
+      = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb

@@ -0,0 +1,18 @@
+<%# navigation styled for Bootstrap 4.0 %>
+<div class="container">
+  <nav class="navbar navbar-dark bg-inverse">
+    <ul class="nav navbar-nav clearfix">
+      <li class="nav-item">
+        <button class="navbar-toggler hidden-sm-up nav-link" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation">
+          &#9776;
+        </button>
+      </li>
+    </ul>
+    <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
+      <%= link_to "Rails bootstrap", root_path, class: 'navbar-brand' %>
+      <ul class="nav navbar-nav">
+        <%= render 'layouts/navigation_links' %>
+      </ul>
+    </div>
+  </nav>
+</div>

data/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml

@@ -0,0 +1,10 @@
+-# navigation styled for Bootstrap 3.0
+.container
+  %nav.navbar.navbar-dark.bg-inverse
+    %ul.nav.navbar-nav.clearfix
+      %li.nav-item
+        %button.navbar-toggler.hidden-sm-up.nav-link{"aria-controls" => "exCollapsingNavbar2", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#exCollapsingNavbar2", "data-toggle" => "collapse", :type => "button"}
+          \ ☰
+    #exCollapsingNavbar2.collapse.navbar-toggleable-xs
+      = link_to "Rails bootstrap", root_path, class: 'navbar-brand'
+      %ul.nav.navbar-nav= render 'layouts/navigation_links'

data/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim

@@ -0,0 +1,11 @@
+/ navigation styled for Bootstrap 4.0
+.container
+  nav.navbar.navbar-dark.bg-inverse
+    ul.nav.navbar-nav.clearfix
+      li.nav-item
+        button.navbar-toggler.hidden-sm-up.nav-link aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label=("Toggle navigation") data-target="#exCollapsingNavbar2" data-toggle="collapse" type="button"
+          | ☰
+    #exCollapsingNavbar2.collapse.navbar-toggleable-xs
+      = link_to "Rails bootstrap", root_path, class: 'navbar-brand'
+      ul.nav.navbar-nav
+        = render 'layouts/navigation_links'

data/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss

@@ -0,0 +1,45 @@
+// import the CSS framework
+// Do not use *= require in Sass or your other stylesheets will not be able to access the Bootstrap mixins and variables.
+@import "bootstrap";
+
+// make all images responsive by default
+img {
+  @extend .img-fluid;
+  margin: 0 auto;
+}
+// override for the 'Home' navigation link
+.navbar-brand {
+  font-size: inherit;
+  }
+
+// THESE ARE EXAMPLES YOU CAN MODIFY
+// create your own classes
+// to make views framework-neutral
+.column {
+  @extend .col-md-6;
+  @extend .text-xs-center;
+}
+.form {
+  @extend .col-md-6;
+}
+.form-centered {
+  @extend .col-md-6;
+  @extend .text-xs-center;
+}
+.submit {
+  @extend .btn;
+  @extend .btn-primary;
+  @extend .btn-lg;
+}
+
+// apply styles to HTML elements
+// to make views framework-neutral
+main {
+  @extend .container;
+  margin-top: 30px; // accommodate the navbar
+}
+
+section {
+  @extend .row;
+  margin-top: 20px;
+}

data/lib/generators/layout/navigation/navigation_generator.rb

@@ -4,11 +4,84 @@ module Layout
   module Generators
     class NavigationGenerator < ::Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
+      argument :framework_name, :type => :string, :default => "simple"
 
       desc "Adds links to a navigation bar."
 
+      # Add navigation links
+      def add_navigation_links_for_bootstrap4
+        return unless framework_name == 'bootstrap4'
+        app = ::Rails.application
+        ext = app.config.generators.options[:rails][:template_engine] || :erb
+        copy_file "navigation_links.html.erb", "app/views/layouts/_navigation_links.html.erb"
+        # ABOUT
+        append_file 'app/views/layouts/_navigation_links.html.erb', "<li class='nav-item'><%= link_to 'About', page_path('about'), class: 'nav-link' %></li>\n" if File.exists?("app/views/pages/about.html.#{ext}")
+        # CONTACT
+        append_file 'app/views/layouts/_navigation_links.html.erb', "<li class='nav-item'><%= link_to 'Contact', new_contact_path, class: 'nav-link' %></li>\n" if File.exists?("app/views/contacts/new.html.#{ext}")
+        # DEVISE
+        if File.exists?('config/initializers/devise.rb')
+          create_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <li class='nav-item'><%= link_to 'Edit account', edit_user_registration_path, class: 'nav-link' %></li>
+  <li class='nav-item'><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete', class: 'nav-link' %></li>
+<% else %>
+  <li class='nav-item'><%= link_to 'Sign in', new_user_session_path, class: 'nav-link' %></li>
+  <li class='nav-item'><%= link_to 'Sign up', new_user_registration_path, class: 'nav-link' %></li>
+<% end %>
+LINKS
+          end
+        end
+        # OMNIAUTH
+        if File.exists?('config/initializers/omniauth.rb')
+          create_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <li class='nav-item'><%= link_to 'Sign out', signout_path, class: 'nav-link' %></li>
+<% else %>
+  <li class='nav-item'><%= link_to 'Sign in', signin_path, class: 'nav-link' %></li>
+<% end %>
+LINKS
+          end
+        end
+        # USERS
+        if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
+          if User.column_names.include? 'role'
+            # suitable for role-based authorization
+            append_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <% if current_user.try(:admin?) %>
+    <li class='nav-item'><%= link_to 'Users', users_path, class: 'nav-link' %></li>
+  <% end %>
+<% end %>
+LINKS
+            end
+          else
+            # suitable for simple authentication
+            append_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <li class='nav-item'><%= link_to 'Users', users_path, class: 'nav-link' %></li>
+<% end %>
+LINKS
+            end
+          end
+        end
+        # UPMIN (administrative dashboard)
+        if File.exists?('config/initializers/upmin.rb')
+          navlink = "    <li class='nav-item'><%= link_to 'Admin', '/admin', class: 'nav-link' %></li>"
+          inject_into_file 'app/views/layouts/_nav_links_for_auth.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
+        end
+        # ADMINSTRATE (administrative dashboard)
+        if File.exists?('config/railscomposer.yml')
+          if Rails.application.config_for(:railscomposer)['dashboard'] == 'administrate'
+            navlink = "    <li class='nav-item'><%= link_to 'Admin', '/admin', class: 'nav-link' %></li>
+"
+            inject_into_file 'app/views/layouts/_nav_links_for_auth.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
+          end
+        end
+      end
+
       # Add navigation links
       def add_navigation_links
+        return if framework_name == 'bootstrap4'
         app = ::Rails.application
         ext = app.config.generators.options[:rails][:template_engine] || :erb
         copy_file "navigation_links.html.erb", "app/views/layouts/_navigation_links.html.erb"

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.29"
+  VERSION = "1.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,17 @@ files:
 - lib/generators/layout/install/templates/bootstrap3-navigation.html.haml
 - lib/generators/layout/install/templates/bootstrap3-navigation.html.slim
 - lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss
+- lib/generators/layout/install/templates/bootstrap4-application.html.erb
+- lib/generators/layout/install/templates/bootstrap4-application.html.haml
+- lib/generators/layout/install/templates/bootstrap4-application.html.slim
+- lib/generators/layout/install/templates/bootstrap4-forms.css.scss
+- lib/generators/layout/install/templates/bootstrap4-messages.html.erb
+- lib/generators/layout/install/templates/bootstrap4-messages.html.haml
+- lib/generators/layout/install/templates/bootstrap4-messages.html.slim
+- lib/generators/layout/install/templates/bootstrap4-navigation.html.erb
+- lib/generators/layout/install/templates/bootstrap4-navigation.html.haml
+- lib/generators/layout/install/templates/bootstrap4-navigation.html.slim
+- lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss
 - lib/generators/layout/install/templates/foundation4-application.html.erb
 - lib/generators/layout/install/templates/foundation4-application.html.haml
 - lib/generators/layout/install/templates/foundation4-application.html.slim
@@ -149,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Rails generator creates application layout files for Bootstrap and other