cmor_core 0.0.54.pre → 0.0.59.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ce1390b38d3ef90beb44794fbddf1c72578975f71cdf7deaab3e09662df2b4
-  data.tar.gz: a4b519f29b180983b14bd966738c37b37fecdb562c5ed4b6c72b694b568ac382
+  metadata.gz: 0a90f86e10b32eeb1836a0b6a8c7cf209e31036d21c11ff363bda7d3d323abde
+  data.tar.gz: ead75dcd8d132699d375b8b2151b618f2898796fe0ef45b5bc326d4927cd865f
 SHA512:
-  metadata.gz: b23e504288131b5b978f7f81ba545a216511dc51cad5a39aaf8ffdaecf8d2acfb88fa67ab9195232b4124ccb63dba607ae812ab1009df99bc3e8a84927cd68f0
-  data.tar.gz: 62328b7904d2c0b2ea633ee29439800c0403332ade25cf2f7330f55b33fea438e6185be6f35c9985beb98aebb0d9c87fc0ff01310517fc0b57951075bafa30e9
+  metadata.gz: d92a51e6cf209b8fb79243bea0b594ec2b70f1b25a0e97a9d229e295376eec653e710cdd147e6a2e10cc10a2f54ab34b31ef8e36ebbae7ef00b8d2c6947f1ffe
+  data.tar.gz: 7ba5e6dc4dc1d0fa3ac52bc4d880d3a2b3a0474cc3d5fe9bd157e7700aac4d11c7312181e8d893decd9ce91400d5865ac5e005d2496e01a7f6d832021015fe32

data/app/view_helpers/cmor/core/application_view_helper.rb

@@ -36,6 +36,45 @@ module Cmor
       end
 
       include FlashConcern
+
+      module PageTitleConcern
+        extend ActiveSupport::Concern
+
+        def application_title
+          t("#{Rails.application.class.to_s.deconstantize.underscore}.application.name")
+        end
+    
+        def page_title
+          page_title = t(page_title_i18n_key, default: page_title_fallbacks)
+          [application_title, page_title].join(" - ")
+        end
+    
+        private
+    
+        def page_title_fallbacks
+          page_title_from_content || page_title_from_resource
+        end
+    
+        def page_title_i18n_key
+          splitted_controller_name = c.params[:controller].split('/')
+          controller_namespace = splitted_controller_name[0..1].join('.')
+          controller_demodulized_name = splitted_controller_name.last
+
+          [controller_namespace, 'pages', controller_demodulized_name, c.controller.action_name].join('.')
+        end
+    
+        def page_title_from_resource
+          if(resource = c.controller.instance_variable_get(:@resource)).respond_to?(:title)
+            resource.title
+          end
+        end
+    
+        def page_title_from_content
+          c.content_for(:title)
+        end
+      end
+
+      include PageTitleConcern
     end
   end
-end
+end

data/app/views/cmor/core/application_view_helper/_render_flash.html.haml

@@ -1,5 +1,5 @@
 - messages.each do |type, content|
   .alert.alert-dismissible.fade.show{ role: "alert", class: "alert-#{type}"} 
-    = content
+    = content.html_safe
     %button.close{"aria-label" => "Close", "data-dismiss" => "alert", :type => "button"}
       %span{"aria-hidden" => "true"} ×

data/lib/cmor/core/model/localization_concern.rb

@@ -5,7 +5,7 @@ module Cmor
         extend ActiveSupport::Concern
 
         included do
-          validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, allow_nil: true, allow_blank: true
+          validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, allow_nil: true
 
           scope :for_locale, ->(locale = I18n.locale, options = {}) do
             options.reverse_merge!(include_without_locale: true)
@@ -16,6 +16,11 @@ module Cmor
               where(locale: locale)
             end
           end
+
+          # We have to override the setter for the locale to avoid empty strings as locale value.
+          def locale=(value)
+            super(value.blank? ? nil : value)
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_core
 version: !ruby/object:Gem::Version
-  version: 0.0.54.pre
+  version: 0.0.59.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.54.pre
+        version: 0.0.59.pre
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Cmor Core Module.