locomotive_cms 0.0.3.3 → 0.0.4.beta1

data/Gemfile

@@ -1,46 +1,60 @@
-# Edit this Gemfile to bundle your application's dependencies.
-source 'http://gemcutter.org'
-source 'http://gems.github.com'
-
-gem 'rails', '3.0.0.beta3'
-
-gem 'liquid', '2.0.0'
-gem 'bson_ext', '>= 1.0.1'
-gem 'mongo_ext'
-gem 'mongoid', '2.0.0.beta6' 
-gem 'mongoid_acts_as_tree', '0.1.5'
-gem 'mongo_session_store', '2.0.0.pre'
+source :rubygems
+
+# add in all the runtime dependencies
+
+gem 'rails', '>= 3.0.0'
+
 gem 'warden'
-gem 'devise', '1.1.rc1'
-gem 'haml', '3.0.1'
-gem 'rmagick', '2.12.2'
-gem 'aws'
-gem 'jeweler'
-gem 'mimetype-fu', :require => 'mimetype_fu'
-gem 'formtastic-rails3', :require => 'formtastic'
-gem 'carrierwave-rails3', :require => 'carrierwave'
-gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
+gem 'devise', '= 1.1.3'
+
+gem 'mongoid', '2.0.0.beta.19'
+gem 'bson_ext', '1.1.1'
+gem 'locomotive_mongoid_acts_as_tree', '0.1.5.1', :require => 'mongoid_acts_as_tree'
+
+gem 'haml', '= 3.0.18'
+gem 'locomotive_liquid', '2.2.2', :require => 'liquid'
+gem 'formtastic', '>= 1.1.0'
+gem 'inherited_resources', '>= 1.1.2'
+
+gem 'rmagick', '= 2.12.2'
+gem 'locomotive_carrierwave', :require => 'carrierwave'
+
+gem 'custom_fields', '1.0.0.beta'
+gem 'fog', '0.3.7'
+gem 'mimetype-fu'
+gem 'actionmailer-with-request'
 gem 'heroku'
-gem 'httparty', '0.6.0'
+gem 'httparty', '>= 0.6.1'
 gem 'RedCloth'
-gem 'inherited_resources', '1.1.2'
+gem 'delayed_job', '2.1.0.pre2'
+gem 'delayed_job_mongoid', '1.0.0.rc'
+gem 'rubyzip'
+
+# The rest of the dependencies are for use when in the locomotive dev environment
 
-# Development environment
 group :development do
   # Using mongrel instead of webrick (default server)
   gem 'mongrel'
   gem 'cgi_multipart_eof_fix'
   gem 'fastthread'
-  gem 'mongrel_experimental'
+end
+
+group :test, :development do
+  gem 'ruby-debug'
 end
 
 group :test do
-	gem 'rspec-rails', '2.0.0.beta.11'
-	gem 'factory_girl', :git => 'git://github.com/thoughtbot/factory_girl.git', :branch => 'rails3'	
-	gem 'capybara'
-	gem 'cucumber'
-	gem 'cucumber-rails'
-	gem 'spork'
-	gem 'launchy'
-	gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'	
+  gem 'autotest'
+  gem 'growl-glue'
+  gem 'rspec-rails', '>= 2.0.0.beta.18'
+  gem 'factory_girl_rails'
+  gem 'pickle', :git => 'http://github.com/ianwhite/pickle.git'
+  gem 'capybara'
+
+  gem 'database_cleaner'
+  gem 'cucumber', '0.8.5'
+  gem 'cucumber-rails'
+  gem 'spork'
+  gem 'launchy'
+  gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'
 end

data/README.textile

