locomotivecms 3.2.1 → 3.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d203a25b5a34a47a541a78378343b514dbf98aa8
-  data.tar.gz: 7ae7925d76d662d1fed3a07aefca4d9443523717
+  metadata.gz: 6fa0ccc8361eb063596917d328170297cafd835e
+  data.tar.gz: a9bd9f70ef7a44687f0d42654e0672320a5df04c
 SHA512:
-  metadata.gz: 2edc5299aab7b77a81bbadbf32f583edfe563d092fe4737c9e392f95dd8735d1d32cf5350ff4a9e268e34c4932989518fb9e318939e0cb0fc221d9e71815990d
-  data.tar.gz: 671d6c44e61c44811ff5c60a9d7d24ee5ba0599259edb178cddc29e0075be2b705f230397319c1627018fce3b3268d00f45970d9abd9c237dd20891069d7b052
+  metadata.gz: 81743c70c111b18756bf436b795dbace81d7b8556c5aad17107bf112f06da723c5440bf8d3d21b36bd8566b5a98abc115dd474b8f527d6759e3e0170a0bb303b
+  data.tar.gz: e5bb69b97e20cd06fcd02889d499514afab906d3752992959f3f273a620bc163045084330154ce068de9f52566342761e92a2f5e2587c4a3fd721186af283b40

data/Gemfile

@@ -9,23 +9,22 @@ gem 'sass-rails', '~> 5.0.4'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier',     '>= 2.5.3'
 
-gem 'coveralls',    '~> 0.7.2', require: false
+gem 'coveralls',    '~> 0.8.19', require: false
 
 group :test, :development do
-  gem 'rspec-rails', '~> 3.2.1' #~> 2.14.2' # In order to have rspec tasks and generators
+  gem 'rspec-rails', '~> 3.5.2' #~> 2.14.2' # In order to have rspec tasks and generators
   gem 'pry'
 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: 'b5dcac5'
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '4a612e5'
 
   # gem 'locomotivecms_common', path: '../gems/common', require: false
   # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a2cba33', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'e624ab686', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers
@@ -55,7 +54,7 @@ end
 group :test do
   gem 'simplecov'
 
-  gem 'capybara-webkit',      '~> 1.10.1'
+  gem 'capybara-webkit',      '~> 1.12.0'
 
   gem 'grape-entity-matchers'
   gem 'shoulda-matchers',     '2.7.0'

data/LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2010-2015, Didier Lafforgue.
+Copyright (c) 2010-2017, NoCoffee.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -10,7 +10,7 @@ Locomotive relies on a **very original workflow**:
 - 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.
 
