liquid_cms 0.2.0.13 → 0.2.1.0

data/app/models/cms/component.rb

@@ -1,43 +1,46 @@
 require 'zip/zip'
 
 class Cms::Component
-
   attr_reader :path
   
   def initialize(context, path = nil)
     @context = context
-    @path = clean_path(path) if path
+    @path = self.class.clean_path(path) if path
   end
 
+  # base public path for components
   def self.base_path(context)
-    File.join('cms', context.object ? File.join('components', context.object.id.to_s) : 'components')
+    Pathname.new(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.sub(full_path(context).to_s + "/", '')
+    path.to_s.include?(full_path(context).to_s) ? path.sub(full_path(context).to_s + "/", '') : ''
   end
 
   def self.files(path)
     Dir[File.expand_path(path) + "/*"]
   end
 
-  def self.valid_type?(file)
-    %w(.css .js .png .jpg .jpeg .gif .json .xml .fla .ico).include?(File.extname(file).downcase)
+  def self.valid_ext?(file)
+    Cms.valid_component_exts.include?(File.extname(file).downcase)
   end
 
-  def expand(file)
+  def self.expand(context, file)
     Zip::ZipFile.open(file) do |zip_file|
       zip_file.each do |f|
-        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)
+        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)
         end
       end
     end
@@ -46,7 +49,7 @@ class Cms::Component
   def read
     return '' if @path.blank? || !self.class.editable?(@path)
 
-    fname = self.class.full_path(@context).join(@path).to_s
+    fname = self.class.full_path(@context).join(@path)
     if File.exist?(fname)
       File.open(fname).read
     else
@@ -57,7 +60,7 @@ 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).to_s
+    fname = self.class.full_path(@context).join(@path)
     File.exist?(fname).tap do |exist|
       File.open(fname, 'w') do |f|
         f.puts content
@@ -75,11 +78,12 @@ class Cms::Component
   end
 
   def self.editable?(file)
-    !(file =~ /\.(js|css|html|xml)$/).blank?
+    Cms.editable_component_exts.include?(File.extname(file).downcase)
   end
 
 protected
-  def clean_path(path)
+  # cleans the path to remove relative references, etc. to other areas of the filesystem
+  def self.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,8 +6,6 @@ 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'
 
@@ -30,7 +28,7 @@ module Cms
     named_scope :published, :conditions => {:published => true}
     named_scope :unpublished, :conditions => {:published => false}
     named_scope :layouts, :conditions => {:is_layout_page => true}
-    named_scope :ordered, :order => 'name ASC'
+    named_scope :ordered, :order => 'is_layout_page DESC, name ASC'
 
     def to_s
       name

data/app/models/cms/tag.rb

@@ -0,0 +1,21 @@
+class Cms::Tag < ActiveRecord::Base
+  unloadable
+
+  set_table_name 'cms_tags'
+
+  class << self
+    def find_or_initialize_with_name_like(name)
+      with_name_like(name).first || new(:name => name)
+    end
+  end
+
+  has_many :taggings, :dependent => :destroy, :class_name => 'Cms::Tagging'
+
+  validates_presence_of :name
+
+  named_scope :with_name_like, lambda { |name| { :conditions => ["name like ?", name] } }
+
+  def to_s
+    name
+  end
+end

data/app/models/cms/taggable.rb

