locomotive_cms 0.0.4 → 1.0.0.beta

data/config/locales/admin_ui_fr.yml

@@ -174,7 +174,7 @@ fr:
         help: "Vous avez le choix de soit uploader n'importe quel fichier ou bien soit de copier/coller du code css ou javascript."
       edit:
         title: "Edition %{file}"
-        help: "Vous pouvez insérer le raccourci suivant dans vos feuilles de style: <strong>%{shortcut_url}</strong> OU utiliser directement l'url : %{url}"
+        help: "L'url du fichier est <a href='%{url}'>%{url}</a>"
       form:
         choose_file: Choisir fichier
         choose_plain_text: Passer en mode texte
@@ -219,6 +219,7 @@ fr:
         new_item: nouvel élément
       form:
         order_by:
+          created_at: 'Par date création'
           updated_at: 'Par date de mise à jour'
           position_in_list: Manuellement
 
@@ -265,6 +266,34 @@ fr:
           success: "Votre site a été mis à jour avec succès."
           failure: "L'import n'a pas fonctionné."
 
+    installation:
+      common:
+        title: Première installation de Locomotive
+        next: Suivant
+      step_1:
+        title: "Étape 1/3"
+        explanations: "Voici la première étape de l'installation de Locomotive. Veuillez lire attentivement ce qui est écrit ci-dessous."
+        database:
+          label: "Nom base de données: <em>%{name}</em>"
+          notes: "Les paramètres de la connection à MongoDB se trouvent dans le fichier <b>config/mongoid.yml</b> de votre application."
+        default_domain:
+          label: "Nom du domaine par défaut: <em>%{name}</em>"
+          notes:
+            "Locomotive est une plate-forme multi-sites. Chaque instance de site a une entrée par défaut appelée aussi sous-domaine et qui est aussi fonction du nom de domaine par défaut. Evidemment, vous êtes libres d'associer d'autres noms de domaines, sortes d'alias.
+            <br/>La valeur du nom de domaine par défaut se trouve dans le fichier <b>config/initializers/locomotive.rb</b>."
+      step_2:
+        title: "Étape 2/3 &mdash; Créer un compte"
+        name: Nom du compte
+        email: E-mail
+        password: Mot de passe
+        password_confirmation: Confirmation mot de passe
+        done: "Vous avez déjà ajouté un compte:<br/><strong>%{name}</strong>, <em>%{email}</em>"
+        next: Créer compte
+      step_3:
+        title: "Étape 3/3 &mdash; Créer premier site"
+        explanations: "C'est la dernière étape de l'installation. Vous pouvez uploader un theme sous forme d'un fichier zip. Nous avons quelques themes disponibles <a href=\"http://www.locomotivecms.com/support/themes\">ici</a>."
+        next: Créer site
+
   formtastic:
     titles:
       information: Informations générales
@@ -297,6 +326,8 @@ fr:
       import:
         new:
           source: Fichier
+          samples: Copier contenu
+          reset: Remettre à zéro
 
     hints:
       page:
@@ -319,3 +350,5 @@ fr:
           hint: "Texte affiché dans le formulaire de l'élément juste en dessous du champ."
       import:
         source: "Un fichier zip contenant database.yml, les fichiers du thème et les templates de page"
+        samples: "Si activé, les contenus et les média seront aussi copiés lors de l'import"
+        reset: "Si activé, toutes les données de votre site seront détruites avant l'import du nouveau site"

data/config/locales/default_en.yml

@@ -13,6 +13,7 @@ en:
         array_too_short: "is too small (minimum element number is %{count})"
         liquid_syntax: "Liquid Syntax error, please check the syntax"
         liquid_extend: "The page extends a template which does not exist"
+        invalid_theme_file: "can't be blank or isn't a zip file"
 
   attributes:
     defaults:

data/config/locales/default_fr.yml

@@ -34,6 +34,7 @@ fr:
       array_too_short: "est trop petit (le nombre minimum d'éléments est %{count})"
       liquid_syntax: "Erreur de syntaxe dans les sections de page, veuillez vérifier la syntaxe"
       liquid_extend: "La page étend le contenu d'une page qui n'existe pas"
+      invalid_theme_file: "doit être rempli ou n'est pas un fichier zip"
 
   attributes:
     defaults:

data/config/locales/flash.en.yml

@@ -111,5 +111,6 @@ en:
 
       imports:
         create:
+          done: "Your site was successfully updated."
           notice: "Your site is being updated."
           alert: "The import was not done."

data/config/locales/flash.fr.yml

@@ -111,5 +111,6 @@ fr:
 
       imports:
         create:
+          done: "Votre site a été mis à jour"
           notice: "Votre site est en train d'être mis à jour"
           alert: "L'import n'a pas pu se faire"

data/config/mongoid.yml

@@ -17,8 +17,16 @@ test:
 # set these environment variables on your prod server
 production:
   <<: *defaults
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
+  database: locomotive_prod
+
+  # other settings for production
+
+  # host: <%= ENV['MONGOID_HOST'] %>
+  # port: <%= ENV['MONGOID_PORT'] %>
+  # username: <%= ENV['MONGOID_USERNAME'] %>
+  # password: <%= ENV['MONGOID_PASSWORD'] %>
+  # database: <%= ENV['MONGOID_DATABASE'] %>
+
+  # heroku
+  # uri: <%= ENV['MONGOHQ_URL'] %>
+

