megatron 0.2.36 → 0.3.0

data/app/controllers/megatron/errors_controller.rb

@@ -15,6 +15,9 @@ module Megatron
 
     include Gaffe::Errors
 
+    # Make sure anonymous users can see the page
+    skip_before_filter :authenticate_user!
+
     # Override 'error' layout
     layout 'megatron/errors'
 

data/app/helpers/megatron/application_helper.rb

@@ -1,25 +1,5 @@
 module Megatron
   module ApplicationHelper
-    
-    # Mounted from dev-kit
-    def dev?
-      __dir__.start_with?("/megatron") || ENV['DEVKIT']
-    end
-
-    def megatron_asset_path(asset)
-
-      if ENV['LOCAL_DEV']
-        alt_host = "http://localhost:5000"
-      elsif dev?
-        alt_host = "https://megatron.compose.devkit"
-      end 
-
-      alt_host ||= ENV['MEGATRON_ASSET_HOST'] 
-      return "#{alt_host}/assets/megatron/#{asset}" if alt_host
-      return "https://d11f55tj5eo9e5.cloudfront.net/assets/megatron/#{asset}" if Rails.env.production?
-      return "/assets/megatron/#{asset}"
-    end
-
     def link_up(href = nil, options = {}, html_options = nil, &block)
       here_if = options.delete(:here_if) || {}
       here_if[:path] = href if here_if.blank?
@@ -28,53 +8,6 @@ module Megatron
       link_to(href, options, &block)
     end
 
-    def megatron_assets_tags
-      version = "-#{Megatron::VERSION}"
-
-      ext_suffix = Rails.env.production? ? '.gz' : ''
-
-      pin_tab_icon(
-        megatron_asset_path('logo.svg')
-      ) +
-      favicon_link_tag(
-        megatron_asset_path('favicon.ico'), sizes: "32x32"
-      ) +
-      stylesheet_link_tag(
-        megatron_asset_path("megatron#{version}.css#{ext_suffix}")
-      ) +
-      javascript_include_tag(
-        megatron_asset_path("megatron#{version}.js#{ext_suffix}")
-      )
-    end
-
-    def pin_tab_icon(path)
-      %Q{<link rel="mask-icon" mask href="#{path}" color="black">}.html_safe
-    end
-
-    def favicon_link_tag(source='favicon.ico', options={})
-      tag('link', {
-        :rel  => 'shortcut icon',
-        :type => 'image/x-icon',
-        :href => source
-      }.merge!(options.symbolize_keys))
-    end
-
-    def megatron_error_asset_tag
-      version = Megatron::VERSION
-      ext_suffix = Rails.env.production? ? '.gz' : ''
-
-      # Embed styles directly for these error codes since they are served from haproxy
-      # and are likely to be served when the stylesheet server cannot be reached
-      #
-      if [408, 502, 503, 504].include?(@status_code)
-        style== File.read("../public/assets/megatron/megatron-error-pages-#{version}.css")
-      else
-        stylesheet_link_tag(
-          megatron_asset_path("megatron-error-pages-#{version}.css#{ext_suffix}")
-        )
-      end
-    end
-
     def options_from_args(args)
       if args.last.is_a? Hash
         args.pop
@@ -83,34 +16,6 @@ module Megatron
       end
     end
 
-    def embed_svg(filename, options = {})
-      group = 0
-      file = File.read(Engine.root.join('app', 'assets', 'images', filename))
-        .gsub(/<!--.+-->/, '')
-        .gsub(/^\t{2,}\s*<\/?g>/, '')
-        .gsub(/width=".+?"/, 'width="312"')
-        .gsub(/\sheight.+$/, '')
-        .gsub(/\t/, '  ')
-        .gsub(/\n{3,}/m, "\n")
-        .gsub(/^\s{2}<g>.+?^\s{2}<\/g>/m) { |g| 
-          g.gsub(/^\s{4,}\s+/, '    ')
-        }
-        .gsub(/^<g>.+?^<\/g>/m) { |g|
-          group += 1
-          count = 0
-          g.gsub(/^\s{2}<g>/) { |g| 
-            count += 1
-            %Q{  <g id="group-#{group}-cube-#{count}">}
-          }
-        }
-      # doc = Nokogiri::HTML::DocumentFragment.parse file
-      # svg = doc.at_css 'svg'
-      # if options[:class].present?
-      #   svg['class'] = options[:class]
-      # end
-      file.html_safe
-    end
-
     def add_class(string, *classes)
       string ||= ''
       string << " #{classes.join(' ')}"

