camaleon_cms 2.4.5 → 2.4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ba2d38e01f825dbd28a578fba4e20f455e8b89
-  data.tar.gz: 140daab06e34c6731cf9887258d56e9b2fb1bcf2
+  metadata.gz: 85e1b055e6161ffaa93a6974f060af2f30d36d08
+  data.tar.gz: 52cd5e9b93f954eb2211bd743221aa7f27c7e42a
 SHA512:
-  metadata.gz: 02383fdb162819ed20ee42f314dc141c2fb887729a6cf5c85fddf0e1a686cc2bede53fc00516b8f5576b5acce88c4fb85d240845f3f6969eabf76c0ed1dd803d
-  data.tar.gz: ed8958c0a60d386cdb2d6f03d0d798b7d707c012f2729eb8c7edb886be13fd0eabd0833b006a752e389b8145a7b87b8b322a03ec77db20e46d9c285e45b929fe
+  metadata.gz: 22acb2602e5d8ea3f194be6d5923b61ea1fbef308b41e174ff619ee6e3e415f2f1d01af29669d668a6b6538121fd59f7e26aa10cbd04c701a7493369bc9839eb
+  data.tar.gz: a54d8e653a938354ba5ce9976cfe0096909686ea0822d9ea40a87e803d59b2c6593b038e631f3544a6808b95461c2d98e0b4510edea1bbb0722fb9af3cc5fc45

data/app/assets/javascripts/camaleon_cms/admin/admin-manifest.js

@@ -7,49 +7,49 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets) for details
 // about supported directives.
 //
 //= require jquery
-//= require ./_data
+//= require camaleon_cms/admin/_data
 //= require camaleon_cms/bootstrap.min
-//= require ./_jquery-ui.min
-//= require ./_underscore
-//= require ./jquery.validate
+//= require camaleon_cms/admin/_jquery-ui.min
+//= require camaleon_cms/admin/_underscore
+//= require camaleon_cms/admin/jquery.validate
 
 // date picker
-//= require ./momentjs/_moment
-//= require ./_bootstrap-datepicker
+//= require camaleon_cms/admin/momentjs/_moment
+//= require camaleon_cms/admin/_bootstrap-datepicker
 
 //= require jquery_ujs
-//= require ./_bootstrap-select
+//= require camaleon_cms/admin/_bootstrap-select
 
-//= require ./_jquery.slugify
-//= require ./_translator
-//= require ./_i18n
-//= require ./_custom_fields
+//= require camaleon_cms/admin/_jquery.slugify
+//= require camaleon_cms/admin/_translator
+//= require camaleon_cms/admin/_i18n
+//= require camaleon_cms/admin/_custom_fields
 
-//= require ./_libraries
-//= require ./_actions
-//= require ./introjs/_intro.min
+//= require camaleon_cms/admin/_libraries
+//= require camaleon_cms/admin/_actions
+//= require camaleon_cms/admin/introjs/_intro.min
 
 // uploader
-//= require ./uploader/uploader_manifest
+//= require camaleon_cms/admin/uploader/uploader_manifest
 
-//= require ./tageditor/_jquery.caret.min
-//= require ./tageditor/_jquery.tag-editor
+//= require camaleon_cms/admin/tageditor/_jquery.caret.min
+//= require camaleon_cms/admin/tageditor/_jquery.tag-editor
 
-//= require ./lte/app
+//= require camaleon_cms/admin/lte/app
 
 // tinymce
 //= require tinymce-jquery
-//= require ./tinymce/plugins/filemanager/plugin.min
+//= require camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min
 
 // post
-//= require ./_jquery.tagsinput.min
-//= require ./_post
+//= require camaleon_cms/admin/_jquery.tagsinput.min
+//= require camaleon_cms/admin/_post
 
-//= require ./_posttype
+//= require camaleon_cms/admin/_posttype
 
 // others
-//= require ./_user_profile
+//= require camaleon_cms/admin/_user_profile

data/app/controllers/camaleon_cms/admin/media_controller.rb

@@ -63,7 +63,8 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
         cama_uploader.delete_file(params[:folder].gsub("//", "/"))
         render inline: ""
       when 'crop_url'
-        r = cama_tmp_upload(params[:url], formats: params[:formats], name: params[:name])
+        params[:url] = (params[:url].start_with?('http') ? '' : current_site.the_url(locale: nil)) + params[:url]
+        r = cama_tmp_upload( params[:url], formats: params[:formats], name: params[:name])
         unless r[:error].present?
           params[:file_upload] = r[:file_path]
           sett = {remove_source: true}

data/app/controllers/camaleon_cms/admin/settings/custom_fields_controller.rb