data/config/routes.rb

@@ -2,7 +2,7 @@
 Rails.application.routes.draw do
 
   constraints(Locomotive::Routing::DefaultConstraint) do
-    root :to => 'home#show'
+    root :to => 'admin/sessions#new'
   end
 
   # admin authentication
@@ -52,6 +52,11 @@ Rails.application.routes.draw do
     resources :cross_domain_sessions, :only => [:new, :create]
 
     resource :import, :only => [:new, :show, :create]
+
+    # installation guide
+    match '/installation' => 'installation#show', :defaults => { :step => 1 }, :as => :installation
+    match '/installation/:step' => 'installation#show', :as => :installation_step
+
   end
 
   # sitemap

data/lib/generators/locomotive/install/install_generator.rb

@@ -1,21 +1,29 @@
 module Locomotive
   class InstallGenerator < Rails::Generators::Base
 
-    def self.source_root
-      @_locomotive_source_root ||= File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('../../../../../', __FILE__)
+
+    def copy_mongoid_config
+      copy_file 'config/mongoid.yml', 'config/mongoid.yml'
+    end
+
+    def copy_assets
+      directory 'public', 'public', :recursive => true
+      copy_file 'config/assets.yml', 'config/assets.yml'
     end
 
-    def copy_initializer
+    def copy_initializers
+      copy_file 'config/initializers/carrierwave.rb', 'config/initializers/carrierwave.rb'
+
+      @source_paths = nil # reset it for the find_in_source_paths method
+
+      Locomotive::InstallGenerator.source_root(File.expand_path('../templates', __FILE__))
+
       template 'locomotive.rb', 'config/initializers/locomotive.rb'
     end
 
-    def seed_db
-      append_file 'db/seeds.rb', %{
-# Uncomment the following lines if you want to create the first website / account
-#account = Account.create! :name => 'Admin', :email => 'admin@example.com', :password => 'locomotive', :password_confirmation => 'locomotive'
-#site = Site.new :name => 'Locomotive test website', :subdomain => 'test'
-#site.memberships.build :account => account, :admin => true
-#site.save!}
+    def remove_index_html
+      remove_file 'public/index.html'
     end
 
     def show_readme

data/lib/generators/locomotive/install/templates/README

@@ -1,17 +1,27 @@
 ===============================================================================
 
-Locomotive initializer has been added to your application. Your db/seeds.rb file has also been updated.
-
-  1. Take a look at this to match your environment.
-  
-  2. Uncomment added code in db/seeds.rb if necessary
-  
-Note: do not forget to run rake db:seed if you modify your db/seeds.rb file.
-  
-Once it is done, the next step is to install assets:
-
-  bundle exec rails g locomotive:copy_assets
-  
-Fire your application server and launch a browser !
+The Locomotive Engine has been correctly installed in your Rails application.
+
+  1. Edit the main config files:
+
+    - config/initializers/locomotive.rb
+    - config/initializers/carrierwave.rb
+    - config/mongoid.yml
+
+  2. Launch the server
+
+    > unicorn_rails
+
+  3. Open your browser
+
+    > open localhost:8080
+
+  4. Follow the installation wizzard steps
+
+  5. Enjoy !
+
+  Note: If you want to use DelayedJob, be sure to launch it:
+
+    > rake jobs:work
 
 ===============================================================================

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -2,7 +2,13 @@ Locomotive.configure do |config|
   # if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
   # Ex:
   # config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
-  config.default_domain = 'mydomain.com'
+  #
+  # If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
+  # Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
+  # during the installation wizzard.
+  # Ex:
+  # config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
+  config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
   config.lastest_items_nb = 5
@@ -23,4 +29,12 @@ Locomotive.configure do |config|
   # Ex:
   # config.heroku = { :name => '<my heroku app name>', :login => 'john@doe.net', :password => 'easy' }
   config.heroku = false
+
+  # Locomotive uses the DelayedJob gem for the theme import module.
+  # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
+  # If you do not mind about importing theme without DelayedJob, disable it.
+  config.delayed_job = false
+
+  # default locale (for now, only en and fr are supported)
+  config.default_locale = :en
 end

data/lib/locomotive/carrierwave.rb

@@ -5,3 +5,4 @@ require 'locomotive/carrierwave/patches'
 # register missing mime types
 EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'
 EXTENSIONS[:woff] = 'application/x-woff'
+EXTENSIONS[:otf] = 'application/octet-stream'

data/lib/locomotive/configuration.rb

@@ -10,7 +10,9 @@ module Locomotive
       :locales          => %w{en fr},
       :cookie_key       => '_locomotive_session',
       :enable_logs      => false,
-      :heroku           => false
+      :heroku           => false,
+      :delayed_job      => true,
+      :default_locale   => :en
     }
 
     cattr_accessor :settings

data/lib/locomotive/custom_fields.rb

