beyond_canvas 0.12.0.pre → 0.13.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a704eb8fc8c4b55d55948f72b6f694d67bac4c4fd668a3542f1c2e0a3826bfdb
-  data.tar.gz: 9521ae434f1eeee686b9f3421a79057cf807ad854f881be29e2d8ccffceab5e1
+  metadata.gz: 81a4312a7836c6b4e45b70a2516f1b8cf1a81c2a5a147b84794f4b81ca91fca9
+  data.tar.gz: e6dfcf1d2ae33991106021e0d6118b6bf5048d34cdffd419226594ede89d7986
 SHA512:
-  metadata.gz: bd1726b41d4a3e55a4704660b2056dad15a4ec191b35377bb4275b2396885fa1591dd4402f2ff21b29035ae61a4719d54d137ab509efcd04287a400674616f3a
-  data.tar.gz: fa0bec465852750728d95e985a61797fde9625d38c771fe2a97f367475f8ffbfbeaff17bba23e12c30869b0c3583b6b7fb6f6eba57fe82a47eedf9a9f3aadc90
+  metadata.gz: 3c90f578bd17802c1822b26412bf5c41c2342b948162ade9d23b4c8591aef7e2ce96a8712d3f56bec21fb8388d18e4478412e0f310a728682193bd9714267050
+  data.tar.gz: 3af58493e12b49d298cbea416a668d1442d8c366ee8cea84df7a928f876f50625205118a51607dce44bd6061c459d9884bcdf5f49f3bb7c7261e6b9ee4bf85ef

data/README.md

