camaleon_cms 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ba5c936124f4f5012e985ffa2380addcb3b741
-  data.tar.gz: e9aced89daa293cfaca1717564102bfd4c19b7b2
+  metadata.gz: 20092bd5db3f09102ba7a1c8d9b92bb53a7dbfce
+  data.tar.gz: 625425eccb4f637eb53c9e6902cb97baa450ab94
 SHA512:
-  metadata.gz: 32c21dbff1283ac8e05ef6d59cc6f3f03c495684b57f302d99147bf2dd7de4339dfe3aa8164d4b3d501b453f50c4807501d7fead43c533f00ef228ca2eafa792
-  data.tar.gz: bbe6bc4fc4ea279ec53846f18d91b67ff59930ec64ac03f41b0216f29037a1f7325cee18e2bf37ffbd2373b67e73b365503ee8f26090d36c3144de936def94ae
+  metadata.gz: dbdeeb331aa35d258d577b4131e4cfd420c119d8c5f9becc1ebf905d5e4079293f3844afadbcc1ea9313df18a9defe70f70cd4850a656a2f170b3a3c983f47c8
+  data.tar.gz: e630a1aea7f17eac32a80c1d5e2cc1e7b503c46cb407ee0fef7c412e0372db89e79a5d357e2ad1e02f8ec4171fb063b97c4211ae195b1a6ddec2c73d9a9be97d

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

@@ -17,8 +17,6 @@ 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/helpers/camaleon_cms/session_helper.rb

@@ -15,11 +15,8 @@ module CamaleonCms::SessionHelper
     c[:domain] = :all if PluginRoutes.system_info["users_share_sites"].present? && CamaleonCms::Site.count > 1
     c[:expires] = 1.month.from_now if remember_me
 
-    CamaleonCms::Site.main_site.set_meta("share_sessions", false) if cookies.delete(:login).present?
     user.update({last_login_at: Time.zone.now})
-
     cookies[:auth_token] = c
-    cookies[:login] = true
 
     # user redirection
     flash[:notice] = t('camaleon_cms.admin.login.message.success', locale: current_site.get_admin_language)
@@ -97,8 +94,9 @@ module CamaleonCms::SessionHelper
   def cama_logout_user
     cookies.delete(:auth_token, domain: :all)
     cookies.delete(:auth_token, domain: nil)
-    cookies[:auth_token] = {value: nil, expires: 24.hours.ago, domain: (PluginRoutes.system_info["users_share_sites"] && CamaleonCms::Site.count > 1 ? :all : nil)}
-    cookies.delete :login
+    c_data = {value: nil, expires: 24.hours.ago}
+    c_data[:domain] = :all if PluginRoutes.system_info["users_share_sites"].present? && CamaleonCms::Site.count > 1
+    cookies[:auth_token] = c_data
     redirect_to params[:return_to].present? ? params[:return_to] : cama_admin_login_path, :notice => t('camaleon_cms.admin.logout.message.closed')
   end
 
@@ -117,17 +115,17 @@ module CamaleonCms::SessionHelper
 
   # return current user logged in
   def cama_current_user
-    return @current_user if defined?(@current_user)
+    return @cama_current_user if defined?(@cama_current_user)
     # api current user...
-    @current_user = cama_calc_api_current_user
-    return @current_user unless @current_user.nil?
+    @cama_current_user = cama_calc_api_current_user
+    return @cama_current_user unless @cama_current_user.nil?
 
     return nil unless cookies[:auth_token].present?
     c = cookies[:auth_token].split("&")
     return nil unless c.size == 3
 
     if c[1] == request.user_agent && request.ip == c[2]
-      @current_user = (current_site.users_include_admins.find_by_auth_token(c[0]).decorate rescue nil)
+      @cama_current_user = (current_site.users_include_admins.find_by_auth_token(c[0]).decorate rescue nil)
     end
   end
 

data/app/helpers/camaleon_cms/site_helper.rb

@@ -13,7 +13,7 @@ module CamaleonCms::SiteHelper
     return $current_site if defined?($current_site)
     return @current_site if defined?(@current_site)
     if PluginRoutes.get_sites.size == 1
-      site = PluginRoutes.get_sites.first.decorate
+      site = CamaleonCms::Site.first.decorate
     else
       host = request.original_url.to_s.parse_domain
       if host == PluginRoutes.system_info["base_domain"]

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -160,58 +160,22 @@ module CamaleonCms::UploaderHelper
     res.gsub(/(\/){2,}/, "/")
   end
 
