camaleon_cms 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f649347d40328e102bf97f667dc9a92a4249da23
-  data.tar.gz: d7b11f5924ce4af26805d9100522b352f2fc536d
+  metadata.gz: 172ad82621088cd3ba8a3500d1802dd2d5946297
+  data.tar.gz: 7e6d38e9b55c818502af17c5dcbf6e5d7d463cf4
 SHA512:
-  metadata.gz: cc798d85dae6d7c2d73c39193990920f491f23c9652d885c81977b943ced6ead22ec380e584c49643aa3e3f56058f5f1c1f1db9d3e19c9caf814f07ded986197
-  data.tar.gz: 23f2520908e6f8799424849ac178e1a47d2a5684d5eddad644924abd9b49b19c697de2d2df6dfcd634aeb1e7ed044fca1c438273f2414027cadbf852f963c105
+  metadata.gz: 4fbe08809da6873778f890d68781a5590dc37c5a1b7494299a593390bbc54ec8be38fc3997157930e15fedbd1078b579fdffdd54ccf1b08d21ea0be260eb3fc0
+  data.tar.gz: 2bab345c0dde92e94e82f32329f3bbbf294635fac9e19006720438b71bf0825cb00573efd6dea850d6d2b1b45806cf604580164606b5852d12566efea9821ab8

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

@@ -50,6 +50,7 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     render 'form'
   end
 
+  # create a new custom field group
   def create
     post_data = params[:custom_field_group]
     post_data[:object_class], post_data[:objectid] = post_data[:assign_group].split(',')
@@ -64,12 +65,22 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     end
   end
 
+  # destroy a custom field group
   def destroy
     @field_group.destroy
 
     redirect_to action: :index
   end
 
+  # reorder custom fields group
+  def reorder
+    params[:values].to_a.each_with_index do |value, index|
+      current_site.custom_field_groups.find(value).update_column('field_order', index)
+    end
+    json = {size: params[:values].size}
+    render json: json
+  end
+
   private
 
   def set_custom_field_group

data/app/controllers/admin_controller.rb

@@ -20,11 +20,12 @@ class AdminController < CamaleonController
   before_action :admin_before_hooks
   after_action :admin_after_hooks
 
+  # render admin dashabord
   def index
 
   end
 
-
+  # render admin dashboard
   def dashboard
      render "admin/dashboard/index"
   end

data/app/controllers/concerns/frontend_concern.rb

@@ -19,7 +19,12 @@ module FrontendConcern extend ActiveSupport::Concern
         format.xml { render(xml: open(path).read) }
       end
     else
-      render text: "Sitemap not found.", status: :not_found
+      Thread.abort_on_exception=true
+      Thread.new do
+        %x(rake camaleon_cms:sitemap)
+        ActiveRecord::Base.connection.close
+      end
+      render text: "Sitemap not found. Generating... Please wait and refresh later.", status: :not_found
     end
   end
 

data/app/helpers/camaleon_helper.rb

@@ -17,7 +17,11 @@ module 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 = 'mailer')
-    HtmlMailer.sender(email, subject, content, from, attachs, root_url, current_site, template_name, layout_name).deliver_now
+    Thread.abort_on_exception=true
+    Thread.new do
+      HtmlMailer.sender(email, subject, content, from, attachs, root_url, current_site, template_name, layout_name).deliver_now
+      ActiveRecord::Base.connection.close
+    end
   end
 
   # execute controller action and return response

data/app/views/admin/settings/custom_fields/form.html.erb

@@ -65,10 +65,7 @@
                   </optgroup>
 
                   <optgroup label="<%= t('admin.sidebar.themes') %>">
-                    <% PluginRoutes.all_themes.each do |theme| %>
-                        <% value = "Theme,#{theme[:key]}"  %>
-                        <option value="<%= value %>" data-help="<%= "#{t('admin.settings.tooltip.add_custom_field_themes')}"+ theme[:name] %>"><%= theme[:name] %></option>
-                    <% end  %>
+                      <option value="Theme,<%= current_theme.id %>" data-help=""><%= current_theme.name %></option>
                   </optgroup>
 
                   <optgroup label="<%= t('admin.sidebar.widgets') %>">

