camaleon_cms 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172ad82621088cd3ba8a3500d1802dd2d5946297
-  data.tar.gz: 7e6d38e9b55c818502af17c5dcbf6e5d7d463cf4
+  metadata.gz: 86c5a7115b4f87254af8ba53628179b7b6304a87
+  data.tar.gz: 008600c9651dd60a96ce27fafba73ff9382ed0ed
 SHA512:
-  metadata.gz: 4fbe08809da6873778f890d68781a5590dc37c5a1b7494299a593390bbc54ec8be38fc3997157930e15fedbd1078b579fdffdd54ccf1b08d21ea0be260eb3fc0
-  data.tar.gz: 2bab345c0dde92e94e82f32329f3bbbf294635fac9e19006720438b71bf0825cb00573efd6dea850d6d2b1b45806cf604580164606b5852d12566efea9821ab8
+  metadata.gz: f0720ca7d3b7530b926b2ee3065b14893a766470890fdc297be2cc7903c6c68dca42d13a2edf2dcd58e552cf4b3ea0a44e91be645c86f20c88c924883cbb5402
+  data.tar.gz: 67eff63900f35a31c009994939e87d82349e830f6b29ad94f455e1e852f072a64bc68544a2f9bce9c1d3c25b3067ca7f656b8af1749ea7981b16f6bf77e7455c

data/app/apps/plugins/front_cache/front_cache_helper.rb

@@ -12,6 +12,7 @@ module Plugins::FrontCache::FrontCacheHelper
   def front_cache_front_before_load
     return if signin?
     cache_key = front_cache_get_key
+    ActionController::Base.page_cache_directory = Rails.root.join("tmp", "cache", "pages")
     if page_cache_exist?(cache_key) # recover cache file
       Rails.logger.info "============================================== readed cache: #{cache_key}"
       render text: File.read(page_cache_get(cache_key)).gsub("{{form_authenticity_token}}", form_authenticity_token)
@@ -133,7 +134,7 @@ module Plugins::FrontCache::FrontCacheHelper
   # clear all frontend cache files
   def front_cache_clean
     FileUtils.rm_f(cache_store.cache_path) # clear fragment caches
-    FileUtils.rm_rf(File.join(Rails.application.config.action_controller.page_cache_directory, current_site.id.to_s)) # clear site pages cache
+    FileUtils.rm_rf(File.join(ActionController::Base.page_cache_directory, current_site.id.to_s)) # clear site pages cache
   end
 
   private

data/app/apps/plugins/visibility_post/visibility_post_helper.rb

@@ -57,10 +57,10 @@ module Plugins::VisibilityPost::VisibilityPostHelper
   def plugin_visibility_filter_post(args)
     args[:active_record] = args[:active_record].where("(posts.published_at is null or posts.published_at <= ?)", Time.now)
     if signin?
-      if ActiveRecord::Base.connection.adapter_name.downcase.include?("sqlite")
-        args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and (',' || posts.visibility_value || ',') LIKE '%,#{current_site.visitor_role},%')")
-      else
+      if ActiveRecord::Base.connection.adapter_name.downcase.include?("mysql")
         args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and FIND_IN_SET(?, posts.visibility_value))", current_site.visitor_role)
+      else
+        args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and (',' || posts.visibility_value || ',') LIKE '%,#{current_site.visitor_role},%')")
       end
     else
       args[:active_record] = args[:active_record].where("visibility != 'private'")

data/app/apps/themes/camaleon_first/views/layouts/index.html.erb

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <!-- END META SECTION -->
 
-    <%= stylesheet_link_tag theme_asset_path("css/main") %>
+    <%= stylesheet_link_tag theme_asset_path("css/main.css") %>
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Montserrat%3A400%2C700&ver=4.2.2">
     <%= javascript_include_tag theme_asset_path("js/main.js") %>

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

@@ -7,7 +7,7 @@
     <meta content="width=device-width, initial-scale=1" name="viewport" />
     <!-- END META SECTION -->
     <%#= javascript_include_tag theme_asset_path("js/main.js") %>
-    <%= stylesheet_link_tag theme_asset_path("css/main") %>
+    <%= stylesheet_link_tag theme_asset_path("css/main.css") %>
     <%= stylesheet_link_tag theme_asset_path("genericons/genericons.css") %>
     <%= raw the_head %>
 </head>

data/app/apps/themes/new/views/layouts/index.html.erb

@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <!-- END META SECTION -->
 
-    <%= stylesheet_link_tag theme_asset_path("css/main") %>
+    <%= stylesheet_link_tag theme_asset_path("css/main.css") %>
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <%= javascript_include_tag theme_asset_path("js/main.js") %>
     <%= raw the_head %>

data/app/decorators/site_decorator.rb

@@ -24,10 +24,11 @@ class SiteDecorator < TermTaxonomyDecorator
   end
 
   # return all contents from this site registered for post_type = slug (filter visibility, hidden, expired, ...)
-  # slug_or_id: slug or id of the post_type, default 'post'
+  # slug_or_id: slug or id of the post_type or array of slugs, default 'post'
   def the_contents(slug_or_id = "post")
     return h.verify_front_visibility(object.posts.where("term_taxonomy.id = ?", slug_or_id)) if slug_or_id.is_a?(Integer)
     return h.verify_front_visibility(object.posts.where("term_taxonomy.slug = ?", slug_or_id)) if slug_or_id.is_a?(String)
+    return h.verify_front_visibility(object.posts.where("term_taxonomy.slug in (?)", slug_or_id)) if slug_or_id.is_a?(Array)
   end
 
   # return all contents for this site registered for post_type = slug (filter visibility, hidden, expired, ...)

data/app/helpers/admin/menus_helper.rb

@@ -152,7 +152,7 @@ module Admin::MenusHelper
     bool = false
     menus.each_with_index do |menu, index_menu|
       menu[:key] = "#{parent_index}__#{rand(999...99999)}" if menu[:key].nil?
-      uri = URI(menu[:url])
+      uri = URI(menu[:url].to_s)
       url_path = uri.path
       url_query = uri.query
       bool = url_path.to_s == _url.to_s && url_path.present?

data/app/helpers/plugins_helper.rb

@@ -78,13 +78,22 @@ module PluginsHelper
 
   # return plugin full asset path
   # plugin_key: plugin name
-  # if asset is present return full path to this asset
-  # sample: <script src="<%= plugin_asset_path("my_plugin", "js/admin.js") %>"></script>
-  def plugin_asset_path(plugin_key, asset = nil)
-    # "#{root_url(locale: nil)}assets/plugins/#{plugin_key}/assets/#{asset}"
-    "plugins/#{plugin_key}/assets/#{asset}"
+  # asset: (String) asset name
+  # sample: <script src="<%= plugin_asset_path("my_plugin", "js/admin.js") %>"></script> => /assets/plugins/my_plugin/assets/css/main-54505620f.css
+  def plugin_asset_path(plugin_key, asset)
+    asset_url("plugins/#{plugin_key}/assets/#{asset}")
   end
 
+  # return the full url for asset of current plugin:
+  # asset: (String) asset name
+  # plugin_key: (optional) plugin name, default (current plugin caller to this function)
+  # sample:
+  #   plugin_asset_url("css/main.css") => return: http://myhost.com/assets/plugins/my_plugin/assets/css/main-54505620f.css
+  def plugin_asset_url(asset, plugin_key = nil)
+    asset_url("plugins/#{plugin_key || self_plugin_key}/assets/#{asset}")
+  end
+
+
   # auto load all helpers of this plugin
   def plugin_load_helpers(plugin)
     return if !plugin.present? || !plugin["helpers"].present?

data/app/helpers/site_helper.rb

@@ -89,7 +89,9 @@ module SiteHelper
     # new theme
     current_site.set_option('_theme', key)
     theme = PluginRoutes.theme_info(key)
+    current_site.themes.update_all(status: "inactive")
     theme_model = current_site.themes.where(slug: key).first_or_create!{|t| t.name = theme[:name]; }
+    theme_model.update(status: nil)
     hook_run(theme, "on_active", theme_model)
     PluginRoutes.reload
   end
@@ -100,7 +102,7 @@ module SiteHelper
     theme = PluginRoutes.theme_info(key)
     theme_model = current_site.get_theme(key)
     hook_run(theme, "on_inactive", theme_model) if theme_model.present?
-    theme_model.destroy
+    # theme_model.destroy
   end
 
 

data/app/helpers/theme_helper.rb

@@ -24,10 +24,18 @@ module ThemeHelper
   # return theme full asset path
   # theme_name: theme name, if nil, then will use current theme
   # asset: asset file name, if asset is present return full path to this asset
-  # sample: <script src="<%= theme_asset_path("js/admin.js") %>"></script>
+  # sample: <script src="<%= theme_asset_path("js/admin.js") %>"></script> => return: /assets/themes/my_theme/assets/css/main-54505620f.css
   def theme_asset_path(asset = nil, theme_name = nil)