@@ -0,0 +1,78 @@
+module Cms::Taggable
+  class TagList < Array
+    def initialize(list)
+      list = list.is_a?(Array) ? list : list.split(/[,\W]+/).collect(&:strip).reject(&:blank?).collect(&:downcase)
+      super
+    end
+    
+    def to_s
+      join ', '
+    end
+  end
+
+  def self.included(klass)
+    klass.extend TaggableMethods::ClassMethods
+
+    klass.class_eval do
+      include TaggableMethods::InstanceMethods
+
+      has_many :taggings, :as => :taggable, :dependent => :destroy, :class_name => 'Cms::Tagging'
+      has_many :tags, :through => :taggings
+
+      after_save :save_tags
+    end
+  end
+
+  module TaggableMethods
+    module ClassMethods
+      def define_tag_association(assoc)
+        source_klass = self.to_s
+        Cms::Tag.class_eval do
+          has_many assoc, :through => :taggings, :source => :taggable, :source_type => source_klass
+        end
+
+        self.named_scope :tagged_with, lambda{|tag| {:include => :tags, :conditions => ['cms_tags.name like ?', tag.to_s]}}
+        self.named_scope :tagged, :joins => "left outer join cms_taggings on cms_taggings.taggable_id = #{table_name}.id", :conditions => 'cms_taggings.id is not null'
+        self.named_scope :untagged, :joins => "left outer join cms_taggings on cms_taggings.taggable_id = #{table_name}.id", :conditions => 'cms_taggings.id is null'
+      end
+    end
+
+    module InstanceMethods
+      def tag_list
+        get_tag_list
+      end
+
+      def tag_list=(new_list)
+        set_tag_list new_list
+      end
+
+    protected
+      def set_tag_list(list)
+        @_tag_list = TagList.new(list)
+      end
+
+      def get_tag_list
+        set_tag_list(tags.map(&:name)) if @_tag_list.nil?
+        @_tag_list
+      end
+      
+      def save_tags
+        delete_unused_tags
+        add_new_tags
+
+        taggings.each(&:save)
+      end
+      
+      def delete_unused_tags
+        tags.each { |t| tags.delete(t) unless get_tag_list.include?(t.name) }
+      end
+
+      def add_new_tags
+        tag_names = tags.map(&:name)
+        get_tag_list.each do |tag_name| 
+          tags << Cms::Tag.find_or_initialize_with_name_like(tag_name) unless tag_names.include?(tag_name)
+        end
+      end
+    end
+  end
+end

data/app/models/cms/tagging.rb

@@ -0,0 +1,6 @@
+class Cms::Tagging < ActiveRecord::Base
+  set_table_name 'cms_taggings'
+
+  belongs_to :tag, :class_name => 'Cms::Tag'
+  belongs_to :taggable, :polymorphic => true
+end

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

@@ -1,8 +1,7 @@
 <% content_tag_for :li, asset, :class => cms_row_class do %>
   <%= file_type_icon asset.asset_file_name %>
-  <%= link_to_remote cms_icon('delete.png', :title => 'Delete'), :url => cms_asset_path(asset), :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') %>
+  <%= 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 %>
 
   <span class="asset_size"><%= number_to_human_size asset.asset_file_size %></span>
 

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

@@ -1,4 +1,19 @@
 <% simple_form_for @asset, :html => {:multipart => true} do |f| %>
+  <% unless f.object.new_record? %>
+  <div class="details">
+    <p><span class="label">Original</span> <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
+    <p><span class="label">Filesize</span> <%= number_to_human_size(@asset.asset_file_size) %></p>
+    <p><span class="label">Last Updated</span> <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
+  </div>
+  <% end %>
+
+  <% if f.object.image? %>
+  <div class="preview">
+    <span class="label">Preview</span>
+    <%= image_tag @asset.asset.url(:large) %>
+  </div>
+  <% end %>
+
   <%= f.input :asset, :as => :file %>
 
   <% if f.object.editable? %>
@@ -7,12 +22,47 @@
     </p>
 
     <div class="text required">
-      <%= label_tag :file_content, 'Content', :class => 'text required' %> <%= text_area_tag :file_content, f.object.read, :rows => 40, :class => 'text required' %>
-      <span class="hint"><%= t('simple_form.hints.cms_asset.file_content') %></span>
+      <%= f.input :file_content, :as => :text, :input_html => {:rows => 40, :cols => nil} %>
     </div>
 
-    <%= codemirror_edit Cms::Editable::content_type(@asset.asset_file_name), 'form.simple_form', 'file_content' %>
+    <%= codemirror_edit Cms::Editable::content_type(@asset.asset_file_name), 'form.simple_form', 'cms_asset_file_content' %>
+  <% end %>
+
+  <div class="dimensions">
+    <%= f.label :custom_size, :required => false %>
+    <%= f.input :custom_width, :label => false, :required => false, :input_html => {:size => 4} %> x
+    <%= f.input :custom_height, :label => false, :required => false, :input_html => {:size => 4} %>
+    <span class="hint"><%= t('simple_form.hints.cms_asset.dimensions') %></span>
+  </div>
+
+  <%= f.input :tag_list, :as => :string, :required => false %>
+
+  <% field_set_tag 'Meta Data' do %>
+    <ul id="meta_fields">
+      <% f.object.meta.each_with_index do |meta,idx| %>
+        <%= render 'meta_field', :f => f, :obj => meta, :idx => idx %>
+      <% end %>
+    </ul>
+    <%= cms_icon 'table_add.png' %> <%= link_to 'Add meta data', nil, :id => 'add_meta', :title => 'Add new meta data' %>
   <% end %>
 
   <%= f.commit_button_or_cancel %>
