RubyGems - camaleon_cms - Versions diffs - 2.3.5 → 2.3.6 - Mend

camaleon_cms 2.3.5 → 2.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of camaleon_cms might be problematic. Click here for more details.

Files changed (15) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d2184b7ea6bb88e684705845b1d72fe9774b55
-  data.tar.gz: 4a9a0cfcb3561742754573763df1df457acfb327
+  metadata.gz: af1af7b67e70d26c3020d77aed3d468e8d8c27a1
+  data.tar.gz: 9dbb8a86e09a60fbdc8e4cdc74e9f48fb8c373fc
 SHA512:
-  metadata.gz: 0b8f36b2eb1be3ddd83695270eb5cb6cbc7f1bfea8fe95bc01427e159534cbb371bd959a5c76b95cec9625b2509167ad2d114417262717676dc05fc71e9ae566
-  data.tar.gz: 5cdc8e9787b638b3688589e4a18e3a673a81c4861efd0b5c0daccf495118e261f270865619685b5d9c8012caf579d9f02f844b1826177fe64f0dad20a35e7913
+  metadata.gz: ec69dfae57a3f430ca5df628bcc0d6e7f4ad15b916a579de233c92874987506dace7c4464c2d2e96a3bd87c41513b1274cfe67679c5431bdb6e138389aa05c25
+  data.tar.gz: 38b58bfb8d7001edab29f52ba3cf22f2a4f04d3fd9b1df8123d70a9127034db1e1ed93cbf3acf122f7cddde48106bc918f57392b14f0e2a4d2f9d72fcc427d82

data/app/apps/themes/default/assets/js/main.js ADDED

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// 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
+// about supported directives.
+//
+//= require jquery

data/app/apps/themes/default/views/layouts/index.html.erb CHANGED

@@ -9,6 +9,7 @@
     <%#= javascript_include_tag theme_asset_path("js/main.js") %>
     <%= stylesheet_link_tag theme_asset_path("css/main.css") %>
     <%= stylesheet_link_tag theme_asset_path("genericons/genericons.css") %>
+    <%= javascript_include_tag theme_asset_path("js/main.js") %>
     <%= raw the_head %>
 </head>
 <body>

data/app/assets/javascripts/camaleon_cms/admin/_data.js CHANGED

@@ -1,4 +1,3 @@
-// generate default settings for tinymce editor
 function cama_get_tinymce_settings(settings){
     if(!settings) settings = {};
     var def = {
@@ -62,5 +61,4 @@ function cama_get_tinymce_settings(settings){
     };
     for(var ff in tinymce_global_settings["settings"]) tinymce_global_settings["settings"][ff](settings, def);
     return $.extend({}, def, settings);
-}
+}

data/app/helpers/camaleon_cms/short_code_helper.rb CHANGED

@@ -141,7 +141,7 @@ module CamaleonCms::ShortCodeHelper
     if @_shortcodes_template[code].class.name == "Proc"
       res = @_shortcodes_template[code].call(_shortcode_parse_attr(attrs), args)
     else
-      res = render :file => template, :locals => {attributes: _shortcode_parse_attr(attrs), args: args}
+      res = render :file => template, :locals => {attributes: _shortcode_parse_attr(attrs), args: args}, formats: [:html]
     end
     res
   end

data/app/models/camaleon_cms/user.rb CHANGED

@@ -6,5 +6,8 @@ unless PluginRoutes.static_system_info['user_model'].present?
     # attr_accessible :is_valid_email
     default_scope {order("#{CamaleonCms::User.table_name}.role ASC")}
+    validates :username, :presence => true
+    validates :email, :presence => true, :format => { :with => /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i } #, :unless => Proc.new { |a| a.auth_social.present? }
+    has_secure_password #validations: :auth_social.nil?
   end
 end

data/app/models/concerns/camaleon_cms/user_methods.rb CHANGED

@@ -12,12 +12,8 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     include CamaleonCms::Metas
     include CamaleonCms::CustomFieldsRead
-    validates :username, :presence => true
-    validates :email, :presence => true, :format => { :with => /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i } #, :unless => Proc.new { |a| a.auth_social.present? }
     validates_with CamaleonCms::UniqValidatorUser
-    has_secure_password #validations: :auth_social.nil?
     before_create { generate_token(:auth_token) }
     before_save :before_saved
     before_create :before_saved
@@ -44,10 +40,6 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     site.posts.where(user_id: self.id)
   end
-  def _id
-    "#{self.role.upcase}-#{self.id}"
-  end
   def fullname
     "#{self.first_name} #{self.last_name}".titleize
   end

data/app/views/camaleon_cms/default_theme/category.json.jbuilder ADDED

@@ -0,0 +1,11 @@
+json.title @category.the_title
+json.description @category.the_excerpt
+json.link @category.the_url
+json.guid @category.the_id
+json.thumb @category.the_thumb_url
+json.post_type do
+  json.partial! partial: 'partials/cama_post_type', locals:{ post_type: @post_type }
+end
+json.posts do
+  json.partial! partial: 'partials/cama_posts_entries', locals:{ posts: @posts }
+end