-    # "#{root_url(locale: nil)}assets/themes/#{theme_name || current_theme.slug }/assets/#{asset}"
-    "themes/#{theme_name || current_theme.slug }/assets/#{asset}"
+    asset_url("themes/#{theme_name || current_theme.slug }/assets/#{asset}")
+  end
+
+  # return the full url for asset of current theme:
+  # asset: (String) asset name
+  # theme_name: (optional) theme name, default (current theme caller to this function)
+  # sample:
+  #   theme_asset_url("css/main.css") => return: http://myhost.com/assets/themes/my_theme/assets/css/main-54505620f.css
+  def theme_asset_url(asset, theme_name = nil)
+    asset_url("themes/#{theme_name || current_theme.slug }/assets/#{asset}")
   end
 
   # return theme full view path

data/app/models/site.rb

@@ -94,7 +94,7 @@ class Site < TermTaxonomy
   # return theme model with slug theme_slug for this site
   # theme_slug: (optional) if it is null, this will return current theme for this site
   def get_theme(theme_slug = nil)
-    self.themes.where(slug: (theme_slug || get_theme_slug)).first_or_create!
+    self.themes.where(slug: (theme_slug || get_theme_slug), status: nil).first_or_create!
   end
 
   # return plugin model with slug plugin_slug

data/app/views/admin/appearances/themes/index.html.erb

@@ -37,8 +37,8 @@
                                     <div class="panel-footer text-muted text-right">
                                         <% if current_theme.slug == theme[:key] && params[:set].nil? %>
                                             <% r = {links: []}; hook_run(theme, "theme_options", r) %>
-                                            <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), admin_plugins_export_content_settings_path(file: ["app", "apps", 'themes', theme[:key], 'data.json'].join("/"))) if current_site.plugin_installed?('export_content') && File.exist?(Rails.root.join("app", "apps", 'themes', theme[:key], 'data.json')) %>
-                                            <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), "#", {'onclick' => "alert('You need to install import/export plugin to import sample data.'); return false;"}) if !current_site.plugin_installed?('export_content') && File.exist?(Rails.root.join("app", "apps", 'themes', theme[:key], 'data.json')) %>
+                                            <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), admin_plugins_export_content_settings_path(file: ["app", "apps", 'themes', theme[:key], 'data.json'].join("/"))) if current_site.plugin_installed?('export_content') && File.exist?(File.join(theme["path"], "data.json")) %>
+                                            <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), "#", {'onclick' => "alert('You need to install import/export plugin to import sample data.'); return false;"}) if !current_site.plugin_installed?('export_content') && File.exist?(File.join(theme["path"], "data.json")) %>
                                             <%= raw r[:links].join(" | ") %>
                                             <span class="btn btn-success"><%= t('admin.button.actived').upcase %></span>
                                         <% else %>

data/app/views/admin/settings/site.html.erb

@@ -1,5 +1,5 @@
 <%
-   theme_settings_file = Rails.root.join("app", "apps", 'themes', current_site.get_theme_slug, 'views/admin/settings.html.erb').to_s
+   theme_settings_file = File.join(current_theme.settings["path"], "views/admin/settings.html.erb").to_s
    @site.slug = PluginRoutes.system_info["base_domain"] if current_site.main_site?
    groups = @site.get_field_groups()
 %>

data/lib/camaleon_cms/engine.rb

@@ -45,7 +45,6 @@ module CamaleonCms
 
         # cache control
         app.config.cache_store = :file_store, Rails.root.join("tmp","cache","vars")
-        app.config.action_controller.page_cache_directory = Rails.root.join("tmp","cache","pages")# (pending for error)
 
         # extra configuration for plugins
         app.config.autoload_paths += %W{#{app.config.root}/app/apps/**/}

data/lib/camaleon_cms/version.rb

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

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

@@ -80,7 +80,6 @@ class PluginRoutes
     camaleon_gem = get_gem('camaleon_cms')
     return {} if !camaleon_gem
     r = cache_variable("system_info");  return r unless r.nil?
-    res = {}
     res = JSON.parse(File.read(File.join(camaleon_gem.gem_dir, "config", "system.json")))
     res = res.with_indifferent_access rescue res
     return cache_variable("system_info", res) unless File.exist?(system_file = File.join(apps_dir, "..", '..', "config", "system.json"))

metadata

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