camaleon_cms 2.4.3.2 → 2.4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 309565425b7415af401d6ea4a5238345397f9766
-  data.tar.gz: b97b8586392c7c6694d99053b02deb200baababc
+  metadata.gz: 321930f8abe547acf106294eafd897348c7aaf30
+  data.tar.gz: e63df5bbaeda1b1c9ffd0ea57b204d2673e5ff31
 SHA512:
-  metadata.gz: 8e5b72a18704f4dba361c8a64fabefc1c6f3d065a33745f73dd35c2c75879d397fe0a2e15df9165475d93844e880ec17a65b8e5cc3c094a08efc75d705eefc92
-  data.tar.gz: 6133cee060a592483e03afe30d1769a8378d1fa4e724489bd014e8f2111a352ef8e425bcf0a214860bc5355f1db5b172cb9739bd8c2264800b1f8554e3ce84a5
+  metadata.gz: 5d6041288936dfe812038b6f18c8848a15aaabfee9d1b890c59913c88090191ebaa454cdb77c2dbbe318a64d8db54cd0340dadec6c38e5388c4bc5f92d0f9869
+  data.tar.gz: 711300967ce1541635e9984b327d7a5a5526ca2894a290a33b28135c5469b04371f6fc3ef315e61c44e534754d1d0d743ecc32cc531ea50ce535198ab668b0e4

data/README.md

@@ -39,20 +39,18 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>= 2.4.3.2' # Stable versions 2.3.6, 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>= 2.4.3.3' # 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
   
-  Add in your Gemfile
+  Add in your Gemfile draper for Rails 5
   ```
-  gem 'activemodel-serializers-xml', git: 'https://github.com/rails/activemodel-serializers-xml'
-  gem 'draper', github: 'audionerd/draper', branch: 'rails5'
+  gem 'draper', github: 'drapergem/draper'
   ```
-  Create a file "lib/rails/test_unit/sub_test_task.rb" in your project (draper patch)
+  In your Gemfile, change sass-rails into (Camaleon doesn't support for sprockets >= 4 which is included in sass-rails >= 6)
   ```
-  class Rails::SubTestTask < Rake::TestTask
-  end
+  gem 'sass-rails', '~> 5.0'
   ```
   
 * Install required Gem and dependencies
@@ -80,7 +78,7 @@
 
 # Camaleon CMS (It adapts to your needs)
 
-Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4 and Ruby 1.9.3+. This CMS is an alternative to wordpress for Ruby on Rails developers to manage advanced contents easily.
+Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4+ and Ruby 1.9.3+. This CMS is an alternative to wordpress for Ruby on Rails developers to manage advanced contents easily.
 Camaleon CMS is a flexible manager where you can build your custom content structure without coding anything by custom fields and custom contents type.
 
 To download or publish themes go to themes store:
@@ -101,7 +99,7 @@ It was released on July, 2015 and tested previously with more than 20 projects b
 * Extend or customize the functionalities by plugins
 * Manage your content visualization by themes
 * Advanced User roles
-* Integrate into existent rails 4 projects
+* Integrate into existent rails 4+ projects
 * Other features:
   - Shortcodes
   - Widgets

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -45,7 +45,7 @@ module CamaleonCms::ShortCodeHelper
                     key: (String) Post slug
                     field: (String) Custom field key, you can add render_field='true' to render field as html element, also you can add index=2 to indicate the value in position 2 for multitple values
                     attrs: (String) attribute name
-                            post: title | created_at | excerpt | url | link | thumb | updated_at | author_name | author_url
+                            post: title | created_at | excerpt | url | link | thumb | updated_at | author_name | author_url | content
                             posttype: title | created_at | excerpt | url | link | thumb | updated_at
                             category: title | created_at | excerpt | url | link | thumb | updated_at
                             posttag: title | created_at | excerpt | url | link | thumb | updated_at

data/app/views/camaleon_cms/admin/settings/site.html.erb

@@ -47,9 +47,9 @@
               </div>
               <div class="form-group admin_logo_upload">
                 <label for=""><%= t('camaleon_cms.admin.table.logo') %></label><br>
-                <%= hidden_field :options, :logo, :class => "form-control unput_upload", :value => @site.get_option("logo") %>
+                <%= hidden_field :options, :logo, :class => "form-control unput_upload", :value => @site.get_option("logo"), "data-label" => "#{t('camaleon_cms.admin.button.upload_image')}" %>
               </div>
-              <div class="form-group admin_logo_upload">
+              <div class="form-group admin_icon_upload">
                 <label for=""><%= t('camaleon_cms.admin.table.favicon') %></label><br>
                 <%= hidden_field :options, :icon, :class => "form-control unput_upload", :value => @site.get_option("icon"), "data-label" => "#{t('camaleon_cms.admin.button.upload_icon')}", "data-ext" => "ico" %>
               </div>
@@ -95,4 +95,4 @@
             $(this).removeAttr("disabled");
         }).trigger("change");
     });
-</script>
+</script>

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   scope PluginRoutes.system_info["relative_url_root"], as: "cama" do
     # root "application#index"
-    default_url_options :host => (CamaleonCms::Site.main_site.slug rescue "")
+    default_url_options PluginRoutes.default_url_options
 
     # public
     get 'error', as: "error", to: 'camaleon_cms/camaleon#render_error'

