locomotivecms 3.0.0 → 3.0.1

data/app/models/locomotive/editable_model.rb

@@ -9,5 +9,9 @@ module Locomotive
       self.content_type.name
     end
 
+    def content_type?
+      !content_type.nil?
+    end
+
   end
 end

data/app/uploaders/locomotive/editable_file_uploader.rb

@@ -12,7 +12,9 @@ module Locomotive
     end
 
     def image?
-      self.file ? self.file.content_type : false
+      if self.file.exists?
+        self.file.content_type.start_with?('image')
+      end
     end
 
   end

data/app/uploaders/locomotive/picture_uploader.rb

@@ -10,7 +10,7 @@ module Locomotive
     end
 
     def image?
-      self.file ? self.file.content_type : false
+      self.file.try(:exists?)
     end
 
     def store_dir

data/app/views/locomotive/editable_elements/_form.html.slim

@@ -22,11 +22,12 @@
           = g.input :content, editable_element_input_options(editable_element, index, as: :select, collection: editable_element.options.map { |attributes| [attributes['text'], attributes['value']] })
 
         - when :editable_model
-          fieldset.inputs
-            .form-group.input.link.optional data-block=editable_element.block
-              label.link.control-label.optional= editable_element_label(editable_element)
-              - if editable_element.hint.present?
-                span class="help-inline"= editable_element.hint
-              span.form_wrapper
-                = link_to t('.model.buttons.list'), content_entries_path(current_site, editable_element.content_type.slug), class: 'btn btn-primary btn-sm'
+          - if editable_element.content_type?
+            fieldset.inputs
+              .form-group.input.link.optional data-block=editable_element.block
+                label.link.control-label.optional= editable_element_label(editable_element)
+                - if editable_element.hint.present?
+                  span class="help-inline"= editable_element.hint
+                span.form_wrapper
+                  = link_to t('.model.buttons.list'), content_entries_path(current_site, editable_element.content_type.slug), class: 'btn btn-primary btn-sm'
 

data/app/views/locomotive/errors/404.html.slim

@@ -1,9 +1,7 @@
 .public-box
   .public-intro
-    h3.text-center
+    h3
+      i.fa.fa-exclamation-triangle
       == error_title
-
-  br
-
-  p.text-center
+  p
     == t('.message')

data/app/views/locomotive/errors/500.html.slim

@@ -1,9 +1,7 @@
 .public-box
   .public-intro
-    h3.text-center
+    h3
+      i.fa.fa-exclamation-triangle
       == error_title
-
-  br
-
-  p.text-center
+  p
     == t('.message')

data/app/views/locomotive/errors/no_site.html.slim

@@ -2,15 +2,10 @@
 
 .public-box
   .public-intro
-    h3.text-center
-      == error_title
-
-  br
-
-  p.text-justify
+    h3
+      i.fa.fa-exclamation-triangle
+      = error_title
+  p
     == message
-
-  br
-
-  p.text-center.next
-    = link_to t('.next').html_safe, link
+    br
+    = link_to t('.next').html_safe, link, class: 'btn btn-primary'

data/app/views/locomotive/layouts/account.html.slim

@@ -4,7 +4,7 @@ html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
     meta charset="utf-8"
     meta http-equiv="x-ua-compatible" content="ie=edge"
 
-    title= escape_once(strip_tags(title) + " | Locomotive")
+    title= escape_once(strip_tags(title) + " | #{Locomotive.config.name}")
 
     meta name="viewport" content="width=device-width, initial-scale=1"
 

data/app/views/locomotive/layouts/error.html.slim

@@ -19,7 +19,6 @@ html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
       .public-container
         .public-wrapper
           = link_to root_path, class: 'brand-logo' do
-            = image_tag 'locomotive/logo.png'
-            span Locomotive
+            = image_tag 'locomotive/logo-white.png'
 
           = yield

data/app/views/locomotive/sessions/new.html.slim

@@ -20,5 +20,5 @@
     = f.actions do
       = f.button :submit, t('.submit'), class: 'btn btn-primary'
 
