camaleon_cms 2.5.3 → 2.5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4aca7ae3b2b5681d349a56ee41b6c88c1496f597ecd227252e33d042d59d6b5
-  data.tar.gz: 0c508dff5966bb018808e66bc08856b091bd36260586a8b811a33d588578baae
+  metadata.gz: 30adea4169e0803e53034bc3b43fab98c94d1283b7a61bce52381d0bcbc18d3e
+  data.tar.gz: b8e7c5cf3f14f1d72fd9725ec1e6c4c15babe9a5ccd8d89e35ba79bac49fd5a0
 SHA512:
-  metadata.gz: 1f1685362205e4e437190fc44af261518012f956877d00c42f62d1ac6fb24313b03b03665044289826dd65b6bd586bbb700a68d5055a504225d5a8e44b5adb45
-  data.tar.gz: 31363bff1b042fd665fa8d628871424f943ff9875e84985fcb69e26667b3bc1061eb56ac02588972ee497b7c6fc748c1f8bedcb49bbcd0579b739dd242ac199f
+  metadata.gz: 676d4efcc885eb8eb35b2ed29f3adeef52aba1438924ce4f90e6eb1151a6b801008722dcec0a1f85b6f8f080ca99dde33c6f9210326e69edfffd854717b5b846
+  data.tar.gz: '0529c9a722fb77fcae4d00391749a5fe1804a39dd33fa422ff6c8783baa2d6113f1d1547c9eb7408243511f011cd36c65f7d49d00f336a81920c008210e8a8aa'

data/app/assets/config/camaleon-cms.js

@@ -1,4 +1,3 @@
-//= link_tree ../fonts
 //= link_tree ../images
 //= link_tree ../javascripts
 //= link_tree ../stylesheets

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -21,7 +21,10 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # render category list
   def category
     begin
-      @category = current_site.the_full_categories.find(params[:category_id]).decorate
+      if params[:category_slug].present?
+        @category ||= current_site.the_full_categories.find_by_slug(params[:category_slug]).decorate
+      end
+      @category ||= current_site.the_full_categories.find(params[:category_id]).decorate
       @post_type = @category.the_post_type
     rescue
       return page_not_found

data/app/helpers/camaleon_cms/frontend/site_helper.rb

@@ -21,11 +21,6 @@ module CamaleonCms::Frontend::SiteHelper
     @cama_visited_post.present?
   end
 
-  # check if current section visited is for post
-  def is_profile?
-    @cama_visited_profile.present?
-  end
-
   # check if current section visited is for ajax
   def is_ajax?
     @cama_visited_ajax.present?
@@ -50,7 +45,7 @@ module CamaleonCms::Frontend::SiteHelper
   def is_category?
     @cama_visited_category.present?
   end
-  
+
   # check if visited page is user profile (frontend)
   def is_profile?
     @cama_visited_profile == true

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -239,7 +239,8 @@ module CamaleonCms::UploaderHelper
     uploaded_io = File.open(uploaded_io) if uploaded_io.is_a?(String)
     return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_uploader.class.validate_file_format(_tmp_name || uploaded_io.path, args[:formats])
     return {error: "#{ct("file_size_exceeded", default: "File size exceeded")} (#{number_to_human_size(args[:maximum])})"} if args[:maximum].present? && args[:maximum] < (uploaded_io.size rescue File.size(uploaded_io))
-    name = args[:name] || uploaded_io.try(:original_filename) || uploaded_io.path.split("/").last; name = "#{File.basename(name, File.extname(name)).underscore}#{File.extname(name)}"
+    name = args[:name] || uploaded_io&.original_filename || uploaded_io.path.split("/").last
+    name = "#{File.basename(name, File.extname(name)).parameterize}#{File.extname(name)}"
     path ||= uploader_verify_name(File.join(tmp_path, name))
     File.open(path, "wb"){|f| f.write(uploaded_io.read) } unless saved
     path = cama_resize_upload(path, args[:dimension]) if args[:dimension].present?

data/config/initializers/non_digest_assets.rb

@@ -0,0 +1,3 @@
+require 'non-digest-assets'
+
+NonDigestAssets.whitelist += [/glyphicons*/]

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.5.3'
+  VERSION = '2.5.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.3.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: non-digest-assets
+  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: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -505,11 +519,6 @@ files:
 - app/apps/themes/new/views/post_type.html.erb
 - app/apps/themes/new/views/search.html.erb
 - app/assets/config/camaleon-cms.js
-- app/assets/fonts/camaleon_cms/glyphicons-halflings-regular.eot
-- app/assets/fonts/camaleon_cms/glyphicons-halflings-regular.svg
-- app/assets/fonts/camaleon_cms/glyphicons-halflings-regular.ttf
-- app/assets/fonts/camaleon_cms/glyphicons-halflings-regular.woff
-- app/assets/fonts/camaleon_cms/glyphicons-halflings-regular.woff2
 - app/assets/images/camaleon.png
 - app/assets/images/camaleon_cms/admin/admin_spinner.gif
 - app/assets/images/camaleon_cms/admin/glyphicons-halflings.png
@@ -659,6 +668,11 @@ files:
 - app/assets/stylesheets/camaleon_cms/admin/uploader/uploader_manifest.css
 - app/assets/stylesheets/camaleon_cms/admin/widgets.css.scss
 - app/assets/stylesheets/camaleon_cms/bootstrap.min.css
+- app/assets/stylesheets/camaleon_cms/fonts/glyphicons-halflings-regular.eot
+- app/assets/stylesheets/camaleon_cms/fonts/glyphicons-halflings-regular.svg
+- app/assets/stylesheets/camaleon_cms/fonts/glyphicons-halflings-regular.ttf
+- app/assets/stylesheets/camaleon_cms/fonts/glyphicons-halflings-regular.woff
+- app/assets/stylesheets/camaleon_cms/fonts/glyphicons-halflings-regular.woff2
 - app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb
 - app/controllers/camaleon_cms/admin/appearances/themes_controller.rb
 - app/controllers/camaleon_cms/admin/appearances/widgets/assign_controller.rb
@@ -945,6 +959,7 @@ files:
 - config/initializers/custom_initializers.rb
 - config/initializers/mobu.rb
 - config/initializers/model_alias.rb
+- config/initializers/non_digest_assets.rb
 - config/initializers/sass.rb
 - config/locales/ar.yml
 - config/locales/camaleon_cms/admin/ar.yml