data/app/helpers/megatron/icon_helper.rb

@@ -1,16 +1,11 @@
 module Megatron
   module IconHelper
-    ICON_OPTIONS = {
-      config_file: File.expand_path('../../../config/esvg.yml', File.dirname(__FILE__)),
-      path: File.expand_path('../../assets/esvg/megatron', File.dirname(__FILE__))
-    }
-
     def iconset
-      svg_icons(ICON_OPTIONS)
+      Esvg.svgs
     end
 
     def icon(name, options={}, &block)
-      i = iconset.use(name, options).html_safe
+      i = iconset.svg_icon(name, options).html_safe
 
       if options[:wrapper]
         i = content_tag(:span, class: options[:wrapper].strip) do
@@ -29,6 +24,15 @@ module Megatron
       i
     end
 
+    def pin_tab_icon(path, color='black')
+      %Q{<link rel="mask-icon" mask href="#{path}" color="#{color}">}.html_safe
+    end
+
+    def font_icon(name, options={})
+      options[:class] = default_class(options[:class], "#{name}_icon")
+      content_tag(:span, class: options[:class], 'aria-hidden' => true) {  }
+    end
+
     def text_icon(name, options={}, &block)
       options = set_icon_classes(options, class: 'text-icon', wrapper: 'icon-wrapper')
       icon(name.to_s, options, &block)

data/app/helpers/megatron/layout_helper.rb

@@ -4,9 +4,9 @@ module Megatron
   def megatron_layout(options={}, &block)
       @custom_nav = options[:custom_nav]
       @primary_nav_here = options[:primary_nav]
-      layout = options.delete(:layout) || 'application'
+      layout = options.delete(:layout) || 'default'
       yield
-      render template: "layouts/megatron/#{layout}"
+      render_layout "megatron/#{layout}"
     end
 
     def page_header(title = nil, &block)
@@ -34,14 +34,6 @@ module Megatron
       content_for :sidebar, &block
     end
 
-    def javascripts(&block)
-      content_for :javascripts, &block
-    end
-
-    def stylesheets(&block)
-      content_for :stylesheets, &block
-    end
-
     def size(*args, &block)
       options = options_from_args(args)
       tag = options[:tag] || :div

data/app/views/layouts/megatron/default.html.slim

@@ -0,0 +1,76 @@
+doctype html
+
+html lang="en"
+
+  - content_for :head do
+    = stylesheet_tag "megatron"
+    = yield :stylesheets
+
+    = javascript_tag "megatron"
+    = yield :javascripts
+
+  = render "megatron/shared/head"
+
+  body
+    - if content_for?(:blank)
+      
+      = yield :blank
+
+    - else
+
+      = render "megatron/shared/flash_messages"
+
+      .site
+
+        header.site-header role="banner" data-no-turbolink=true
+          button.nav_toggle data-toggle-class="active-nav; body"
+            span.icon
+            span.hidden_label View Navigation
+          a.header_logo.logo_icon href="/"
+            span.hidden_label Compose
+
+        .site-content
+
+          - if !@custom_nav
+
+            = render partial: 'megatron/shared/primary_nav'
+
+          - if content_for?(:primary_nav)
+            nav.primary_nav role="navigation" data-no-turbolink=true
+              = yield :primary_nav
+
+          .page
+            = yield
+
+            / Render wrapper divs if main content
+
+            - if content_for?(:main)
+
+              header.page-header
+                = yield :page_header
+
+              .page-content
+
+                / Secondary Navigation
+
+                - if content_for?(:secondary_nav)
+                  nav.secondary_nav
+                    = yield :secondary_nav
+
+                / Main with Sidebar
+
+                - if content_for?(:sidebar)
+
+                  .main.with-sidebar
+                    .main-content
+                      = render 'megatron/shared/main_content'
+
+                    .main-sidebar
+                      = yield :sidebar
+
+                / Main without Sidebar
+
+                - else
+
+                  .main
+                    = render 'megatron/shared/main_content'