-  # Generate Hash structure of files from FOG
-  def cama_uploader_browser_files(load_cache = true)
-    if load_cache
-      cache_res = current_site.get_meta("cache_browser_files_#{@fog_connection_hook_res}")
-      return cache_res.with_indifferent_access if cache_res.present?
-    end
-
-    @browser_files = {folders: {}, files: [], path: ""}
-    cama_uploader_init_connection()
-    @fog_connection_bucket_dir.files.all.each do |file|
-      cama_uploader_browser_files_parse_file(@browser_files, File.dirname(file.key), file)
-    end
-    current_site.set_meta("cache_browser_files_#{@fog_connection_hook_res}", @browser_files)
-  end
-
-  # add full file path into browser structure
-  # sample: 1/500_3.html => {folders: { 1:{ folders:{}, files: [{name: 503.html, ..}] } } }
-  def cama_uploader_browser_files_parse_file(folder_src, folder_dst, file)
-    if folder_dst.present?
-      return "" if folder_dst.start_with?(@fog_connection_hook_res[:thumb_folder_name]) # thumb folders ignored
-      f = folder_dst.split("/").first
-      folder_src[:folders][f] = {folders: {}, files: []} unless folder_src[:folders].keys.include?(f)
-      cama_uploader_browser_files_parse_file(folder_src[:folders][f], folder_dst.split("/").from(1).join("/"), file)
-    else
-      if file.key.end_with?("/")
-        folder_src[:folders][file.key.split("/").last] = {folders: {}, files: []}
-      else
-        r_file = cama_uploader_parse_file(file)
-        folder_src[:files] << r_file if r_file["url"].present? && !file.key.include?('/_tmp.txt') # skip non public url files (protected)
-      end
-    end
-  end
-
   # search a folder by path and return all folders and files
   # 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
-          res =  folder[k]
-          folder = folder[k][:folders]
-        rescue
-          break
-        end
+    cama_uploader_init_connection(true)
+
+    prefix  = "#{current_site.id}/#{path}/".gsub(/(\/){2,}/, "/")
+    res     = {folders: {}, files: []}
+
+    @fog_connection.directories.get(@fog_connection_hook_res[:bucket_name], prefix: prefix).files.each do |file|
+      res[:files] << cama_uploader_parse_file(file) if file.key =~ %r|#{prefix}[^/]+$| && !file.key.include?('/_tmp.txt')
+      if file.key =~ %r|#{prefix}([^/]+)/|
+        folder_name = "#{$~[1]}"
+        res[:folders][folder_name] = {folders: {}, files: []} unless (folder_name == @fog_connection_hook_res[:thumb_folder_name])
       end
     end
-    cama_draw_timer
-    res || {folders: {}, files: []}
+    return res
   end
 
   # parse file information of FOG file

data/app/models/camaleon_cms/ability.rb

@@ -12,7 +12,7 @@ class CamaleonCms::Ability
   def initialize(user, current_site = nil)
     # Define abilities for the passed in user here. For example:
     #
-    user ||= User.new # guest user (not logged in)
+    user ||= CamaleonCms::User.new # guest user (not logged in)
     if user.admin?
       can :manage, :all
     elsif user.client?
@@ -105,4 +105,19 @@ class CamaleonCms::Ability
     # See the wiki for details:
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end
+
+  #overwrite can method to support decorator class names
+  def can?(action, subject, *extra_args)
+    if subject.is_a?(Draper::Decorator)
+      super(action,subject.model,*extra_args)
+    else
+      super(action,subject,*extra_args)
+    end
+  end
+
+  #overwrite cannot method to support decorator class names
+  def cannot?(*args)
+    !can?(*args)
+  end
+
 end

data/app/models/camaleon_cms/site.rb

@@ -265,10 +265,6 @@ class CamaleonCms::Site < CamaleonCms::TermTaxonomy
         @nav_menu.append_menu_item({label: title, type: 'post', link: post.id})
       end
     end
-
-    # default theme
-    # self.themes.create(slug: PluginRoutes.system_info["default_template"])
-    # self.set_option('_theme', PluginRoutes.system_info["default_template"])
   end
 
   # assign all users to this new site

data/app/models/camaleon_cms/user_role.rb

@@ -99,11 +99,6 @@ class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
               label: "#{I18n.t('camaleon_cms.admin.users.roles_values.comments')}",
               description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.comments')}"
           },
-          #{
-          #    key: 'forms',
-          #    label: "#{I18n.t('camaleon_cms.admin.users.roles_values.forms')}",
-          #    description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.forms')}"
-          #},
           {
               key: 'themes',
               label: "#{I18n.t('camaleon_cms.admin.users.roles_values.themes')}",

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

@@ -72,12 +72,12 @@
                 <select id="select_post_simple" name="custom_field_group[assign_group]" class="form-control required" style="display: none" disabled>
                     <% current_site.post_types.each do |pt| pt = pt.decorate %>
                       <optgroup label="<%= pt.the_title %>">
-                        <% pt.posts.visible_frontend.each do |post| value = "#{post.class.name},#{post.id}"; post = post.decorate %>
+                        <% pt.posts.visible_frontend.each do |post| value = "#{post.class.name},#{post.id}".parseCamaClass; post = post.decorate %>
                             <option value="<%= value %>" data-help="<%= "#{t('camaleon_cms.admin.settings.tooltip.add_custom_field_posts')}"+ post.the_title %>"><%= post.the_title %></option>
                         <% end %>
                       </optgroup>
                     <% end %>
-                 </select>
+                </select>
                 <input id="select_assign_group_caption" type="hidden" name="custom_field_group[caption]"/>
                 <div id="select_assign_group_help"></div>
               </div>

data/lib/camaleon_cms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt