camaleon_cms 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f563bcf2d58db0bb34eb164a1e983395142b143b
-  data.tar.gz: 80d1a9b4536d849d0166841bb38de5b8077e06e6
+  metadata.gz: c1ba5c936124f4f5012e985ffa2380addcb3b741
+  data.tar.gz: e9aced89daa293cfaca1717564102bfd4c19b7b2
 SHA512:
-  metadata.gz: efcd7e9bf29c89ade2035d86e489247b1b99b6fa8927123236286fb6d9ff07920243b2c649f836f4687aad0ada8d97715c2bcf711c263dc993bcd914dce27440
-  data.tar.gz: a90a0451c52fb454d1d50510673acdb7bfce6d39e3fdeb93c9abc43ba4b2cfa82ee9563d1d767cc2fedc6861bbab16ed83f7f81fe5161e1b9226518dee7b4110
+  metadata.gz: 32c21dbff1283ac8e05ef6d59cc6f3f03c495684b57f302d99147bf2dd7de4339dfe3aa8164d4b3d501b453f50c4807501d7fead43c533f00ef228ca2eafa792
+  data.tar.gz: bbe6bc4fc4ea279ec53846f18d91b67ff59930ec64ac03f41b0216f29037a1f7325cee18e2bf37ffbd2373b67e73b365503ee8f26090d36c3144de936def94ae

data/README.md

@@ -28,8 +28,8 @@
 * Add the gem in your Gemfile
   
   ```
-  gem "camaleon_cms", github: 'owen2345/camaleon-cms', branch: "moduler" # version 2
-  # If you are using Camaleon CMS 1x, you can use this patch to use this new version
+  gem "camaleon_cms"
+  # If you are using Camaleon CMS 1x, you need to use this patch
   gem "migration1x", github: 'owen2345/camaleoncms_1xmigration'
   ```
 * Install required Gem and dependencies
@@ -37,7 +37,7 @@
   ```
   bundle install
   ```
