beyond_canvas 0.11.2.pre → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e3fb33f8c3a76af104b94c6bb5291c6c6b4a4a0ff9e62f5388c282289f0dec9
-  data.tar.gz: 41a5f4403e38347a5050e8a0390ecf636617d60813f0e76d709003e7b32d9261
+  metadata.gz: a704eb8fc8c4b55d55948f72b6f694d67bac4c4fd668a3542f1c2e0a3826bfdb
+  data.tar.gz: 9521ae434f1eeee686b9f3421a79057cf807ad854f881be29e2d8ccffceab5e1
 SHA512:
-  metadata.gz: 49992be8568fb4962642c4e400753d1ceec3daa8b7802d2065864a2ae6ba7b6e678217342a74baa3dfa75938fc0159dc893fcd40a8c2dcc1f7e555149ae25031
-  data.tar.gz: 35a6b36b8832265a71a4e40bb7ff3eca879cca0dae6cc72d980d86dfc972c9f7b509720d414dfac527e242d0fe6ed78660b97eb98085b129ad7b55817c4415ca
+  metadata.gz: bd1726b41d4a3e55a4704660b2056dad15a4ec191b35377bb4275b2396885fa1591dd4402f2ff21b29035ae61a4719d54d137ab509efcd04287a400674616f3a
+  data.tar.gz: fa0bec465852750728d95e985a61797fde9625d38c771fe2a97f367475f8ffbfbeaff17bba23e12c30869b0c3583b6b7fb6f6eba57fe82a47eedf9a9f3aadc90

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

@@ -0,0 +1,5 @@
+.body--public
+
+  .select--locale
+    +position(absolute, 40px 40px null null)
+    width: 200px

data/app/assets/stylesheets/beyond_canvas.sass

@@ -13,6 +13,7 @@
 @import 'beyond_canvas/components/flash'
 @import 'beyond_canvas/components/forms'
 @import 'beyond_canvas/components/inputs'
+@import 'beyond_canvas/components/layouts'
 @import 'beyond_canvas/components/links'
 @import 'beyond_canvas/components/main'
 @import 'beyond_canvas/components/margins'

data/app/controllers/beyond_canvas/application_controller.rb

@@ -5,5 +5,21 @@ module BeyondCanvas
     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
   end
 end

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

@@ -6,27 +6,22 @@ module BeyondCanvas
 
     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)
+    # Sets the I18n.locale to either +cookies[ :locale ]+ or the browser
+    # compatible locale (if +cookies[ :locale ]+ is not set)
     #
     def set_locale
-      puts '*' * 100
-      puts '*' * 100
-      I18n.locale = session[:locale] || session[:locale] = browser_compatible_locale
+      unless valid_locale?(cookies[:locale])
+        cookies[:locale] = { value: browser_compatible_locale, expires: 1.day.from_now }
+      end
+
+      I18n.locale = cookies[:locale]
+
+      logger.debug "[BeyondCanvas] Locale set to: #{I18n.locale}".yellow
     end
 
     #
@@ -47,10 +42,10 @@ module BeyondCanvas
     end
 
     #
-    # Strong parameters for locale switch
+    # Checks if the given locale parameter is included on +I18n.available_locales+
     #
-    def app_locale_params
-      params.require(:app).permit(:locale)
+    def valid_locale?(locale)
+      I18n.available_locales.map(&:to_s).include? locale
     end
   end
 end

data/lib/beyond_canvas/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beyond_canvas
 version: !ruby/object:Gem::Version
-  version: 0.11.2.pre
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Unai Abrisketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -167,6 +167,7 @@ files:
 - app/assets/stylesheets/beyond_canvas/components/_flash.sass
 - app/assets/stylesheets/beyond_canvas/components/_forms.sass
 - app/assets/stylesheets/beyond_canvas/components/_inputs.sass
+- app/assets/stylesheets/beyond_canvas/components/_layouts.sass
 - app/assets/stylesheets/beyond_canvas/components/_links.sass
 - app/assets/stylesheets/beyond_canvas/components/_main.sass
 - app/assets/stylesheets/beyond_canvas/components/_margins.sass