@@ -8,7 +8,7 @@ If we have to give only 5 main features to describe our application, there will
 * nice looking UI (see http://www.locomotiveapp.org for some screenshots)
 * flexible content types
 * playing smoothly with Heroku and MongoHQ
-* inline editing (coming soon)
+* inline editing (beta)
 
 h2. Strategy / Development status
 
@@ -19,23 +19,29 @@ h2. Gems
 
 Here is a short list of main gems used in the application.
 
-* Rails 3 (beta 3)
-* Mongoid
+* Rails 3.0
+* Mongoid 2.0.0.beta 17 (with MongoDB 1.6)
 * Liquid
 * Devise
 * Carrierwave
 * Haml
+* Delayed job
 
 h2. Installation
 
 See the "official website":http://www.locomotiveapp.org
 
-h2. Credits
+h2. Team
+
+* Developers: "Didier Lafforgue":http://www.nocoffee.fr, "Jacques Crocker":http://www.railsjedi.com
+* UI Designer: "Sacha Greif":http://www.sachagreif.com
 
-Many thanks to "Sacha Greif":http://www.sachagreif.com for his great work on the user interface and the LocomotiveApp website front page.
+h2. Credits
 
 "Rodrigo Alvarez":http://blog.codecaster.es/ for his plugin named Congo which gave us a good starting point and for his availability for (very late) tech discussions.
 
+"Emmanuel Grard":http://www.grardesign.com designed the awesome locomotive illustration in the LocomotiveApp.org landing page.
+
 h2. Contact
 
 Feel free to contact me at didier at nocoffee dot fr.

data/app/controllers/admin/accounts_controller.rb

@@ -1,18 +1,18 @@
 module Admin
   class AccountsController < BaseController
-    
+
     sections 'settings'
-    
+
     def new
       @account = Account.new(:email => params[:email])
     end
-    
+
     def create
       @account = Account.create(params[:account])
       current_site.memberships.create(:account => @account) if @account.errors.empty?
-      
+
       respond_with @account, :location => edit_admin_current_site_url
     end
-    
+
   end
-end
+end

data/app/controllers/admin/api_contents_controller.rb

@@ -1,12 +1,12 @@
 module Admin
   class ApiContentsController < ActionController::Base
-  
+
     include Locomotive::Routing::SiteDispatcher
-    
+
     before_filter :require_site
-    
+
     before_filter :set_content_type
-  
+
     def create
       @content = @content_type.contents.build(params[:content])
 
@@ -18,13 +18,13 @@ module Admin
         end
       end
     end
-    
+
     protected
-  
+
     def set_content_type
-      @content_type = current_site.content_types.where(:slug => params[:slug]).first      
+      @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
     end
-  
+
   end
-end
+end

data/app/controllers/admin/asset_collections_controller.rb

@@ -1,25 +1,25 @@
 module Admin
   class AssetCollectionsController < BaseController
-    
-    sections 'assets'  
-    
+
+    sections 'assets'
+
     before_filter :set_collections
-    
+
     def index
       if not @asset_collections.empty?
         redirect_to(edit_admin_asset_collection_url(@asset_collections.first)) and return
       end
     end
-  
+
     def show
       @asset_collection = current_site.asset_collections.find(params[:id])
       render :action => 'edit'
     end
-  
-    protected 
-  
+
+    protected
+
     def set_collections
-      @asset_collections = current_site.asset_collections.order_by([[:name, :asc]])
+      @asset_collections = current_site.asset_collections.not_internal.order_by([[:name, :asc]])
     end
   end
 end

data/app/controllers/admin/assets_controller.rb

@@ -1,30 +1,30 @@
 module Admin
   class AssetsController < BaseController
-    
-    sections 'assets'  
-    
+
+    sections 'assets'
+
     before_filter :set_collections_and_current_collection
-    
+
     respond_to :json, :only => :update
-    
+
     def create
       create! { edit_admin_asset_collection_url(@asset_collection) }
     end
-    
+
     def update
       update! { edit_admin_asset_collection_url(@asset_collection) }
     end
-    
-    protected 
-    
+
+    protected
+
     def begin_of_association_chain
       @asset_collection
     end
-  
+
     def set_collections_and_current_collection
-      @asset_collections = current_site.asset_collections
-      @asset_collection = @asset_collections.find(params[:collection_id])
+      @asset_collections = current_site.asset_collections.not_internal.order_by([[:name, :asc]])
+      @asset_collection = current_site.asset_collections.find(params[:collection_id])
     end
-    
+
   end
 end

data/app/controllers/admin/base_controller.rb

@@ -1,37 +1,37 @@
 module Admin
   class BaseController < InheritedResources::Base
-    
+
     include Locomotive::Routing::SiteDispatcher
-    
+
     layout 'admin/application'
-    
+
     before_filter :authenticate_admin!
-      
+
     before_filter :require_site
-    
+
     before_filter :validate_site_membership
-  
+
     before_filter :set_locale
-  
+
     helper_method :sections
-    
+
     # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
     Dir[File.dirname(__FILE__) + "/../../helpers/**/*_helper.rb"].each do |file|
       helper "admin/#{File.basename(file, '.rb').gsub(/_helper$/, '')}"
     end
-        
+
     self.responder = Locomotive::AdminResponder # custom responder
-    
+
     defaults :route_prefix => 'admin'
-    
+
     respond_to :html
-    
+
     protected
-    
+
     def begin_of_association_chain
       current_site
-    end    
-  
+    end
+
     def self.sections(main, sub = nil)
       before_filter do |c|
         sub = sub.call(c) if sub.respond_to?(:call)
@@ -39,18 +39,18 @@ module Admin
         c.instance_variable_set(:@admin_sections, sections)
       end
     end
-  
+
     def sections(key = nil)
       if !key.nil? && key.to_sym == :sub
         @admin_sections[:sub] || self.controller_name.dasherize
-      else      
+      else
         @admin_sections[:main]
-      end      
+      end
     end
-  
+
     def set_locale
       I18n.locale = current_admin.locale
     end
-      
+
   end
-end
+end

data/app/controllers/admin/content_types_controller.rb

@@ -1,7 +1,11 @@
 module Admin
   class ContentTypesController < BaseController
-  
+
     sections 'contents'
-            
+
+    def destroy
+      destroy! { admin_pages_url }
+    end
+
   end
-end
+end

data/app/controllers/admin/contents_controller.rb

@@ -1,45 +1,45 @@
 module Admin
   class ContentsController < BaseController
-  
+
     sections 'contents'
-    
+
     before_filter :set_content_type
-    
+
     respond_to :json, :only => :update
-  
+
     def index
       @contents = @content_type.list_or_group_contents
     end
-  
+
     def create
       create! do |success, failure|
         success.html { redirect_to edit_admin_content_url(@content_type.slug, @content) }
       end
     end
-      
+
     def update
       update! { edit_admin_content_url(@content_type.slug, @content) }
     end
-    
+
     def sort
       @content_type.sort_contents!(params[:order])
-      
+
       respond_with(@content_type, :location => admin_contents_url(@content_type.slug))
-    end    
-    
+    end
+
     def destroy
       destroy! { admin_contents_url(@content_type.slug) }
     end
-  
+
     protected
-  
+
     def set_content_type
       @content_type ||= current_site.content_types.where(:slug => params[:slug]).first
     end
-    
+
     def begin_of_association_chain
       set_content_type
-    end    
-  
+    end
+
   end
-end
+end

data/app/controllers/admin/cross_domain_sessions_controller.rb

@@ -0,0 +1,34 @@
+module Admin
+  class CrossDomainSessionsController < BaseController
+
+    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] }
+        @target = site.domains_without_subdomain.first || site.domains_with_subdomain.first
+        current_admin.reset_switch_site_token!
+      else
+        redirect_to admin_pages_path
+      end
+    end
+
+    def create
+      if account = Account.find_using_switch_site_token(params[:token])
+        account.reset_switch_site_token!
+        sign_in(account)
+        redirect_to admin_pages_path
+      else
+        redirect_to new_admin_session_path, :alert => t('flash.admin.cross_domain_sessions.create.alert')
+      end
+    end
+
+  end
+end

