locomotivecms 4.0.0.rc0 → 4.0.0

data/config/locales/en.yml

@@ -49,7 +49,7 @@ en:
         dashboard: Dashboard
         assets: Assets
         pages: Pages
-        settings: General Settings
+        settings: Site Administration
         metafields: Properties
         developers: Developers
         content_types:
@@ -87,6 +87,8 @@ en:
           create_account: "Please create an account first and then create a site."
           add_domain: "Add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
           sign_in: "Please sign in first. Then, add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
+      access_denied:
+        message: "You're not allowed to perform this action. Contact your site administrator for some help."
 
     notifications:
       new_content_entry:
@@ -261,7 +263,7 @@ en:
 
     current_site:
       edit:
-        title: Editing the current site
+        title: Site Administration
       form:
         main:
           new_membership: "Add account"
@@ -359,9 +361,9 @@ en:
     content_entries:
       index:
         title: '%{type}'
-        download: download entries
-        new: new entry
-        bulk_destroy: delete entries
+        download: Download entries
+        new: New entry
+        bulk_destroy: Delete entries
         edit_notification_settings: Edit notification settings
         search_placeholder: "Enter your search keywords here"
         group_by:

data/config/locales/fr.yml

@@ -83,6 +83,8 @@ fr:
           create_account: "Veuillez créer un compte avant de créer un site"
           add_domain: "Ajoutez le domaine <strong>%{host}</strong>  à la liste de domaines de l'un de vos sites."
           sign_in: "Veuillez d'abord vous identifier. Puis, ajoutez le domaine <strong>%{host}</strong> à la liste de domaines de l'un de vos sites."
+      access_denied:
+        message: "Vous n'êtes pas autorisé(e) à effectuer cette action. Veuillez contacter l'administrateur du site pour de l'aide."
     notifications:
       new_content_entry:
         subject: "[%{domain}][%{type}] nouvelle entité"

data/config/locales/simple_form.en.yml

@@ -101,6 +101,7 @@ en:
           asset_host: "Site-specific asset host that overrides engine asset host (ex. \"localhost\", \"asset.dev\", \"https://asset-host.com/\")."
           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."
+          bypass_browser_locale: "By default, in a multi locales site, if a visitor visits the index page for the first time, we'll redirect her/him to the locale matching one of the browser languages. Toggle on if you don't want this behaviour."
           redirect_to_first_domain: "When enabled, requests made to any domains listed above will be redirected to the first domain."
           redirect_to_https: "When enabled, non secure requests will be redirected to https. This requires the installation of a SSL certificate on the web server."
           url_redirections_expert_mode: "When enabled, a textarea will let you manage your redirections. <strong>IMPORTANT: save your site before returning to the default mode.</strong>"
@@ -167,4 +168,6 @@ en:
           delete: Delete this site
         page:
           delete: Delete
+        content_entry:
+          delete: Delete
 

data/config/webpack/production.js

@@ -1,6 +1,6 @@
 const config = require('./development.js');
 
-config.target = 'node'
+config.target = 'web'
 config.mode   = 'production';
 config.optimization = { minimize: true };
 

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

@@ -3,7 +3,7 @@ module Locomotive
 
     source_root File.expand_path('../../../../../', __FILE__)
 
-    class_option :heroku, type: :boolean, default: false, description: 'if the Engine runs on Heroku'
+    class_option :heroku, type: :boolean, default: false, description: 'if the Engine is supposed to run on Heroku'
 
     def copy_initializers
       @source_paths = nil # reset it for the find_in_source_paths method
@@ -19,6 +19,19 @@ module Locomotive
       if options.heroku? || yes?('Do you want to store your assets on Amazon S3?')
         template 'carrierwave_aws.rb', 'config/initializers/carrierwave.rb'
         gem 'carrierwave-aws'
+        gem 'rack-cors', require: 'rack/cors'
+        inject_into_file 'Gemfile', after: "# the framework and any gems in your application.\n" do <<-RUBY
+
+    config.assets.initialize_on_precompile = false
+
+    config.middleware.insert_before ActionDispatch::Static, Rack::Cors do
+      allow do
+        origins '*'
+        resource '/assets/*', headers: :any, methods: :any
+      end
+    end
+
+        RUBY
       else
         template 'carrierwave.rb', 'config/initializers/carrierwave.rb'
       end
@@ -41,7 +54,7 @@ module Locomotive
         inject_into_file 'Gemfile', after: "source 'https://rubygems.org'\n" do <<-'RUBY'
 
 if ENV['HEROKU_APP_NAME']
-  ruby '2.5.1'
+  ruby '2.6.2'
 end
         RUBY
         end

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

@@ -1,6 +1,6 @@
 ===============================================================================
 
