locomotive_cms 0.0.4.beta5 → 0.0.4.beta7

data/Gemfile

@@ -8,8 +8,9 @@ gem 'warden'
 gem 'devise', '= 1.1.3'
 
 gem 'mongoid', '2.0.0.beta.19'
-gem 'bson_ext', '1.1.1'
+gem 'bson_ext', '1.1.5'
 gem 'locomotive_mongoid_acts_as_tree', '0.1.5.1', :require => 'mongoid_acts_as_tree'
+gem 'will_paginate'
 
 gem 'haml', '= 3.0.18'
 gem 'locomotive_liquid', '2.2.2', :require => 'liquid'
@@ -26,29 +27,30 @@ gem 'actionmailer-with-request'
 gem 'heroku'
 gem 'httparty', '>= 0.6.1'
 gem 'RedCloth'
-gem 'delayed_job', '2.1.0.pre2'
-gem 'delayed_job_mongoid', '1.0.0.rc'
+gem 'delayed_job', '2.1.2'
+gem 'delayed_job_mongoid', '1.0.1'
 gem 'rubyzip'
+gem 'jammit-s3'
 
 # The rest of the dependencies are for use when in the locomotive dev environment
 
 group :development do
-  # Using mongrel instead of webrick (default server)
-  gem 'mongrel'
-  gem 'cgi_multipart_eof_fix'
-  gem 'fastthread'
+  # Using unicorn_rails instead of webrick (default server)
+  gem 'unicorn'
 end
 
 group :test, :development do
-  gem 'ruby-debug'
+  gem "ruby-debug", :platforms => :mri_18
+  gem "ruby-debug19", :platforms => :mri_19
 end
 
 group :test do
   gem 'autotest'
+  gem 'ZenTest'
   gem 'growl-glue'
-  gem 'rspec-rails', '>= 2.0.0.beta.18'
+  gem 'rspec-rails', '2.3.1'
   gem 'factory_girl_rails'
-  gem 'pickle', :git => 'http://github.com/ianwhite/pickle.git'
+  gem 'pickle'
   gem 'capybara'
 
   gem 'database_cleaner'

data/app/controllers/admin/api_contents_controller.rb

@@ -13,8 +13,17 @@ module Admin
       respond_to do |format|
         if @content.save
           format.json { render :json => { :content => @content } }
+          format.html do
+            flash[@content_type.slug.singularize] = @content.aliased_attributes
+            redirect_to params[:success_callback]
+          end
         else
           format.json { render :json => { :content => @content, :errors => @content.errors } }
+          format.html do
+            flash[@content_type.slug.singularize] = @content.aliased_attributes
+            flash['errors'] = @content.errors_to_hash
+            redirect_to params[:error_callback]
+          end
         end
       end
     end
@@ -23,7 +32,7 @@ module Admin
 
     def set_content_type
       @content_type = current_site.content_types.where(:slug => params[:slug]).first
-      render :json => { :error => 'Api not enabled'} and return false unless @content_type.api_enabled
+      render :json => { :error => 'Api not enabled' } and return false unless @content_type.api_enabled
     end
 
   end

data/app/controllers/admin/base_controller.rb

@@ -3,7 +3,7 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/application'
+    layout '/admin/layouts/application'
 
     before_filter :authenticate_admin!
 
@@ -49,7 +49,7 @@ module Admin
     end
 
     def set_locale
-      I18n.locale = current_admin.locale
+      I18n.locale = current_admin.locale rescue Locomotive.config.default_locale
     end
 
   end

data/app/controllers/admin/cross_domain_sessions_controller.rb

@@ -1,19 +1,22 @@
 module Admin
   class CrossDomainSessionsController < BaseController
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     skip_before_filter :verify_authenticity_token
 
     skip_before_filter :validate_site_membership
 
-    skip_before_filter :set_locale, :only => :create
-
     before_filter :authenticate_admin!, :only => :new
 
     def new
       if site = current_admin.sites.detect { |s| s._id.to_s == params[:target_id] }
-        @target = site.domains_without_subdomain.first || site.domains_with_subdomain.first
+        if Rails.env == 'development'
+          @target = site.full_subdomain
+        else
+          @target = site.domains_without_subdomain.first || site.full_subdomain
+        end
+
         current_admin.reset_switch_site_token!
       else
         redirect_to admin_pages_path

data/app/controllers/admin/current_sites_controller.rb

@@ -1,6 +1,8 @@
 module Admin
   class CurrentSitesController < BaseController
 
+    defaults :instance_name => 'site'
+
     sections 'settings', 'site'
 
     actions :edit, :update

data/app/controllers/admin/imports_controller.rb

@@ -17,22 +17,21 @@ module Admin
           :failed => @job && @job.last_error.present?
         } }
       end
-
     end
 
     def new; end
 
     def create
-      identifier = store_zipfile!
-
-      if identifier
-        job = Locomotive::Import::Job.new(identifier, current_site)
-        Delayed::Job.enqueue job, { :site => current_site, :job_type => 'import' }
+      begin
+        Locomotive::Import::Job.run!(params[:zipfile], current_site, {
+          :samples  => Boolean.set(params[:samples]),
+          :reset    => Boolean.set(params[:reset])
+        })
 
-        flash[:notice] = t('flash.admin.imports.create.notice')
+        flash[:notice] = t("flash.admin.imports.create.#{Locomotive.config.delayed_job ? 'notice' : 'done'}")
 
-        redirect_to admin_import_url
-      else
+        redirect_to Locomotive.config.delayed_job ? admin_import_url : new_admin_import_url
+      rescue
         @error = t('errors.messages.invalid_theme_file')
         flash[:alert] = t('flash.admin.imports.create.alert')
 
@@ -40,23 +39,5 @@ module Admin
       end
     end
 
-    protected
-
-    def store_zipfile!
-      return nil if params[:zipfile].blank?
-
-      file = CarrierWave::SanitizedFile.new(params[:zipfile])
-
-      uploader = ThemeUploader.new(current_site)
-
-      begin
-        uploader.store!(file)
-      rescue CarrierWave::IntegrityError
-        return nil
-      end
-
-      uploader.identifier
-    end
-
   end
 end

data/app/controllers/admin/installation_controller.rb

@@ -0,0 +1,79 @@
+module Admin
+  class InstallationController < BaseController
+
+    layout '/admin/layouts/box'
+
+    skip_before_filter :require_site
+
+    skip_before_filter :authenticate_admin!
+
+    skip_before_filter :verify_authenticity_token
+
+    skip_before_filter :validate_site_membership
+
+    before_filter :is_step_already_done?
+
+    before_filter :allow_installation?
+
+    def show
+      request.get? ? self.handle_get : self.handle_post
+    end
+
+    protected
+
+    def handle_get
+      case params[:step].to_i
+      when 2 then @account = Account.new
+      when 3 then @site = Site.new
+      end
+      render "step_#{params[:step]}"
+    end
+
+    def handle_post
+      case params[:step].to_i
+      when 2 # create account
+        @account = Account.create(params[:account])
+        if @account.valid?
+          redirect_to admin_installation_step_url(3)
+        else
+          render 'step_2'
+        end
+      when 3 # create site
+        @site = Site.new(params[:site])
+        @site.memberships.build :account => Account.first, :admin => true
+        @site.save
+
+        if @site.valid?
+          begin
+            unless params[:zipfile].blank?
+              Locomotive::Import::Job.run!(params[:zipfile], @site, { :samples => true })
+            end
+          rescue Exception => e
+            logger.error "Import failed because of #{e.message}"
+          end
+
+          redirect_to admin_session_url(:host => Site.first.domains.first, :port => request.port)
+        else
+          render 'step_3'
+        end
+      end
+    end
+
+    def is_step_already_done?
+      case params[:step].to_i
+      when 2 # already an account in db
+        if Account.count > 0
+          @step_done = t('admin.installation.step_2.done', Account.first.attributes)
+          render 'step_2' and return false
+        end
+      else
+        true
+      end
+    end
+
+    def allow_installation?
+      redirect_to admin_pages_url if Site.count > 0 && Account.count > 0
+    end
+
+  end
+end

data/app/controllers/admin/passwords_controller.rb

@@ -3,11 +3,11 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     before_filter :require_site
 
-    helper 'admin/base', 'admin/login'
+    helper 'admin/base', 'admin/box'
 
   end
 end

data/app/controllers/admin/sessions_controller.rb

@@ -3,11 +3,11 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     before_filter :require_site
 
-    helper 'admin/base', 'admin/login'
+    helper 'admin/base', 'admin/box'
 
     protected
 

data/app/controllers/admin/sites_controller.rb

@@ -1,6 +1,8 @@
 module Admin
   class SitesController < BaseController
 
+    defaults :instance_name => 'site'
+
     sections 'settings'
 
     def create

data/app/controllers/application_controller.rb

@@ -6,6 +6,6 @@ class ApplicationController < ActionController::Base
   # rescue_from Exception, :with => :render_error
   #
   # def render_error
-  #   render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
+  #   render :template => "/admin/errors/500", :layout => '/admin/layouts/box', :status => 500
   # end
 end

data/app/helpers/admin/assets_helper.rb

@@ -12,10 +12,4 @@ module Admin::AssetsHelper
     asset.new_record? || asset.stylesheet? || asset.javascript?
   end
 
-  def image_picker_include_tags
-    html = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/scrollTo', 'admin/plugins/codemirror/codemirror', 'admin/plugins/fancybox', 'admin/plugins/plupload/plupload.full', 'admin/plugins/imagepicker'
-    html += stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
-    html
-  end
-
 end

data/app/helpers/admin/{login_helper.rb → box_helper.rb}

@@ -1,6 +1,6 @@
-module Admin::LoginHelper
+module Admin::BoxHelper
 
-  def login_flash_message
+  def box_flash_message
     if not flash.empty?
       content_tag :div, flash.values.first,
         :id => "flash-#{flash.keys.first}",
@@ -10,8 +10,12 @@ module Admin::LoginHelper
     end
   end
 
-  def login_button_tag(label)
+  def box_button_tag(label)
     content_tag(:button, content_tag(:span, label), :type => 'submit', :class => 'button')
   end
 
+  def next_installation_step_link(step = 1, label = nil)
+    link_to(content_tag(:span, label || t('admin.installation.common.next')), admin_installation_step_url(step), :class => 'button')
+  end
+
 end

data/app/helpers/admin/custom_fields_helper.rb

@@ -7,7 +7,7 @@ module Admin::CustomFieldsHelper
   end
 
   def options_for_order_by(content_type, collection_name)
-    options = %w{updated_at _position_in_list}.map do |type|
+    options = %w{created_at updated_at _position_in_list}.map do |type|
       [t("admin.content_types.form.order_by.#{type.gsub(/^_/, '')}"), type]
     end
     options + options_for_highlighted_field(content_type, collection_name)
@@ -16,7 +16,7 @@ module Admin::CustomFieldsHelper
   def options_for_highlighted_field(content_type, collection_name)
     custom_fields_collection_name = "ordered_#{collection_name.singularize}_custom_fields".to_sym
     collection = content_type.send(custom_fields_collection_name)
-    collection.delete_if { |f| f.label == 'field name' }
+    collection.delete_if { |f| f.label == 'field name' || f.kind == 'file' }
     collection.map { |field| [field.label, field._name] }
   end
 

data/app/models/asset_collection.rb

@@ -18,6 +18,7 @@ class AssetCollection
   ## callbacks ##
   before_validation :normalize_slug
   before_save :store_asset_positions!
+  after_destroy :remove_uploaded_files
 
   ## validations ##
   validates_presence_of :site, :name, :slug
@@ -68,4 +69,13 @@ class AssetCollection
       end
     end
   end
+
+  def remove_uploaded_files # callbacks are not called on each asset so we do it manually
+    self.assets.each do |asset|
+      self.asset_custom_fields.each do |field|
+        asset.send(:"remove_#{field._name}!") if field.kind == 'file'
+      end
+    end
+  end
+
 end

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,7 +63,16 @@ 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
 
@@ -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

@@ -31,7 +31,7 @@ module Models
 
           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 +44,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,6 +53,7 @@ module Models
           def change_parent
             if self.parent_id_changed?
               self.fix_position(false)
+              self.position = nil # make it move to bottom
               self.add_to_list_bottom
               self.instance_variable_set :@_will_move, true
             end
@@ -81,7 +79,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/site.rb

@@ -40,6 +40,10 @@ class Site
 
   ## methods ##
 
+  def domains=(array)
+    array = [] if array.blank?; super(array)
+  end
+
   def accounts
     Account.criteria.in(:_id => self.memberships.collect(&:account_id))
   end
@@ -50,15 +54,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/theme_asset_uploader.rb

@@ -15,7 +15,7 @@ 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)
   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')