+
+  <% javascript_tag do %>
+    function remove_element(evt) {
+      this.up('li').remove();
+      evt.stop();
+    }
+
+    $('add_meta').observe('click', function(evt) {
+      var new_field_id = "new_" + new Date().getTime();
+      $('meta_fields').insert({
+        bottom:
+        "<%= escape_javascript(render('meta_field', :f => f, :obj => nil)) %>".replace(/new_\d+/g, new_field_id)
+      }).select('.remove_meta').last().observe('click', remove_element);
+      evt.stop();
+    });
+
+    $$('.remove_meta').invoke('observe', 'click', remove_element);
+  <% end %>
 <% end %>

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

@@ -11,7 +11,22 @@
     <% end %>
 
     <ul>
-      <%= render :partial => 'cms/assets/asset', :collection => @cms_assets %>
+      <% @context_asset_tags.each do |tag| %>
+        <li class="group tagged">
+          <h4><%= tag.to_s %> <%= link_to cms_icon('picture_add.png', :title => 'Add a new asset with this tag'), new_cms_asset_path(:tag => tag.to_s) %></h4>
+          <ul>
+            <%= render :partial => 'cms/assets/asset', :collection => @context.assets.tagged_with(tag).ordered %>
+          </ul>
+        </li>
+      <% end %>
+      <li class="group untagged">
+        <% unless @context_asset_tags.blank? %>
+        <h4>Untagged</h4>
+        <% end %>
+        <ul>
+          <%= render :partial => 'cms/assets/asset', :collection => @context.assets.untagged.ordered %>
+        </ul>
+      </li>
     </ul>
   <% end %>
 </div>

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

@@ -0,0 +1,15 @@
+<% f.simple_fields_for :meta, obj ? obj : nil, :index => obj ? idx : 'new_0' do |m| %>
+<li>
+  <div class="field">
+    <%= m.input :name, :placeholder => 'field name', :size => 40 %>
+    <span class="hint"><%= t('simple_form.hints.cms_asset.meta.name') %></span>
+  </div>
+  <div class="field">
+    <%= m.input :value, :as => :text, :required => false, :input_html => {:rows => 2, :cols => 60, :placeholder => 'field value'} %>
+  </div>
+
+  <span class="delete">
+    <%= link_to cms_icon('table_delete.png'), nil, :class => 'remove_meta', :title => 'Delete this meta data' %>
+  </span>
+</li>
+<% end %>

data/app/views/cms/documentation/_cms_drops.html.erb

@@ -11,3 +11,21 @@
 {{ image.large.width }}
 {{ image.large.height }}
 </pre>
+
+<a name="asset_drop"></a>
+<h3>Asset</h3>
+<ul>
+  <li><span class="attribute">meta</span> - Meta fields can be accessed from the meta attribute. Meta data is associated with an asset when creating or editing them.</li>
+  <li>
+    <span class="attribute">image</span> - Gives you access to the image fields if the asset an image.  See the <a href="#image_drop">paperclip objects</a> drop for available fields.</a><br/>
+    The image attribute only contains the <em>'original'</em> size in addition to a <em>'custom'</em> size if custom dimensions were specified for the image.
+  </li>
+</ul>
+
+<pre>
+{{ asset.meta.field_name }}
+{{ asset.meta.location }}
+
+{{ asset.image.custom.url }}
+{{ asset.image.original.url }}
+</pre>

data/app/views/cms/documentation/_cms_tags.html.erb

@@ -7,3 +7,16 @@
   {% include 'test' %}
 </div>
 </pre>
