locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/config/routes.rb

@@ -28,6 +28,8 @@ Locomotive::Engine.routes.draw do
     get '/',          to: 'dashboard#show'
     get 'dashboard',  to: 'dashboard#show', as: :dashboard
 
+    get 'developers', to: 'developers_documentation#show', as: :developers_documentation
+
     resources :pages do
       put :sort, on: :member
       get :get_path, on: :collection
@@ -47,6 +49,10 @@ Locomotive::Engine.routes.draw do
       post :bulk_create, on: :collection
     end
 
+    resource :public_submission_accounts, only: [:edit, :update], path: 'content_types/:slug/public_submission_accounts' do
+      get :new_account
+    end
+
     resources :content_entries, path: 'content_types/:slug/entries' do
       get :show_in_form,  on: :collection
       put :sort,          on: :collection

data/features/support/env.rb

@@ -79,4 +79,4 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/locomotiv
 
 World(Locomotive::Engine.routes.url_helpers) # Load engine routes
 
-Locomotive.configure_for_test(true)
+Locomotive.configure_for_test(true)

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

@@ -3,6 +3,8 @@ module Locomotive
 
     source_root File.expand_path('../../../../../', __FILE__)
 
+    class_option :heroku, type: :boolean, default: false, description: 'if the Engine runs on Heroku'
+
     def copy_initializers
       @source_paths = nil # reset it for the find_in_source_paths method
 
@@ -31,10 +33,56 @@ module Locomotive
   mount Locomotive::Steam::Server.to_app => '/', anchor: false)
     end
 
+    def enable_heroku
+      if options.heroku?
+        inject_into_file 'Gemfile', after: "source 'https://rubygems.org'\n" do <<-'RUBY'
+
+if ENV['HEROKU_APP_NAME']
+  ruby '2.2.2'
+end
+        RUBY
+        end
+
+        template 'heroku.rb', 'config/initializers/heroku.rb'
+        template 'mongoid_heroku.yml', 'config/mongoid.yml', force: true
+
+        inject_into_file 'config/environments/production.rb', after: "  # config.action_mailer.raise_delivery_errors = false\n" do <<-'RUBY'
+  config.action_mailer.raise_delivery_errors  = true
+  config.action_mailer.delivery_method        = :smtp
+  config.action_mailer.smtp_settings          = {
+    :address        => 'smtp.sendgrid.net',
+    :port           => 25,
+    :authentication => :plain,
+    :user_name      => ENV['SENDGRID_USERNAME'],
+    :password       => ENV['SENDGRID_PASSWORD'],
+    :domain         => ENV['SENDGRID_DOMAIN']
+}
+        RUBY
+        end
+
+        inject_into_file 'config/initializers/carrierwave.rb', after: "    config.fog_directory    = ENV['S3_BUCKET']\n" do <<-'RUBY'
+
+    # Put your CDN host below instead
+    config.asset_host       = ENV['S3_BUCKET_REGION'].present? ? "s3-#{ENV['S3_BUCKET_REGION']}.amazonaws.com" : 's3.amazonaws.com'
+        RUBY
+        end
+
+        gem 'platform-api', '~> 0.3.0'
+      end
+    end
+
     def remove_index_html
       remove_file 'public/index.html'
     end
 
+    def use_puma_as_app_server
+      inject_into_file 'Gemfile', after: "# gem 'unicorn'\n" do <<-'RUBY'
+# Use Puma as the app server
+gem 'puma'
+      RUBY
+      end
+    end
+
     def show_readme
       readme 'README'
     end

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