@@ -82,7 +82,7 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
 
   # return boolean: true if all fields were saved successfully
   def _save_fields(group)
-    errors_saved, all_fields = group.add_fields(params.require(:fields).permit!, params.require(:field_options).permit!)
+    errors_saved, all_fields = group.add_fields(params[:fields] ? params.require(:fields).permit! : {}, params[:field_options] ? params.require(:field_options).permit! : {})
     group.set_option('caption', @caption)
     if errors_saved.present?
       flash[:error] = "<b>#{t('camaleon_cms.errors_found_msg', default: 'Several errors were found, please check.')}</b><br>#{errors_saved.map{|field| "#{field.name}: " + "#{field.errors.messages.map{|k,v| "#{k.to_s.titleize}: #{v.join('|')}"}.join(', ')}" }.join('<br>')}"

data/app/decorators/camaleon_cms/custom_fields_concern.rb

@@ -27,7 +27,7 @@ module CamaleonCms::CustomFieldsConcern
   end
 
   # the same function as get_fields_grouped(..) but this returns translated and shortcodes evaluated
-  def the_fields_grouped(field_keys, is_json_format = false)
+  def the_fields_grouped(field_keys, is_json_format = false, single_value = false)
     res = []
     object.get_fields_grouped(field_keys).each do |_group|
       group = {}.with_indifferent_access
@@ -37,6 +37,7 @@ module CamaleonCms::CustomFieldsConcern
         else
           group[k] = _group[k].map{|v| h.do_shortcode(v.to_s.translate(@_deco_locale), object) }
         end
+        group[k] = group[k].first if single_value
       end
       res << group
     end

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -210,7 +210,7 @@ module CamaleonCms::UploaderHelper
   #   dimension: 20x30
   # return: {file_path, error}
   def cama_tmp_upload(uploaded_io, args = {})
-    tmp_path = args[:path] || Rails.public_path.join("tmp", current_site.id.to_s)
+    tmp_path = args[:path] || File.join(Rails.public_path, "tmp", current_site.id.to_s).to_s
     FileUtils.mkdir_p(tmp_path) unless Dir.exist?(tmp_path)
     saved = false
     if uploaded_io.is_a?(String) && (uploaded_io.start_with?("data:")) # create tmp file using base64 format
@@ -223,7 +223,7 @@ module CamaleonCms::UploaderHelper
       saved =  true
     elsif uploaded_io.is_a?(String) && (uploaded_io.start_with?("http://") || uploaded_io.start_with?("https://"))
       return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_uploader.class.validate_file_format(uploaded_io, args[:formats])
-      uploaded_io = Rails.public_path.join(uploaded_io.sub(current_site.the_url(locale: nil), '')).to_s if uploaded_io.include?(current_site.the_url(locale: nil)) # local file
+      uploaded_io = File.join(Rails.public_path, uploaded_io.sub(current_site.the_url(locale: nil), '')).to_s if uploaded_io.include?(current_site.the_url(locale: nil)) # local file
       _tmp_name = uploaded_io.split("/").last.split('?').first; args[:name] = args[:name] || _tmp_name
       uploaded_io = open(uploaded_io)
     end

data/app/models/camaleon_cms/custom_field_group.rb

@@ -128,7 +128,7 @@ class CamaleonCms::CustomFieldGroup < CamaleonCms::CustomField
         owner = "CamaleonCms::#{class_name}".constantize.find(objectid) rescue "CamaleonCms::#{class_name}".constantize.find_by(slug: objectid) # owner model
       end
       (options[:default_values] || [options[:default_value]] || []).each do |value|
