camaleon_cms 2.4.6.9 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c8476ef3365232d1b41494c06c66d5209132e46de2d82d138e57248b213af5
-  data.tar.gz: 4fde82e12120242fc58dcd5e14222084be61437c6bc30bda69acd1197be930f3
+  metadata.gz: f5d5227bb2b35a92317e34504f8f4e6761572e4b56205f800499b1be6970b33f
+  data.tar.gz: 80880a6f96cba71ea2407da6c0913dd1cd9f18208cdf0c3d584151969e6ad3ff
 SHA512:
-  metadata.gz: 0aa4621ffcac1e2b76fdd1e8b6544e61c1d15bd9128c0fc8b93f3b7b9cb3ee227e3fe625ccbb5044459b3f59a3906b33dd47a6d900fb92017f8bdc46e5d138a5
-  data.tar.gz: 9091e5e86b0e486abcdd6efb3b90597444b9339d82d93a421d83c4108d3af23fafe26f6063dfb146b9b2651df0c6d0d235726473bd4c78dd126bfc2ae35d69e1
+  metadata.gz: 50018c854c231ff6d29f0a2e5ffe216303dd81610d9319bb7679f75709410b9353cd037bcb7829f328b44b2f3bc08cd9225c5e37da591fc54b68d714f8cac4bd
+  data.tar.gz: 314dd4a5224c69799bf849b1e36f39737cc776d47fe9d8786c5209d6799824ea91e09035db46468c9fbb0cab460b0dadba5974bb24ab987069b3c26c5a5347a0

data/README.md

@@ -123,6 +123,9 @@ http://camaleon.tuzitio.com/store/plugins
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # latest development version
 
   # gem 'draper', '~> 3' # for Rails 5+
+  
+  # For Ruby version < 2.5 
+  # gem 'sprockets', '< 4' # Sprockets 4 requires Ruby version >= 2.5 
   ```
 
 * Install required Gem and dependencies

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

@@ -2,9 +2,6 @@
 //= link_tree ../images
 //= link_tree ../javascripts
 //= link_tree ../stylesheets
-//= link_tree ../../apps/themes/default/assets
-//= link_tree ../../apps/themes/camaleon_first/assets
-//= link_tree ../../apps/themes/new/assets
 //= link_tree ../../apps/plugins/visibility_post/assets/js
 //= link plugins/cama_contact_form/admin_editor.js
 //= link camaleon_cms/admin/nav_menu.js

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -243,7 +243,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     lookup_context.prefixes.delete_if{|t| t =~ /themes\/(.*)\/views/i || t == "camaleon_cms/default_theme" || t == "themes/#{current_site.id}/views" }
 
     lookup_context.prefixes.append("themes/#{current_site.id}/views") if Dir.exist?(Rails.root.join('app', 'apps', 'themes', current_site.id.to_s).to_s)
-    lookup_context.prefixes.append("themes/#{current_site.get_theme_slug}/views")
+    lookup_context.prefixes.append("themes/#{current_theme.slug}/views")
     lookup_context.prefixes.append("camaleon_cms/default_theme")
 
     lookup_context.prefixes = lookup_context.prefixes.uniq

data/app/helpers/camaleon_cms/session_helper.rb

@@ -141,7 +141,9 @@ module CamaleonCms::SessionHelper
   # return the session id
   def cama_get_session_id
     session[:autor] = "Owen Peredo Diaz" unless request.session_options[:id].present?
-    request.session_options[:id]
+    id = request.session_options[:id]
+    id = id.public_id if id && id.class.name == 'Rack::Session::SessionId'
+    id
   end
 
   private

data/config/initializers/assets.rb

@@ -3,4 +3,25 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-Rails.application.config.tinymce.install = :compile
+Rails.application.config.tinymce.install = :copy
+
+# Add additional assets to the asset load path
+Rails.application.config.assets.precompile += %w( camaleon_cms/* )
+# Rails.application.config.assets.precompile += %w( themes/*/assets/* )
+
+# This will precompile any assets, not just JavaScript (.js, .coffee, .swf, .css, .scss)
+
+sprokects_4_or_newer = defined?(Sprockets::BabelProcessor)
+unless sprokects_4_or_newer
+  Rails.application.config.assets.precompile << Proc.new { |path|
+    res = false
+    if File.dirname(path).start_with?('plugins/') || File.dirname(path).start_with?('themes/')
+      name = File.basename(path)
+      content_type = MIME::Types.type_for(name).first.content_type rescue ""
+      if (path =~ /\.(css|js|svg|ttf|woff|eot|swf|pdf|png|jpg|gif)\z/ || content_type.scan(/(javascript|image\/|audio|video|font)/).any?) && !name.start_with?("_") && !path.include?('/views/')
+        res = true
+      end
+    end
+    res
+  }
+end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.6.9'
+  VERSION = '2.5.0'
 end

data/lib/generators/camaleon_cms/install_generator.rb

@@ -12,6 +12,28 @@ module CamaleonCms
         Dir.mkdir Rails.root.join("app", "apps").to_s unless Dir.exist?(Rails.root.join("app", "apps").to_s)
         directory("apps", "app/apps")
         directory( File.join($camaleon_engine_dir, 'app/apps/themes').to_s, 'app/apps/themes')
+
+        sprokects_4_or_newer = defined?(Sprockets::BabelProcessor)
+        if sprokects_4_or_newer
+          assets_config_dir = Rails.root.join('app', 'assets', 'config')
+          FileUtils.makedirs(assets_config_dir)
+          assets_config_file = assets_config_dir.join('manifest.js')
+          FileUtils.touch(assets_config_file) unless File.file?(assets_config_file)
+          append_to_file assets_config_file, <<~ASSETS
+  
+                                               // Camaleon CMS assets
+                                               //= link camaleon-cms.js
+                                               //= link_tree ../../apps/themes/camaleon_first/assets
+                                               //= link_tree ../../apps/themes/default/assets
+                                               //= link_tree ../../apps/themes/new/assets
+                                             ASSETS
+          append_to_file Rails.root.join('config', 'initializers', 'assets.rb'),
+            <<~PRECOMPILE_MANIFEST
+  
+              Rails.application.config.assets.precompile += %w( manifest.js )
+            PRECOMPILE_MANIFEST
+        end
+
         append_to_file 'Gemfile' do
           "\n\n#################### Camaleon CMS include all gems for plugins and themes #################### \nrequire './lib/plugin_routes' \ninstance_eval(PluginRoutes.draw_gems)"
         end

data/spec/dummy/app/assets/config/manifest.js

@@ -1,4 +1,8 @@
 //= link_tree ../images
 //= link_tree ../javascripts
 //= link_tree ../stylesheets
+//= link_tree ../../../../../app/apps/themes/default/assets
+//= link_tree ../../../../../app/apps/themes/camaleon_first/assets
+//= link_tree ../../../../../app/apps/themes/new/assets
 //= link camaleon-cms.js
+//= link camaleon_cms/admin/nav_menu.js

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.6.9
+  version: 2.5.0
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -376,16 +376,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: '0'
 description: Camaleon CMS is a dynamic and advanced content management system based
   on Ruby on Rails as an alternative to Wordpress.
 email:
@@ -1160,7 +1160,7 @@ requirements:
 - ruby >= 2.2
 - imagemagick
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Camaleon is a CMS for Ruby on Rails as an alternative to Wordpress.