locomotivecms 4.0.0.alpha3 → 4.0.0.rc0

data/config/routes.rb

@@ -71,6 +71,8 @@ Locomotive::Engine.routes.draw do
       put :sort,              on: :collection
       get :export,            on: :collection
       delete :bulk_destroy,   on: :collection
+
+      resource :impersonation, only: [:create], controller: 'content_entry_impersonations'
     end
 
     namespace :custom_fields, path: 'content_types/:slug/fields/:name' do

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

@@ -41,7 +41,7 @@ module Locomotive
         inject_into_file 'Gemfile', after: "source 'https://rubygems.org'\n" do <<-'RUBY'
 
 if ENV['HEROKU_APP_NAME']
-  ruby '2.4.3'
+  ruby '2.5.1'
 end
         RUBY
         end
@@ -63,7 +63,7 @@ end
         RUBY
         end
 
-        gem 'platform-api', '~> 2'
+        gem 'platform-api', '~> 2.2.0'
       end
     end
 
@@ -75,14 +75,6 @@ end
       remove_file 'public/robots.txt'
     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/locomotive/dependencies.rb

@@ -14,6 +14,7 @@ require 'bootstrap-kaminari-views'
 require 'bootstrap-sass'
 require 'font-awesome-sass'
 require 'autoprefixer-rails'
+require 'jbuilder'
 require 'slim'
 require 'simple_form'
 require 'responders'

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

@@ -28,7 +28,7 @@ module Locomotive
       def with_form(type_slug, attributes, as_json, &block)
         load_content_type(type_slug)
 
-        useTempfiles(attributes)
+        use_tempfiles(attributes)
 
         ::Mongoid::Fields::I18n.with_locale(self.locale) do
           form  = Locomotive::API::Forms::ContentEntryForm.new(@content_type, attributes)
@@ -39,7 +39,7 @@ module Locomotive
         end
       end
 
-      def useTempfiles(attributes)
+      def use_tempfiles(attributes)
         # kind of marshal/unmarshal mechanism :-)
         attributes.each do |key, value|
           if value.is_a?(Hash) && value['tempfile'].present? && value['tempfile'].is_a?(String) && value['filename'].present?

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

@@ -22,9 +22,10 @@ module Locomotive
       def create_entry(attributes)
         ::Mongoid::Fields::I18n.with_locale(locale) do
           entry = engine_service.public_create(attributes, {
-            ip_address: self.request.ip,
-            user_agent: self.request.user_agent,
-            referer:    self.request.referer
+            ip_address:   self.request.ip,
+            user_agent:   self.request.user_agent,
+            referer:      self.request.referer,
+            emails:       notified_emails
           })
 
           entity = entry.to_steam(@content_type)
@@ -40,6 +41,15 @@ module Locomotive
         self.service.locale
       end
 
+      # a public form might need to inform accounts from other Locomotive sites
+      def notified_emails
+        (
+          self.request.params['notified_emails'] ||
+          self.request.params['notified_accounts'] ||
+          ''
+        ).split(',')
+      end
+
       def engine_service
         Locomotive::ContentEntryService.new(@content_type, nil, locale)
       end

data/lib/locomotive/version.rb

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

data/lib/tasks/locomotive_tasks.rake

@@ -94,6 +94,35 @@ namespace :locomotive do
       end
       puts '[x] set completion for translations'
 
+      # rename routes to url_redirections
+      Locomotive::Site.all.each_by(10) do |site|
+        site.url_redirections = site.routes
+        site.routes = nil
+        site.save
+      end
+      puts '[x] rename site attribute: change routes to url_redirections'
+
+      # editable controle are now localized by default
+      Locomotive::Site.all.each_by(10) do |site|
+        site.pages.each_by(10) do |page|
+          page.editable_elements.each do |el|
+            next if !el.is_a?(Locomotive::EditableControl) || el.attributes['content'].is_a?(Hash)
+
+            value = el.attributes['content']
+
+            # trick: reset the content with an empty hash
+            new_attributes = el.attributes.dup
+            new_attributes[:content] = {}
+            el.instance_variable_set(:@attributes, new_attributes)
+
+            site.locales.each do |locale|
+              Mongoid::Fields::I18n.with_locale(locale) {  el.set(content: value) }
+            end
+          end
+        end
+      end
+      puts '[x] editable_control elements are localized by default'
+
       puts "\nDone!"
     end
 

data/vendor/assets/javascripts/locomotive/wysihtml5x-toolbar.js

@@ -18339,7 +18339,6 @@ wysihtml5.views.View = Base.extend(
     },
 
     _updateLinkStates: function() {
-
       var i, state, action, command, displayDialogAttributeValue,
           commandMapping      = this.commandMapping,
           composer            = this.composer,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha3
+  version: 4.0.0.rc0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: custom_fields
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0.beta3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0.beta3
+- !ruby/object:Gem::Dependency
+  name: locomotivecms_steam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0.rc0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0.rc0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -302,14 +330,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -464,6 +492,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: adomain
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -769,6 +811,7 @@ files:
 - app/controllers/locomotive/concerns/within_site_controller.rb
 - app/controllers/locomotive/content_assets_controller.rb
 - app/controllers/locomotive/content_entries_controller.rb
+- app/controllers/locomotive/content_entry_impersonations_controller.rb
 - app/controllers/locomotive/current_site_controller.rb
 - app/controllers/locomotive/current_site_metafields_controller.rb
 - app/controllers/locomotive/custom_fields/select_options_controller.rb
@@ -831,6 +874,7 @@ files:
 - app/models/locomotive/concerns/asset/checksum.rb
 - app/models/locomotive/concerns/asset/types.rb
 - app/models/locomotive/concerns/asset/vignette.rb
+- app/models/locomotive/concerns/content_entry/authentication.rb
 - app/models/locomotive/concerns/content_entry/counter.rb
 - app/models/locomotive/concerns/content_entry/csv.rb
 - app/models/locomotive/concerns/content_entry/file_size.rb