locomotive_cms 0.0.4.beta12 → 0.0.4

data/Gemfile

@@ -8,9 +8,8 @@ gem 'warden'
 gem 'devise', '= 1.1.3'
 
 gem 'mongoid', '2.0.0.beta.19'
-gem 'bson_ext', '1.1.5'
+gem 'bson_ext', '1.1.1'
 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'
@@ -18,39 +17,38 @@ gem 'formtastic', '>= 1.1.0'
 gem 'inherited_resources', '>= 1.1.2'
 
 gem 'rmagick', '= 2.12.2'
-gem 'locomotive_carrierwave', '0.5.0.1.beta2', :require => 'carrierwave'
+gem 'locomotive_carrierwave', :require => 'carrierwave'
 
-gem 'custom_fields', '1.0.0.beta2'
-gem 'fog', '0.3.7'
+gem 'custom_fields', '1.0.0.beta'
+gem 'fog'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'
 gem 'heroku'
 gem 'httparty', '>= 0.6.1'
 gem 'RedCloth'
-gem 'delayed_job', '2.1.2'
-gem 'delayed_job_mongoid', '1.0.1'
+gem 'delayed_job', '2.1.0.pre2'
+gem 'delayed_job_mongoid', '1.0.0.rc'
 gem 'rubyzip'
-gem 'locomotive_jammit-s3', :require => 'jammit-s3'
 
 # The rest of the dependencies are for use when in the locomotive dev environment
 
 group :development do
-  # Using unicorn_rails instead of webrick (default server)
-  gem 'unicorn'
+  # Using mongrel instead of webrick (default server)
+  gem 'mongrel'
+  gem 'cgi_multipart_eof_fix'
+  gem 'fastthread'
 end
 
 group :test, :development do
-  gem "ruby-debug", :platforms => :mri_18
-  gem "ruby-debug19", :platforms => :mri_19
+  gem 'ruby-debug'
 end
 
 group :test do
   gem 'autotest'
-  gem 'ZenTest'
   gem 'growl-glue'
-  gem 'rspec-rails', '2.3.1'
+  gem 'rspec-rails', '>= 2.0.0.beta.18'
   gem 'factory_girl_rails'
-  gem 'pickle'
+  gem 'pickle', :git => 'http://github.com/ianwhite/pickle.git'
   gem 'capybara'
 
   gem 'database_cleaner'

data/README.textile

@@ -5,7 +5,7 @@ Locomotive is a simple but powerful CMS based on liquid templates and mongodb da
 If we have to give only 5 main features to describe our application, there will be:
 
 * managing as many websites as you want with one application instance
-* nice looking UI (see http://www.locomotivecms.com for some screenshots)
+* nice looking UI (see http://www.locomotiveapp.org for some screenshots)
 * flexible content types
 * playing smoothly with Heroku and MongoHQ
 * inline editing (beta)
@@ -19,18 +19,17 @@ h2. Gems
 
 Here is a short list of main gems used in the application.
 
-* Rails 3.0.3
-* Mongoid 2.0.0.beta 19 (with MongoDB 1.6)
+* Rails 3.0
+* Mongoid 2.0.0.beta 17 (with MongoDB 1.6)
 * Liquid
 * Devise
 * Carrierwave
 * Haml
 * Delayed job
-* Jammit-s3
 
 h2. Installation
 
-See the "official website":http://www.locomotivecms.com
+See the "official website":http://www.locomotiveapp.org
 
 h2. Team
 

data/app/controllers/admin/api_contents_controller.rb

@@ -13,17 +13,8 @@ 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
@@ -32,7 +23,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/layouts/application'
+    layout 'admin/application'
 
     before_filter :authenticate_admin!
 
@@ -49,7 +49,7 @@ module Admin
     end
 
     def set_locale
-      I18n.locale = current_admin.locale rescue Locomotive.config.default_locale
+      I18n.locale = current_admin.locale
     end
 
   end

data/app/controllers/admin/cross_domain_sessions_controller.rb

@@ -1,22 +1,19 @@
 module Admin
   class CrossDomainSessionsController < BaseController
 
-    layout '/admin/layouts/box'
+    layout 'admin/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] }
-        if Rails.env == 'development'
-          @target = site.full_subdomain
-        else
-          @target = site.domains_without_subdomain.first || site.full_subdomain
-        end
-
+        @target = site.domains_without_subdomain.first || site.domains_with_subdomain.first
         current_admin.reset_switch_site_token!
       else
         redirect_to admin_pages_path

data/app/controllers/admin/current_sites_controller.rb

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

data/app/controllers/admin/imports_controller.rb

@@ -17,29 +17,35 @@ module Admin
           :failed => @job && @job.last_error.present?
         } }
       end
+
     end
 
     def new; end
 
     def create
-      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.#{Locomotive.config.delayed_job ? 'notice' : 'done'}")
+      if params[:zipfile].blank?
+        @error = t('errors.messages.blank')
+        flash[:alert] = t('flash.admin.imports.create.alert')
+        render 'new'
+      else
+        path = self.store_zipfile!
 
-        redirect_to Locomotive.config.delayed_job ? admin_import_url : new_admin_import_url
-      rescue Exception => e
-        logger.error "[Locomotive import] #{e.message}"
+        job = Locomotive::Import::Job.new(path, current_site)
+        Delayed::Job.enqueue job, { :site => current_site, :job_type => 'import' }
 
-        @error = t('errors.messages.invalid_theme_file')
-        flash[:alert] = t('flash.admin.imports.create.alert')
+        flash[:notice] = t('flash.admin.imports.create.notice')
 
-        render 'new'
+        redirect_to admin_import_url
       end
     end
 
+    protected
+
+    def store_zipfile!
+      file = CarrierWave::SanitizedFile.new(params[:zipfile])
+      file.move_to(File.join(Rails.root, 'tmp', 'files', current_site.id.to_s))
+      file.path
+    end
+
   end
 end

data/app/controllers/admin/pages_controller.rb

@@ -6,7 +6,7 @@ module Admin
     respond_to :json, :only => [:update, :sort, :get_path]
 
     def index
-      @pages = current_site.all_pages_in_once
+      @pages = current_site.pages.roots
     end
 
     def new

data/app/controllers/admin/passwords_controller.rb

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

data/app/controllers/admin/sessions_controller.rb

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

data/app/controllers/admin/sites_controller.rb

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

data/app/controllers/admin/theme_assets_controller.rb

@@ -16,7 +16,7 @@ module Admin
       @js_and_css_assets = (@assets[:javascripts] || []) + (@assets[:stylesheets] || [])
 
       if request.xhr?
-        @images = @assets[:images] || []
+        @images = @assets[:images]
         render :action => 'images', :layout => false and return
       else
         @snippets = current_site.snippets.order_by([[:name, :asc]]).all.to_a

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/layouts/box', :status => 500
+  #   render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
   # end
 end

data/app/controllers/home_controller.rb

@@ -0,0 +1,7 @@
+class HomeController < ApplicationController
+
+  def show; end
+
+  def unknown; end
+
+end

data/app/helpers/admin/assets_helper.rb

@@ -12,4 +12,10 @@ 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/custom_fields_helper.rb

@@ -7,7 +7,7 @@ module Admin::CustomFieldsHelper
   end
 
   def options_for_order_by(content_type, collection_name)
-    options = %w{created_at updated_at _position_in_list}.map do |type|
+    options = %w{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' || f.kind == 'file' }
+    collection.delete_if { |f| f.label == 'field name' }
     collection.map { |field| [field.label, field._name] }
   end
 

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

@@ -1,6 +1,6 @@
-module Admin::BoxHelper
+module Admin::LoginHelper
 
-  def box_flash_message
+  def login_flash_message
     if not flash.empty?
       content_tag :div, flash.values.first,
         :id => "flash-#{flash.keys.first}",
@@ -10,12 +10,8 @@ module Admin::BoxHelper
     end
   end
 
-  def box_button_tag(label)
+  def login_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/models/asset_collection.rb

@@ -18,7 +18,6 @@ class AssetCollection
   ## callbacks ##
   before_validation :normalize_slug
   before_save :store_asset_positions!
-  after_destroy :remove_uploaded_files
 
   ## validations ##
   validates_presence_of :site, :name, :slug
@@ -54,28 +53,17 @@ class AssetCollection
   end
 
   def store_asset_positions!
-    return if @assets_order.blank?
+    return if @assets_order.nil?
 
-    ids = @assets_order.split(',').collect { |id| BSON::ObjectId(id) }
-
-    ids.each_with_index do |asset_id, index|
+    @assets_order.split(',').each_with_index do |asset_id, index|
       self.assets.find(asset_id).position = index
     end
 
     self.assets.clone.each do |asset|
-      if !ids.include?(asset._id)
+      if !@assets_order.split(',').include?(asset._id)
         self.assets.delete(asset)
         asset.send(:delete)
       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,7 +28,6 @@ class ContentInstance
   ## methods ##
 
   alias :visible? :_visible?
-  alias :_permalink :_slug
 
   def site_id  # needed by the uploader of custom fields
     self.content_type.site_id
@@ -38,24 +37,6 @@ 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,7 +25,6 @@ class ContentType
   ## callbacks ##
   before_validation :normalize_slug
   before_save :set_default_values
-  after_destroy :remove_uploaded_files
 
   ## validations ##
   validates_presence_of :site, :name, :slug
@@ -63,22 +62,13 @@ class ContentType
     (if conditions.nil? || conditions.empty?
       self.contents
     else
-      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)
+      self.contents.where(conditions)
     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(BSON::ObjectId(id))._position_in_list = position
+      self.contents.find(id)._position_in_list = position
     end
     self.save
   end
@@ -94,7 +84,7 @@ class ContentType
   protected
 
   def set_default_values
-    self.order_by ||= 'created_at'
+    self.order_by ||= 'updated_at'
     self.highlighted_field_name ||= self.content_custom_fields.first._name
   end
 
@@ -103,12 +93,4 @@ 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