-The Locomotive Engine has been correctly installed in your Rails application.
+The LocomotiveCMS Engine has been correctly installed in your Rails application.
 
   1. Edit the main config files:
 

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

@@ -72,7 +72,7 @@ test:
 production:
   clients:
     default:
-      uri: <%%= ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] %>
+      uri: <%%= ENV['MONGODB_URI'] || ENV['MONGO_URL'] %>
       options:
         # consistency: :strong
         # identity_map_enabled: true

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

@@ -32,6 +32,9 @@ module Locomotive
 
           translations.each do |attributes|
             if existing = site.translations.where(key: attributes[:key]).first
+              # don't need to call the DB if we already have the values in DB
+              next if existing.values == attributes[:values]
+
               existing.update_attribute :values, existing.values.merge(attributes[:values])
             else
               new_translations << attributes

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

@@ -48,6 +48,13 @@ module Locomotive
             )
             response.first.gsub!('</head>', %(#{html}</head>))
 
+            # make sure there is no span tags within the head.
+            # For the record, Steam adds a span tag next to a block liquid tag
+            response.first.gsub!(/<head>(.+)<\/head>/m) do
+              head = Regexp.last_match[1]
+              "<head>#{head.gsub(/<span/, '<meta').gsub(/<\/span>/, '</meta>')}</head>"
+            end
+
             # new way of letting the parent window know about the status of the preview
             response.first.gsub!('</body>', %(
                 <script type="text/javascript">

data/lib/locomotive/steam/services/liquid_parser_with_cache_service.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     class LiquidParserWithCacheService < LiquidParserService
 
-      UNMARSHALABLE_OPTIONS = %i(parser page parent_finder snippet_finder).freeze
+      UNMARSHALABLE_OPTIONS = %i(parser page parent_finder snippet_finder section_finder locale).freeze
 
       attr_accessor_initialize :current_site, :parent_finder, :snippet_finder, :locale
 
@@ -39,17 +39,18 @@ module Locomotive
       def marshal(template)
         _template = template.dup
 
+        # delete the unmarshalable options of the Liquid Template
+        delete_unmarshalable_options(_template)
+
         # get rid of options in any tags/blocks of the document
         # because options can not be marshaled
-        remove_unmarshalable_options(_template)
-
         clean_template!(_template.root)
 
         Marshal.dump(_template)
       end
 
       def clean_template!(node)
-        remove_unmarshalable_options(node)
+        remove_unmarshalable_parse_context_options(node)
 
         # special case
         clean_template!(node.descendant) if node.respond_to?(:descendant) && node.descendant
@@ -60,30 +61,36 @@ module Locomotive
           end
         end
 
-        # [Debug](used to find the node element whic can't be marshaled): Marshal.dump(node)
+        # FIXME: To debug marshalling errors, find the node element which can't be marshaled with `Marshal.dump(node)`
       end
 
-      def remove_unmarshalable_options(node)
-        options = node.instance_variable_get(:@options)
+      def remove_unmarshalable_parse_context_options(node)
+        parse_context = node.instance_variable_get(:@parse_context)
 
-        return if options.blank?
+        return if parse_context.nil?
 
-        unless options[:inherited_blocks].blank?
-          remove_unmarshalable_options_from_inherited_blocks(options)
+        unless parse_context[:inherited_blocks].blank?
+          remove_unmarshalable_parse_context_options_from_inherited_blocks(parse_context)
         end
 
-        options.delete_if { |name, _| UNMARSHALABLE_OPTIONS.include?(name) }
+        delete_unmarshalable_options(parse_context)
       end
 
-      def remove_unmarshalable_options_from_inherited_blocks(options)
-        options[:inherited_blocks].values.each do |blocks|
+      def remove_unmarshalable_parse_context_options_from_inherited_blocks(parse_context)
+        parse_context[:inherited_blocks].values.each do |blocks|
           (blocks.respond_to?(:has_key?) ? blocks.values : blocks).each do |block|
-            _options = block.instance_variable_get(:@options)
-            _options.delete_if { |name, _| UNMARSHALABLE_OPTIONS.include?(name) }
+            _parse_context = block.instance_variable_get(:@parse_context)
+            delete_unmarshalable_options(_parse_context)
           end
         end
       end
 
+      def delete_unmarshalable_options(template_or_parse_context)
+        options = template_or_parse_context.instance_variable_get(:@template_options) ||
+                  template_or_parse_context.instance_variable_get(:@options)
+        options.delete_if { |name, _| UNMARSHALABLE_OPTIONS.include?(name) }
+      end
+
     end
 
   end

data/lib/locomotive/steam_adaptor.rb

@@ -32,7 +32,7 @@ Locomotive::Steam.configure do |config|
   require_relative 'steam/middlewares/catch_error'
   config.middleware.insert_after Locomotive::Steam::Middlewares::Site, Locomotive::Steam::Middlewares::CatchError
 
-  %w(cache page_editing missing_translations wysihtml_css).each do |name|
+  %w(page_editing missing_translations wysihtml_css).each do |name|
     require_relative "steam/middlewares/#{name}"
     config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Steam::Middlewares.const_get(name.camelize)
   end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive
-  VERSION = '4.0.0.rc0'
+  VERSION = '4.0.0'
 end

data/lib/tasks/development_tasks.rake

@@ -4,7 +4,11 @@ namespace :development do
 
   desc "Display the API routes"
   task api_routes: :environment do
-    puts Locomotive::API::Dispatch.routes.map(&:to_s).join("\n")
+    Locomotive::API::Dispatch.routes.each do |api|
+      method  = api.request_method.ljust(10)
+      path    = api.path
+      puts "#{method} #{path}"
+    end
   end
 
   desc "Setup sites and account for development"
@@ -19,7 +23,7 @@ namespace :development do
       end
     end
 
-    account = Locomotive::Account.new email: "admin@locomotivecms.com", password: "locomotive", password_confirmation: "locomotive", name: "Admin"
+    account = Locomotive::Account.new email: "admin@locomotivecms.com", password: "locomotive", password_confirmation: "locomotive", name: "Admin", super_admin: true
     account.api_key = 'd49cd50f6f0d2b163f48fc73cb249f0244c37074'
     account.save!
 
@@ -33,7 +37,7 @@ namespace :development do
 
     puts "\"LocomotiveCMS\" created: #{site._id}"
 
-    site = Locomotive::Site.create! name: "Sample site", handle: "sample", domains: ["sample.example.com"]
+    site = Locomotive::Site.create! name: "Sample site", handle: "sample", domains: ["sample.example.com", "acme.example.local"]
     site.memberships.build account: account, role: 'admin'
     site.save!
 

data/lib/tasks/locomotive_tasks.rake

@@ -45,6 +45,16 @@ namespace :locomotive do
       end
       puts '[x] set the number of entries by content type'
 
+      # content_types: filter_fields (don't use ids but use field name instead)
+      Locomotive::ContentType.where(:'filter_fields.0'.exists => true).all.each_by(10) do |content_type|
+        content_type.filter_fields = content_type.filter_fields.map do |id_or_name|
+          content_type.entries_custom_fields.where(id: id_or_name).first&.name || id_or_name
+        end
+        content_type.save
+      end
+      puts '[x] make filter_fields an array of only names (and not of field ids)'
+
+
       # content_entries: many_to_many relationships, make sure both sides are consistent
       Locomotive::ContentType.where('entries_custom_fields.type' => 'many_to_many').all.each_by(10) do |content_type|
         # puts "[#{content_type.site.name}] #{content_type.name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc0
+  version: 4.0.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,20 +30,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rails-html-sanitizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 4.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta3
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0.beta3
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.rc0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.rc0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
@@ -847,6 +875,7 @@ files:
 - app/helpers/locomotive/pages_helper.rb
 - app/helpers/locomotive/public_submission_accounts_helper.rb
 - app/helpers/locomotive/shared/accounts_helper.rb
+- app/helpers/locomotive/shared/activities_helper.rb
 - app/helpers/locomotive/shared/pages_helper.rb
 - app/helpers/locomotive/shared/site_metafields_helper.rb
 - app/helpers/locomotive/shared/sites_helper.rb
@@ -1055,6 +1084,7 @@ files:
 - app/views/locomotive/shared/_main_app_header.html.slim
 - app/views/locomotive/shared/_navigation.html.slim
 - app/views/locomotive/shared/_sidebar.html.slim
+- app/views/locomotive/shared/account/_head.html.slim
 - app/views/locomotive/shared/account/_navigation.html.slim
 - app/views/locomotive/shared/rte/_image_popover.html.slim
 - app/views/locomotive/shared/rte/_link_popover.html.slim
@@ -1077,7 +1107,6 @@ files:
 - config/initializers/devise.rb
 - config/initializers/mongoid.rb
 - config/initializers/multi_json.rb
-- config/initializers/rails_fixes.rb
 - config/initializers/simple_form.rb
 - config/initializers/slim.rb
 - config/initializers/time_format.rb
@@ -1292,7 +1321,6 @@ files:
 - lib/locomotive/regexps.rb
 - lib/locomotive/simple_form.rb
 - lib/locomotive/simple_token_authentication.rb
-- lib/locomotive/steam/middlewares/cache.rb
 - lib/locomotive/steam/middlewares/catch_error.rb
 - lib/locomotive/steam/middlewares/missing_translations.rb
 - lib/locomotive/steam/middlewares/page_editing.rb
@@ -1381,12 +1409,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A platform to create, publish and edit sites