data/app/controllers/admin/current_sites_controller.rb

@@ -1,24 +1,24 @@
 module Admin
   class CurrentSitesController < BaseController
-  
+
     sections 'settings', 'site'
-    
+
     actions :edit, :update
-    
+
     respond_to :json, :only => :update
-    
+
     def update
       update! do |success, failure|
         success.html { redirect_to edit_admin_current_site_url(new_host_if_subdomain_changed) }
       end
     end
-      
+
     protected
-    
+
     def resource
       @site = current_site
     end
-    
+
     def new_host_if_subdomain_changed
       if @site.domains.include?(request.host)
         {}
@@ -26,6 +26,6 @@ module Admin
         { :host => "#{@site.subdomain}.#{Locomotive.config.default_domain}:#{request.port}" }
       end
     end
-  
+
   end
-end
+end

data/app/controllers/admin/custom_fields_controller.rb

@@ -1,39 +1,39 @@
 module Admin
   class CustomFieldsController < BaseController
-   
+
     layout false
-    
+
     before_filter :set_parent_and_fields
-    
+
     def edit
       @field = @fields.find(params[:id])
       render :action => "edit_#{@field.kind.downcase}"
     end
-    
+
     def update
       @field = @fields.find(params[:id])
       @field.updated_at = Time.now # forces mongoid to save the object