@@ -0,0 +1,29 @@
+# Custom code if Locomotive is running on the Heroku platform
+
+if Rails.env.production? && (api_key = ENV['HEROKU_API_KEY']) && (app_name = ENV['HEROKU_APP_NAME'])
+  Rails.logger.info "[Locomotive] Heroku app detected"
+
+  require 'platform-api'
+
+  heroku = PlatformAPI.connect(api_key)
+
+  ActiveSupport::Notifications.subscribe('locomotive.site.domain_sync') do |name, start, finish, id, payload|
+    (payload[:added] || []).each do |domain|
+      next if Locomotive.config.host == domain
+      begin
+        heroku.domain.create(app_name, hostname: domain)
+      rescue Exception => e
+        Rails.logger.error "Unable to add '#{domain}' as a new domain in Heroku, error #{e.message}"
+      end
+    end
+
+    (payload[:removed] || []).each do |domain|
+      next if Locomotive.config.host == domain
+      begin
+        heroku.domain.delete(app_name, domain)
+      rescue Exception => e
+        Rails.logger.error "Unable to remove '#{domain}' from the list of domains in Heroku, error #{e.message}"
+      end
+    end
+  end
+end

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

@@ -1,11 +1,14 @@
 Locomotive.configure do |config|
 
+  # enable it if you want Locomotive to render the site of the Rails application embedding the engine
+  # config.host = 'mylocomotiveapp.com'
+
   # list of forbidden handles for a site because there are in conflicts with internal resources.
   # config.reserved_site_handles = %w(sites my_account password sign_in sign_out)
 
-  # configure how many items we display in sub menu in the "Contents" section.
+  # configure how many items we display in sub menu in the "Models" section.
   config.ui = {
-    per_page:           10
+    per_page: 10
   }
 
   # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)

data/lib/generators/locomotive/install/templates/mongoid.yml

@@ -78,4 +78,4 @@ production:
       options:
         # consistency: :strong
         # identity_map_enabled: true
-      # uri: <%%= ENV['MONGOHQ_URL'] %>
+      # uri: <%%= ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] %>

data/lib/generators/locomotive/install/templates/mongoid_heroku.yml

@@ -0,0 +1,78 @@
+development:
+  # Configure available database sessions. (required)
+  sessions:
+    # Defines the default session. (required)
+    default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_dev
+      # Provides the hosts the default session can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+      options:
+        # Change whether the session persists in safe mode by default.
+        # (default: false)
+        # safe: false
+
+        # Change the default consistency model to :eventual or :strong.
+        # :eventual will send reads to secondaries, :strong sends everything
+        # to master. (default: :eventual)
+        # consistency: :strong
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Configuration for whether or not to allow access to fields that do
+    # not have a field definition on the model. (default: true)
+    # allow_dynamic_fields: true
+
+    # Enable the identity map, needed for eager loading. (default: false)
+    # identity_map_enabled: true
+
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serializaion. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Protect id and type from mass assignment. (default: true)
+    # protect_sensitive_fields: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Skip the database version check, used when connecting to a db without
+    # admin access. (default: false)
+    # skip_version_check: false
+
+    # User Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
+
+test:
+  sessions:
+    default:
+      database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_test
+      hosts:
+        - localhost:27017
+      options:
+        # consistency: :strong
+        # identity_map_enabled: true
+
+production:
+  sessions:
+    default:
+      uri: <%%= ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] %>
+      options:
+        # consistency: :strong
+        # identity_map_enabled: true

data/lib/locomotive.rb

@@ -4,7 +4,6 @@ require 'locomotive/configuration'
 require 'locomotive/devise'
 require 'locomotive/simple_token_authentication'
 require 'locomotive/logger'
-require 'locomotive/haml'
 require 'locomotive/simple_form'
 require 'locomotive/dragonfly'
 require 'locomotive/kaminari'

data/lib/locomotive/configuration.rb

@@ -5,6 +5,7 @@ module Locomotive
 
     @@defaults = {
       name:                         'Locomotive',
+      host:                         nil,
       # forbidden_paths:            %w{layouts snippets stylesheets javascripts assets admin system api},
       reserved_site_handles:        %w(sites my_account password sign_in sign_out),
       reserved_slugs:               %w{stylesheets javascripts assets admin locomotive images api pages edit},
@@ -25,12 +26,7 @@ module Locomotive
         metastore:   URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
         entitystore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
       },
