camaleon_cms 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5830fa03ce317041674944ce490df0efda85a49a
-  data.tar.gz: 752e2b694adf04b736391ebbed33d66bb8045438
+  metadata.gz: 1d114547f428656d17fdf58ce3a7d1096a01e413
+  data.tar.gz: 3b994b5712f74b98f58942d1fa7de814a042c8ab
 SHA512:
-  metadata.gz: c34446bf08bf3670f2226c111f8bec2f38a921ce453d055999f0e7d685a888e7c0f61db948f16181178a22f2d57901fc2686d3f27a0cc255e1fc692bd2c1bce6
-  data.tar.gz: 1347c27ddf41316c23f545ed8f287bbc92ac06e24cce339f19cab6234adc554d692a522c4235341a51c8e7f791fd7aa830937b91a538efa412c410614608bdff
+  metadata.gz: 1a8b1bad326b7d06e0051a93b2962c98f0e0ee8e0ac0b7d41950c580891e11948f0cb94e09d6adbcab52c4024a604f1d951b7f9d89208fb73cfe613e436fa969
+  data.tar.gz: ad8f732b2820f70fc2e994eb8499d2502243c014d7eee187874166954b1b04d7d693449f8ba57e6a8f7751c16b0d8e5327ab2b1f35a701eb17483db32b6d86b7

data/config/initializers/rufus_cron.rb

@@ -6,22 +6,31 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-require 'rufus-scheduler'
-$scheduler = Rufus::Scheduler.singleton
-$scheduler.cron '00 05 * * *' do
-  system("rake camaleon_cms:sitemap")
-end
-# cronjob for hook by site
 begin
-  Site.all.each do |site|
-    # hooks
-    c = CamaleonController.new
-    c.instance_eval do
-      @current_site = site
-      @_hooks_skip = []
+  require 'rufus-scheduler'
+  loaded_rufus = true
+rescue LoadError
+  loaded_rufus = false
+end
+
+if loaded_rufus
+  $scheduler = Rufus::Scheduler.singleton
+  $scheduler.cron '00 05 * * *' do
+    system("rake camaleon_cms:sitemap")
+  end
+
+  # run all custom cron jobs
+  begin
+    Site.all.each do |site|
+      # hooks
+      c = CamaleonController.new
+      c.instance_eval do
+        @current_site = site
+        @_hooks_skip = []
+      end
+      r = {site: site, eval: nil}; c.hooks_run("cron", r)
+      r[:eval].call(r) if r[:eval].present? # evaluate the cron job created by plugin or theme
     end
-    r = {site: site, eval: nil}; c.hooks_run("cron", r)
-    r[:eval].call(r) if r[:eval].present? # evaluate the cron job created by plugin or theme
+  rescue  #ActiveRecord::RecordNotFound # skipping pending migrations
   end
-rescue ActiveRecord::RecordNotFound # skipping sites not found
 end

data/lib/camaleon_cms/engine.rb

@@ -1,5 +1,4 @@
 $camaleon_engine_dir = File.expand_path("../../../", __FILE__)
-require File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "install_template", "plugin_routes").to_s
 Dir[File.join($camaleon_engine_dir, "lib", "ext", "**", "*.rb")].each{ |f| require f }
 module CamaleonCms
   class Engine < ::Rails::Engine
@@ -14,33 +13,38 @@ module CamaleonCms
     end
 
     initializer :append_migrations do |app|
-      engine_dir = File.expand_path("../../../", __FILE__)
-      app.config.i18n.load_path += Dir[File.join($camaleon_engine_dir, 'config', 'locales', '**', '*.{rb,yml}')]
-      app.config.i18n.enforce_available_locales = false
-      PluginRoutes.all_apps.each{ |info| app.config.i18n.load_path += Dir[File.join(info["path"], "config", "locales", '*.{rb,yml}')] }
+      unless defined?(PluginRoutes)
+        require File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "install_template", "plugin_routes").to_s
+        Rails.logger.info "Please copy plugin_routes.rb file in lib/"
+      else
+        engine_dir = File.expand_path("../../../", __FILE__)
+        app.config.i18n.load_path += Dir[File.join($camaleon_engine_dir, 'config', 'locales', '**', '*.{rb,yml}')]
+        app.config.i18n.enforce_available_locales = false
+        PluginRoutes.all_apps.each{ |info| app.config.i18n.load_path += Dir[File.join(info["path"], "config", "locales", '*.{rb,yml}')] }
 
-      # assets
-      app.config.assets.paths << Rails.root.join("app", "apps")
-      app.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
-      app.config.assets.paths << File.join($camaleon_engine_dir, "app", "apps")
-      app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
-      app.config.encoding = "utf-8"
+        # assets
+        app.config.assets.paths << Rails.root.join("app", "apps")
+        app.config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
+        app.config.assets.paths << File.join($camaleon_engine_dir, "app", "apps")
+        app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
+        app.config.encoding = "utf-8"
 
-      #multiple route files
-      app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "admin.rb"))
-      app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "frontend.rb"))
-      # Dir[File.join(engine_dir, "config", "routes", "*.rb")].each{|r| app.routes_reloader.paths.unshift(r) }
+        #multiple route files
+        app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "admin.rb"))
+        app.routes_reloader.paths.push(File.join(engine_dir, "config", "routes", "frontend.rb"))
+        # Dir[File.join(engine_dir, "config", "routes", "*.rb")].each{|r| app.routes_reloader.paths.unshift(r) }
 
-      # extra configuration for plugins
-      app.config.autoload_paths += %W{#{app.config.root}/app/apps/**/}
-      PluginRoutes.all_plugins.each{ |plugin| app.config.paths["db/migrate"] << File.join(plugin["path"], "migrate") if Dir.exist?(File.join(plugin["path"], "migrate")) }
+        # extra configuration for plugins
+        app.config.autoload_paths += %W{#{app.config.root}/app/apps/**/}
+        PluginRoutes.all_plugins.each{ |plugin| app.config.paths["db/migrate"] << File.join(plugin["path"], "migrate") if Dir.exist?(File.join(plugin["path"], "migrate")) }
 
-      # migrations checking
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+        # migrations checking
+        unless app.root.to_s.match root.to_s
+          config.paths["db/migrate"].expanded.each do |expanded_path|
+            app.config.paths["db/migrate"] << expanded_path
+          end
         end
       end
     end
   end
-end
+end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Owen Peredo Diaz