data/app/views/camaleon_cms/default_theme/partials/_cama_post_entry.json.jbuilder ADDED

@@ -0,0 +1,7 @@
+json.extract! post, :created_at, :updated_at, :status, :post_parent, :published_at, :user_id, :post_order, :is_feature
+json.title post.the_title
+json.description post.the_excerpt
+json.content post.the_content
+json.url post.the_url
+json.slug post.the_slug
+json.thumb post.the_thumb_url

data/app/views/camaleon_cms/default_theme/partials/_cama_post_type.json.jbuilder ADDED

@@ -0,0 +1,6 @@
+json.extract! post_type, :created_at, :updated_at, :term_order
+json.title post_type.the_title
+json.description post_type.the_excerpt
+json.url post_type.the_url
+json.slug post_type.the_slug
+json.thumb post_type.the_thumb_url

data/app/views/camaleon_cms/default_theme/partials/_cama_posts_entries.json.jbuilder ADDED

@@ -0,0 +1,8 @@
+json.current_page  posts.current_page
+json.per_page posts.per_page
+json.total_entries posts.total_entries
+json.previous_page url_for(params.merge(page: posts.previous_page)) if posts.previous_page.present?
+json.next_page url_for(params.merge(page: posts.next_page)) if posts.next_page.present?
+json.entries posts.decorate do |post|
+  json.partial! partial: 'partials/cama_post_entry', locals:{ post: post }
+end

data/app/views/camaleon_cms/default_theme/search.json.jbuilder ADDED

	@@ -0,0 +1 @@
1	+ json.partial! partial: 'partials/cama_posts_entries', locals:{ posts: @posts }

data/config/routes/frontend.rb CHANGED

@@ -54,7 +54,7 @@ Rails.application.routes.draw do
         end
         # posts
-        constraints(format: /html|rss/) do
+        constraints(format: /html|rss|json/) do
           get ':parent_title/*slug(.:format)' => :post, as: :hierarchy_post, constraints:{ parent_title: /(?!(#{PluginRoutes.all_locales}))[\w\-]+/, slug: /[a-zA-Z0-9_=\s\-\/]+/ }
           get ":slug(.:format)" => :post, :as => :post, constraints: { slug: /[a-zA-Z0-9_=\s\-]+/}
         end

data/lib/camaleon_cms/version.rb CHANGED

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.3.5'
+  VERSION = '2.3.6'
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -445,6 +445,7 @@ files:
 - app/apps/themes/default/assets/images/image.png
 - app/apps/themes/default/assets/images/search-icon-2x.png
 - app/apps/themes/default/assets/images/search-icon.png
+- app/apps/themes/default/assets/js/main.js
 - app/apps/themes/default/config/config.json
 - app/apps/themes/default/default_helper.rb
 - app/apps/themes/default/views/admin/settings.html.erb
@@ -836,6 +837,7 @@ files:
 - app/views/camaleon_cms/admin/users/profile/_settings.html.erb
 - app/views/camaleon_cms/default_theme/admin/settings.html.erb
 - app/views/camaleon_cms/default_theme/category.html.erb
+- app/views/camaleon_cms/default_theme/category.json.jbuilder
 - app/views/camaleon_cms/default_theme/category.rss.builder
 - app/views/camaleon_cms/default_theme/custom_fields/audio.html.erb
 - app/views/camaleon_cms/default_theme/custom_fields/checkbox.html.erb
@@ -864,6 +866,9 @@ files:
 - app/views/camaleon_cms/default_theme/layouts/cama_ajax.html.erb
 - app/views/camaleon_cms/default_theme/layouts/index.html.erb
 - app/views/camaleon_cms/default_theme/partials/_breadcrumb.html.erb
+- app/views/camaleon_cms/default_theme/partials/_cama_post_entry.json.jbuilder
+- app/views/camaleon_cms/default_theme/partials/_cama_post_type.json.jbuilder
+- app/views/camaleon_cms/default_theme/partials/_cama_posts_entries.json.jbuilder
 - app/views/camaleon_cms/default_theme/partials/_categories_list.html.erb
 - app/views/camaleon_cms/default_theme/partials/_comments.html.erb
 - app/views/camaleon_cms/default_theme/partials/_comments_list.html.erb
@@ -882,6 +887,7 @@ files:
 - app/views/camaleon_cms/default_theme/robots.text.erb
 - app/views/camaleon_cms/default_theme/rss.rss.builder
 - app/views/camaleon_cms/default_theme/search.html.erb
+- app/views/camaleon_cms/default_theme/search.json.jbuilder
 - app/views/camaleon_cms/default_theme/single.html.erb
 - app/views/camaleon_cms/default_theme/single.rss.builder
 - app/views/camaleon_cms/default_theme/sitemap.html.erb