-      devise_modules:             [:registerable, :rememberable, :database_authenticatable, :recoverable, :trackable, :validatable, :encryptable, { encryptor: :sha1 }],
-      context_assign_extensions:  { },
-      models_for_templatization:  [],
-      csrf_protection:            false,
-      theme_assets_checksum:      false,
-      asset_host:                 nil
+      devise_modules:             [:registerable, :rememberable, :database_authenticatable, :recoverable, :trackable, :validatable, :encryptable, { encryptor: :sha1 }]
     }
 
     cattr_accessor :settings

data/lib/locomotive/dependencies.rb

@@ -13,14 +13,13 @@ require 'bootstrap-kaminari-views'
 require 'bootstrap-sass'
 require 'font-awesome-sass'
 require 'autoprefixer-rails'
-require 'haml'
+require 'slim'
 require 'simple_form'
 require 'responders'
 require 'carrierwave'
 require 'custom_fields'
 require 'mimetype_fu'
 require 'actionmailer_with_request'
-require 'httparty'
 require 'select2-rails'
 require 'dragonfly'
 require 'pundit'

data/lib/locomotive/dragonfly.rb

@@ -22,7 +22,7 @@ module Locomotive
     def self.fetch_file(source)
       file = nil
 
-      if source.is_a?(String) || source.is_a?(Hash) # simple string or theme asset
+      if source.is_a?(String) || source.is_a?(Hash) # simple string or drop
         source = source['url'] if source.is_a?(Hash)
 
         clean_source!(source)
@@ -34,12 +34,11 @@ module Locomotive
         end
 
       elsif source.respond_to?(:url) # carrierwave uploader
-        if source.file.respond_to?(:url)
-          file = self.app.fetch_url(source.url) # amazon s3, cloud files, ...etc
-        else
+        if source.path.first == '/'
           file = self.app.fetch_file(source.path)
+        else
+          file = self.app.fetch_url(source.url)
         end
-
       end
 
       file

data/lib/locomotive/engine.rb

@@ -10,19 +10,15 @@ module Locomotive
 
     paths['mongodb/migrate'] = 'mongodb/migrate'
 
-    initializer "locomotive.params.filter" do |app|
-      # Do not log remote_<field>_url params because they can contain huge base64 string
-      app.config.filter_parameters += [/\Aremote_.+_url\Z/]
+    config.to_prepare do
+      Dir.glob(Rails.root + 'app/decorators/**/*_decorator*.rb').each do |c|
+        require_dependency(c)
+      end
     end
 
-    initializer 'locomotive.content_types' do |app|
-      # Load all the dynamic classes (custom fields)
-      begin
-        ContentType.all.collect { |content_type| content_type.klass_with_custom_fields(:entries) }
-      rescue Exception => e
-        # let assume it's because of the first install (meaning no config.yml file)
-        Locomotive.log :warn, "WARNING: unable to load the content types, #{e.message}"
-      end
+    initializer 'locomotive.params.filter' do |app|
+      # Do not log remote_<field>_url params because they can contain huge base64 string
+      app.config.filter_parameters += [/\Aremote_.+_url\Z/]
     end
 
     initializer 'locomotive.action_controller' do |app|
@@ -33,14 +29,15 @@ module Locomotive
       ::DeviseController.respond_to :html, :json
     end
 
-    initializer "locomotive.precompile.hook", group: :all do |app|
+    initializer 'locomotive.precompile.hook', group: :all do |app|
       app.config.assets.precompile += %w(
         locomotive/wysihtml5_reset.css
         locomotive/wysihtml5_editor.css
         locomotive.js
         locomotive.css
         locomotive/not_logged_in.js
-        locomotive/not_logged_in.css)
+        locomotive/not_logged_in.css
+        locomotive/error.css)
 
       # Uncomment the lines below to view the names of assets as they are
       # precompiled for the rails asset pipeline

