camaleon_cms 2.3.7.1 → 2.3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f916d0199fb4184ace2440c0a2babd487d672a39
-  data.tar.gz: 0e76f175f3d880c2b2f84e91d674858f0e28a665
+  metadata.gz: 3483c89c73c13138983fa6355ba481ac61daf5ec
+  data.tar.gz: e2efd330151d314cf6981daa752dcd661b3d9eee
 SHA512:
-  metadata.gz: c76db884004fde5715ebdf2a66e6d21b85ac4ef60143b68cf68f52bc27f656eaebb946396d33fb190a4c34a2985894ce5495cedbc2c100457771c964dfbcf868
-  data.tar.gz: 6555d2bb2527a82241456a5d2e2f0b3a93beab0d6f1c49ff20bf437100ff517725468ca4c8020a16f7870a652fba8fe9efb4e2e98dcf26a825269d17b73613bd
+  metadata.gz: f4c9a0e7f7b2f446280f474c2e4fe23547e0d2170e83b72fee0485b3642e46e7a6bd5d98359f478a048f31568e45313bb23bc3dfc374a288f0471f2c18b21ff1
+  data.tar.gz: 903beafb1fedfe15f338e0380d8f46b6e565a025527f8fb10c727535c8df87d5eef5c65a17d3900622e83116697697fcfb19a49409e68c74978d9984993d9abe

data/README.md

@@ -39,7 +39,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>=2.3.6' # Stable versions 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>=2.3.7.2' # Stable versions 2.3.6, 2.2.1, 2.1.1, 2.1.0
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
   ```
 * Only Rails 5 support

data/app/helpers/camaleon_cms/email_helper.rb

@@ -18,6 +18,7 @@ module CamaleonCms::EmailHelper
   end
 
   # short method of send_email
+  # args: content='', from=nil, attachs=[], url_base='', current_site, template_name, layout_name, extra_data, format, cc_to
   def cama_send_email(email_to, subject, args = {})
     args = {url_base: cama_root_url, current_site: current_site, subject: subject}.merge(args)
     args[:attachments] = args[:attachs] if args[:attachs].present?
@@ -47,4 +48,9 @@ module CamaleonCms::EmailHelper
     send_email(user_to_send.email, t('camaleon_cms.admin.login.message.subject_email'), '', nil, [], 'password_reset', 'camaleon_cms/mailer', extra_data)
   end
 
+  # send email to the first administrator
+  # args: same arguments than cama_send_email
+  def cama_send_mail_to_admin(subject, args = {})
+    cama_send_email(current_site.get_option('system_email', current_site.users.admin_scope.first.email), subject, args)
+  end
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.3.7.1'
+  VERSION = '2.3.7.2'
 end

data/lib/ext/string.rb

@@ -81,8 +81,9 @@ class String
     res = self
     values.each do |k, v|
       v = v.join(',') if v.is_a?(Array)
-      res = res.gsub("[#{k}]", v) if format_code == '['
-      res = res.gsub("{#{k}}", v) if format_code == '{'
+      res = res.gsub("[#{k}]", v.to_s) if format_code == '['
+      res = res.gsub("{#{k}}", v.to_s) if format_code == '{'
+      res = res.gsub("%{#{k}}", v.to_s) if format_code == '%{'
     end
     res
   end

data/lib/plugin_routes.rb

@@ -106,7 +106,7 @@ class PluginRoutes
     end
     # convert action parameter into hash
     def fixActionParameter(h)
-      (h.is_a?(ActionController::Parameters) ? (h.to_h rescue h.to_hash) : h)
+      (h.is_a?(ActionController::Parameters) ? (h.permit!.to_h rescue h.to_hash) : h)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.7.1
+  version: 2.3.7.2
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt