locomotivecms 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2afe64fab76edbf20e2d79ede530d56718e76f
-  data.tar.gz: e66377e24345467ba5e893fa1ba996ae60999bc5
+  metadata.gz: 3a0a1781f88c6f7d67c51dba24298c5be9880728
+  data.tar.gz: 35b36ae8bbc5c7aa6e857dea7f67707c4c6d7e24
 SHA512:
-  metadata.gz: 864c8c0c17575926f0d2fa10ceaafa2606827ed05ed1562ff300160835448b220ca07515313b6977c424be25554d365c5c4b2f851d0f8ebe1969f793312b7fdf
-  data.tar.gz: 3a20c0edb014b7a2b1d29bc147751a411b0ac7fdc2191725bda3208702a961fd7c55b5e4ff4683390a5726145d196287a1b575c3516e04986de4fe4496041e57
+  metadata.gz: e55ecd3fa077eb76429b00b147fad3ad12d8ab13a3d3f816183d3168042324455b145751b2eb06c2a148a44f3bb1a9024f1ec00750abfddeb064b31ade9c2426
+  data.tar.gz: d783f608c5e0b57a2c2fee907a18de0435534a815f99f4b00ac69d6cceba3a99f9118eda36db206c81f0cb0909d6385f064289f215f8aebc574796b48b7d40c1

data/Gemfile

@@ -19,10 +19,10 @@ end
 group :development do
   # gem 'custom_fields', path: '../custom_fields'
   # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '279c6744eb6b7dd'
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '131b6a6'
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '939f6f6', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '0cdb255dafd13', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers
@@ -56,7 +56,7 @@ group :test do
   gem 'simplecov'
 
   gem 'capybara',             '~> 2.5.0'
-  gem 'poltergeist',          '~> 1.8.1'
+  gem 'capybara-webkit',      '~> 1.8.0'
 
   gem 'grape-entity-matchers'
   gem 'shoulda-matchers',     '2.7.0'

data/README.md

@@ -2,32 +2,20 @@
 
 [![Build Status](https://travis-ci.org/locomotivecms/engine.svg?branch=master)](https://travis-ci.org/locomotivecms/engine) [![Code Climate](https://codeclimate.com/github/locomotivecms/engine/badges/gpa.svg)](https://codeclimate.com/github/locomotivecms/engine) [![Dependency Status](https://gemnasium.com/locomotivecms/engine.svg)](https://gemnasium.com/locomotivecms/engine) [![Coverage Status](https://img.shields.io/coveralls/locomotivecms/engine.svg)](https://coveralls.io/r/locomotivecms/engine?branch=master) [![Join the chat at https://gitter.im/locomotivecms/engine](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/locomotivecms/engine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-![Locomotive Screenshot](https://wagonapp.s3.amazonaws.com/doc/v3_backoffice.png)
+Locomotive is an open source platform to create, publish and edit sites (CMS). It is designed to save time and help you focus on what matters: front-end technology, standard development process and a very low learning curve for your clients.
 
-Locomotive is an open source platform to create, publish and edit sites. It is designed to save your time and help you focus on what matters: front-end technology, standard development process and no learning time for your client.
+Locomotive relies on a **very original workflow**:
 
-Locomotive relies on a **very original workflow**.
-
-- Sites are coded locally using our open source tool: [Wagon](https://github.com/locomotivecms/wagon). A desktop version (not open source) is also available [here](http://www.wagonapp.com).
+- Sites are coded locally using our open source tool: [Wagon](https://github.com/locomotivecms/wagon). A desktop version (not open source and not tested in v3) is also available [here](http://www.wagonapp.com).
 - Sites are deployed to the platform (engine) thanks to our internal API.
 - A back-office for the end-users is automatically generated based on the custom models and editable regions described by the developers.
 
-Visit the Locomotive official website [here](http://www.locomotivecms.com) for more information.
-
-## Development Status ##
-
-As you can see from the commit logs, we are intensively working on the new V3 version. We kept all the features from our stable [v2 version](https://github.com/locomotivecms/engine/tree/v2.5.x), we just replace the UI, upgrade the gems and refactor our code.
-
-**[UPDATES]** Finally, we've been doing much more than we planned at first. We extracted the rendering functionality from the Engine and make it a gem named [Steam](https://github.com/locomotivecms/steam). This gem is also now used by [Wagon](https://github.com/locomotivecms/wagon) (version 2.0 in progress) which makes sure you get the same result between Wagon and Engine when you preview a page.
-And last but not least, we added a Ruby API client for Locomotive that we called [Coal](https://github.com/locomotivecms/coal). That client consumes the API from Engine which embeds now GrapeAPI. [Nic Boie](https://github.com/boie0025) is in charge of it. Kudos to him!
+![Locomotive](https://dl.dropboxusercontent.com/u/20823269/locomotive-engine.png)
 
-**TRELLO** [here](https://trello.com/b/kRiy1dZu/locomotive-v3)
+Visit the Locomotive official website [here](http://
+locomotive.works) for more information.
 
-## Getting Started ##
-
-If you can not wait for playing with our new version, you still can use the current one (v2.5.x). Check out our [installation guide](http://doc.locomotivecms.com/get-started).
-
-## Features ##
+## Features
 
 - Multi-sites natively supported
 - Uses Liquid, a simple and clean templating language
@@ -36,9 +24,19 @@ If you can not wait for playing with our new version, you still can use the curr
 - Can fully localize all the content and pages
 - Embed a Restful API to manage every site
 - Develop and preview sites locally with your favorite tools **(Wagon)**
-- Support for SASS, LESS, HAML and Coffee Script **(Wagon)**
+- Support for SASS, HAML and Coffee Script **(Wagon)**
 
-## Technologies ##
+## Instructions and help
+
+- [Documentation](https://locomotive-v3.readme.io/)
+- Get help with Locomotive or discuss technical issues on [Gitter](https://gitter.im/locomotivecms/engine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or [here](https://locomotive-v3.readme.io/discuss).
+- [Follow us on twitter](http://twitter.com/locomotivecms)
+
+## Contribute
+
+V3 has launched! Which means a lot of stuff changed and we got bunch of new features shipped in. However, Locomotive will be updated frequently with more awesome features. Have a look at our [Trello](https://trello.com/b/kRiy1dZu/locomotive-v3) board to see what's next or see where you can help out.
+
+### Technologies
 
 Here is a list of the main gems used to power the Locomotive platform:
 
@@ -49,19 +47,15 @@ Here is a list of the main gems used to power the Locomotive platform:
 - Carrierwave - *Upload*
 - Pundit      - *Permissions*
 
-## Community ##
-
-- [Gitter](https://gitter.im/locomotivecms/engine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) for technical discussions.
-- Get help or discuss Locomotive at the [Locomotive Google group](https://groups.google.com/forum/?fromgroups#!forum/locomotivecms)
-- [Follow us on twitter](http://twitter.com/locomotivecms)
+### Translating the back-office
 
-## Translating the back-office ##
+By default, the Locomotive back-office is fully translated in English, Dutch and Greek.
 
-By default, the Locomotive back-office is fully translated in English. But adding a new language is pretty straightforward since we now manage all our I18n translation keys in [Transifex](https://www.transifex.com), a platform dedicated to this kind of task.
+Adding a new language is pretty straightforward since we now manage all our I18n translation keys in [Transifex](https://www.transifex.com), a platform dedicated to this kind of task.
 
 Here is our Transifex portal page: [https://www.transifex.com/locomotive/locomotive-engine](https://www.transifex.com/locomotive/locomotive-engine). Feel free to sign up and translate!
 
-## Contributing to Locomotive ##
+### How to contribute
 
 Locomotive is an open source project, we encourage contributions. If you have found a bug and want to contribute a fix, or have a new feature you would like to add, follow the steps below to get your patch into the project:
 
@@ -76,7 +70,7 @@ Locomotive is an open source project, we encourage contributions. If you have fo
 
 For new features (especially large ones) it is best to create a topic on the [Google group](https://groups.google.com/forum/?fromgroups#!forum/locomotivecms) first to make sure it fits into the goals of the project.
 
-## Contact ##
+### Contact
 
 Feel free to contact me at did at locomotivecms dot com.
 

data/app/api/locomotive/api/entities/content_type_field_entity.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class ContentTypeFieldEntity < BaseEntity
 
-        expose :name, :type, :label, :hint, :required, :localized, :unique, :position
+        expose :name, :type, :label, :hint, :required, :localized, :unique, :default, :position
 
         # text type field
         expose :text_formatting, if: ->(field, _) { field.type.to_s == 'text' }

data/app/api/locomotive/api/forms/content_type_field_form.rb

@@ -10,7 +10,7 @@ module Locomotive
               :required, :localized, :unique, :position,
               :text_formatting, :select_options_attributes,
               :target, :inverse_of, :order_by, :ui_enabled,
-              :class_name, :_destroy
+              :default, :class_name, :_destroy
 
         def initialize(content_type_service, existing_field, attributes)
           self.content_type_service = content_type_service

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -46,6 +46,7 @@ module Locomotive
                 optional :required
                 optional :localized
                 optional :unique
+                optional :default
                 optional :position
                 optional :text_formatting
                 optional :select_options
@@ -90,6 +91,7 @@ module Locomotive
                 optional :required
                 optional :localized
                 optional :unique
+                optional :default
                 optional :position
                 optional :text_formatting
                 optional :select_options

data/app/assets/javascripts/locomotive/views/editable_elements/iframe_view.js.coffee

@@ -44,7 +44,7 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
   build_and_render_page_view: ->
     @page_view.remove() if @page_view?
     @page_view = new Locomotive.Views.EditableElements.PageView
-      el:           $(@window.document.body)
+      el:           $(@window.document)
       parent_view:  @
       button_labels:
         edit: $(@el).data('edit-label')

data/app/assets/javascripts/locomotive/views/editable_elements/page_view.js.coffee

@@ -15,8 +15,11 @@ class Locomotive.Views.EditableElements.PageView extends Backbone.View
       PubSub.subscribe 'pages.sorted',                          @refresh_all
     ]
 
+    # used to prefix links to inner pages with mounted_on
+    @mounted_on = @$('meta[name=locomotive-mounted-on]').attr('content')
+
     # create the highlighter view
-    @views = [new Locomotive.Views.EditableElements.TextHighLighterView(el: @el, button_labels: @options.button_labels)]
+    @views = [new Locomotive.Views.EditableElements.TextHighLighterView(el: @$('body'), button_labels: @options.button_labels)]
 
   render: ->
     # render the highlighter view

data/app/assets/javascripts/locomotive/views/inputs/array_view.js.coffee

@@ -46,8 +46,8 @@ class Locomotive.Views.Inputs.ArrayView extends Backbone.View
 
   make_simple_selectable: ->
     @$new_input.select2
-      templateResult:     @format_select_result
-      templateSelection:   @format_select_result
+      templateResult:       @format_select_result
+      templateSelection:    @format_select_result
 
   format_select_result: (state) ->
     return state.text unless state.id?

data/app/assets/stylesheets/locomotive/account.scss

@@ -2,7 +2,7 @@
 // Account
 // =============================================================================
 
-// Stylesheet for all un-authorized pages like register, sign in, ...
+// Stylesheet for all account related pages like register, my account, ...
 
 // Core variables and mixins
 

data/app/assets/stylesheets/locomotive/account/_files.scss

@@ -97,7 +97,8 @@
   user-select: none;
   .file-name {
     display: inline-block;
-    width: 210px;
+    width: 100%;
+    max-width: 210px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

data/app/assets/stylesheets/locomotive/account/_navigation.scss

@@ -7,10 +7,11 @@
 // Navigation wrapper.
 
 .navigation {
-  position: fixed;
+  position: absolute;
   top: 0;
   right: 0;
   left: 0;
+  display: block;
   padding: 25px 40px;
   text-align: left;
   .brand-logo {

data/app/assets/stylesheets/locomotive/account/_public.scss

@@ -35,7 +35,7 @@
 .public-wrapper {
   display: inline-block;
   width: 460px;
-  margin: 25px 0;
+  padding: 56px 0;
   vertical-align: middle;
 }
 
@@ -59,6 +59,9 @@
   &.without-padding {
     padding: 0;
   }
+  > p {
+    margin: 0;
+  }
 }
 
 // Styles intro title and text above the public form.
@@ -69,10 +72,17 @@
   text-align: center;
   h3 {
     margin-bottom: 15px;
+    i {
+      display: block;
+      margin-bottom: 15px;
+      font-size: 30px;
+      color: $gray-lighter;
+      text-align: center;
+    }
   }
   p {
     margin-bottom: 30px;
-    color: $gray-light;
+    color: $gray;
   }
   &.with-padding {
     padding: 50px 50px 0;
@@ -105,6 +115,7 @@
   display: block;
   max-height: 500px;
   overflow: auto;
+  border-top: 1px solid $border-color-base;
 }
 
 //  Public entries, used in the sites overview.
@@ -115,13 +126,14 @@
   padding: 15px 25px;
   text-align: left;
   background: transparent;
-  border-top: 1px solid $border-color-base;
+  border-bottom: 1px solid $border-color-base;
   transition: background $base-transition-speed linear;
   img {
     display: inline-block;
     width: 60px;
     margin-right: 25px;
     vertical-align: middle;
+    background: $gray-lightest;
     border-radius: 50%;
   }
   .fa-arrow-right {
@@ -133,9 +145,13 @@
     line-height: 1;
     color: $gray-lighter;
   }
+  &:last-child {
+    border-bottom: 0;
+  }
   &.is-add {
     padding: 25px;
     text-align: center;
+    border-top: 1px solid $border-color-base;
     border-radius: 0 0 $border-radius-base $border-radius-base;
     .fa {
       margin-right: 10px;
@@ -159,10 +175,12 @@
   display: inline-block;
   vertical-align: middle;
   h5 {
+    font-family: $font-family-sans-serif;
     color: $gray-darker;
   }
   p {
     margin: 5px 0 0;
+    font-weight: 300;
     color: $gray-light;
   }
 }
@@ -174,8 +192,7 @@
   .public-wrapper {
     left: 0;
     width: 99%;
-    padding: 20px 10px;
-    margin-left: 0;
+    padding: 56px 10px;
   }
   .public-box {
     padding: 50px 20px;

data/app/assets/stylesheets/locomotive/account/_type.scss

@@ -12,3 +12,8 @@ h5,
 h6 {
   margin: 0;
 }
+
+code {
+  display: block;
+  overflow: auto;
+}

data/app/assets/stylesheets/locomotive/live_editing_iframe.scss

@@ -48,7 +48,7 @@ $fa-version:            '4_4_0';
     font-family: 'Noto Sans', sans-serif;
     font-size: 12px;
     font-weight: normal;
-    height: 30px;
+    max-height: 30px;
     line-height: 18px;
     margin: 0 10px 0 0px;
     padding: 5px 10px;

data/app/controllers/locomotive/concerns/redirect_to_main_host_controller.rb

@@ -19,7 +19,7 @@ module Locomotive
           options = { host: Locomotive.config.host }
           options[:port] = request.port if request.port != 80
 
-          redirect_to options
+          redirect_to root_url(options)
         end
       end
 

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -10,7 +10,11 @@ module Locomotive
     #
     def render_custom_fields(content_type, form)
       html = content_type.ordered_entries_custom_fields.map do |field|
-        render_custom_field(field, form)
+        if field.ui_enabled? || field.name == content_type.label_field_name
+          render_custom_field(field, form)
+        else
+          ''
+        end
       end
 
       html.join("\n").html_safe

data/app/inputs/locomotive/file_input.rb

@@ -57,7 +57,7 @@ module Locomotive
     def filename_or_image
       if persisted_file?
         css = "current-file #{persisted_file.image? ? 'image' : ''}"
-        template.content_tag :span, image_html + filename_html, class: css
+        template.content_tag :span, (image_html + filename_html).html_safe, class: css
       else
         ''
       end

data/app/models/locomotive/concerns/asset/checksum.rb

@@ -18,9 +18,7 @@ module Locomotive
 
         def calculate_checksum
           begin
-            if self.checksum.blank?
-              self.checksum = Digest::MD5.hexdigest(self.source.read)
-            end
+            self.checksum = Digest::MD5.hexdigest(self.source.read)
           rescue Errno::ENOENT => e
             # no file
           end
@@ -31,3 +29,4 @@ module Locomotive
     end
   end
 end
+

data/app/models/locomotive/concerns/page/redirect.rb

@@ -15,7 +15,7 @@ module Locomotive
           ## validations ##
           validates_presence_of :redirect_type, if: :redirect?
           validates_presence_of :redirect_url,  if: :redirect?
-          validates_format_of   :redirect_url,  with: Locomotive::Regexps::URL, allow_blank: true
+          validates_format_of   :redirect_url,  with: Locomotive::Regexps::URL_AND_MAILTO, allow_blank: true
 
         end
 

data/app/models/locomotive/concerns/site/access_points.rb

@@ -22,6 +22,7 @@ module Locomotive
           validates_format_of       :handle, with: Locomotive::Regexps::HANDLE, allow_blank: true,
             multiline: true
           validate                  :domains_must_be_valid_and_unique
+          validate                  :domains_must_not_be_reserved
 
           ## callbacks ##
           before_validation :prepare_domain_sync
@@ -74,6 +75,18 @@ module Locomotive
           end
         end
 
+        def domains_must_not_be_reserved
+          return if self.domains.empty? || Locomotive.config.reserved_domains.blank?
+
+          self.domains.each do |domain|
+            any = Locomotive.config.reserved_domains.any? do |matcher|
+              matcher.is_a?(Regexp) ? domain =~ matcher : matcher == domain
+            end
+
+            self.errors.add(:domains, :domain_taken, value: domain) if any
+          end
+        end
+
         def emit_domain_sync_event
           return if @added_domains.blank? && @removed_domains.blank?
 

data/app/models/locomotive/editable_file.rb

@@ -37,7 +37,7 @@ module Locomotive
 
     def init_localized_source
       # FIXME: the source of the element is not correctly set for the first time (certainly because the source is localized)
-      attributes[:source] = {} unless self.persisted?
+      attributes['source'] = {} unless self.persisted?
     end
 
   end