camaleon_cms 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322873a45ef38a4a4f83887f1963bfe55e2b7ab4
-  data.tar.gz: 87a4662b7f099b0f8e1ef8606a56f0794935409b
+  metadata.gz: 62fc7ad41d7bb84eb19b420320039004edf012ba
+  data.tar.gz: fed0f9bc7a3ea5b624eba15c41c8f28f15ac7b39
 SHA512:
-  metadata.gz: d3c6e1be0f889d9e35821c42415c005caaa1796c6ea98cecfe26ffafa6e88744c27b58d9bd3a3bd383e8edf26170041cef4825de500918cc396eb44d22340e21
-  data.tar.gz: 6701d5ff639c44fbe9fbec821b605e2d02789127d56c7568206070067963aa7814283f612521d60dc7d35ecf1e984c2a14a2d5f1fc4192e1dba32d0b49fb241d
+  metadata.gz: 726e598be6d038d1f63a3abad00fac9b79d94c0162716cbf31153f4919fb2d7b797c312e3c0522dede7318c016182ab3411893802b4b60bc327cac97ab171067
+  data.tar.gz: afc6f987d85a6e649310b6ff49b7c5720fa4fc596efeb18f35d9daf3564aa6de159a8881181bea1cc5653b3b08a846b039e7b3e58b0f8bb2ffb9dd5178dc0fda

data/app/controllers/camaleon_controller.rb

@@ -94,16 +94,16 @@ class CamaleonController < ApplicationController
     self.prepend_view_path(File.join($camaleon_engine_dir, "app", "views", 'default_theme'))
     self.prepend_view_path(Rails.root.join("app", "views", 'default_theme'))
 
-    if current_theme.present?
-      views_dir = "app/apps/themes/#{current_theme.slug}/views"
-      self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
-      self.prepend_view_path(Rails.root.join(views_dir).to_s)
-    end
-
     if current_site.present?
       views_site_dir = "app/apps/themes/#{current_site.id}/views"
       self.prepend_view_path(File.join($camaleon_engine_dir, views_site_dir).to_s)
       self.prepend_view_path(Rails.root.join(views_site_dir).to_s)
+
+      if current_theme.present?
+        views_dir = "app/apps/themes/#{current_theme.slug}/views"
+        self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
+        self.prepend_view_path(Rails.root.join(views_dir).to_s)
+      end
     end
   end
 

data/config/initializers/custom_initializers.rb

@@ -7,9 +7,11 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 # load all custom initializers of plugins or themes
-PluginRoutes.all_enabled_apps.each do |ap|
-  if ap["path"].present?
-    f = File.join(ap["path"], "config", "initializer.rb")
-    eval(File.read(f)) if File.exist?(f)
+if defined?(PluginRoutes)
+  PluginRoutes.all_enabled_apps.each do |ap|
+    if ap["path"].present?
+      f = File.join(ap["path"], "config", "initializer.rb")
+      eval(File.read(f)) if File.exist?(f)
+    end
   end
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-08-31 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.