liquid_cms 0.2.2.0 → 0.3.0

data/app/helpers/cms/components_helper.rb

@@ -1,8 +1,4 @@
 module Cms::ComponentsHelper
-  def component_folder_open?(folder_id)
-    cookie_jar('component_folders')[folder_id].present?
-  end
-
   def component_edit_link(path)
     full_path = Cms::Component.component_path(@context, path)
     link_to(truncate(File.basename(path), :length => 15), {:controller => 'cms/components', :action => 'edit', :url => CGI::escape(full_path)})
@@ -10,32 +6,30 @@ module Cms::ComponentsHelper
 
   def component_delete_link(path)
     full_path = Cms::Component.component_path(@context, path)
-    link_to(cms_icon('delete.png', :title => 'Delete'), {:controller => 'cms/components', :action => 'destroy', :url => CGI::escape(full_path)}, :confirm => "Are you sure you want to remove '#{full_path}'?")
+    link_to(delete_icon, {:controller => 'cms/components', :action => 'destroy', :url => CGI::escape(full_path)}, :confirm => "Are you sure you want to remove '#{full_path}'?")
   end
 
-  def list_files(files, hidden = false)
-    html = ''
-    html += hidden ? %[<ul class="tree" style="display:none">] : %[<ul class="tree">]
-    for file in files do
-      html += "<li>"
-      if File.directory?(file)
-        folder_id = "folder_#{Digest::MD5.hexdigest(file)}"
-
-        html += cms_icon('folder.png', :class => 'folder', :id => folder_id) + ' ' + component_delete_link(file) + ' '
-        html += content_tag(:span, File.basename(file), :title => Cms::Component.component_path(@context, file))
-        html += list_files(Cms::Component.files(file), !component_folder_open?(folder_id))
-      else
-        html += file_type_icon(File.basename(file)) + ' '
-        html += component_delete_link(file) + ' '
-        if Cms::Component.editable?(file)
-          html += component_edit_link(file)
+  def list_files(path, hidden = false)
+    ''.tap do |html|
+      html += hidden ? %[<ul class="tree" style="display:none">] : %[<ul class="tree">]
+      for file in Dir[File.expand_path(path)+"/*"] do
+        html += "<li>"
+        if File.directory?(file)
+          html += cms_icon('folder.png', :class => 'folder') + ' ' + component_delete_link(file) + ' '
+          html += content_tag(:span, File.basename(file), :title => Cms::Component.component_path(@context, file))
+          html += list_files(file, true)
         else
-          html += content_tag(:span, truncate(File.basename(file), :length => 15), :title => Cms::Component.component_path(@context, file))
+          html += file_type_icon(File.basename(file)) + ' '
+          html += component_delete_link(file) + ' '
+          if Cms::Component.editable?(file)
+            html += component_edit_link(file)
+          else
+            html += content_tag(:span, truncate(File.basename(file), :length => 15), :title => Cms::Component.component_path(@context, file))
+          end
         end
+        html += "</li>"
       end
-      html += "</li>"
-    end
-    html += "</ul>"
-    html
+      html += "</ul>"
+    end.html_safe
   end
 end

data/app/helpers/cms/pages_helper.rb

@@ -3,9 +3,15 @@ module Cms::PagesHelper
     page.new_record? ? @context.pages.layouts : @context.pages.layouts.reject{|pg| pg == page}
   end
 