-      
+
       params[:custom_field][:category_items_attributes].delete('-1')
-      
+
       if @field.update_attributes(params[:custom_field])
         render :json => @field.attributes
       else
         render :json => { :error => t('flash.admin.custom_fields.update.alert') }
       end
     end
-    
+
     protected
-    
+
     def set_parent_and_fields
       if params[:parent] == 'asset_collection'
         @parent = current_site.asset_collections.where(:slug => params[:slug]).first
-        @fields = @parent.asset_custom_fields        
+        @fields = @parent.asset_custom_fields
       else
         @parent = current_site.content_types.where(:slug => params[:slug]).first
         @fields = @parent.content_custom_fields
       end
     end
-    
+
   end
-end
+end

data/app/controllers/admin/images_controller.rb

@@ -0,0 +1,51 @@
+module Admin
+  class ImagesController < BaseController
+
+    include ActionView::Helpers::SanitizeHelper
+    include ActionView::Helpers::TextHelper
+
+    defaults :collection_name => 'assets', :instance_name => 'asset'
+
+    respond_to :json, :only => [:index, :create, :destroy]
+
+    def index
+      index! do |response|
+        response.json do
+          render :json => { :images => @assets.collect { |image| image_to_json(image) } }
+        end
+      end
+    end
+
+    def create
+      params[:asset] = { :name => params[:name], :source => params[:file] } if params[:file]
+
+      create! do |success, failure|
+        success.json do
+          render :json => image_to_json(@asset)
+        end
+        failure.json { render :json => { :status => 'error' } }
+      end
+    end
+
+    protected
+
+    def collection
+      @assets ||= begin_of_association_chain.assets
+    end
+
+    def begin_of_association_chain
+      @asset_collection ||= AssetCollection.find_or_create_internal(current_site)
+    end
+
+    def image_to_json(image)
+      {
+        :status       => 'success',
+        :name         => truncate(image.name, :length => 15),
+        :url          => image.source.url,
+        :vignette_url => image.vignette_url,
+        :destroy_url  => admin_image_url(image, :json)
+      }
+    end
+
+  end
+end

data/app/controllers/admin/imports_controller.rb

@@ -0,0 +1,51 @@
+module Admin
+  class ImportsController < BaseController
+
+    sections 'settings', 'site'
+
+    actions :show, :new, :create
+
+    def show
+      @job = Delayed::Job.where({ :job_type => 'import', :site_id => current_site.id }).last
+
+      respond_to do |format|
+        format.html do
+          redirect_to new_admin_import_url if @job.nil?
+        end
+        format.json { render :json => {
+          :step => @job.nil? ? 'done' : @job.step,
+          :failed => @job && @job.last_error.present?
+        } }
+      end
+
+    end
+
+    def new; end
+
+    def create
+      if params[:zipfile].blank?
+        @error = t('errors.messages.blank')
+        flash[:alert] = t('flash.admin.imports.create.alert')
+        render 'new'
+      else
+        path = self.store_zipfile!
+
+        job = Locomotive::Import::Job.new(path, current_site)
+        Delayed::Job.enqueue job, { :site => current_site, :job_type => 'import' }
+
+        flash[:notice] = t('flash.admin.imports.create.notice')
+
+        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/memberships_controller.rb

@@ -1,8 +1,8 @@
 module Admin
   class MembershipsController < BaseController
-    
+
     sections 'settings'
-    
+
     def create
       @membership = current_site.memberships.build(params[:membership])
 
@@ -21,6 +21,6 @@ module Admin
     def destroy
       destroy! { edit_admin_current_site_url }
     end
-  
+
   end
-end
+end