data/lib/locomotive/middlewares.rb

@@ -1,2 +1 @@
 require 'locomotive/middlewares/site'
-require 'locomotive/middlewares/page_editing'

data/lib/locomotive/middlewares/custom_public_exceptions.rb

@@ -0,0 +1,19 @@
+module Locomotive
+  module Middlewares
+
+    class CustomPublicExceptions < ActionDispatch::PublicExceptions
+
+      def call(env)
+        status = env['PATH_INFO'][1..-1]
+
+        if status == '404' || status == '500'
+          Locomotive::ErrorsController.action(:"error_#{status}").call(env)
+        else
+          super
+        end
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/middlewares/site.rb

@@ -8,9 +8,16 @@ module Locomotive
 
       def call(env)
         env['locomotive.site'] = env['steam.site'] = fetch_site(env)
-        @app.call(env)
+        begin
+          @app.call(env)
+        rescue ::Locomotive::Steam::NoSiteException => exception
+          # no_site!
+          Locomotive::ErrorsController.action(:no_site).call(env)
+        end
       end
 
+      private
+
       def fetch_site(env)
         request = Rack::Request.new(env)
         handle  = site_handle(request)
@@ -20,25 +27,41 @@ module Locomotive
         Locomotive.log "[fetch site] host = #{request.host} / site_handle = #{handle.inspect}"
 
         if handle
-          # The site is not rendered from a domain but from the back-office
-          # we need to get:
-          # - the path of "mouting point" (basically: locomotive/:handle/preview)
-          # - the real path of the page
-          #
-          # FIXME: move that in a different middleware
-          mounted_on = "#{Locomotive.mounted_on}/#{handle}/preview"
+          fetch_from_handle(handle, env, request)
+        elsif !request_for_the_back_office_and_default_host?(request)
+          fetch_from_host(env, request)
+        else
+          nil
+        end
+      end
 
-          env['locomotive.mounted_on']  = env['steam.mounted_on'] = mounted_on
-          env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
+      # def no_site!(env)
+      #   Locomotive::ErrorsController.action(:no_site).call(env)
+      #   # [200, { 'Content-Type' => 'text/html' }, ['Hello world']]
+      # end
 
-          env['steam.live_editing']     = true
+      # The site is not rendered from a domain but from the back-office
+      # we need to get:
+      # - the path of "mouting point" (basically: locomotive/:handle/preview)
+      # - the real path of the page
+      #
+      # FIXME: move that in a different middleware
+      def fetch_from_handle(handle, env, request)
+        mounted_on = "#{Locomotive.mounted_on}/#{handle}/preview"
 
-          Locomotive::Site.where(handle: handle).first
-        else
-          env['locomotive.path'] = request.path_info
+        env['locomotive.mounted_on']  = env['steam.mounted_on'] = mounted_on
+        env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
 
-          Locomotive::Site.match_domain(request.host).first
-        end
+        env['steam.live_editing']     = true
+
+        Locomotive::Site.where(handle: handle).first
+      end
+
+      # The request is for one of the domains registered in Locomotive.
+      # Find the related site.
+      def fetch_from_host(env, request)
+        env['locomotive.path'] = request.path_info
+        Locomotive::Site.match_domain(request.host).first
       end
 
       def site_handle(request)
@@ -55,6 +78,16 @@ module Locomotive
         @regexp ||= /#{Locomotive.mounted_on}\/([^\/]+)/o
       end
 
+      # Is it a request for the back-office AND the domain used to also
+      # render the site of the Rails application?
+      def request_for_the_back_office_and_default_host?(request)
+        default_host && request.host == default_host && request.path_info =~ /#{Locomotive.mounted_on}\//
+      end
+
+      def default_host
+        Locomotive.config.host
+      end
+
     end
   end
 end