data/app/views/layouts/megatron/errors.html.slim

@@ -1,11 +1,11 @@
-<!DOCTYPE html>
-html.error-layout
-  head
-    title Error #{@status_code}: #{@rescue_response.to_s.humanize} - Compose
-    meta name="viewport" content="width=device-width,initial-scale=1"
-    meta charset="utf-8"
-    = favicon_link_tag(megatron_asset_path('favicon.ico'))
-    = megatron_error_asset_tag
+doctype html
+html.error-layout lang='en'
+  - @title = "Error #{@status_code}: #{@rescue_response.to_s.humanize} - Compose"
+
+  - content_for :head do
+    = stylesheet_tag "megatron-error-pages"
+
+  = render "megatron/shared/head"
 
   body
     .error-page class="error-#{@status_code} #{('reverse-stack' if @status_code == 404)}"

data/app/views/megatron/shared/_flash_messages.html.slim

@@ -0,0 +1,6 @@
+- if flash[:notice]
+  .form-flash.hidden data-type="action"= flash[:notice]
+- if flash[:success]
+  .form-flash.hidden data-type="success"= flash[:success]
+- if flash[:error]
+  .form-flash.hidden data-type="error"= flash[:error]

data/app/views/megatron/shared/_head.html.slim

@@ -0,0 +1,23 @@
+head
+
+  / Document Settings
+  meta charset="utf-8"
+  meta http-equiv="X-UA-Compatible" content="IE=edge"
+  = csrf_meta_tags
+
+  / Referrer
+  meta name="referrer" content="origin"
+
+  / Mobile
+  meta name="HandheldFriendly" content="True"
+  meta name="viewport" content="width=device-width, initial-scale=1.0"
+
+  - if @title.present?
+    title #{@title} | Compose
+  - else
+    title Compose
+
+  = favicon_tag 'favicon.ico'
+  = pin_tab_icon_tag "logo.svg"
+
+  = yield :head

data/app/views/megatron/shared/_main_content.html.slim

@@ -1,4 +1,7 @@
 - if content_for?(:main_header)
-  header.main-header
-    = yield :main_header
-= yield :main
+  header.main-header = yield :main_header
+
+- if @wide_layout
+  .wide = yield :main
+- else
+  = yield :main

data/lib/megatron/engine.rb

@@ -18,12 +18,5 @@ module Megatron
     initializer "megatron.static_assets" do |app|
       app.middleware.insert_before(::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public")
     end
-
-    initializer "megatron.errors" do |app|
-      Gaffe.configure do |config|
-        config.errors_controller = 'Megatron::ErrorsController'
-      end
-      Gaffe.enable!
-    end
   end
 end

data/lib/megatron/slim_code_filter.rb

@@ -0,0 +1,21 @@
+require 'slim'
+
+module Slim
+  class CodeEngine < Slim::Embedded::TagEngine
+    disable_option_validator!
+
+    set_options tag: :pre, attributes: { class: "" }
+
+    def on_slim_embedded(engine, body)
+
+      lang = body[1].last
+      body.slice!(1,2)
+
+      code = super(engine, body)
+      code[3][2][3][1] = "lang-#{lang}"
+      code
+    end
+  end
+end
+
+Slim::Embedded.register :code, Slim::CodeEngine

data/lib/megatron/version.rb

@@ -1,3 +1,3 @@
 module Megatron
-  VERSION = "0.2.36".freeze
+  VERSION = "0.3.0".freeze
 end