-- if current_site.nil?
+- if current_site.nil? && Locomotive.config.enable_registration
   = link_to t('.sign_up').html_safe, sign_up_path, class: 'public-link'

data/config/locales/simple_form.en.yml

@@ -94,7 +94,7 @@ en:
           meta_keywords: "Meta keywords used within the head tag of the page. They are separated by a comma. Required for SEO."
           meta_description: "Meta description used within the head tag of the page. Required for SEO."
           robots_txt: "Content of the <span class='code'>/robots.txt</span> file. Check the following <a href='http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1'>url</a> for more information."
-          domains: "Add your domains just below. Then, register a CNAME DNS record pointing to <b>%{domain}</b>."
+          domains: "Add your domains just below. Documentation <a href=\"https://locomotive-v3.readme.io/docs/domains\">here</a> for more information."
           memberships: "You can invite other accounts to edit/manage the site."
           cache_enabled: "When enabled, your pages will be cached as long as the content doesn't change. Disabling cache per page is allowed."
           redirect_to_first_domain: "When enabled, requests made to any domains listed above will be redirected to the first domain."

data/config/routes.rb

@@ -10,8 +10,10 @@ Locomotive::Engine.routes.draw do
     failure_app:  'Locomotive::Devise::FailureApp'
 
   devise_scope :locomotive_account do
-    get     'sign_up'  => 'registrations#new',    as: :sign_up
-    post    'sign_up'  => 'registrations#create'
+    if Locomotive.config.enable_registration
+      get     'sign_up'  => 'registrations#new',    as: :sign_up
+      post    'sign_up'  => 'registrations#create'
+    end
     get     'sign_in'  => 'sessions#new',         as: :sign_in
     delete  'sign_out' => 'sessions#destroy',     as: :sign_out
   end

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

@@ -37,7 +37,7 @@ module Locomotive
   mount Locomotive::API.to_app => '/locomotive(/:site_handle)/api'
 
   # Render site
-  mount Locomotive::Steam::Server.to_app => '/', anchor: false)
+  mount Locomotive::Steam.to_app => '/', anchor: false)
     end
 
     def enable_heroku

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

@@ -6,6 +6,9 @@ Locomotive.configure do |config|
   # 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)
 