-        owner.field_values.create!(custom_field_id: field.id, custom_field_slug: field.slug,
+        owner.custom_field_values.create!(custom_field_id: field.id, custom_field_slug: field.slug,
           value: fix_meta_value(value)) if owner.present?
       end
     end

data/app/models/concerns/camaleon_cms/custom_fields_read.rb

@@ -71,7 +71,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   # get custom field values
   # _key: custom field key
   def get_field_values(_key, group_number = 0)
-    field_values.loaded? ? field_values.select{|f| f.custom_field_slug == key && f.group_number == group_number}.map{|f| f.value } : field_values.where(custom_field_slug: _key, group_number: group_number).pluck(:value)
+    custom_field_values.loaded? ? custom_field_values.select{|f| f.custom_field_slug == _key && f.group_number == group_number}.map{|f| f.value } : custom_field_values.where(custom_field_slug: _key, group_number: group_number).pluck(:value)
   end
   alias_method :get_fields, :get_field_values
 
@@ -92,7 +92,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   #   puts res[0]['my_slug1'].first ==> "val 1"
   def get_fields_grouped(field_keys)
     res = []
-    field_values.where(custom_field_slug: field_keys).order(group_number: :asc).group_by(&:group_number).each do |group_number, group_fields|
+    custom_field_values.where(custom_field_slug: field_keys).order(group_number: :asc).group_by(&:group_number).each do |group_number, group_fields|
       group = {}
       field_keys.each do |field_key|
         _tmp = []
@@ -109,7 +109,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   # {key1: {values: "single value", options: {a:1, b: 4}}, key2: {values: [multiple, values], options: {a=1, b=2} }} if include_options = true
   def get_field_values_hash(include_options = false)
     fields = {}
-    self.field_values.to_a.uniq.each do |field_value|
+    self.custom_field_values.to_a.uniq.each do |field_value|
       custom_field = field_value.custom_fields
       values = custom_field.values.where(objectid: self.id).pluck(:value)
       fields[field_value.custom_field_slug] = custom_field.cama_options[:multiple].to_s.to_bool ? values : values.first unless include_options
@@ -123,7 +123,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   # deprecated f attribute
   def get_fields_object(f=true)
     fields = {}
-    self.field_values.eager_load(:custom_fields).to_a.uniq.each do |field_value|
+    self.custom_field_values.eager_load(:custom_fields).to_a.uniq.each do |field_value|
       custom_field = field_value.custom_fields
       # if custom_field.options[:show_frontend].to_s.to_bool
       values = custom_field.values.where(objectid: self.id).pluck(:value)
@@ -194,13 +194,13 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   def set_field_values(datas = {})
     if datas.present?
       ActiveRecord::Base.transaction do 
-        self.field_values.delete_all
+        self.custom_field_values.delete_all
         datas.each do |index, fields_data|
           fields_data.each do |field_key, values|
             if values[:values].present?
               order_value = -1
               ((values[:values].is_a?(Hash) || values[:values].is_a?(ActionController::Parameters)) ? values[:values].values : values[:values]).each do |value|
-                item = self.field_values.create!({custom_field_id: values[:id], custom_field_slug: field_key, value: fix_meta_value(value), term_order: order_value += 1, group_number: values[:group_number] || 0})
+                item = self.custom_field_values.create!({custom_field_id: values[:id], custom_field_slug: field_key, value: fix_meta_value(value), term_order: order_value += 1, group_number: values[:group_number] || 0})
               end
             end
           end
@@ -212,7 +212,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   # update new value for field with slug _key
   # Sample: my_posy.update_field_value('sub_title', 'Test Sub Title')
   def update_field_value(_key, value = nil, group_number = 0)
-    self.field_values.where(custom_field_slug: _key, group_number: group_number).first.update_column('value', value) rescue nil
+    self.custom_field_values.where(custom_field_slug: _key, group_number: group_number).first.update_column('value', value) rescue nil
   end
 
   # Set custom field values for current model
@@ -242,14 +242,14 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
     unless args[:field_id].present?
       raise ArgumentError, "There is no custom field configured for #{key}"
     end
-    self.field_values.where({custom_field_slug: key, group_number: args[:group_number]}).delete_all if args[:clear]
+    self.custom_field_values.where({custom_field_slug: key, group_number: args[:group_number]}).delete_all if args[:clear]
     v = {custom_field_id: args[:field_id], custom_field_slug: key, value: fix_meta_value(value), term_order: args[:order], group_number: args[:group_number]}
     if value.is_a?(Array)
       value.each do |val|
-        self.field_values.create!(v.merge({value: fix_meta_value(val)}))
+        self.custom_field_values.create!(v.merge({value: fix_meta_value(val)}))
       end
     else
-      self.field_values.create!(v)
+      self.custom_field_values.create!(v)
     end
   end
 

data/app/uploaders/camaleon_cms_uploader.rb

@@ -112,7 +112,7 @@ class CamaleonCmsUploader
     format.downcase.gsub(' ', '').split(',').each do |f|
       res << case f
                 when 'image', 'images'
-                  "jpg,jpeg,png,gif,bmp,ico"
+                  "jpg,jpeg,png,gif,bmp,ico,svg"
                 when 'video', 'videos'
                   "flv,webm,wmv,avi,swf,mp4,mov,mpg"
                 when 'audio'

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_audio.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
+  <input type="text" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
   <span class="input-group-addon btn_upload" onclick="load_upload_audio_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_audio')%></span>
-</div>
+</div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_file.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" data-formats="<%= field.options[:formats] || "" %>" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control input-value data-error-place-parent file_format <%= "required" if field.options[:required].to_s.to_bool %>"  />
+  <input type="text" data-formats="<%= field.options[:formats] || "" %>" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control input-value data-error-place-parent file_format <%= "required" if field.options[:required].to_s.to_bool %>"  />
   <span class="input-group-addon btn_upload" onclick="load_upload_file_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_file') %></span>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb

@@ -5,7 +5,7 @@
         data-dimension="<%= field.options[:dimension] %>"
         data-versions="<%= field.options[:versions] %>"
         data-thumb_size="<%= field.options[:thumb_size] %>"
-        type="url"
+        type="text"
         name="<%= field_name %>[<%= field.slug %>][values][]"
         class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
     <span class="input-group-addon btn_upload" onclick="load_upload_image_field($(this).prev());" style="cursor: pointer;">

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_url.html.erb

@@ -1,3 +1,3 @@
 <div class="group-input-fields-content" data-callback-render="custom_field_url_callback">
-  <input type="url" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control url input-value <%= 'is_translate' if field.options[:translate].to_s.to_bool %> <%= "required" if field.options[:required].to_s.to_bool %>" />
+  <input type="text" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control url input-value <%= 'is_translate' if field.options[:translate].to_s.to_bool %> <%= "required" if field.options[:required].to_s.to_bool %>" />
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_video.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
+  <input type="text" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
   <span class="input-group-addon btn_upload" onclick="load_upload_video_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_video')%></span>
 </div>

data/app/views/camaleon_cms/default_theme/single.json.jbuilder

@@ -6,7 +6,7 @@ json.urls @post.the_urls
 
 json.partial! partial: 'partials/cama_comments_entry', locals:{ post: @post }
 
-json.fields @post.the_fields_grouped(@post.field_values.pluck(:custom_field_slug))
+json.fields @post.the_fields_grouped(@post.custom_field_values.pluck(:custom_field_slug))
 
 json.categories @post.categories.decorate do |category|
   json.partial! partial: 'partials/cama_category_entry', locals:{ category: category }

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.5'
+  VERSION = '2.4.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.5.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -1106,67 +1106,67 @@ signing_key:
 specification_version: 4
 summary: Camaleon is a cms for Ruby on Rails 4 as an alternative to wordpress.
 test_files:
-- spec/decorators/camaleon_cms/post_decorator_spec.rb
-- spec/decorators/post_type_spec.rb
+- spec/spec_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/schema.rb
 - spec/dummy/Rakefile
+- spec/dummy/db/schema.rb
 - spec/dummy/README.rdoc
-- spec/features/categories_spec.rb
-- spec/features/comments_spec.rb
-- spec/features/contact_form_spec.rb
+- spec/mailers/send_mail_spec.rb
+- spec/decorators/camaleon_cms/post_decorator_spec.rb
+- spec/decorators/post_type_spec.rb
+- spec/features/session_spec.rb
+- spec/features/widgets_spec.rb
+- spec/features/posts_spec.rb
 - spec/features/content_groups_spec.rb
-- spec/features/custom_fields_spec.rb
-- spec/features/frontend/pages_spec.rb
-- spec/features/languages_spec.rb
+- spec/features/sites_spec.rb
 - spec/features/media_spec.rb
+- spec/features/frontend/pages_spec.rb
+- spec/features/user_roles_spec.rb
 - spec/features/menus_spec.rb
+- spec/features/custom_fields_spec.rb
 - spec/features/pages_spec.rb
-- spec/features/plugins_spec.rb
-- spec/features/posts_spec.rb
-- spec/features/session_spec.rb
-- spec/features/settings_spec.rb
 - spec/features/shortcodes_spec.rb
-- spec/features/sites_spec.rb
+- spec/features/plugins_spec.rb
 - spec/features/tags_spec.rb
-- spec/features/themes_spec.rb
-- spec/features/user_roles_spec.rb
+- spec/features/categories_spec.rb
+- spec/features/settings_spec.rb
 - spec/features/users_spec.rb
-- spec/features/widgets_spec.rb
-- spec/helpers/email_helper_spec.rb
-- spec/helpers/short_code_helper_spec.rb
-- spec/mailers/send_mail_spec.rb
+- spec/features/themes_spec.rb
+- spec/features/comments_spec.rb
+- spec/features/contact_form_spec.rb
+- spec/features/languages_spec.rb
 - spec/models/user_spec.rb
-- spec/rails_helper.rb
-- spec/routing/post_type_routes_spec.rb
-- spec/spec_helper.rb
 - spec/support/common.rb
-- spec/support/custom_admin.html.erb
 - spec/support/wait_for_ajax.rb
+- spec/support/custom_admin.html.erb
+- spec/routing/post_type_routes_spec.rb
+- spec/rails_helper.rb
+- spec/helpers/short_code_helper_spec.rb
+- spec/helpers/email_helper_spec.rb