beyond_canvas 0.9.0.pre → 0.10.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335beddd2eac597c9fa0897cb7c20f6fb57c86a0ca5e622836298e8c325cfd24
-  data.tar.gz: a82e3214de0668784582bc4f8b32c5f761687c49343f00f54191e494318c1cf0
+  metadata.gz: fd36e8ee286be66d4bee8fcae14a2b1bbc7b1196c78ad74b422bc52bb6979ee0
+  data.tar.gz: 5cdf4c4ff623a1a504bc323cf5cbd603c7b5286f1cf16ac144ad26db1a3ea35b
 SHA512:
-  metadata.gz: 53c3b4a996a98077b105426c0b130092a083a86b2b8d9fa12ec2779d47e685e1d3e199f3fd4fcd3527a60751377cf1cc0d713e5cd2af93787c4097fbeb0830f2
-  data.tar.gz: e25da7ec134955b4f5b192dc7f4824328754b3a32c19c4a595b4bed7f913b62d4528222b093169af51fea63e21295efbdcddbce1d36bc2ce1fa9bbe09a1c4ac1
+  metadata.gz: e5b1967bcc9c9d9e5fb907c23e24332ad8f223755a982028afa3928b90d12eb6e5685a1abdc7cee7a1e6a6f8bd90aa51bc5fc5b57f3338405e2421790f33d6f0
+  data.tar.gz: 9180fa6cab6bb646d4a95507906c7786edd6d5ef8eb3189cee42e7ec2d769158f43420fb6b3f5e925f836762d5bb680890f54f92a4c9163ec3d6718f77c7f792

data/app/assets/javascripts/beyond_canvas/buttons.js