@@ -5,7 +5,6 @@ module CustomFields
       class FileUploader < ::CarrierWave::Uploader::Base
 
         def store_dir
-          puts
           "sites/#{model.site_id}/contents/#{model.class.model_name.underscore}/#{model.id}/files"
         end
 

data/lib/locomotive/delayed_job.rb

@@ -1,5 +1,4 @@
-require 'delayed_job'
-require 'delayed/backend/mongoid'
+require 'delayed_job_mongoid'
 
 module Delayed
   module Backend

data/lib/locomotive/engine.rb

@@ -1,20 +1,37 @@
-puts "...Locomotive engine loaded"
+puts "...loading Locomotive engine"
 
-require 'mimetype_fu'
-require 'liquid'
+require 'rails'
 require 'devise'
-require 'carrierwave'
-require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
+require 'will_paginate'
+require 'haml'
+require 'liquid'
+require 'formtastic'
+require 'inherited_resources'
+require 'carrierwave'
+require 'custom_fields'
+require 'mimetype_fu'
+require 'actionmailer_with_request'
+require 'heroku'
 require 'httparty'
 require 'redcloth'
-require 'actionmailer_with_request'
+require 'delayed_job_mongoid'
 require 'zip/zipfilesystem'
-require 'custom_fields'
+require 'jammit-s3'
+
+$:.unshift File.dirname(__FILE__)
 
 module Locomotive
   class Engine < Rails::Engine
 
+    rake_tasks do
+      load "railties/tasks.rake"
+    end
+
+    initializer "serving fonts" do |app|
+      app.middleware.insert_after Rack::Lock, '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
+    end
+
   end
 end

data/lib/locomotive/heroku.rb

@@ -1,4 +1,5 @@
 require 'heroku'
+require 'heroku/client'
 require 'locomotive/heroku/custom_domain'
 
 module Locomotive

data/lib/locomotive/httparty/webservice.rb

@@ -17,7 +17,18 @@ module Locomotive
 
         # puts "[WebService] consuming #{path}, #{options.inspect}"
 
-        self.get(path, options).try(:underscore_keys)
+        response = self.get(path, options)
+
+        if response.code == 200
+          if response.respond_to?(:underscore_keys)
+            response.underscore_keys
+          else
+            response.collect(&:underscore_keys)
+          end
+        else
+          nil
+        end
+
       end
 
     end

data/lib/locomotive/import.rb

@@ -1,3 +1,5 @@
+require 'locomotive/import/logger'
+require 'locomotive/import/base'
 require 'locomotive/import/job'
 require 'locomotive/import/site'
 require 'locomotive/import/assets'

data/lib/locomotive/import/asset_collections.rb

@@ -1,30 +1,34 @@
 module Locomotive
   module Import
-    module AssetCollections
-
-      def self.process(context)
-        site, database = context[:site], context[:database]
+    class AssetCollections < Base
 
+      def process
         asset_collections = database['site']['asset_collections']
 
         return if asset_collections.nil?
 
         asset_collections.each do |name, attributes|
-          puts "....asset_collection = #{attributes['slug']}"
+          self.log "slug = #{attributes['slug']}"
 
           asset_collection = site.asset_collections.where(:slug => attributes['slug']).first
 
-          asset_collection ||= self.build_asset_collection(site, attributes.merge(:name => name))
+          asset_collection ||= self.build_asset_collection(attributes.merge(:name => name))
 
           self.add_or_update_fields(asset_collection, attributes['fields'])
 
+          if options[:samples] && attributes['assets']
+            self.insert_samples(asset_collection, attributes['assets'])
+          end
+
           asset_collection.save!
 
           site.reload
         end
       end
 
-      def self.build_asset_collection(site, data)
+      protected
+
+      def build_asset_collection(data)
         attributes = { :internal => false }.merge(data)
 
         attributes.delete_if { |name, value| %w{fields assets}.include?(name) }
@@ -32,7 +36,7 @@ module Locomotive
         site.asset_collections.build(attributes)
       end
 
-      def self.add_or_update_fields(asset_collection, fields)
+      def add_or_update_fields(asset_collection, fields)
         fields.each_with_index do |data, position|
           name, data = data.keys.first, data.values.first
 
@@ -48,6 +52,34 @@ module Locomotive
         end
       end
 
+      def insert_samples(asset_collection, assets)
+        assets.each_with_index do |data, position|
+          value, attributes = data.is_a?(Array) ? [data.first, data.last] : [data.keys.first, data.values.first]
+
+          url = attributes.delete('url')
+
+          # build with default attributes
+          asset = asset_collection.assets.build(:name => value, :position => position, :source => self.open_sample_asset(url))
+
+          attributes.each do |name, value|
+            field = asset_collection.asset_custom_fields.detect { |f| f._alias == name }
+
+            value = (case field.kind.downcase
+            when 'file'     then self.open_sample_asset(value)
+            when 'boolean'  then Boolean.set(value)
+            else
+              value
+            end)
+
+            asset.send("#{name}=", value)
+          end
+
+          asset.save
+
+          self.log "insert asset '#{asset.name}'"
+        end
+      end
+
     end
   end
 end