@@ -49,26 +49,7 @@
     $ rails g beyond_canvas:install
     ```
 
-    This will generate `config/initializers/beyond_canvas.rb` file, used for general Beyond Canvas configuration
-
-## Style Customization
-
-Beyond Canvas comes with _out-of-the-box_ styles to make your app look like as a Beyond integrated one. If you want to customize the gem styles, follow these instructions:
-
-1. Run the custom style generator:
-
-    ```bash
-    $ rails g beyond_canvas:custom_styles
-    ```
-
-    This command will generate a file (`app/assets/stylesheets/_beyond_canvas_custom_styles.sass`) that contains all variables you can customize.
-
-1. Import the custom styles **before** Beyond Canvas itself (to override the default styles) on `application.scss`:
-
-    ```scss
-    @import 'beyond_canvas_custom_styles'
-    @import 'beyond_canvas'
-    ```
+    This will generate `config/initializers/beyond_canvas.rb` file, used for general Beyond Canvas configuration. Read [this wiki entry](https://github.com/ePages-de/beyond_canvas/wiki/Initializer) to get more information about the different configuration options.
 
 ## Documentation
 

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

@@ -54,16 +54,16 @@ select
     &__text
       margin-left: 20px
       font-weight: 500
+      text-overflow: ellipsis
+      overflow: hidden
+      white-space: nowrap
+      max-width: 200px
 
     &__icon
       margin-right: 5px
       position: relative
       top: 1px
 
-
-  // &__with-error
-  //   border-left: 2px solid $input-errors-color
-
 label.input__error
     +padding(5px 7px)
     +position(absolute, calc(100% + 8px) null null 0)

data/app/controllers/beyond_canvas/application_controller.rb

@@ -4,22 +4,6 @@ module BeyondCanvas
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
-    include ::BeyondCanvas::LocaleManagement
-
-    def update_locale
-      cookies[:locale] = { value: app_locale_params[:locale], expires: 1.day.from_now }
-      set_locale
-
-      redirect_back(fallback_location: main_app.root_path)
-    end
-
-    private
-
-    #
-    # Strong parameters for locale switch
-    #
-    def app_locale_params
-      params.require(:app).permit(:locale)
-    end
+    include ::BeyondCanvas::StatusCodes
   end
 end

data/app/controllers/beyond_canvas/system_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_dependency 'beyond_canvas/application_controller'
+
+module BeyondCanvas
+  class SystemController < ApplicationController
+    include ::BeyondCanvas::LocaleManagement
+
+    def update_locale
+      cookies[:locale] = { value: system_locale_params[:locale], expires: 1.day.from_now }
+
+      redirect_back(fallback_location: main_app.root_path)
+    end
+
+    private
+
+    #
+    # Strong parameters for locale switch
+    #
+    def system_locale_params
+      params.require(:system).permit(:locale)
+    end
+  end
+end

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

@@ -5,23 +5,23 @@ module BeyondCanvas
     extend ActiveSupport::Concern
 
     included do
-      before_action :set_locale, except: :update_locale
+      around_action :switch_locale, except: :update_locale
     end
 
     private
 
     #
-    # Sets the I18n.locale to either +cookies[ :locale ]+ or the browser
-    # compatible locale (if +cookies[ :locale ]+ is not set)
+    # Sets the cookie locale as default locale if it is a valid locale. If it is not a valid locale, searches for a
+    # browser compatible locale, sets the value to the cookie and set that locale as default locale.
     #
-    def set_locale
+    def switch_locale(&action)
       unless valid_locale?(cookies[:locale])
         cookies[:locale] = { value: browser_compatible_locale, expires: 1.day.from_now }
       end
 
-      I18n.locale = cookies[:locale]
+      I18n.with_locale(cookies[:locale], &action)
 
-      logger.debug "[BeyondCanvas] Locale set to: #{I18n.locale}".yellow
+      logger.debug "[BeyondCanvas] Locale set to: #{cookies[:locale]}".yellow
     end
 
     #

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

@@ -0,0 +1,35 @@
+module BeyondCanvas
+  module RequestValidation
+    extend ActiveSupport::Concern
+
+    private
+
+    def validate_app_installation_request!
+      bad_request unless app_installation_params? && valid_signature?(params[:signature],
+                                                                      app_installation_data,
+                                                                      BeyondApi.configuration.client_secret)
+    end
+
+    def app_installation_params?
+      if params[:code].nil? ||
+        params[:signature].nil? ||
+        params[:return_url].nil? ||
+        params[:api_url].nil? ||
+        params[:access_token_url].nil?
+        false
+      else
+        true
+      end
+    end
+
+    def app_installation_data
+      "#{params[:code]}:#{params[:access_token_url]}"
+    end
+
+    def valid_signature?(signature, data, secret)
+      digest = OpenSSL::Digest.new('SHA1')
+      hmac = OpenSSL::HMAC.digest(digest, secret, data)
+      signature == Base64.encode64(hmac).chop
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module BeyondCanvas
+  module StatusCodes
+    extend ActiveSupport::Concern
+
+    private
+
+    def bad_request
+      raise ActionController::BadRequest.new 'Bad Request'
+    end
+
+    def not_found
+      raise ActionController::RoutingError.new 'Not Found'
+    end
+  end
+end

data/app/form_builders/beyond_canvas/form_builder.rb

@@ -17,7 +17,7 @@ module BeyondCanvas
       end
     end
 
-    [:email, :text, :password, :file].each do |method|
+    [:email, :text, :number, :password].each do |method|
       define_method :"#{method}_field" do |attribute, args = {}|
         field_wrapper(attribute, args) do
           super(attribute, args)

data/app/views/beyond_canvas/{shared/_locale_switch.html.slim → locales/_edit.html.slim}

@@ -1,6 +1,6 @@
 - if defined?(I18n) && I18n.available_locales.count > 1
-  = form_for :app, url: beyond_canvas.update_locale_path, method: :put do |f|
+  = form_for :system, url: beyond_canvas.update_locale_path, method: :put do |f|
     = f.select :locale, I18n.available_locales.collect { |l| [translate_locale(l), l] },
-                        { selected: I18n.locale },
+                        { selected: cookies[:locale] },
                         class: 'select--locale',
                         onchange: 'this.form.submit()'

data/app/views/layouts/beyond_canvas/public.html.slim

@@ -6,7 +6,7 @@ html
   body.body--public
     main.main class=("#{params[:controller].gsub(/[\/_]/, "-")}--#{params[:action]}")
       = render 'beyond_canvas/shared/flash'
-      = render 'beyond_canvas/shared/locale_switch'
+      = render 'beyond_canvas/locales/edit'
       .main-wrapper
         = render 'beyond_canvas/shared/logo'
         = yield

data/config/initializers/beyond_canvas/filter_parameter_logging.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Filter app installation parameters
+Rails.application.config.filter_parameters += [
+  :access_token_url,
+  :code,
+  :return_url,
+  :signature
+]

data/config/routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 BeyondCanvas::Engine.routes.draw do
-  put '/locale', to: 'application#update_locale', as: :update_locale
+  put '/locale', to: 'system#update_locale', as: :update_locale
 end

data/lib/beyond_canvas.rb

@@ -10,6 +10,8 @@ require 'inline_svg'
 require 'http/accept'
 require 'premailer/rails'
 
+require 'beyond_api'
+
 module BeyondCanvas
   class << self
     attr_accessor :configuration

data/lib/beyond_canvas/engine.rb

@@ -7,6 +7,8 @@ module BeyondCanvas
     config.before_initialize do
       ActiveSupport.on_load :action_controller do
         include ::BeyondCanvas::LocaleManagement
+        include ::BeyondCanvas::RequestValidation
+        include ::BeyondCanvas::StatusCodes
 
         ::ActionController::Base.helper BeyondCanvas::Engine.helpers
       end

data/lib/beyond_canvas/version.rb

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

data/lib/generators/beyond_canvas/install_generator.rb

@@ -8,6 +8,18 @@ module BeyondCanvas
       def copy_initializer
         template 'beyond_canvas.rb', 'config/initializers/beyond_canvas.rb'
       end
+
+      def install_beyond_api
+        require 'beyond_api'
+
+        initializer_file = File.join(destination_root, 'config/initializers/beyond_api.rb')
+
+        if File.exist?(initializer_file)
+          log :generate, 'No need to install beyond_api, already done.'
+        else
+          invoke 'beyond_api:install'
+        end
+      end
     end
   end
 end

data/lib/generators/templates/beyond_canvas.rb

@@ -1,8 +1,20 @@
 # frozen_string_literal: true
 
 BeyondCanvas.setup do |config|
-  # config.public_logo = "logo.png"
+  # ==> Site configuration
 
+  # Configure an optional logo image to be displayed on the public layout. By
+  # default no image is set. It accepts any string supported by image_tag's
+  # source parameter.
+  # config.public_logo = 'logo.png'
+
+  # ==> CSS and JS configuration
+
+  # Configure the parent app's main stylesheet file. Default value is
+  # 'application'.
   # config.stylesheet_link_tag = 'application'
+
+  # Configure the parent app's main javascript file. Default value is
+  # 'application'.
   # config.javascript_include_tag = 'application'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: beyond_canvas
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre
+  version: 0.13.0.pre
 platform: ruby
 authors:
 - Unai Abrisketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: beyond_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -183,22 +197,26 @@ 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/beyond_canvas/system_controller.rb
 - app/controllers/concerns/beyond_canvas/locale_management.rb
+- app/controllers/concerns/beyond_canvas/request_validation.rb
+- app/controllers/concerns/beyond_canvas/status_codes.rb
 - app/form_builders/beyond_canvas/form_builder.rb
 - app/helpers/beyond_canvas/application_helper.rb
 - app/helpers/beyond_canvas/locale_switch_helper.rb
 - app/views/beyond_canvas/custom/_public_head.html.slim
+- app/views/beyond_canvas/locales/_edit.html.slim
 - app/views/beyond_canvas/mailer/_button.html.erb
 - app/views/beyond_canvas/mailer/_footer.html.erb
 - app/views/beyond_canvas/mailer/_header.html.erb
 - app/views/beyond_canvas/mailer/_text.html.erb
 - app/views/beyond_canvas/shared/_flash.html.slim
 - app/views/beyond_canvas/shared/_head.html.slim
-- app/views/beyond_canvas/shared/_locale_switch.html.slim
 - app/views/beyond_canvas/shared/_logo.html.slim
 - app/views/layouts/beyond_canvas/mailer.html.erb
 - app/views/layouts/beyond_canvas/public.html.slim
 - config/initializers/beyond_canvas/assets.rb
+- config/initializers/beyond_canvas/filter_parameter_logging.rb
 - config/initializers/beyond_canvas/form_utils.rb
 - config/routes.rb
 - lib/beyond_canvas.rb
@@ -208,7 +226,6 @@ files:
 - lib/generators/beyond_canvas/install_generator.rb
 - lib/generators/templates/beyond_canvas.rb
 - lib/generators/templates/beyond_canvas_custom_styles.sass
-- lib/generators/templates/beyond_canvas_form_utils.rb
 homepage: https://github.com/ePages-de/beyond_canvas
 licenses:
 - MIT

data/lib/generators/templates/beyond_canvas_form_utils.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# Adds form__error class to the inputs after sending a form when errors
-ActionView::Base.field_error_proc = proc do |html_tag, _instance|
-  include ActionView::Helpers::SanitizeHelper
-
-  if html_tag =~ /<(input|textarea|select)/
-    error_class = 'form__error'
-
-    doc = Nokogiri::XML(html_tag)
-    doc.children.each do |field|
-      next if field['type'] == 'hidden'
-
-      next if field['class'] =~ /\berror\b/
-
-      field['class'] = "#{field['class']} #{error_class}".strip
-    end
-
-    sanitize doc.to_html
-  else
-    html_tag
-  end
-end