+  # list of domains which can't be used by any Locomotive sites
+  # config.reserved_domains = []
+
   # configure how many items we display in sub menu in the "Models" section.
   config.ui = {
     per_page: 10
@@ -59,4 +62,9 @@ Locomotive.configure do |config|
 
   # Dragonfly within Steam uses it to generate the protective SHA
   # config.steam_image_resizer_secret = 'please change it'
+
+  # Indicate whether you want to allow users to register with the site. If set
+  # to false the registration page will not be shown. (Default: true)
+  # config.enable_registration = true
+
 end

data/lib/locomotive/configuration.rb

@@ -9,6 +9,7 @@ module Locomotive
       # 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},
+      reserved_domains:             [],
       locales:                      @@default_locales,
       site_locales:                 @@default_locales,
       cookie_key:                   '_locomotive_session',
@@ -18,6 +19,7 @@ module Locomotive
       default_locale:               :en,
       mailer_sender:                'support@example.com',
       unsafe_token_authentication:  false,
+      enable_registration:          true,
       ui:                     {
         per_page:     10
       },

data/lib/locomotive/middlewares/site.rb

@@ -53,7 +53,7 @@ module Locomotive
       # if accounts but no site, redirect to the sign in page
       def handle_no_account_or_site(env, request)
         if Locomotive::Account.count == 0
-          redirect_to(sign_up_path)
+          redirect_to((Locomotive.config.enable_registration ? sign_up_path : sign_in_path))
         elsif default_host?(request)
           redirect_to(sign_in_path)
         else

data/lib/locomotive/mongoid.rb

@@ -1,4 +1,3 @@
-require 'locomotive/mongoid/presenter'
 require 'locomotive/mongoid/liquid'
 require 'locomotive/mongoid/document'
 require 'locomotive/mongoid/patches'

data/lib/locomotive/regexps.rb

@@ -1,13 +1,13 @@
 module Locomotive
   module Regexps
 
-    # SUBDOMAIN           = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
-
     HANDLE              = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
 
     DOMAIN              = /^(([a-z\d])([a-z\d-]){0,61}([a-z\d]))(\.([a-z\d])([a-z\d-]){0,61}([a-z\d]))*$/i
 
-    URL                 = /((http|https|ftp):\/)?\/\S*/
+    URL                 = /\A((https?:\/\/)|(ftp:\/))\S+\Z/
+
+    URL_AND_MAILTO      = /\A((https?:\/\/\S+)|(ftp:\/\S+)|(mailto:\S+)|\/\S*)\Z/
 
   end
 end

data/lib/locomotive/simple_form.rb

@@ -40,6 +40,7 @@ module Locomotive
             model_name = model_names.join('.')
 
             _key = [
+              Locomotive::VERSION,
               I18n.locale,
               template.instance_variable_get(:"@virtual_path"),
               namespace,

data/lib/locomotive/steam/middlewares/cache.rb

@@ -47,7 +47,7 @@ module Locomotive
           !env['steam.live_editing'] &&
           env['steam.site'].try(:cache_enabled) &&
           env['steam.page'].try(:cache_enabled) &&
-          env['steam.page'].try(:redirect_url).blank?
+          is_redirect_url?(env['steam.page'], env['steam.locale'])
         end
 
         def cache_key(env)
@@ -56,6 +56,11 @@ module Locomotive
           Digest::MD5.hexdigest(key)
         end
 
+        def is_redirect_url?(page, locale)
+          return false if page.nil?
+          (page.try(:redirect_url) || {})[locale].blank?
+        end
+
       end
 
     end

data/lib/locomotive/steam/middlewares/page_editing.rb

@@ -13,13 +13,35 @@ module Locomotive
         def call(env)
           status, headers, response = @app.call(env)
 
-          site, page, locale, live_editing = env['steam.site'], env['steam.page'], env['steam.locale'].to_s, env['steam.live_editing']
+          site, mounted_on, page, locale, live_editing = env['steam.site'], env['steam.mounted_on'], env['steam.page'], env['steam.locale'].to_s, env['steam.live_editing']
 
           if editable?(page, response, live_editing)
             html = %(
               <meta name="locomotive-locale" content="#{locale}" />
               <meta name="locomotive-editable-elements-path" content="#{editable_elements_path(site, page, locale, env)}" />
               <meta name="locomotive-page-id" content="#{page._id}" />
+              <meta name="locomotive-mounted-on" content="#{mounted_on}" />
+
+              <link href='https://fonts.googleapis.com/css?family=Noto+Sans' rel='stylesheet' type='text/css'>
+
+              <!-- [Locomotive] fix absolute links to inner pages in preview mode-->
+              <script>
+                window.document.addEventListener('click', function (event) {
+                  var qs = document.querySelectorAll('a');
+                  if (qs) {
+                    var el = event.target, index = -1;
+                    while (el && ((index = Array.prototype.indexOf.call(qs, el)) === -1)) {
+                      el = el.parentElement;
+                    }
+                    if (index > -1) {
+                      var url = el.getAttribute('href');
+                      if (url[0] == '/' && url.indexOf('#{mounted_on}') == -1 ) {
+                        el.setAttribute('href', '#{mounted_on}' + url);
+                      }
+                    }
+                  }
+                });
+              </script>
             )
             response.first.gsub!('</head>', %(#{html}</head>))
           end

data/lib/locomotive/steam_adaptor.rb

@@ -52,6 +52,6 @@ end
 
 Locomotive::Common.reset
 Locomotive::Common.configure do |config|
-  config_file = Rails.root.join('log', 'steam.log')
+  config_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
   config.notifier = Locomotive::Common::Logger.setup(config_file.to_s)
 end

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/dummy/config/initializers/locomotive.rb

@@ -57,4 +57,8 @@ Locomotive.configure do |config|
   #
   # Note: by default, rack/cache is disabled in the Heroku platform
 
+  # Indicate whether you want to allow users to register with the site. If set
+  # to false the registration page will not be shown. (Default: true)
+  # config.enable_registration = true
+
 end

data/spec/dummy/config/mongoid.yml

@@ -131,4 +131,5 @@ test:
       hosts:
         - localhost:27017
       options:
+        truncate_logs: false
         max_pool_size: 1

data/spec/models/locomotive/concerns/page/redirect_spec.rb

@@ -23,6 +23,31 @@ describe Locomotive::Concerns::Page::Redirect do
       expect(page.errors[:redirect_type]).to eq(["can't be blank"])
     end
 
+    it 'requires valid URLs' do
+      page.redirect_url = 'http:/foo.fr'
+      page.valid?
+      expect(page.errors[:redirect_url]).to eq(['is invalid'])
+
+      page.redirect_url = 'httpss://foo.fr'
+      page.valid?
+      expect(page.errors[:redirect_url]).to eq(['is invalid'])
+    end
+
+    it 'allows absolute urls' do
+      page.redirect_url = '/'
+      page.valid?
+      expect(page.errors[:redirect_url]).to be_blank
+      page.redirect_url = '/foo/bar'
+      page.valid?
+      expect(page.errors[:redirect_url]).to be_blank
+    end
+
+    it 'also allows mailto as a valid URL' do
+      page.redirect_url = 'mailto:foo@foo.fr'
+      page.valid?
+      expect(page.errors[:redirect_url]).to be_blank
+    end
+
   end
 
 end

data/spec/models/locomotive/concerns/site/access_points_spec.rb

@@ -14,6 +14,35 @@ describe Locomotive::Concerns::Site::AccessPoints do
     end
   end
 
+  describe '#valid?' do
+
+    subject { site.valid? }
+
+    it { is_expected.to eq true }
+
+    describe 'forbidden domains defined' do
+
+      before { allow(Locomotive.config).to receive(:reserved_domains).and_return(['www.locomotiveapp.com', /.+\.acme\.org/]) }
+
+      let(:domains) { ['example.fr', 'acme.org'] }
+
+      it { is_expected.to eq true }
+
+      context 'setting a forbidden domain name' do
+
+        let(:domains) { ['example.fr', 'www.locomotiveapp.com', 'staging.acme.org'] }
+
+        it 'adds errors for each invalid domain' do
+          is_expected.to eq false
+          expect(site.errors['domains']).to eq(["www.locomotiveapp.com is already taken", "staging.acme.org is already taken"])
+        end
+
+      end
+
+    end
+
+  end
+
   describe 'domain sync' do
 
     let!(:listener) { DomainEventListener.new }

data/spec/requests/locomotive/site_spec.rb

@@ -47,7 +47,17 @@ describe Locomotive::Middlewares::Site do
     subject { middleware.call(env_for(url)) }
 
     it { expect(subject.first).to eq 301 }
-    it { expect(subject[1]['Location']).to eq '/locomotive/sign_up' }
+
+    context 'default config' do
+      it { expect(subject[1]['Location']).to eq '/locomotive/sign_up' }
+    end
+
+    context 'config enable_registration set to false' do
+
+      before { allow(Locomotive.config).to receive(:enable_registration).and_return(false) }
+
+      it { expect(subject[1]['Location']).to eq '/locomotive/sign_in' }
+    end
 
   end
 

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq 'af996b364aaafa8c8f5bd89d7af70a07' }
+    it { expect(subject).to eq '5d728f9f71240d744cd635d03afc5969' }
 
   end
 
@@ -74,7 +74,8 @@ describe Locomotive::Steam::Middlewares::Cache do
 
           context 'page is a redirection' do
 
-            let(:page) { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache, redirect_url: 'http://locomotive.works') }
+            let(:i18n_field) { instance_double('I18nField', :[] => { 'en' => 'http://locomotive.works' }) }
+            let(:page) { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache, redirect_url: i18n_field) }
             it { expect(subject).to eq false }
 
           end