+
+<h3><span class="function">asset_data</span> - Retrieves assets as a collection of asset drops.</h3>
+<ul>
+  <li><span class="param required">tag</span> - The tag string used to search for the assets.  Tags are associated with the asset when creating or editing them.</li>
+  <li><span class="param">random</span> - Return assets in a random order or most recent first. (true/false).  false by default.</li>
+  <li><span class="param">limit</span> - The maximum number of records to return.  Returns all by default.</li>
+  <li><span class="param">as</span> - Specify the name of the variable that the asset data will be saved in.  The name is 'assets' by default.</li>
+</ul>
+
+<pre>
+{% asset_data tag:'gallery' %}
+{% asset_data tag:'customer' random:true %}
+</pre>

data/app/views/cms/pages/_page.html.erb

@@ -3,15 +3,13 @@
   <% if page.published? %>
     <%= cms_icon 'accept.png' %>
   <% else %>
-    <%= delete_page_link page %>
+    <%= link_to cms_icon('delete.png', :title => 'Delete'), cms_page_path(page), :method => :delete, :confirm => "Are you sure you want to delete the \"#{page}\" page?" %>
   <% end %>
   <%= link_to truncate(page.to_s, :length => 24), edit_cms_page_path(page), :title => "Edit '#{page}'" %>
 
   <%= cms_icon 'house.png', :title => 'Root/Home Page' if page.root? %>
   <%= link_to cms_icon('magnifier.png', :title => 'View'), page.url, :class => 'external' if page.published? %>
 
-  <%= indicator dom_id(page, 'progress') %>
-
   <% unless page.content_pages.empty? %>
     <ul>
       <%= render :partial => 'cms/pages/page', :collection => page.content_pages %>

data/app/views/cms/shared/_sidebar.html.erb

@@ -1,35 +1,36 @@
-<ul id="cms_menus" class="tabs clearfix">
-  <li><%= link_to t('pages.actions.index.title'), '#cms_pages' %></li>
-  <li><%= link_to t('assets.actions.index.title'), '#cms_assets' %></li>
-  <li><%= link_to t('components.actions.index.title'), '#cms_components' %></li>
-</ul>
+<div id="sidebar_container">
+  <ul id="cms_menus" class="tabs clearfix">
+    <li><%= link_to t('pages.actions.index.title'), '#cms_pages' %></li>
+    <li><%= link_to t('assets.actions.index.title'), '#cms_assets' %></li>
+    <li><%= link_to t('components.actions.index.title'), '#cms_components' %></li>
+  </ul>
 
-<div id="tab_container">
-  <div id="cms_pages">
-    <h2><%= t 'pages.actions.index.title' %></h2>
-    <%= render 'cms/pages/list' %>
-  </div>
+  <div id="tab_container">
+    <div id="cms_pages">
+      <h2><%= t 'pages.actions.index.title' %></h2>
+      <%= render 'cms/pages/list' %>
+    </div>
 
-  <div id="cms_assets">
-    <h2><%= t 'assets.actions.index.title' %></h2>
-    <%= render 'cms/assets/list' %>
-  </div>
+    <div id="cms_assets">
+      <h2><%= t 'assets.actions.index.title' %></h2>
+      <%= render 'cms/assets/list' %>
+    </div>
 
-  <div id="cms_components">
-    <h2><%= t 'components.actions.index.title' %></h2>
-    <%= render 'cms/components/list' %>
+    <div id="cms_components">
+      <h2><%= t 'components.actions.index.title' %></h2>
+      <%= render 'cms/components/list' %>
+    </div>
   </div>
-</div>
 
-<% javascript_tag do %>
-  new Control.Tabs('cms_menus', {
-    defaultTab: jar.get('active_tab') || 'first',
-    afterChange: function(new_container) {
-      // save the active tab
-      jar.put('active_tab', new_container.getAttribute('id'));
-    }
-  });
-<% end %>
-
-<p class="documentation"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_path %></p>
+  <% javascript_tag do %>
+    new Control.Tabs('cms_menus', {
+      defaultTab: jar.get('active_tab') || 'first',
+      afterChange: function(new_container) {
+        // save the active tab
+        jar.put('active_tab', new_container.getAttribute('id'));
+      }
+    });
+  <% end %>
 
+  <p class="documentation"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_path %></p>
+</div>