data/app/views/admin/settings/custom_fields/index.html.erb

@@ -52,12 +52,11 @@
       <!-- END BASIC TABLE SAMPLE -->
     </div>
   </div>
-
 </div>
 
 <script>
   run.push(function(){
-      $('#table_custom_groups').table_order({url: '<%= admin_api_path('reorder', {model: 'field_groups'}) %>', on_success: function(obj){
+      $('#table_custom_groups').table_order({url: '<%= reorder_admin_settings_custom_fields_path %>', on_success: function(obj){
           if(obj.res.error){
               $.fn.alert({title: obj.res.error, type: 'error'})
           }else{

data/config/initializers/rufus_cron.rb

@@ -2,7 +2,7 @@ begin
   require 'rufus-scheduler'
   $scheduler = Rufus::Scheduler.singleton
   $scheduler.cron '00 05 * * *' do
-    system("rake sitemap:generate")
+    system("rake camaleon_cms:sitemap")
   end
   #cronjob for hook by site
   begin

data/config/routes/admin.rb

@@ -49,6 +49,7 @@ Rails.application.routes.draw do
       resources :custom_fields do
         collection do
           post 'get_items/:key', action: :get_items, as: :get_items
+          post "reorder"
         end
       end
 

data/config/sitemap.rb

@@ -1,6 +1,10 @@
 require 'uri'
 h = PluginRoutes.system_info["base_domain"]
 
+# create sitemap directory
+sitemaps_dir = Rails.root.join("public", "sitemaps").to_s
+FileUtils.mkdir(sitemaps_dir) unless Dir.exist?(sitemaps_dir)
+
 Site.all.each do |site|
   site = site.decorate
   folder "sitemaps/#{site.slug}"

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/generators/camaleon_cms/install_generator.rb

@@ -9,7 +9,7 @@ module CamaleonCms
       def create_initializer_file
         copy_file "system.json", "config/system.json"
         copy_file "plugin_routes.rb", "lib/plugin_routes.rb"
-        # copy_file "Gemfile", "lib/Gemfile_camaleon"
+        copy_file "../../../Gemfile", "lib/Gemfile_camaleon"
         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)"

data/lib/generators/camaleon_cms/install_template/plugin_routes.rb

@@ -229,7 +229,7 @@ class PluginRoutes
     if camaleon_gem = get_gem('camaleon_cms')
       res << File.read(File.join(camaleon_gem.gem_dir, "lib", "Gemfile")).gsub("source 'https://rubygems.org'", "")
     else
-      puts "You need to install camaleon_cms gem."
+      puts "******** Warning: You need to install camaleon_cms gem. *********"
       return ""
     end
     (self.all_themes + self.all_plugins).each do |item|

data/lib/tasks/camaleon_cms_tasks.rake

@@ -2,3 +2,22 @@
 # task :camaleon_cms do
 #   # Task goes here
 # end
+
+namespace :camaleon_cms do
+  task :sitemap => :environment do
+    include Rails.application.routes.url_helpers
+    include Frontend::ApplicationHelper
+    include SiteHelper
+    include PluginsHelper
+    include HooksHelper
+
+    DynamicSitemaps.configure do |config|
+      config.config_path = File.join($camaleon_engine_dir, "config", "sitemap.rb")
+    end
+
+    start_time = Time.now
+    DynamicSitemaps::Logger.info "Generating sitemap..."
+    DynamicSitemaps.generate_sitemap
+    DynamicSitemaps::Logger.info "Done generating sitemap in #{Time.now - start_time} seconds."
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies: []
 description: Camaleon CMS is a dynamic and advanced content management system based
   on Ruby on Rails 4 as an alternative to Wordpress.