-  # find the # of term matches in each page and sorts the pages by the match count (highest to lowest)
-  # only shows the first SEARCH_LIMIT pages
-  def page_match_order(pages, term)
-    pages.collect{|page| [page, page.content.scan(/#{term}/i).length]}.sort{|a,b| b[1] <=> a[1]}[0..(Cms::PagesController::SEARCH_LIMIT-1)]
+  def delete_page_link(page)
+    options = {:method => :delete, :confirm => "Are you sure you want to delete the \"#{page}\" page?"}
+  
+    # use a remote link if there are no children since if we remove the current page list item, all the children items get removed (in the UI) as well
+    # it's easier to just remove the item otherwise with a normal post and refresh the page
+    if page.content_pages.empty?
+      link_to cms_icon('delete.png', :title => 'Delete'), cms_page_path(page), {:remote => true, :indicator => dom_id(page, 'progress')}.merge(options)
+    else
+      link_to cms_icon('delete.png', :title => 'Delete'), cms_page_path(page), options
+    end
   end
 end

data/app/liquid/cms_paperclip_extension.rb

@@ -3,86 +3,14 @@ module Paperclip
     extend ActiveSupport::Memoizable
 
     def to_liquid
-      style_hash = {}
-
-      style_hash.tap do |h|
+      {}.tap do |h|
         all_styles = self.styles.keys + ['original']
         all_styles.each do |style|
-          h[style.to_s] = find_geometry_dims(style)
-          h[style.to_s]['url'] = self.url(style) if h[style.to_s].present?
+          g = Paperclip::Geometry.from_file(self.path(style))
+          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)}
         end
       end
-
-      save_geometry_dims style_hash
-
-      style_hash
     end
     memoize :to_liquid
-
-    # clear out the dimension attribute when post processing
-    # it'll be updated on the next render via to_liquid
-    def post_process_with_dimension_attribute_clear
-      key = dimension_key
-
-      if instance.has_attribute?(key)
-        instance.send("#{key}=", nil)
-      end
-
-      post_process_without_dimension_attribute_clear
-    end
-
-    alias_method_chain :post_process, :dimension_attribute_clear
-
-  protected
-    def dimension_key
-      "cms_#{name}_dimensions"
-    end
-
-    def find_geometry_dims(style)
-      key = dimension_key
-
-      if instance.has_attribute?(key)
-        # dimension attr found
-        values = YAML::load(instance.send(key) || '{}')
-        if values.blank?
-          # no saved entry
-          geometry_dims(style)
-        else
-          # saved entry
-          dimensions = values[style.to_s]
-          if dimensions.blank?
-            # empty dimensions for the given style
-            geometry_dims(style)
-          else
-            # valid dimensions for the given style
-            {'width' => dimensions['width'].to_i, 'height' => dimensions['height'].to_i}
-          end
-        end
-      else
-        log %{To optimize image data in your liquid templates, add a text column named "#{key}" to your "#{instance.class.table_name}" table.}
-        # no dimensions found
-        geometry_dims(style)
-      end
-    end
-
-    def save_geometry_dims(style_hash)
-      key = dimension_key
-
-      if instance.has_attribute?(key) && YAML::load(instance.send(key) || '{}').all?{|k,v| v.blank?} && style_hash.present?
-        # deep copy hash
-        temp_hash = Marshal.load(Marshal.dump(style_hash))
-        # remove blank styles
-        temp_hash.delete_if{|k,v| v.blank?}
-        # and remove the urls
-        temp_hash.each{|k,v| v.delete_if{|k2,v2| k2 == 'url'}}
-
-        instance.update_attribute key, temp_hash.to_yaml if temp_hash.present?
-      end
-    end
-
-    def geometry_dims(style)
-      g = Paperclip::Geometry.from_file(self.path(style)) rescue nil
-      g.nil? ? {} : {'width' => g.width.to_i, 'height' => g.height.to_i}
-    end
   end
 end

data/app/liquid/drops/cms_params_drop.rb

@@ -8,7 +8,7 @@ module Cms
     end
     
     def url
-      @record[:url]
+      (@record[:url] || '').split('/')
     end
   end
 end

data/app/liquid/filters/cms_filters.rb

@@ -1,11 +1,30 @@
+require 'formatize/helper'
+
+class Module
+  # for the tezeilze method to work
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
+end
+
 module CmsFilters
   module Protected
     extend ERB::Util
+    extend Formatize::Helper
     extend ActionView::Helpers::TextHelper
+    extend ActionView::Helpers::SanitizeHelper
     extend ActionView::Helpers::NumberHelper
     extend ActionView::Helpers::TagHelper
     extend ActionView::Helpers::AssetTagHelper
     extend ActionView::Helpers::UrlHelper
+
+    def self.config=(controller)
+      @controller = controller
+    end
+    def self.config
+      @controller
+    end
+    def self.controller
+      @controller
+    end
   end
 
   def money(value, precision = 0)
@@ -33,16 +52,22 @@ module CmsFilters
   end
 
   def script_tag(url)
+    Protected.config = @context.registers[:controller]
     Protected.javascript_include_tag url
   end
 
   def stylesheet_tag(url)
     return '' if url.blank?
+
+    Protected.config = @context.registers[:controller]
     Protected.stylesheet_link_tag url
   end
 
   def image_tag(url, title = nil, size = nil)
     return '' if url.blank?
+
+    Protected.config = @context.registers[:controller]
+
     options = title.present? ? {:title => title, :alt => title} : {}
     options[:size] = size if size.present?
     Protected.image_tag url, options
@@ -88,7 +113,7 @@ module CmsFilters
 
   def component_url(path)
     context = @context.registers[:context]
-    "/" + Cms::Component.base_path(context).join(path).to_s
+    "/" + File.join(Cms::Component.base_path(context), Cms::Component.component_path(context, path))
   end
 end
 

data/app/models/cms/asset.rb

@@ -1,161 +1,33 @@
 module Cms
   class Asset < ActiveRecord::Base
-    unloadable
-
     set_table_name 'cms_assets'
 
-    include Cms::Taggable
-    define_tag_association :assets
-
-    def self.tags_for_context(context)
-      common_options = {:order => 'name ASC'}
-      context.object ? Cms::Tag.all({:include => :assets, :conditions => {'cms_assets.context_id' => context.object.id}}.merge(common_options)) : Cms::Tag.all(common_options)
-    end
-
-    class Meta
-      attr_reader :name, :value, :errors
-
-      def initialize(data)
-        @name, @value = data[:name], data[:value]
-        @errors = ActiveRecord::Errors.new(self)
-      end
-
-      def valid?
-        validate
-        errors.empty?
-      end
-
-      def validate
-        errors.clear
-        if @name.blank?
-          errors.add :name, 'must be set'
-        else
-          errors.add :name, "is an invalid format" if (@name =~ /^[a-z]+[a-z0-9_]*$/).nil?
-        end
-      end
-    end
-
-    serialize :meta_data
-
     has_attached_file :asset,
-      :styles => { :tiny => '50x50>', :thumb => '100x100>', :large => '200x200>', :custom => Proc.new{|instance| custom_dimensions(instance)} },
-      :convert_options => {:all => '-strip -quality 90'},
+      :styles => { :tiny => '50x50>', :thumb => '100x100>' }, #:custom => Proc.new { |instance| "#{instance.photo_width}x#{instance.photo_height}>" } },
       :path => ":rails_root/public/cms/assets/:id/:style/:filename",
       :url => "/cms/assets/:id/:style/:filename"
 
     validates_attachment_presence :asset
-    validate :meta_data_check
 
-    named_scope :ordered, :order => 'asset_file_name ASC'
+    scope :ordered, :order => 'asset_file_name ASC'
 
-    after_save :reprocess_custom_dimensions
     before_post_process :process_check
 
     def to_s
       asset_file_name
     end
 
-    def assign_ordered_attributes(params)
-      # force the custom dimensions to be assigned first so that when the asset is assigned, the custom dims are present
-      # if the custom dims aren't set before the asset is assigned, the custom size won't be generated properly
-      # this can occur if the attribute hash is iterated with the asset coming before the dims
-      self.attributes = params.slice(:custom_height, :custom_width)
-      self.attributes = params
-    end
-
-    def self.context_tags(context)
-      if context
-        Tag.all :joins => 'inner join taggings on taggings.tag_id = tags.id inner join cms_assets on taggings.taggable_id = cms_assets.id', :conditions => {'cms_assets.context_id' => context.id}
-      else
-        Tag.all
-      end
-    end
-
     def image?
-      !(asset_content_type =~ /^image.*/).blank?
+      !(asset_content_type =~ /^image.*/).nil?
     end
 
     def icon?
-      # accepts ico or icon
-      !(asset_content_type =~ /icon?$/).blank?
-    end
-
-    def editable?
-      Cms::Component.editable?(asset_file_name)
-    end
-
-    def file_content
-      read
-    end
-
-    def file_content=(content)
-      write content
-    end
-
-    def meta
-      return @_meta if @_meta.present?
-      @_meta = (meta_data || []).collect{|m| Meta.new(m)}
-    end
-
-    def meta=(data)
-      # reset the cached meta collection
-      @_meta = nil
-
-      # data ex:
-      # {"new_1301457489798"=>{"name"=>"test1", "value"=>"test1"}, "new_1301457493800"=>{"name"=>"test2", "value"=>"test2"}}
-      # converted to:
-      # [{"name"=>"test1", "value"=>"test1"}, {"name"=>"test2", "value"=>"test2"}]
-      # strip spaces of name and value
-      temp_data = data.to_a.sort{|a,b| a.first <=> b.first}.collect{|a| h = a[1]; {:name => h[:name].strip, :value => h[:value].strip} }
-      # remove any elements that have both name and value blank
-      temp_data = temp_data.reject{|d| d[:name].blank? && d[:value].blank?}
-
-      self.meta_data = temp_data
-    end
-
-    def to_liquid
-      Cms::AssetDrop.new(self)
+      !(asset_content_type =~ /icon$/).nil?
     end
 
   protected
-    def read
-      return '' if !editable?
-      asset.to_file(:original).read
-    end
-
-    def write(content)
-      return false if content.blank? || !editable?
-
-      fname = asset.path(:original)
-      File.exist?(fname).tap do |exist|
-        File.open(fname, 'w') do |f|
-          f.puts content
-        end if exist
-      end
-    end
-
-    def meta_data_check
-      if !meta.find_all{|m| !m.valid?}.empty?
-        errors.add :meta_data, "is invalid"
-      end
-    end
-
-    def self.custom_dimensions(record)
-      if !record.custom_width.to_i.zero? && !record.custom_height.to_i.zero?
-        "#{record.custom_width}x#{record.custom_height}>"
-      else
-        ''
-      end
-    end
-
     def process_check
       image? && !icon?
     end
-
-    def reprocess_custom_dimensions
-      if custom_height_changed? || custom_width_changed?
-        asset.reprocess!
-      end
-    end
   end
 end

data/app/models/cms/component.rb

@@ -1,46 +1,39 @@
 require 'zip/zip'
 
 class Cms::Component
-  attr_reader :path
 
+  attr_reader :path
+  
   def initialize(context, path = nil)
     @context = context
-    @path = self.class.clean_path(path) if path
+    @path = clean_path(path) if path
   end
 
-  # base public path for components
   def self.base_path(context)
-    Pathname.new(File.join('cms', context.object ? File.join('components', context.object.id.to_s) : 'components'))
+    File.join('cms', context.object ? File.join('components', context.object.id.to_s) : 'components')
   end
 
-  # full component path on the local system
   def self.full_path(context)
     Rails.root.join 'public', base_path(context)
   end
 
-  # the path for just the current component file as it existed in the original zip file
-  # returns empty if the path isn't in the main component directory which occurs if the zip contained relative references
-  # path: the full path of the component on the file system
   def self.component_path(context, path)
-    path.to_s.include?(full_path(context).to_s) ? path.sub(full_path(context).to_s + "/", '') : ''
+    path.sub(full_path(context).to_s + "/", '')
   end
 
-  def self.files(path)
-    Dir[File.expand_path(path) + "/*"]
+  def self.valid_type?(file)
+    %w(.css .js .png .jpg .jpeg .gif .json .xml .fla .ico).include?(File.extname(file).downcase)
   end
 
-  def self.valid_ext?(file)
-    Cms.valid_component_exts.include?(File.extname(file).downcase)
-  end
-
-  def self.expand(context, file)
+  def expand(file)
     Zip::ZipFile.open(file) do |zip_file|
       zip_file.each do |f|
-        f_path = full_path(context).join(f.name)
-        if valid_ext?(f_path) && component_path(context, f_path).present?
-          FileUtils.mkdir_p f_path.dirname
-          FileUtils.rm_rf(f_path.to_s) if f_path.exist?
-          zip_file.extract(f, f_path.to_s)
+        f_path = self.class.full_path(@context).join(f.name)
+        #if !File.exist?(f_path) && self.class.valid_type?(f_path)
+        if self.class.valid_type?(f_path)
+          FileUtils.mkdir_p File.dirname(f_path)
+          FileUtils.rm_rf(f_path) if File.exist?(f_path)
+          zip_file.extract(f, f_path)
         end
       end
     end
@@ -49,9 +42,9 @@ class Cms::Component
   def read
     return '' if @path.blank? || !self.class.editable?(@path)
 
-    fname = self.class.full_path(@context).join(@path)
-    if File.exist?(fname)
-      File.open(fname).read
+    base = self.class.full_path(@context).join(@path).to_s
+    if File.exist?(base)
+      File.open(base).readlines
     else
       ''
     end
@@ -60,30 +53,34 @@ class Cms::Component
   def write(content)
     return false if content.blank? || @path.blank? || !self.class.editable?(@path)
 
-    fname = self.class.full_path(@context).join(@path)
-    File.exist?(fname).tap do |exist|
-      File.open(fname, 'w') do |f|
+    base = self.class.full_path(@context).join(@path).to_s
+    if File.exist?(base)
+      File.open(base, 'w') do |f|
         f.puts content
-      end if exist
+      end
+    else
+      ''
     end
   end
-
+  
   def delete
     return false if @path.blank?
 
-    fname = self.class.full_path(@context).join(@path)
-    File.exist?(fname).tap do |exist|
-      FileUtils.rm_rf fname if exist
+    base = self.class.full_path(@context).join(@path)
+    if File.exist?(base)
+      FileUtils.rm_rf base
+      true
+    else
+      false
     end
   end
 
   def self.editable?(file)
-    file.present? && Cms.editable_component_exts.include?(File.extname(file).downcase)
+    !(file =~ /\.(js|css|html|xml)$/).nil?
   end
 
 protected
-  # cleans the path to remove relative references, etc. to other areas of the filesystem
-  def self.clean_path(path)
+  def clean_path(path)
     # don't do anything if the root path is present
     return nil if path.blank? || path[0] == "/"
 

data/app/models/cms/page.rb

@@ -6,6 +6,8 @@ module Cms
 
     NAME_REGEX = /^[^\/][a-zA-Z0-9_\-\.]+$/
 
+    versioned
+
     belongs_to :layout_page, :class_name => self.to_s
     has_many :content_pages, :class_name => self.to_s, :foreign_key => 'layout_page_id', :dependent => :nullify, :order => 'name ASC'
 
@@ -25,10 +27,10 @@ module Cms
       record.errors.add attr, "can't be set for a layout page" if value.present? && record.is_layout_page? 
     end
 
-    named_scope :published, :conditions => {:published => true}
-    named_scope :unpublished, :conditions => {:published => false}
-    named_scope :layouts, :conditions => {:is_layout_page => true}
-    named_scope :ordered, :order => 'is_layout_page DESC, name ASC'
+    scope :published, :conditions => {:published => true}
+    scope :unpublished, :conditions => {:published => false}
+    scope :layouts, :conditions => {:is_layout_page => true}
+    scope :ordered, :order => 'name ASC'
 
     def to_s
       name
@@ -37,20 +39,18 @@ module Cms
     def reserved_slug?
       return false if self.slug.blank?
 
-      begin
-        # reserved paths
-        return true if self.slug =~ /\A\/(stylesheets|scripts|images)\b/
-
-        path_options = ActionController::Routing::Routes.recognize_path(slug, {:method => :get})
-        # if the :url option is nil, then one of the existing routes matched the slug
-        return true if path_options[:url].nil?
- 
-        # if "root path" of any of the existing routes match the "root path" of requested url, then the slug is reserved
-        ActionController::Routing::Routes.routes.any? do |r|
-          r.segments.collect{|s| s.to_s}.reject{|s| s == '/'}.first == path_options[:url].first
-        end
-      rescue ActionController::RoutingError
-        false
+      # reserved paths
+      return true if self.slug =~ /\A\/(stylesheets|scripts|images)\b/
+
+      path_options = Rails.application.routes.recognize_path(slug)
+      # if the :url option is nil, then one of the existing routes matched the slug
+      return true if path_options[:url].nil?
+
+      first_segment = (path_options[:url] || '/').split('/')[0]
+
+      # if part of the path matches and of the route "controllers" then we have a route conflict
+      Rails.application.routes.routes.any? do |r|
+        r.path.split('/')[1] == first_segment
       end
     end
 
@@ -58,7 +58,7 @@ module Cms
       render_options = {} #{:filters => [CmsFilters, AppFilters]}
       common_assigns = {'params' => ParamsDrop.new((controller.params || {}).except(:controller, :action)), 'site_url' => controller.request.protocol + controller.request.raw_host_with_port}
 
-      context_obj = Cms::Context.new(Cms.context_class ? context : nil)
+      context_obj = Cms.context_class ? Cms::Context.new(context) : nil
 
       # render the current page
       page = self
@@ -98,7 +98,7 @@ module Cms
 
     def content=(text)
       write_attribute :content, text
-      self.is_layout_page = !(text =~ /\{\{\s?content_for_layout\s?\}\}/).blank?
+      self.is_layout_page = !(text =~ /\{\{\s?content_for_layout\s?\}\}/).nil?
     end
 
   protected

data/app/views/cms/assets/_asset.html.erb

@@ -1,7 +1,8 @@
-<% content_tag_for :li, asset, :class => cms_row_class do %>
+<%= content_tag_for :li, asset, :class => cms_row_class do %>
   <%= file_type_icon asset.asset_file_name %>
-  <%= link_to cms_icon('delete.png', :title => 'Delete'), cms_asset_path(asset), :method => :delete, :confirm => "Are you sure you want to delete the \"#{asset}\" asset?" %>
-  <%= link_to truncate(asset.asset_file_name, :length => 22), edit_cms_asset_path(asset), :title => asset.asset_file_name %>
+  <%= link_to cms_icon('delete.png', :title => 'Delete'), cms_asset_path(asset), :remote => true, :indicator => dom_id(asset, 'progress'), :method => :delete, :confirm => "Are you sure you want to delete the \"#{asset}\" asset?" %>
+  <%= link_to truncate(asset.asset_file_name, :length => 22), cms_asset_path(asset), :title => asset.asset_file_name %>
+  <%= indicator dom_id(asset, 'progress') %>
 
   <span class="asset_size"><%= number_to_human_size asset.asset_file_size %></span>