locomotive_cms 0.0.3.3 → 0.0.4.beta1

data/app/models/theme_asset.rb

@@ -1,94 +1,138 @@
 class ThemeAsset
-  
+
   include Locomotive::Mongoid::Document
-  
-  ## Extensions ##  
-  include Models::Extensions::Asset::Vignette
-  
+
   ## fields ##
-  field :slug
+  field :local_path
   field :content_type
   field :width, :type => Integer
   field :height, :type => Integer
   field :size, :type => Integer
+  field :folder, :default => nil
+  field :hidden, :type => Boolean, :default => false
   mount_uploader :source, ThemeAssetUploader
-  
+
   ## associations ##
-  belongs_to_related :site
-  
+  referenced_in :site
+
+  ## indexes ##
+  index :site_id
+  index [[:site_id, Mongo::ASCENDING], [:local_path, Mongo::ASCENDING]]
+
   ## callbacks ##
-  before_validate :sanitize_slug
-  before_validate :store_plain_text
-  before_save     :set_slug
-  
+  before_validation :store_plain_text
+  before_save :sanitize_folder
+  before_save :build_local_path
+
   ## validations ##
-  validate :extname_can_not_be_changed
   validates_presence_of :site, :source
-  validates_presence_of :slug, :if => Proc.new { |a| a.new_record? && a.performing_plain_text? }
-  validates_uniqueness_of :slug, :scope => [:site_id, :content_type]
+  validates_presence_of :plain_text_name, :if => Proc.new { |a| a.performing_plain_text? }
+  validates_uniqueness_of :local_path, :scope => :site_id
   validates_integrity_of :source
-    
+  validate :content_type_can_not_changed
+
+  ## named scopes ##
+  scope :visible, lambda { |all| all ? {} : { :where => { :hidden => false } } }
+
   ## accessors ##
-  attr_accessor :performing_plain_text
-  
+  attr_accessor :plain_text_name, :plain_text, :performing_plain_text
+
   ## methods ##
-  
-  %w{movie image stylesheet javascript}.each do |type|
+
+  %w{movie image stylesheet javascript font}.each do |type|
     define_method("#{type}?") do
       self.content_type == type
-    end  
+    end
   end
-  
-  def plain_text
-    @plain_text ||= (if self.stylesheet? || self.javascript?
-      self.source.read
+
+  def stylesheet_or_javascript?
+    self.stylesheet? || self.javascript?
+  end
+
+  def local_path(short = false)
+    if short
+      self.read_attribute(:local_path).gsub(/^#{self.content_type.pluralize}\//, '')
     else
-      nil
-    end)
+      self.read_attribute(:local_path)
+    end
+  end
+
+  def plain_text_name
+    if not @plain_text_name_changed
+      @plain_text_name ||= self.safe_source_filename
+    end
+    @plain_text_name.gsub(/(\.[a-z0-9A-Z]+)$/, '') rescue nil
+  end
+
+  def plain_text_name=(name)
+    @plain_text_name_changed = true
+    @plain_text_name = name
   end
-  
-  def plain_text=(source)
-    self.performing_plain_text = true if self.performing_plain_text.nil?
-    @plain_text = source
+
+  def plain_text
+    @plain_text ||= self.source.read
   end
-  
+
   def performing_plain_text?
-    return true if !self.new_record? && !self.image? && !self.movie? && self.errors.empty?
-    
-    !(self.performing_plain_text.blank? || self.performing_plain_text == 'false' || self.performing_plain_text == false)
+    Boolean.set(self.performing_plain_text) || false
   end
-  
+
   def store_plain_text
-    return if self.plain_text.blank?
-    
-    self.source = CarrierWave::SanitizedFile.new({ 
-      :tempfile => StringIO.new(self.plain_text),
-      :filename => "#{self.slug}.#{self.stylesheet? ? 'css' : 'js'}"
+    data = self.performing_plain_text? ? self.plain_text : self.source.read
+
+    return if !self.stylesheet_or_javascript? || self.plain_text_name.blank? || data.blank?
+
+    sanitized_source = self.escape_shortcut_urls(data)
+
+    self.source = CarrierWave::SanitizedFile.new({
+      :tempfile => StringIO.new(sanitized_source),
+      :filename => "#{self.plain_text_name}.#{self.stylesheet? ? 'css' : 'js'}"
     })
   end
-  
+
   def to_liquid
     { :url => self.source.url }.merge(self.attributes)
   end
-    
+
   protected
-  
-  def sanitize_slug
-    self.slug.slugify!(:underscore => true) if self.slug.present?
+
+  def safe_source_filename
+    self.source_filename || self.source.send(:original_filename) rescue nil
   end
-  
-  def set_slug
-    if self.slug.blank?
-      self.slug = File.basename(self.source_filename, File.extname(self.source_filename))
-      self.sanitize_slug
+
+  def sanitize_folder
+    self.folder = self.content_type.pluralize if self.folder.blank?
+
+    # no accents, no spaces, no leading and ending trails
+    self.folder = ActiveSupport::Inflector.transliterate(self.folder).gsub(/(\s)+/, '_').gsub(/^\//, '').gsub(/\/$/, '').downcase
+
+    # folder should begin by a root folder
+    if (self.folder =~ /^(stylesheets|javascripts|images|media|fonts)/).nil?
+      self.folder = File.join(self.content_type.pluralize, self.folder)
     end
   end
-  
-  def extname_can_not_be_changed
-    return if self.new_record?
-        
-    if File.extname(self.source.file.original_filename) != File.extname(self.source_filename)
-      self.errors.add(:source, :extname_changed)
+
+  def build_local_path
+    self.local_path = File.join(self.folder, self.safe_source_filename)
+  end
+
+  def escape_shortcut_urls(text)
+    return if text.blank?
+
+    text.gsub(/[("'](\/(stylesheets|javascripts|images|media)\/((.+)\/)*([a-z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
+
+      sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
+
+      if asset = self.site.theme_assets.where(:local_path => sanitized_path).first
+        "#{path.first}#{asset.source.url}#{path.last}"
+      else
+        path
+      end
     end
   end
-end
+
+  def content_type_can_not_changed
+    self.errors.add(:source, :extname_changed) if !self.new_record? && self.content_type_changed?
+  end
+
+end

data/app/uploaders/asset_uploader.rb

@@ -7,16 +7,16 @@ class AssetUploader < CarrierWave::Uploader::Base
   def store_dir
     "sites/#{model.collection.site_id}/assets/#{model.id}"
   end
-  
+
   def cache_dir
     "#{Rails.root}/tmp/uploads"
   end
-  
+
   version :thumb do
     process :resize_to_fill => [50, 50]
     process :convert => 'png'
   end
-  
+
   version :medium do
     process :resize_to_fill => [80, 80]
     process :convert => 'png'
@@ -24,18 +24,18 @@ class AssetUploader < CarrierWave::Uploader::Base
 
   version :preview do
     process :resize_to_fit => [880, 1100]
-    process :convert => 'png'    
+    process :convert => 'png'
   end
-  
-  process :set_content_type  
+
+  process :set_content_type
   process :set_size
   process :set_width_and_height
 
-  def set_content_type
+  def set_content_type(*args)
     value = :other
-    
+
     content_type = file.content_type == 'application/octet-stream' ? File.mime_type?(original_filename) : file.content_type
-    
+
     self.class.content_types.each_pair do |type, rules|
       rules.each do |rule|
         case rule
@@ -44,29 +44,30 @@ class AssetUploader < CarrierWave::Uploader::Base
         end
       end
     end
-    
+
     model.content_type = value
   end
-  
-  def set_size
+
+  def set_size(*args)
     model.size = file.size
   end
-  
+
   def set_width_and_height
     if model.image?
       model.width, model.height = `identify -format "%wx%h" #{file.path}`.split(/x/).collect(&:to_i)
     end
   end
-    
+
   def self.content_types
     {
       :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'],
-      :movie      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
+      :video      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
       :audio      => [/^audio/, 'application/ogg', 'application/x-mp3'],
       :pdf        => ['application/pdf', 'application/x-pdf'],
       :stylesheet => ['text/css'],
-      :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript']
-    }  
+      :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript'],
+      :font       => ['application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff']
+    }
   end
-    
+
 end

data/app/uploaders/editable_file_uploader.rb

@@ -0,0 +1,11 @@
+class EditableFileUploader < ::CarrierWave::Uploader::Base
+
+  def store_dir
+    "sites/#{model.page.site_id}/pages/#{model.page.id}/files"
+  end
+
+  def cache_dir
+    "#{Rails.root}/tmp/uploads"
+  end
+
+end

data/app/uploaders/theme_asset_uploader.rb

@@ -1,32 +1,21 @@
 # encoding: utf-8
 
 class ThemeAssetUploader < AssetUploader
-  
-  process :set_content_type  
+
+  process :set_content_type
   process :set_size
   process :set_width_and_height
-  
-  version :thumb do
-    process :resize_to_fill => [50, 50]
-    process :convert => 'png'
-  end
-  
-  version :medium do
-    process :resize_to_fill => [80, 80]
-    process :convert => 'png'
-  end
 
-  version :preview do
-    process :resize_to_fit => [880, 1100]
-    process :convert => 'png'    
-  end
-  
   def store_dir
-    "sites/#{model.site_id}/themes/#{model.id}"
+    File.join('sites', (model.site_id_was || model.site_id).to_s, 'theme', model.folder_was || model.folder)
   end
-  
+
+  def stale_model?
+    !model.new_record? && model.folder_changed?
+  end
+
   def extension_white_list
-    %w(jpg jpeg gif png css js swf flv)
+    %w(jpg jpeg gif png css js swf flv eot svg ttf woff)
   end
-  
-end
+
+end

data/app/views/admin/accounts/new.html.haml

@@ -3,7 +3,7 @@
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @account, :url => admin_accounts_url do |f|
 
@@ -12,11 +12,11 @@
 
   = f.foldable_inputs :name => :credentials do
     = f.input :email, :required => false
-    
+
     = f.custom_input :password, :label => :new_password do
       = f.password_field :password
-      
+
     = f.custom_input :password_confirmation, :label => :new_password_confirmation do
       = f.password_field :password_confirmation
-  
+
   = render 'admin/shared/form_actions', :back_url => edit_admin_current_site_url, :button_label => :create

data/app/views/admin/asset_collections/edit.html.haml

@@ -2,32 +2,32 @@
 
 - content_for :head do
   = javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
 
-%p= t('.help')
+%p!= t('.help')
 
 - content_for :buttons do
   = admin_button_tag :add_asset, new_admin_asset_url(@asset_collection), :class => 'new'
-  
+
 %p.no-items{ :style => "#{'display: none' unless @asset_collection.assets.empty? }" }
-  = t('.no_items', :url => new_admin_asset_url(@asset_collection))
-    
+  != t('.no_items', :url => new_admin_asset_url(@asset_collection))
+
 %ul#assets.assets.sortable
   = render :partial => 'asset', :collection => @asset_collection.ordered_assets
   %li.clear
-  
+
 = semantic_form_for @asset_collection, :url => admin_asset_collection_url(@asset_collection), :html => { :multipart => true } do |f|
   = f.hidden_field :assets_order
-  
+
   = f.foldable_inputs :name => :options do
     = f.input :name
     = f.input :slug, :required => false
-    
+
   = render 'admin/custom_fields/index', :form => f, :collection_name => 'assets'
-    
+
   = render 'admin/shared/form_actions', :delete_button => link_to(content_tag(:em, escape_once(' ')) + t('.destroy'), admin_asset_collection_url(@asset_collection), :confirm => t('admin.messages.confirm'), :method => :delete, :class => 'button small remove'), :button_label => :update
-  
+
 = render 'admin/custom_fields/edit_field'

data/app/views/admin/asset_collections/index.html.haml

@@ -3,6 +3,6 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
 
-%p= t('.help')
+%p!= t('.help')
 
-%p.no-items= t('.no_items', :url => new_admin_asset_collection_url)
+%p.no-items!= t('.no_items', :url => new_admin_asset_collection_url)

data/app/views/admin/asset_collections/new.html.haml

@@ -6,12 +6,12 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @asset_collection, :url => admin_asset_collections_url do |f|
 
   = f.inputs :name => :information do
     = f.input :name
     = f.input :slug, :required => false
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_asset_collections_url, :button_label => :create

data/app/views/admin/assets/edit.html.haml

@@ -6,7 +6,7 @@
 - content_for :buttons do
   = admin_button_tag t('admin.asset_collections.edit.add_asset'), new_admin_asset_url(@asset_collection), :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @asset, :url => admin_asset_url(@asset_collection, @asset), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
 

data/app/views/admin/assets/new.html.haml

@@ -3,10 +3,10 @@
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @asset, :url => admin_assets_url(@asset_collection), :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@asset_collection), :button_label => :create

data/app/views/admin/content_types/_form.html.haml

@@ -1,12 +1,12 @@
 - content_for :head do
   = javascript_include_tag 'admin/plugins/fancybox', 'admin/custom_fields'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 = f.inputs :name => :information do
   = f.input :name
   = f.input :slug
   = f.input :description
-  
+
 = render 'admin/custom_fields/index', :form => f, :collection_name => 'contents'
 
 - unless f.object.new_record?
@@ -18,5 +18,5 @@
     = f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false
     = f.custom_input :api_enabled, :css => 'toggle' do
       = f.check_box :api_enabled
-      
-  
+
+

data/app/views/admin/content_types/edit.html.haml

@@ -7,12 +7,12 @@
   = admin_button_tag :show_items, admin_contents_url(@content_type.slug), :class => 'show'
   = admin_button_tag :new_item, new_admin_content_url(@content_type.slug), :class => 'new'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @content_type, :url => admin_content_type_url(@content_type) do |f|
 
   = render 'form', :f => f
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_contents_url(@content_type.slug), :button_label => :update
-  
+
 = render 'admin/custom_fields/edit_field'

data/app/views/admin/content_types/new.html.haml

@@ -6,12 +6,12 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
 
-%p= t('.help')
+%p!= t('.help')
 
 = semantic_form_for @content_type, :url => admin_content_types_url do |f|
 
   = render 'form', :f => f
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_pages_url, :button_label => :create
 
 = render 'admin/custom_fields/edit_field'

data/app/views/admin/contents/_form.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
   = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/contents'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
 
 = render 'admin/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type

data/app/views/admin/contents/_list.html.haml

@@ -1,5 +1,5 @@
 - if contents.empty?
-  %p.no-items= t('.no_items', :url => new_admin_content_url(@content_type.slug))
+  %p.no-items!= t('.no_items', :url => new_admin_content_url(@content_type.slug))
 - else
   %ul{ :id => 'contents-list', :class => "list #{'sortable' if @content_type.order_by == '_position_in_list'}" }
     - contents.each do |content|
@@ -9,7 +9,7 @@
           = link_to content.send(@content_type.highlighted_field_name), edit_admin_content_path(@content_type.slug, content)
         .more
           %span
-            = t('admin.contents.index.updated_at')
+            != t('admin.contents.index.updated_at')
           = l content.updated_at, :format => :short rescue 'n/a'
-          
+
           = link_to image_tag('admin/list/icons/trash.png'), admin_content_path(@content_type.slug, content), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete

data/app/views/admin/contents/edit.html.haml

@@ -3,7 +3,7 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
 
-- content_for :buttons do  
+- content_for :buttons do
   = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
   = admin_button_tag t('admin.contents.index.new'), new_admin_content_url(@content_type.slug), :class => 'new'
 

data/app/views/admin/contents/index.html.haml

@@ -2,25 +2,25 @@
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
-    
+
 - content_for :head do
   = javascript_include_tag 'admin/contents'
-  
+
 - content_for :buttons do
   = admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit'
   = admin_button_tag :new, new_admin_content_url(@content_type.slug), :class => 'new'
 
-- if @content_type.description.present? 
+- if @content_type.description.present?
   %p= @content_type.description
 
 - if @content_type.groupable?
-  - @contents.each do |group|  
+  - @contents.each do |group|
     %h3= group[:name] || t('.category_noname')
-    = render 'list', :contents => group[:items]  
+    = render 'list', :contents => group[:items]
     %br
 - else
   = render 'list', :contents => @contents
-        
+
 = form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do
   = hidden_field_tag :order
 

data/app/views/admin/contents/new.html.haml

@@ -2,14 +2,14 @@
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
-  
+
 - content_for :buttons do
   = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
-  
+
 %p= @content_type.description
 
 = semantic_form_for @content, :as => :content, :url => admin_contents_url(@content_type.slug), :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
-  
+
   = render 'admin/shared/form_actions', :back_url => admin_contents_url(@content_type.slug), :button_label => :create

data/app/views/admin/cross_domain_sessions/new.html.haml

@@ -0,0 +1,14 @@
+- title t('.title')
+
+= form_tag admin_cross_domain_sessions_url(:host => @target, :port => request.port), :method => 'post' do
+
+  = hidden_field_tag 'token', current_admin.switch_site_token
+
+  .inner
+    %p.notice= t('.notice')
+
+  .footer
+    = login_button_tag t('admin.buttons.switch_to_site')
+
+:javascript
+  $(document).ready(function() { $('form').submit(); });