data/db/migrate/20150611161134_post_table_into_utf8.rb

@@ -1,4 +1,4 @@
-class PostTableIntoUtf8 < ActiveRecord::Migration
+class PostTableIntoUtf8 < CamaManager.migration_class
   def change
     if table_exists? CamaleonCms::User.table_name
       add_column(CamaleonCms::User.table_name, :email, :string) unless column_exists?(CamaleonCms::User.table_name, :email)

data/db/migrate/20150926095310_rename_column_posts.rb

@@ -1,5 +1,5 @@
 # change post structure to optimize query speed
-class RenameColumnPosts < ActiveRecord::Migration
+class RenameColumnPosts < CamaManager.migration_class
   def change
     remove_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :comment_count
     add_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :post_order, :integer, default: 0

data/db/migrate/20151212095328_add_confirm_token_to_users.rb

@@ -1,4 +1,4 @@
-class AddConfirmTokenToUsers < ActiveRecord::Migration
+class AddConfirmTokenToUsers < CamaManager.migration_class
   def change
     add_column CamaleonCms::User.table_name, :confirm_email_token, :string, default: nil
     add_column CamaleonCms::User.table_name, :confirm_email_sent_at, :datetime, default: nil

data/db/migrate/20160504155652_add_feature_to_posts.rb

@@ -1,4 +1,4 @@
-class AddFeatureToPosts < ActiveRecord::Migration
+class AddFeatureToPosts < CamaManager.migration_class
   def change
     add_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :is_feature, :boolean, default: false
   end

data/db/migrate/20160504155653_move_first_name_of_users.rb

@@ -1,4 +1,4 @@
-class MoveFirstNameOfUsers < ActiveRecord::Migration
+class MoveFirstNameOfUsers < CamaManager.migration_class
   def change
     add_column CamaleonCms::User.table_name, :first_name, :string unless column_exists?(CamaleonCms::User.table_name, :first_name)
     add_column CamaleonCms::User.table_name, :last_name, :string unless column_exists?(CamaleonCms::User.table_name, :last_name)

data/db/migrate/20160606135421_improve_menus_structure.rb

@@ -1,4 +1,4 @@
-class ImproveMenusStructure < ActiveRecord::Migration
+class ImproveMenusStructure < CamaManager.migration_class
   def change
     CamaleonCms::NavMenuItem.all.each do |menu|
       menu.update_columns({description: menu.get_option('object_id'), slug: menu.get_option('type')})

data/db/migrate/20160609121449_add_group_to_custom_field_values.rb

@@ -1,4 +1,4 @@
-class AddGroupToCustomFieldValues < ActiveRecord::Migration
+class AddGroupToCustomFieldValues < CamaManager.migration_class
   def change
     add_column "#{PluginRoutes.static_system_info["db_prefix"]}custom_fields_relationships", :group_number, :integer, default: 0
   end

data/db/migrate/20161206211917_install_migrated_seo_plugin.rb

@@ -1,4 +1,4 @@
-class InstallMigratedSeoPlugin < ActiveRecord::Migration
+class InstallMigratedSeoPlugin < CamaManager.migration_class
   # install seo plugin without calling hooks (seo logic moved to separated plugin)
   def change
     CamaleonCms::Site.all.each do |s|

data/db/migrate/20161215202255_drop_user_relationship_table.rb

@@ -1,4 +1,4 @@
-class DropUserRelationshipTable < ActiveRecord::Migration
+class DropUserRelationshipTable < CamaManager.migration_class
   def change
     drop_table "#{PluginRoutes.static_system_info["db_prefix"]}user_relationships"
   end

data/lib/camaleon_cms/engine.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bcrypt'
 require 'cancancan'
-require 'draper'
 require 'meta-tags'
 require 'mini_magick'
 # require 'mobu'
@@ -13,13 +12,15 @@ require 'font-awesome-rails'
 require 'tinymce-rails'
 require 'jquery-rails'
 require 'coffee-rails'
-require 'sass-rails'
+# require 'sass-rails'
 require 'cama_contact_form'
 require 'cama_meta_tag'
 
 $camaleon_engine_dir = File.expand_path("../../../", __FILE__)
 require File.join($camaleon_engine_dir, "lib", "plugin_routes").to_s
 Dir[File.join($camaleon_engine_dir, "lib", "ext", "**", "*.rb")].each{ |f| require f }
+require 'draper' if PluginRoutes.isRails4?
+
 module CamaleonCms
   class Engine < ::Rails::Engine
     config.before_initialize do |app|

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.2'
+  VERSION = '2.4.3.3'
 end

data/lib/plugin_routes.rb

@@ -368,7 +368,17 @@ class PluginRoutes
   rescue
     Gem.available?(name)
   end
+  
+  # return the default url options for Camaleon CMS
+  def self.default_url_options
+    {host: (CamaleonCms::Site.main_site.slug rescue "")}
+  end
+  
+  def self.migration_class
+    isRails4? ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+  end
 end
+CamaManager = PluginRoutes
 
 #********* fix missing helper method for breadcrumb on rails gem **********#
 if PluginRoutes.isRails5?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.2
+  version: 2.4.3.3
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -182,16 +182,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.6
 - !ruby/object:Gem::Dependency
   name: cama_contact_form
   requirement: !ruby/object:Gem::Requirement