-![Locomotive](https://dl.dropboxusercontent.com/u/20823269/locomotive-engine.png)
+![Locomotive](http://i.imgur.com/iRG1gWA.jpg)
 
 Visit the Locomotive official website [here](http://
 locomotive.works) for more information.
@@ -74,4 +74,4 @@ For new features (especially large ones) it is best to create a topic on the [Go
 
 Feel free to contact me at did at locomotivecms dot com.
 
-Copyright (c) 2016 NoCoffee, released under the MIT license
+Copyright (c) 2017 NoCoffee, released under the MIT license

data/app/api/locomotive/api.rb

@@ -50,6 +50,7 @@ module Locomotive
       mount API::Resources::MembershipResource
       mount API::Resources::CurrentSiteResource
       mount API::Resources::ContentAssetResource
+      mount API::Resources::UrlRedirectionResource
 
       route :any, '*path' do
         error!({ error: "Unrecognized request path: #{params[:path]}" }, 404)

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

@@ -71,6 +71,10 @@ module Locomotive
           dynamic_value_of(name).pluck_with_natural_order(:_slug)
         end
 
+        def expose_json_field(name)
+          expose_default_field(name).try(:to_json)
+        end
+
         def dynamic_value_of(name)
           self.object.send(name)
         end

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

@@ -24,6 +24,9 @@ module Locomotive
         # Editable elements
         attrs :editable_elements_attributes
 
+        # Display settings
+        attrs :display_settings
+
         def initialize(site, attributes = {}, existing_page = nil)
           @site = site
           @existing_page = existing_page
@@ -62,6 +65,13 @@ module Locomotive
           set_attribute :redirect_url, value
         end
 
+        def display_settings=(settings)
+          (settings || {}).each do |k, v|
+            settings[k] = v == 'true'
+          end
+          set_attribute(:display_settings, settings)
+        end
+
       end
 
     end

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

@@ -61,6 +61,7 @@ module Locomotive
               optional :seo_title
               optional :meta_keywords
               optional :meta_description
+              optional :display_settings
             end
           end
           post do
@@ -97,6 +98,7 @@ module Locomotive
               optional :seo_title
               optional :meta_keywords
               optional :meta_description
+              optional :display_settings
             end
           end
           put ':id' do

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

@@ -0,0 +1,69 @@
+module Locomotive
+  module API
+    module Resources
+
+      class UrlRedirectionResource < Grape::API
+
+        resource :url_redirections do
+          entity_klass = Entities::SiteEntity
+
+          before do
+            authenticate_locomotive_account!
+            require_site!
+          end
+
+          desc 'Index of url redirections'
+          get '/' do
+            authorize current_site, :show?
+
+            present current_site.url_redirections_with_information, with: Grape::Presenters::Presenter
+          end
+
+
+          desc 'Add or update url redirection'
+          params do
+            requires :url_redirection, type: Hash do
+              requires :source
+              requires :target
+              optional :counter, type: Integer
+              optional :hidden, type: Boolean
+            end
+          end
+          put do
+            authorize current_site, :update?
+
+            source      = params[:url_redirection][:source]
+            target      = params[:url_redirection][:target]
+            information = params[:url_redirection].slice(:counter, :hidden)
+
+            if current_site.add_or_update_url_redirection(source, target, information)
+              current_site.save
+              present current_site, with: Grape::Presenters::Presenter
+            else
+              status 422
+            end
+          end
+
+
+          desc "Delete url redirection"
+          params do
+            requires :url_redirection, type: Hash do
+              requires :source
+            end
+          end
+          delete do
+            authorize current_site, :destroy?
+
+            current_site.remove_url_redirection(params[:url_redirection][:source])
+            current_site.save
+
+            present current_site, with: entity_klass
+          end
+
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -12,8 +12,12 @@ class Locomotive.Views.Inputs.MarkdownView extends Locomotive.Views.Inputs.TextV
 
     _.bindAll(@, 'insert_file')
 
-    @$textarea  = @$('textarea.markdown')
-    @editor     = CodeMirror.fromTextArea @$textarea[0],
+    @$textarea = @$('textarea.markdown')
+
+    # if the input is required then Chrome won't be able to submit the form
+    @$textarea.removeAttr('required')
+
+    @editor = CodeMirror.fromTextArea @$textarea[0],
       mode:         'markdown'
       tabMode:      'indent'
       lineWrapping: true

data/app/assets/javascripts/locomotive/views/inputs/rte/link_view.js.coffee

@@ -26,7 +26,7 @@ class Locomotive.Views.Inputs.Rte.LinkView extends Backbone.View
     @$content.show()
     @$link.popover
       container:  @$link.parents('fieldset')
-      placement:  'right'
+      placement:  'bottom'
       content:    @$content
       html:       true
       trigger:    'manual'

data/app/assets/javascripts/locomotive/views/inputs/rte/table_view.js.coffee

@@ -24,7 +24,7 @@ class Locomotive.Views.Inputs.Rte.TableView extends Backbone.View
     @$content.show()
     @$link.popover
       container:  @$link.parents('fieldset')
-      placement:  'right'
+      placement:  'bottom'
       content:    @$content
       html:       true
       trigger:    'manual'

data/app/assets/javascripts/locomotive/views/inputs/rte_view.js.coffee.erb

@@ -59,7 +59,7 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
     html    = $button.next('.style-dialog-content').html()
 
     @$style_popover = @$style_popover || ($button.popover
-      placement:  'top'
+      placement:  'bottom'
       content:    html
       html:       true
       title:      undefined)

data/app/assets/stylesheets/locomotive/new/_flags.scss.erb

@@ -7,7 +7,8 @@
   background-size: 24px;
   background-position: 0 0;
 
-  <% %w(bf bg cs de en es et fr it ja lt mg nb nl pl pt-BR pt ru sk sr sv zh-CN).each do |locale| %>
+  // https://www.iconfinder.com/iconsets/flags_gosquared
+  <% %w(bf bg cs da de el en es et fa-IR fi-FI fr it ja-JP lt mg nb nl pl-PL pt-BR pt ru sk sr sv uk zh-CN).each do |locale| %>
   &.flag-<%= locale %> {
     background-image: url(asset-path('locomotive/icons/flags/<%= locale %>.png'));
   }

data/app/assets/stylesheets/locomotive/old/form/_popover.scss

@@ -1,8 +1,4 @@
 .popover {
-  margin-top: 60px !important;
-  .arrow {
-    margin-top: -71px !important;
-  }
   .simple_form {
     padding-bottom: 0;
 

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

@@ -13,7 +13,7 @@ module Locomotive
       private
 
       def redirect_to_main_host
-        return if Locomotive.config.host.blank?
+        return if Locomotive.config.host.blank? || request.env['locomotive.default_host'].present?
 
         if request.host != Locomotive.config.host
           options = { host: Locomotive.config.host }

data/app/controllers/locomotive/current_site_controller.rb

@@ -47,7 +47,10 @@ module Locomotive
 
     def new_url_redirection
       if params[:url_redirection].present? && params[:url_redirection].include?(' ')
-        render partial: 'url_redirection', locals: { url_redirection: params[:url_redirection].split(' ') }
+        source, target = params[:url_redirection].split(' ')
+        render partial: 'url_redirection', locals: {
+          url_redirection: { 'source' => source, 'target' => target }
+        }
       else
         head :unprocessable_entity
       end

data/app/controllers/locomotive/errors_controller.rb

@@ -3,6 +3,8 @@ module Locomotive
 
     layout '/locomotive/layouts/error'
 
+    helper Locomotive::BaseHelper
+
     def error_404
       render '404', status: :not_found
     end

data/app/controllers/locomotive/passwords_controller.rb

@@ -28,7 +28,11 @@ module Locomotive
     end
 
     def set_locale
-      I18n.locale = current_site? ? current_site.accounts.first.locale : Locomotive.config.default_locale
+      I18n.locale = current_site? ? current_site.accounts.first.locale : default_locale
+    end
+
+    def default_locale
+      Locomotive.config.default_locale
     end
 
   end

data/app/controllers/locomotive/registrations_controller.rb

@@ -10,6 +10,8 @@ module Locomotive
 
     helper Locomotive::BaseHelper
 
+    before_filter :set_locale
+
     private
 
     def after_sign_up_path_for(resource)
@@ -20,5 +22,9 @@ module Locomotive
       devise_parameter_sanitizer.for(:sign_up) << :name
     end
 
+    def set_locale
+      I18n.locale = Locomotive.config.default_locale
+    end
+
   end
 end

data/app/controllers/locomotive/sessions_controller.rb

@@ -24,7 +24,11 @@ module Locomotive
     end
 
     def set_locale
-      I18n.locale = current_site? ? current_site.accounts.first.locale : Locomotive.config.default_locale
+      I18n.locale = current_site? ? current_site.accounts.first.locale : default_locale
+    end
+
+    def default_locale
+      Locomotive.config.default_locale
     end
 
   end

data/app/helpers/locomotive/base_helper.rb

@@ -11,6 +11,10 @@ module Locomotive
       [self.controller.controller_name, action].map(&:dasherize).join(' ')
     end
 
+    def application_name
+      Locomotive.config.name
+    end
+
     def title(title = nil)
       if title.nil?
         @content_for_title
@@ -33,6 +37,12 @@ module Locomotive
       end
     end
 
+    #= Sessions
+
+    def enable_registration?
+      current_site.nil? && Locomotive.config.enable_registration
+    end
+
     #= Sidebar
 
     def sidebar_current_section_class
@@ -72,6 +82,14 @@ module Locomotive
 
     ## Tag helpers ##
 
+    def account_logo_tag
+      image_tag 'locomotive/logo-white.png'
+    end
+
+    def sidebar_logo_tag
+      image_tag 'locomotive/logo.png'
+    end
+
     def icon_tag(name)
       content_tag :i, '', class: ['fa', name].join(' ')
     end

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -103,6 +103,10 @@ module Locomotive
       { as: :email }
     end
 
+    def password_custom_field_options(field, entry)
+      { as: :password }
+    end
+
     def file_custom_field_options(field, entry)
       { as: :file, select_content_asset: true }
     end
@@ -195,6 +199,16 @@ module Locomotive
       { as: type }
     end
 
+    def json_custom_field_options(field, entry)
+      {
+        as: :text,
+        input_html: {
+          rows:   10,
+          value:  entry.send(field.name).try(:to_json)
+        }
+      }
+    end
+
     def custom_field_picker_options(field, slug)
       {
         label_method: :_label,

data/app/helpers/locomotive/shared/pages_helper.rb

@@ -108,6 +108,10 @@ module Locomotive
           depth >= 2 ? MAX_WIDTH[depth - 2 + inc] : nil
         end
 
+        def show?
+          controller.send(:policy, page).show?
+        end
+
         alias :to_param :_id
 
       end