-* Install the CMS (This will copy some basic templates and plugins in your project)
+* Install the CMS (before this, you can change defaut configuration in config/system.json)
 
   ```
   rails generate camaleon_cms:install
@@ -52,6 +52,7 @@
   ```
   rails server # and then go to your browser http://localhost:3000/
   ```
+  Previous stable version (1x): https://github.com/owen2345/camaleon-cms/tree/version_1x
 
 # Camaleon CMS (It adapts to your needs)
 
@@ -85,6 +86,7 @@ It was released on July, 2015 and tested previously with more than 20 projects b
   - Easy migration from wordpress
 
 ## Some features are:
+* Integrate into existent Ruby on Rails Projects
 * Easy administration
   Camaleon CMS permit you to adapt the CMS to all your needs and not you adapt to the CMS.
 I.E. you can create your custom architecture with all attributes that you need for each kind of content.

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

@@ -17,6 +17,8 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     authorize! :manager, :media
     @show_file_actions = true
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.media")
+    render "index"
+    cama_draw_timer
   end
 
   # crop a image to save as a new file

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -20,7 +20,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # home page for frontend
   def index
     @cama_visited_home = true
-    cama_init_seo(current_site)
     if @_site_options[:home_page].present?
       render_post(@_site_options[:home_page].to_i)
     else
@@ -39,7 +38,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       return page_not_found
     end
     @cama_visited_category = @category
-    cama_init_seo(@category)
     @children = @category.children.no_empty.decorate
     @posts = @category.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     r_file = lookup_context.template_exists?("categories/#{@category.the_slug}") ? "categories/#{@category.the_slug}" : "category"
@@ -56,7 +54,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       return page_not_found
     end
     @cama_visited_post_type = @post_type
-    cama_init_seo(@post_type)
     @posts = @post_type.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     @categories = @post_type.categories.no_empty.eager_load(:metas).decorate
     @post_tags = @post_type.post_tags.eager_load(:metas)
@@ -75,7 +72,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       return page_not_found
     end
     @cama_visited_tag = @post_tag
-    cama_init_seo(@post_tag)
     @posts = @post_tag.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     r_file = lookup_context.template_exists?("post_tags/#{@post_tag.the_slug}") ? "post_tags/#{@post_tag.the_slug}" : "post_tag"
     layout_ = lookup_context.template_exists?("layouts/post_tags/#{@post_tag.the_slug}") ? "post_tags/#{@post_tag.the_slug}" : (self.send :_layout)
@@ -124,7 +120,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       return page_not_found
     end
     @cama_visited_profile = true
-    cama_init_seo(@user)
     layout_ = lookup_context.template_exists?("layouts/profile") ? "profile" : (self.send :_layout)
     r = {user: @user, layout: layout_, render: "profile"};  hooks_run("on_render_profile", r)
     render r[:render], layout: r[:layout]
@@ -158,7 +153,6 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     else
       @post = @post.decorate
       @cama_visited_post = @post
-      cama_init_seo(@post)
       @post_type = @post.the_post_type
       @comments = @post.the_comments
       @categories = @post.the_categories

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -44,11 +44,6 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
     h.breadcrumb_draw
   end
 
-  # build the attributes for this model
-  def the_seo
-    h.cama_build_seo({ image: (the_thumb_url() rescue nil), title: the_title, description: the_excerpt, keywords: the_keywords, object: self })
-  end
-
   # ---------------------
   def set_decoration_locale(locale)
     @_deco_locale = locale.to_sym

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -35,11 +35,6 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
     object.get_meta("slogan", "Hello World")
   end
 
-  # generate all seo attributes for profile page
-  def the_seo
-    h.cama_build_seo({ image: (the_avatar rescue nil), title: the_name, object: self })
-  end
-
   # return front url for this user
   def the_url(*args)
     args = args.extract_options!

data/app/helpers/camaleon_cms/camaleon_helper.rb

@@ -16,7 +16,7 @@ module CamaleonCms::CamaleonHelper
   # layout_name: path of the template to render
   # template_name: template name to render in template_path
   def sendmail(email,subject='Tiene una notificacion',content='',from=nil,attachs=[],template_name = 'mailer', layout_name = 'camaleon_cms/mailer')
-    Thread.abort_on_exception=true
+    # Thread.abort_on_exception=true
     Thread.new do
       HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name).deliver_now
       ActiveRecord::Base.connection.close
@@ -92,4 +92,10 @@ module CamaleonCms::CamaleonHelper
     cache
   end
 
+  def cama_draw_timer
+    @_cama_timer ||= Time.current
+    puts "***************************************** timer: #{((Time.current - @_cama_timer) * 24 * 60 * 60).to_i}  (#{caller.first})"
+    @_cama_timer = Time.current
+  end
+
 end

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

@@ -7,22 +7,42 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 module CamaleonCms::Frontend::SeoHelper
-  def cama_init_seo(model)
-    @_seo_info = model.the_seo
-  end
-
   # add seo attributes to your page
   # you can pass custom data to overwrite default data generated by the system
   def cama_the_seo(data = {})
-    (@_seo_info ||= {}).merge(data)
+    if is_home?
+      data2 = {}
+    elsif is_page?
+      data2 = {image: @cama_visited_post.the_thumb_url, title: @cama_visited_post.the_title, description: @cama_visited_post.the_excerpt, keywords: @cama_visited_post.the_keywords, object: @cama_visited_post }
+    elsif is_ajax?
+      data2 = {}
+    elsif is_search?
+      data2 = {title: "#{current_site.the_title} | #{ct("search_title", default: "Search")}"}
+    elsif is_post_type?
+      data2 = {image: @cama_visited_post_type.the_thumb_url, title: @cama_visited_post_type.the_title, description: @cama_visited_post_type.the_excerpt, keywords: @cama_visited_post_type.the_keywords, object: @cama_visited_post_type }
+    elsif is_post_tag?
+      data2 = {image: @cama_visited_tag.the_thumb_url, title: @cama_visited_tag.the_title, description: @cama_visited_tag.the_excerpt, keywords: @cama_visited_tag.the_keywords, object: @cama_visited_tag }
+    elsif is_category?
+      data2 = {image: @cama_visited_category.the_thumb_url, title: @cama_visited_category.the_title, description: @cama_visited_category.the_excerpt, keywords: @cama_visited_category.the_keywords, object: @cama_visited_category }
+    else
+      data2 = {}
+    end
+    cama_build_seo((@_cama_seo_default_values || {}).merge(data2).merge(data))
+  end
+
+  # permit to define define default seo attributes by code without hooks
+  # @Sample: cama_seo_default({title: "my custom title", description: "my descr", keywords: "my keywords", image: 'my img url'})
+  def cama_seo_default(options)
+    @_cama_seo_default_values ||= {}
+    @_cama_seo_default_values = @_cama_seo_default_values.merge(options)
   end
 
   # create seo attributes with options + default attributes
-  def cama_build_seo(options)
+  def cama_build_seo(options = {})
     options[:image] = options[:image] || current_site.get_option("screenshot", current_site.the_logo)
-    options[:title] = I18n.transliterate(is_home? ? current_site.the_title : "#{current_site.the_title} | #{options[:title]}")
-    options[:description] = I18n.transliterate(is_home? ? current_site.the_option("seo_description") : options[:description].to_s)
-    options[:keywords] = I18n.transliterate(is_home? ? current_site.the_option("keywords") : options[:keywords].to_s)
+    options[:title] = I18n.transliterate(options[:title].present? ? "#{current_site.the_title} | #{options[:title]}" : current_site.the_title)
+    options[:description] = I18n.transliterate(options[:description].present? ? options[:description].to_s : current_site.the_option("seo_description"))
+    options[:keywords] = I18n.transliterate(options[:keywords].present? ? options[:keywords] : current_site.the_option("keywords"))
     options[:url] = request.original_url
     s = {
       title: options[:title],

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

@@ -26,32 +26,37 @@ module CamaleonCms::Frontend::SiteHelper
 
   # check if current section visited is for post
   def is_page?
-    ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "post"
+    @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?
-    ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "ajax"
+    @cama_visited_ajax.present?
   end
 
   # check if current section visited is for search
   def is_search?
-    ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "search"
+    @cama_visited_search.present? || ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "search"
   end
 
   # check if current section visited is for post type
   def is_post_type?
-    ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "post_type"
+    @cama_visited_post_type.present?
   end
 
   # check if current section visited is for post tag
   def is_post_tag?
-    params[:controller] == "frontend" && params[:action] == "post_tag"
+    @cama_visited_tag.present?
   end
 
   # check if current section visited is for category
   def is_category?
-    ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "category"
+    @cama_visited_category.present?
   end
   #**************** end section is a? ****************#
 
@@ -62,6 +67,6 @@ module CamaleonCms::Frontend::SiteHelper
   def the_head(seo_attrs = {}, show_seo = true)
     icon = "<link rel='shortcut icon' href='#{current_site.the_icon}'>"
     js = "<script>var ROOT_URL = '#{cama_root_url}'; var LANGUAGE = '#{I18n.locale}'; </script>"
-    icon + "\n" + (csrf_meta_tag || "") + "\n" + (show_seo ? display_meta_tags(cama_the_seo.merge(seo_attrs)) : "") + "\n" + js + "\n" + cama_draw_custom_assets
+    icon + "\n" + (csrf_meta_tag || "") + "\n" + (show_seo ? display_meta_tags(cama_the_seo(seo_attrs)) : "") + "\n" + js + "\n" + cama_draw_custom_assets
   end
 end

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -197,7 +197,9 @@ module CamaleonCms::UploaderHelper
   # sample: cama_media_find_folder("test/exit")
   def cama_media_find_folder(path = "")
     res = nil
+    cama_draw_timer
     folder = cama_uploader_browser_files[:folders]
+    cama_draw_timer
     "#{current_site.id}/#{path}".gsub(/(\/){2,}/, "/").split("/").each do |k|
       if k.present?
         begin
@@ -208,6 +210,7 @@ module CamaleonCms::UploaderHelper
         end
       end
     end
+    cama_draw_timer
     res || {folders: {}, files: []}
   end
 

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/generators/camaleon_cms/install_generator.rb

@@ -9,6 +9,7 @@ module CamaleonCms
       def create_initializer_file
         copy_file "system.json", "config/system.json"
         copy_file "plugin_routes.rb", "lib/plugin_routes.rb"
+        Dir.mkdir Rails.root.join("app", "apps").to_s unless Dir.exist?(Rails.root.join("app", "apps").to_s)
         directory("apps", "app/apps")
         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)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -878,8 +878,9 @@ requirements:
 - ruby >= 1.9.3
 - imagemagick
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Camaleon is a cms for Ruby on Rails 4 as an alternative to wordpress.
 test_files: []
+has_rdoc: