locomotive_cms 0.0.4 → 1.0.0.beta

data/app/models/content_instance.rb

@@ -28,6 +28,7 @@ class ContentInstance
   ## methods ##
 
   alias :visible? :_visible?
+  alias :_permalink :_slug
 
   def site_id  # needed by the uploader of custom fields
     self.content_type.site_id
@@ -37,6 +38,24 @@ class ContentInstance
     self._visible || self._visible.nil?
   end
 
+  def aliased_attributes # TODO: move it to the custom_fields gem
+    hash = { :created_at => self.created_at, :updated_at => self.updated_at }
+
+    self.custom_fields.each do |field|
+      case field.kind
+      when 'file' then hash[field._alias] = self.send(field._name.to_sym).url
+      else
+        hash[field._alias] = self.send(field._name.to_sym)
+      end
+    end
+
+    hash
+  end
+
+  def errors_to_hash
+    Hash.new.replace(self.errors)
+  end
+
   def to_liquid
     Locomotive::Liquid::Drops::Content.new(self)
   end

data/app/models/content_type.rb

@@ -25,6 +25,7 @@ class ContentType
   ## callbacks ##
   before_validation :normalize_slug
   before_save :set_default_values
+  after_destroy :remove_uploaded_files
 
   ## validations ##
   validates_presence_of :site, :name, :slug
@@ -62,13 +63,22 @@ class ContentType
     (if conditions.nil? || conditions.empty?
       self.contents
     else
-      self.contents.where(conditions)
+      conditions_with_names = {}
+
+      conditions.each do |key, value|
+        # convert alias (key) to name
+        field = self.content_custom_fields.detect { |f| f._alias == key }
+
+        conditions_with_names[field._name.to_sym] = value
+      end
+
+      self.contents.where(conditions_with_names)
     end).sort { |a, b| (a.send(column) || 0) <=> (b.send(column) || 0) }
   end
 
   def sort_contents!(order)
     order.split(',').each_with_index do |id, position|
-      self.contents.find(id)._position_in_list = position
+      self.contents.find(BSON::ObjectId(id))._position_in_list = position
     end
     self.save
   end
@@ -84,7 +94,7 @@ class ContentType
   protected
 
   def set_default_values
-    self.order_by ||= 'updated_at'
+    self.order_by ||= 'created_at'
     self.highlighted_field_name ||= self.content_custom_fields.first._name
   end
 
@@ -93,4 +103,12 @@ class ContentType
     self.slug.slugify! if self.slug.present?
   end
 
+  def remove_uploaded_files # callbacks are not called on each content so we do it manually
+    self.contents.each do |content|
+      self.content_custom_fields.each do |field|
+        content.send(:"remove_#{field._name}!") if field.kind == 'file'
+      end
+    end
+  end
+
 end

data/app/models/extensions/page/tree.rb

@@ -27,11 +27,65 @@ module Models
           alias :descendants :hacked_descendants
         end
 
+        module ClassMethods
+
+          # Warning: used only in read-only
+          def quick_tree(site)
+            pages = site.pages.minimal_attributes.order_by([[:depth, :asc], [:position, :asc]]).to_a
+
+            tmp = []
+
+            while !pages.empty?
+              tmp << _quick_tree(pages.delete_at(0), pages)
+            end
+
+            tmp
+          end
+
+          def _quick_tree(current_page, pages)
+            i, children = 0, []
+
+            while !pages.empty?
+              page = pages[i]
+
+              break if page.nil?
+
+              if page.parent_id == current_page.id
+                page = pages.delete_at(i)
+
+                children << _quick_tree(page, pages)
+              else
+                i += 1
+              end
+            end
+
+            current_page.instance_eval do
+              def children=(list); @children = list; end
+              def children; @children || []; end
+            end
+
+            current_page.children = children
+
+            current_page
+          end
+
+        end
+
         module InstanceMethods
 
+          def children?
+            self.class.where(self.parent_id_field => self.id).count
+          end
+
+          def children_with_minimal_attributes
+            self.class.where(self.parent_id_field => self.id).
+              order_by(self.tree_order).
+              minimal_attributes
+          end
+
           def sort_children!(ids)
             ids.each_with_index do |id, position|
-              child = self.children.detect { |p| p._id == id }
+              child = self.children.detect { |p| p._id == BSON::ObjectId(id) }
               child.position = position
               child.save
             end
@@ -44,10 +98,7 @@ module Models
           end
 
           def hacked_descendants
-            # workorund for mongoid unexpected behavior
-            _new_record_var = self.instance_variable_get(:@new_record)
-            _new_record = _new_record_var != false
-            return [] if _new_record
+            return [] if new_record?
             self.class.all_in(path_field => [self._id]).order_by tree_order
          end
 
@@ -56,7 +107,12 @@ module Models
           def change_parent
             if self.parent_id_changed?
               self.fix_position(false)
-              self.add_to_list_bottom
+
+              unless self.parent_id_was.nil?
+                self.position = nil # make it move to bottom
+                self.add_to_list_bottom
+              end
+
               self.instance_variable_set :@_will_move, true
             end
           end
@@ -81,7 +137,7 @@ module Models
           end
 
           def add_to_list_bottom
-            self.position = (::Page.where(:_id.ne => self._id).and(:parent_id => self.parent_id).max(:position) || 0) + 1
+            self.position ||= (::Page.where(:_id.ne => self._id).and(:parent_id => self.parent_id).max(:position) || 0) + 1
           end
 
           def remove_from_list

data/app/models/page.rb

@@ -40,6 +40,8 @@ class Page
   scope :index, :where => { :slug => 'index', :depth => 0 }
   scope :not_found, :where => { :slug => '404', :depth => 0 }
   scope :published, :where => { :published => true }
+  scope :fullpath, lambda { |fullpath| { :where => { :fullpath => fullpath } } }
+  scope :minimal_attributes, :only => %w(title slug fullpath position depth published templatized parent_id created_at updated_at)
 
   ## methods ##
 

data/app/models/site.rb

@@ -40,6 +40,14 @@ class Site
 
   ## methods ##
 
+  def all_pages_in_once
+    Page.quick_tree(self)
+  end
+
+  def domains=(array)
+    array = [] if array.blank?; super(array)
+  end
+
   def accounts
     Account.criteria.in(:_id => self.memberships.collect(&:account_id))
   end
@@ -50,15 +58,19 @@ class Site
 
   def add_subdomain_to_domains
     self.domains ||= []
-    (self.domains << "#{self.subdomain}.#{Locomotive.config.default_domain}").uniq!
+    (self.domains << self.full_subdomain).uniq!
   end
 
   def domains_without_subdomain
-    (self.domains || []) - ["#{self.subdomain}.#{Locomotive.config.default_domain}"]
+    (self.domains || []) - [self.full_subdomain]
   end
 
   def domains_with_subdomain
-    ((self.domains || []) + ["#{self.subdomain}.#{Locomotive.config.default_domain}"]).uniq
+    ((self.domains || []) + [self.full_subdomain]).uniq
+  end
+
+  def full_subdomain
+    "#{self.subdomain}.#{Locomotive.config.default_domain}"
   end
 
   def to_liquid

data/app/uploaders/asset_uploader.rb

@@ -60,7 +60,7 @@ class AssetUploader < CarrierWave::Uploader::Base
 
   def self.content_types
     {
-      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'],
+      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
       :video      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
       :audio      => [/^audio/, 'application/ogg', 'application/x-mp3'],
       :pdf        => ['application/pdf', 'application/x-pdf'],

data/app/uploaders/theme_asset_uploader.rb

@@ -15,7 +15,18 @@ class ThemeAssetUploader < AssetUploader
   end
 
   def extension_white_list
-    %w(jpg jpeg gif png css js swf flv eot svg ttf woff)
+    %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico)
+  end
+
+  def self.url_for(site, path)
+    build(site, path).url
+  end
+
+  def self.build(site, path)
+    asset = ThemeAsset.new(:site => site, :folder => File.dirname(path))
+    uploader = ThemeAssetUploader.new(asset)
+    uploader.retrieve_from_store!(File.basename(path))
+    uploader
   end
 
 end

data/app/uploaders/theme_uploader.rb

@@ -0,0 +1,19 @@
+class ThemeUploader < ::CarrierWave::Uploader::Base
+
+  def store_dir
+    if Locomotive.config.delayed_job
+      "sites/#{model.id}/tmp/themes"
+    else
+      "#{Rails.root}/tmp/themes"
+    end
+  end
+
+  def cache_dir
+    "#{Rails.root}/tmp/uploads"
+  end
+
+  def extension_white_list
+    %w(zip)
+  end
+
+end

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

@@ -1,8 +1,8 @@
 - title link_to(@asset_collection.name.blank? ? @asset_collection.name_was : @asset_collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
+  = include_javascripts :asset_collections
+  = include_stylesheets :fancybox
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'

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

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = javascript_include_tag 'admin/asset_collections.js'
+  = include_javascripts :asset_collections
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'

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

@@ -1,6 +1,6 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/assets'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+  = include_javascripts :edit_custom_fields, :assets
+  = include_stylesheets :custom_fields
 
 = f.inputs :name => :information do
   = f.input :name

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

@@ -1,6 +1,6 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/fancybox', 'admin/custom_fields'
-  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
+  = include_javascripts :custom_fields
+  = include_stylesheets :fancybox
 
 = f.inputs :name => :information do
   = f.input :name

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

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = javascript_include_tag 'admin/content_types.js'
+  = include_javascripts :content_types
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'

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/fancybox_changes'
+  = include_javascripts :edit_custom_fields, :contents
+  = include_stylesheets :fancybox
 
 = render 'admin/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type

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

@@ -4,7 +4,7 @@
   = render 'admin/shared/menu/contents'
 
 - content_for :head do
-  = javascript_include_tag 'admin/contents'
+  = include_javascripts :contents
 
 - content_for :buttons do
   = admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit'

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

@@ -8,7 +8,7 @@
     %p.notice= t('.notice')
 
   .footer
-    = login_button_tag t('admin.buttons.switch_to_site')
+    = box_button_tag t('admin.buttons.switch_to_site')
 
 :javascript
   $(document).ready(function() { $('form').submit(); });

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

@@ -1,5 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'admin/site'
+  = include_javascripts :site
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
@@ -23,7 +23,7 @@
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
-      = text_field_tag 'current_site[domains][]', name
+      = text_field_tag 'site[domains][]', name, :class => 'string label void domain'
        
       = error_on_domain(@site, name)
       %span.actions
@@ -32,7 +32,7 @@
   %li.item.template
     %em
       http://
-    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void'
+    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void domain'
      
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')

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

@@ -9,7 +9,7 @@
 
 %p!= t('.help')
 
-= semantic_form_for @site, :as => :current_site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
+= semantic_form_for @site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = render 'form', :f => f
 

data/app/views/admin/errors/no_page.html.haml

@@ -0,0 +1 @@
+No Page!

data/app/views/admin/errors/no_site.html.haml

@@ -0,0 +1 @@
+No Site!

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

@@ -18,4 +18,15 @@
           %p.inline-errors= @error
         %p.inline-hints= t('formtastic.hints.import.source')
 
+      %li.input.toggle
+        = label_tag 'samples', t('formtastic.labels.import.new.samples')
+        = check_box_tag 'samples'
+        %p.inline-hints= t('formtastic.hints.import.samples')
+
+      %li.input.toggle
+        = label_tag 'reset', t('formtastic.labels.import.new.reset')
+        = check_box_tag 'reset'
+        %p.inline-hints= t('formtastic.hints.import.reset')
+
+
   = render 'admin/shared/form_actions', :button_label => :send

data/app/views/admin/imports/show.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/smartupdater', 'admin/import'
+  = include_javascripts :import
 
 - title t('.title')
 

data/app/views/admin/installation/step_1.html.haml

@@ -0,0 +1,24 @@
+- content_for :head_title do
+  = t('admin.installation.common.title')
+
+- title t('.title')
+
+- content_for :head do
+  = include_stylesheets :installation
+
+.inner
+  %p.explanations
+    = t('.explanations')
+
+  %dl
+    %dt!= t('.database.label', :name => Mongoid.config.database.name)
+    %dd
+      %p.notes!= t('.database.notes')
+
+    %dt!= t('.default_domain.label', :name => Locomotive.config.default_domain)
+    %dd
+      %p.notes!= t('.default_domain.notes', :domain => Locomotive.config.default_domain)
+
+
+.footer
+  = next_installation_step_link(2)