@@ -5,7 +5,7 @@
   });
 
   $(document).on('ready page:load turbolinks:load', function() {
-    $('[class^="button"]').each(function() {
+    $('button[class^="button"]').each(function() {
       var button = $(this);
 
       // Add width attribute and save old width

data/app/assets/javascripts/beyond_canvas/inputs.js

@@ -0,0 +1,28 @@
+(function($) {
+  $(document).on('ready page:load turbolinks:load', function() {
+    $('input[type="file"]').each(function() {
+      var $input = $(this),
+          $label = $(`.input__file__text.${$input.attr('id')}`),
+          labelVal = $label.html();
+
+      $input.on('change', function(e) {
+        var fileName = '';
+
+        if (this.files && this.files.length > 1)
+          fileName = (this.getAttribute('data-multiple-caption') || '').replace('{count}', this.files.length);
+        else if (e.target.value)
+          fileName = e.target.value.split('\\').pop();
+
+        if (fileName)
+          $label.html(`<i class="far fa-file input__file__icon"></i>${fileName}`);
+        else
+          $label.html(labelVal);
+      });
+
+      // Firefox bug fix
+      $input
+        .on('focus', function() { $input.addClass('has-focus'); })
+        .on('blur', function() { $input.removeClass('has-focus'); });
+    });
+  });
+})(jQuery);

data/app/assets/javascripts/beyond_canvas.js

@@ -1,2 +1,3 @@
-//= require beyond_canvas/flash
 //= require beyond_canvas/buttons
+//= require beyond_canvas/flash
+//= require beyond_canvas/inputs

data/app/assets/stylesheets/beyond_canvas/components/_inputs.sass

@@ -44,6 +44,23 @@ select
     font-size: 13px
     margin-top: 1px
 
+  &__file
+    display: flex
+    align-items: center
+
+    &__label
+      display: inline-block
+
+    &__text
+      margin-left: 20px
+      font-weight: 500
+
+    &__icon
+      margin-right: 5px
+      position: relative
+      top: 1px
+
+
   // &__with-error
   //   border-left: 2px solid $input-errors-color
 

data/app/assets/stylesheets/beyond_canvas/components/_notices.sass

@@ -1,47 +1,41 @@
 .notice
-  align-items: center
   border-radius: $notice-border-radius
+  border: 1px solid
   box-sizing: border-box
   display: flex
-  padding: 10px 15px
 
   &--success
-    background-color: lighten($notice-success-background, 25%)
+    border-color: $notice-success-background
 
     .notice__icon
-      background-color: darken($notice-success-background, 10%)
-      color: lighten($notice-success-background, 25%)
+      background-color: $notice-success-background
 
   &--info
-    background-color: lighten($notice-info-background, 25%)
+    border-color: $notice-info-background
 
     .notice__icon
-      background-color: darken($notice-info-background, 10%)
-      color: lighten($notice-info-background, 25%)
+      background-color: $notice-info-background
 
   &--warning
-    background-color: lighten($notice-warning-background, 25%)
+    border-color: $notice-warning-background
 
     .notice__icon
-      background-color: darken($notice-warning-background, 10%)
-      color: lighten($notice-warning-background, 25%)
+      background-color: $notice-warning-background
 
   &--error
-    background-color: lighten($notice-error-background, 25%)
+    border-color: $notice-error-background
 
     .notice__icon
-      background-color: darken($notice-error-background, 10%)
-      color: lighten($notice-error-background, 25%)
+      background-color: $notice-error-background
 
   &__icon
-    +size(18px)
-    align-items: center
-    border-radius: 100%
+    +padding(10px 8px)
+    color: $white
     display: flex
-    font-size: 12px
-    justify-content: center
-    margin-right: 15px
-    min-width: 18px
+    font-size: 18px
 
-  &__message
+  &__content
+    +padding(8px 14px)
     color: $notice-color
+    display: flex
+    align-items: center

data/app/assets/stylesheets/beyond_canvas/settings/_variables.sass

@@ -128,11 +128,11 @@ $comment-color:               rgb(170, 169, 156) !default
 // ************************************************************
 
 $notice-success-background:   rgb(123, 170, 81) !default
-$notice-info-background:      rgb(90, 129, 171) !default
-$notice-warning-background:   rgb(193, 179, 26) !default
+$notice-info-background:      rgb(153, 153, 153) !default
+$notice-warning-background:   rgb(235, 183, 92) !default
 $notice-error-background:     rgb(162, 66, 60) !default
 $notice-border-radius:        4px !default
-$notice-color:                rgb(255, 255, 255) !default
+$notice-color:                rgb(153, 153, 153) !default
 
 // ************************************************************
 // Markdown

data/app/controllers/beyond_canvas/application_controller.rb

@@ -3,57 +3,7 @@
 module BeyondCanvas
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
-    before_action :set_locale, except: :update_locale
 
-    ############################################################################
-    # Locale management
-    ############################################################################
-
-    def update_locale
-      if I18n.available_locales.map(&:to_s).include? app_locale_params[:locale]
-        session[:locale] = app_locale_params[:locale]
-        set_locale
-      end
-
-      redirect_back(fallback_location: main_app.root_path)
-    end
-
-    private
-
-    ############################################################################
-    # Locale management
-    ############################################################################
-
-    #
-    # Sets the I18n.locale to either +session[ :locale ]+ or the browser
-    # compatible locale (if +session[ :locale ]+ is not set)
-    #
-    def set_locale
-      I18n.locale = session[:locale] || session[:locale] = browser_compatible_locale
-    end
-
-    #
-    # Reads the +HTTP_ACCEPT_LANGUAGE+ header and searches a compatible locale
-    # on +I18n.available_locales+. If no compatible language is found, it
-    # returns +I18n.default_locale+.
-    #
-    # @return [String] a browser compatible language string or
-    #   +I18n.default_locale+. (e.g. +'en-GB'+)
-    #
-    def browser_compatible_locale
-      browser_locales = HTTP::Accept::Languages.parse(request.headers['HTTP_ACCEPT_LANGUAGE'])
-      available_locales = HTTP::Accept::Languages::Locales.new(I18n.available_locales.map(&:to_s))
-
-      locales = available_locales & browser_locales
-
-      locales.empty? ? I18n.default_locale : locales.first
-    end
-
-    #
-    # Strong parameters for locale switch
-    #
-    def app_locale_params
-      params.require(:app).permit(:locale)
-    end
+    include ::BeyondCanvas::LocaleManagement
   end
 end

data/app/controllers/concerns/beyond_canvas/locale_management.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module LocaleManagement
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_locale, except: :update_locale
+
+      def update_locale
+        if I18n.available_locales.map(&:to_s).include? app_locale_params[:locale]
+          session[:locale] = app_locale_params[:locale]
+          set_locale
+        end
+
+        redirect_back(fallback_location: main_app.root_path)
+      end
+    end
+
+    private
+
+    #
+    # Sets the I18n.locale to either +session[ :locale ]+ or the browser
+    # compatible locale (if +session[ :locale ]+ is not set)
+    #
+    def set_locale
+      puts '*' * 100
+      puts '*' * 100
+      I18n.locale = session[:locale] || session[:locale] = browser_compatible_locale
+    end
+
+    #
+    # Reads the +HTTP_ACCEPT_LANGUAGE+ header and searches a compatible locale
+    # on +I18n.available_locales+. If no compatible language is found, it
+    # returns +I18n.default_locale+.
+    #
+    # @return [String] a browser compatible language string or
+    #   +I18n.default_locale+. (e.g. +'en-GB'+)
+    #
+    def browser_compatible_locale
+      browser_locales = HTTP::Accept::Languages.parse(request.headers['HTTP_ACCEPT_LANGUAGE'])
+      available_locales = HTTP::Accept::Languages::Locales.new(I18n.available_locales.map(&:to_s))
+
+      locales = available_locales & browser_locales
+
+      locales.empty? ? I18n.default_locale : locales.first
+    end
+
+    #
+    # Strong parameters for locale switch
+    #
+    def app_locale_params
+      params.require(:app).permit(:locale)
+    end
+  end
+end

data/app/form_builders/beyond_canvas/form_builder.rb

@@ -24,5 +24,25 @@ module BeyondCanvas
         end
       end
     end
+
+    def file_field(attribute, args = {})
+      field_wrapper(attribute, args) do
+        filed_identifyer = "#{attribute}_#{(Time.now.to_f * 1000).to_i.to_s}"
+
+        args.merge!(id: filed_identifyer)
+            .merge!(hidden: true)
+
+        custom_attributes = { data: { multiple_selection_text: '{count} files selected' } }
+        args = custom_attributes.merge!(args)
+
+        @template.content_tag(:div, class: 'input__file') do
+          super(attribute, args) +
+          @template.content_tag(:label, for: filed_identifyer, class: 'input__file__label button__transparent--primary') do
+            args[:data][:button_text] || 'Choose file'
+          end +
+          @template.content_tag(:span, args[:data][:no_file_text] || 'No file chosen', class: "input__file__text #{filed_identifyer}")
+        end
+      end
+    end
   end
 end

data/app/helpers/beyond_canvas/application_helper.rb

@@ -2,6 +2,17 @@
 
 module BeyondCanvas
   module ApplicationHelper
+    def full_title(page_title = '')
+      if I18n.exists?('app_name')
+        base_title = I18n.t('app_name')
+      else
+        logger.debug "[BeyondCanvas] Missing translation: #{I18n.locale}.app_name".yellow
+        base_title = File.basename(Rails.root).humanize
+      end
+
+      page_title.empty? ? base_title : page_title + ' | ' + base_title
+    end
+
     def link_to_with_icon(name = nil, options = nil, fa_class = nil, html_options = nil)
       options ||= {}
 
@@ -16,14 +27,30 @@ module BeyondCanvas
       end
     end
 
+    [:success, :info, :warning, :error].each do |method|
+      define_method :"notice_#{method}" do |name = nil, html_options = nil, &block|
+        notice_render(method, name, html_options, &block)
+      end
+    end
+
+    def logo_image_tag(logo_path)
+      if File.extname(logo_path) == '.svg'
+        inline_svg_tag logo_path, class: 'logo', alt: 'logo'
+      else
+        image_tag logo_path, class: 'logo', alt: 'logo'
+      end
+    end
+
+    private
+
     def get_flash_icon(key)
       case key
       when 'success'
         'fas fa-check'
       when 'info'
-        'fas fa-info'
+        'fas fa-info-circle'
       when 'warning'
-        'fas fa-exclamation'
+        'fas fa-exclamation-circle'
       when 'error'
         'far fa-times-circle'
       else
@@ -31,20 +58,16 @@ module BeyondCanvas
       end
     end
 
-    [:success, :info, :warning, :error].each do |method|
-      define_method :"notice_#{method}" do |message|
-        content_tag('div', class: "notice notice--#{method}") do
-          content_tag('i', nil, class: "notice__icon #{get_flash_icon(method.to_s)}") +
-            content_tag('span', message, class: 'notice__message')
-        end
-      end
-    end
+    def notice_render(method, name = nil, html_options = nil, &block)
+      html_options, name = name, block if block_given?
 
-    def logo_image_tag(logo_path)
-      if File.extname(logo_path) == '.svg'
-        inline_svg_tag logo_path, class: 'logo', alt: 'logo'
-      else
-        image_tag logo_path, class: 'logo', alt: 'logo'
+      html_options ||= {}
+
+      html_options.merge!(class: "notice notice--#{method}") { |key, old_val, new_val| [new_val, old_val].join(' ') }
+
+      content_tag('div', html_options) do
+        content_tag('i', nil, class: "notice__icon #{get_flash_icon(method.to_s)}") +
+        content_tag('span', block_given? ? capture(&name) : name, class: 'notice__content')
       end
     end
   end

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

@@ -1,12 +1,20 @@
 head
   = csrf_meta_tags
   meta content='width=device-width, initial-scale=1.0' name='viewport' /
+
   link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" rel="stylesheet" /
   script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"
 
+  title = full_title(yield :title)
+
   - stylesheet_link_tag = BeyondCanvas.configuration.stylesheet_link_tag
   - javascript_include_tag = BeyondCanvas.configuration.javascript_include_tag
-  = stylesheet_link_tag(stylesheet_link_tag) unless stylesheet_link_tag.nil?
-  = javascript_include_tag(javascript_include_tag) unless javascript_include_tag.nil?
+
+  - if defined?(Turbolinks)
+    = stylesheet_link_tag stylesheet_link_tag, 'data-turbolinks-track' => true
+    = javascript_include_tag javascript_include_tag, 'data-turbolinks-track' => true
+  - else
+    = stylesheet_link_tag stylesheet_link_tag
+    = javascript_include_tag javascript_include_tag
 
   = render 'beyond_canvas/custom/public_head'

data/config/initializers/beyond_canvas/assets.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+Rails.application.config.assets.precompile += %w( beyond_canvas.css )
+Rails.application.config.assets.precompile += %w( beyond_canvas.js )

data/lib/beyond_canvas/engine.rb

@@ -4,10 +4,11 @@ module BeyondCanvas
   class Engine < ::Rails::Engine
     isolate_namespace BeyondCanvas
 
-    initializer 'local_helper.action_controller' do
+    config.before_initialize do
       ActiveSupport.on_load :action_controller do
-        helper BeyondCanvas::ApplicationHelper
-        helper BeyondCanvas::LocaleSwitchHelper
+        include ::BeyondCanvas::LocaleManagement
+
+        ::ActionController::Base.helper BeyondCanvas::Engine.helpers
       end
     end
   end

data/lib/beyond_canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  VERSION = '0.9.0.pre'
+  VERSION = '0.10.0.pre'
 end

data/lib/beyond_canvas.rb

@@ -25,8 +25,8 @@ module BeyondCanvas
 
     def initialize
       @public_logo = nil
-      @stylesheet_link_tag = nil
-      @javascript_include_tag = nil
+      @stylesheet_link_tag = 'application'
+      @javascript_include_tag = 'application'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beyond_canvas
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.10.0.pre
 platform: ruby
 authors:
 - Unai Abrisketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -144,6 +144,7 @@ files:
 - app/assets/javascripts/beyond_canvas.js
 - app/assets/javascripts/beyond_canvas/buttons.js
 - app/assets/javascripts/beyond_canvas/flash.js
+- app/assets/javascripts/beyond_canvas/inputs.js
 - app/assets/stylesheets/beyond_canvas.sass
 - app/assets/stylesheets/beyond_canvas/components/_actions.sass
 - app/assets/stylesheets/beyond_canvas/components/_buttons.sass
@@ -166,6 +167,7 @@ files:
 - app/assets/stylesheets/beyond_canvas/settings/_variables.sass
 - app/assets/stylesheets/beyond_canvas/utilities/_mixins.sass
 - app/controllers/beyond_canvas/application_controller.rb
+- app/controllers/concerns/beyond_canvas/locale_management.rb
 - app/form_builders/beyond_canvas/form_builder.rb
 - app/helpers/beyond_canvas/application_helper.rb
 - app/helpers/beyond_canvas/locale_switch_helper.rb
@@ -175,6 +177,7 @@ files:
 - app/views/beyond_canvas/shared/_locale_switch.html.slim
 - app/views/beyond_canvas/shared/_logo.html.slim
 - app/views/layouts/beyond_canvas/public.html.slim
+- config/initializers/beyond_canvas/assets.rb
 - config/initializers/beyond_canvas/form_utils.rb
 - config/routes.rb
 - lib/beyond_canvas.rb