locomotivecms 4.0.0 → 4.1.0.rc1

data/config/locales/editor.fr.yml

@@ -35,9 +35,19 @@ fr:
           remove_button: "Enlever"
           crop_button: "Rogner"
 
+        asset_picker:
+          select_button: "Sélectionner"
+          change_button: "Changer"
+          remove_button: "Enlever"
+
         content_type:
           show: "Voir"
 
+        content_entry:
+          select_button: "Sélectionner"
+          change_button: "Changer"
+          remove_button: "Enlever"
+
       views:
         action_bar:
           header:
@@ -54,6 +64,12 @@ fr:
             seo: "SEO"
 
         pickers:
+          assets:
+            title: "Fichiers"
+            loading: "Chargement des fichiers en cours !"
+            add: "+ ajouter"
+            upload_in_progress: "Téléchargement en cours..."
+            search_placeholder: "Nom du fichier"
           images:
             title: "Images"
             loading: "Chargement des images en cours !"
@@ -82,9 +98,15 @@ fr:
             email:
               label: Adresse Email
               placeholder: "name@example.com"
+          content_entry:
+            title: "Sélectionner une ressource"
+            input:
+              label: Titre d'une ressource
+              placeholder: Taper le tire de votre ressource
 
         preview:
           view: "Aperçu"
+          errorMessage: "La page n'a pas pu être chargée. Veuillez contacter le développeur du site."
 
         sections:
           edit:

data/config/locales/en.yml

@@ -38,6 +38,8 @@ en:
       unsaved_content_warning: "This page is asking you to confirm that you want to leave - data you have entered may not be saved."
 
     shared:
+      "yes": "Yes"
+      "no": "No"
       header:
         welcome: Welcome, %{name}
         sites: My sites
@@ -332,6 +334,7 @@ en:
       dropzone:
         instructions: "<strong>Drop files from your computer here.</strong><br/>You can also"
         browse: "browse for a file"
+        maximum_file_size: "Maximum file size allowed is %{maximum}."
 
       list:
         no_items: "There are no media for now."
@@ -363,6 +366,7 @@ en:
         title: '%{type}'
         download: Download entries
         new: New entry
+        import: CSV Import
         bulk_destroy: Delete entries
         edit_notification_settings: Edit notification settings
         search_placeholder: "Enter your search keywords here"
@@ -377,6 +381,23 @@ en:
       shared:
         back: '&larr; Back to list'
 
+    content_entry_imports:
+      new:        
+        title: "%{type} - Import a CSV file"
+        show: "See last import"
+      show:
+        title: "%{type} - Report of the CSV import"
+        report:
+          status: "Status"
+          created_rows: "Created entries"
+          updated_rows: "Updated entries"
+          failed_rows: "Failed entries"
+        statuses:
+          ready: "Ready"
+          done: "Done"
+          canceled: "Canceled"
+          failed: "Failer"
+
     developers_documentation:
       show:
         title: Developers

data/config/locales/es.yml

@@ -291,6 +291,8 @@ es:
       dropzone:
         instructions: "<strong>Coloca los archivos desde tu computadora aqui.</strong><br/>Tambien puedes"
         browse: "buscar un fichero"
+        maximum_file_size: "El tamaño máximo permitido es %{maximum}."
+
       list:
         no_items: "No hay archivos por ahora"
         buttons:

data/config/locales/flash.en.yml

@@ -32,6 +32,12 @@ en:
           notice: "Model was successfully updated."
           alert: "Model was not updated."
 
+      content_entry_imports:
+        create:
+          notice: "The import task was successfully launched."
+        destroy:
+          notice: "The import task was manually cancelled."
+
       current_site:
         update:
           notice: "My site was successfully updated."

data/config/locales/fr.yml

@@ -36,6 +36,8 @@ fr:
       confirm: Êtes-vous sûr ?
       unsaved_content_warning: "Vous avez des modifications non sauvegardées dans cette page. Si vous la quittez, ces modifications seront perdues."
     shared:
+      "yes": "Oui"
+      "no": "Non"
       header:
         welcome: Bienvenue, %{name}
         sites: Mes sites

data/config/locales/mongoid.en.yml

@@ -14,10 +14,14 @@ en:
               unique_account: "is already used"
             email:
               unique_account: "is already used"
+        locomotive/content_asset:
+          attributes:
+            source:
+              maximum_file_size_exceeded: exceeds the maximum file size allowed        
     attributes:
       locomotive/content_entry:
         created_at: Created at
-
+      
   errors:
     messages:
       domain_taken: "%{value} is already taken"

data/config/locales/mongoid.es.yml

@@ -14,6 +14,10 @@ es:
               unique_account: "ya estaba en uso"
             email:
               unique_account: "ya esta en uso"
+        locomotive/content_asset:
+          attributes:
+            source:
+              maximum_file_size_exceeded: supera el tamaño máximo de fichero permitido
     attributes:
       locomotive/content_entry:
         created_at: Creado el

data/config/locales/simple_form.en.yml

@@ -32,6 +32,9 @@ en:
           public_submission_accounts: "Notified Accounts"
           # "custom_fields/field":
           #   select_options: "Options"
+        content_entry_import:
+          col_sep: "Column separator"
+          quote_char: "Quote character"
         account:
           api_key: API key
           no_api_key: None
@@ -52,6 +55,7 @@ en:
           password: "Site-Wide Password"
           url_redirections_expert_mode: "Expert mode"
           url_redirections_plain_text: "Url redirections"
+          maximum_uploaded_file_size: "Maximum uploaded files size"
           new:
             locales: First language
         membership:
@@ -74,6 +78,8 @@ en:
           rows: "Rows"
           head: "Head row?"
           class_name: "CSS class"
+        content_entry_import:
+          file: CSV File
 
     hints:
       locomotive:
@@ -97,6 +103,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."
+          maximum_uploaded_file_size: "In bytes."
           domains: "Add your domains just below. Documentation <a href=\"https://locomotive-v3.readme.io/docs/domains\">here</a> for more information."
           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."
@@ -119,11 +126,16 @@ en:
           seo_title: "The value you fill in will replace the SEO title of the templatized page related to your model."
           meta_keywords: "Overrides the site's meta keywords used within the head tag of the page. They are separated by a comma."
           meta_description: "Overrides the site's meta description used within the head tag of the page."
+        content_entry_import:
+          col_sep: "The String placed between each field. ',' by default."
+          quote_char: "The character used to quote fields. '\"' by default." 
         content_type:
           public_submission_accounts: "When an entry is created, send a notification email to the accounts listed below."
         image_resize_form:
           width: "in px"
-          height: "in px"
+          height: "in px"        
+        content_entry_import:
+          file: "Your CSV must contain a header and use the double quotes to enclose value."
 
     placeholders:
       locomotive:

data/config/locales/simple_form.es.yml

@@ -46,6 +46,7 @@ es:
           cache_enabled: Cache
           private_access: "Habilitar proteccion de password"
           password: "Password global de sitio"
+          maximum_uploaded_file_size: Tamaño máximo de los archivos subidos
           new:
             locales: Primer lenguaje
         membership:
@@ -89,6 +90,7 @@ es:
           meta_keywords: "Keywords meta usadas dentro de la etiqueta principal de la pagina. Son separadas por una coma. Requeridas para SEO."
           meta_description: "Meta descripcion usada dentro de la etiqueta principal de la pagina. Requerida para SEO."
           robots_txt: "Contenido del archivo <span class='code'>/robots.txt</span>. Chequea el siguiente <a href='http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1'>url</a> para mas informacion."
+          maximum_uploaded_file_size: "En bytes."
           domains: "Agrega tus dominios debajo.  Encontraras documentacion <a href=\"https://locomotive-v3.readme.io/docs/domains\">aqui</a> para mas informacion."
           memberships: "Puedes invitar a otras cuentas a editar/manejar el sitio."
           cache_enabled: "Cuendo este habilitado, tus paginas seran 'cacheadas' siempre y cuando el contenido no cambie. Desahbilitar el cache por pagina es permitido."

data/config/routes.rb

@@ -66,12 +66,13 @@ Locomotive::Engine.routes.draw do
       get :new_account
     end
 
+    resource :content_entry_import, only: [:show, :new, :create, :destroy], path: 'content_types/:slug/imports'
+
     resources :content_entries, path: 'content_types/:slug/entries' do
       get :show_in_form,      on: :collection
       put :sort,              on: :collection
       get :export,            on: :collection
-      delete :bulk_destroy,   on: :collection
-
+      delete :bulk_destroy,   on: :collection      
       resource :impersonation, only: [:create], controller: 'content_entry_impersonations'
     end
 

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

@@ -32,6 +32,7 @@ module Locomotive
     end
 
         RUBY
+        end
       else
         template 'carrierwave.rb', 'config/initializers/carrierwave.rb'
       end

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

@@ -22,6 +22,11 @@ CarrierWave.configure do |config|
       region:             ENV['S3_BUCKET_REGION']
     }
 
+    # Use a different endpoint (eg: another provider such as Exoscale)
+    if ENV['S3_ENDPOINT'].present?
+      config.aws_credentials[:endpoint] = ENV['S3_ENDPOINT']
+    end
+
     # Put your CDN host below instead
     if ENV['S3_ASSET_HOST_URL'].present?
       config.asset_host = ENV['S3_ASSET_HOST_URL']

data/lib/locomotive/configuration.rb

@@ -22,6 +22,7 @@ module Locomotive
       unsafe_token_authentication:  false,
       enable_registration:          true,
       optimize_uploaded_files:      false,
+      default_maximum_uploaded_file_size: 2.megabytes,
       ui:                     {
         per_page:     10
       },

data/lib/locomotive/dragonfly.rb

@@ -3,18 +3,20 @@ require 'locomotive/dragonfly/processors/smart_thumb'
 module Locomotive
   module Dragonfly
 
-    def self.resize_url(source, resize_string)
+    def self.resize_url(source, resize_string, timestamp = nil)
       if file = self.fetch_file(source)
-        file.thumb(resize_string).url
+        url = file.thumb(resize_string).url
+        timestamp ? url + "?#{timestamp}" : url
       else
         Locomotive.log :error, "Unable to resize on the fly: #{source.inspect}"
         return
       end
     end
 
-    def self.thumbnail_pdf(source, resize_string)
+    def self.thumbnail_pdf(source, resize_string, timestamp = nil)
       if file = self.fetch_file(source)
-        file.thumb(resize_string, format: 'png', frame: 0).encode('png').url
+        url = file.thumb(resize_string, format: 'png', frame: 0).encode('png').url
+        timestamp ? url + "?#{timestamp}" : url
       else
         Locomotive.log :error, "Unable to convert the pdf: #{source.inspect}"
         return

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 section_finder locale).freeze
+      UNMARSHALABLE_OPTIONS = %i(parser page parent_finder snippet_finder section_finder).freeze
 
       attr_accessor_initialize :current_site, :parent_finder, :snippet_finder, :locale
 

data/lib/locomotive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2021-09-24 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.3
+        version: 5.2.4.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -162,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -442,14 +442,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -484,14 +484,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -534,34 +534,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: carrierwave-imageoptim
   requirement: !ruby/object:Gem::Requirement
@@ -730,6 +744,8 @@ files:
 - app/assets/javascripts/locomotive/views/content_entries/edit_view.js.coffee
 - app/assets/javascripts/locomotive/views/content_entries/index_view.js.coffee
 - app/assets/javascripts/locomotive/views/content_entries/new_view.js.coffee
+- app/assets/javascripts/locomotive/views/content_entry_imports/new_view.js.coffee
+- app/assets/javascripts/locomotive/views/content_entry_imports/show_view.js.coffee
 - app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee
 - app/assets/javascripts/locomotive/views/current_site_metafields/index_view.js.coffee
 - app/assets/javascripts/locomotive/views/custom_fields/select_options/edit_view.js.coffee
@@ -782,6 +798,7 @@ files:
 - app/assets/stylesheets/locomotive/new/_brand.scss
 - app/assets/stylesheets/locomotive/new/_checkbox.scss
 - app/assets/stylesheets/locomotive/new/_content.scss
+- app/assets/stylesheets/locomotive/new/_dashboard.scss
 - app/assets/stylesheets/locomotive/new/_drawer.scss
 - app/assets/stylesheets/locomotive/new/_files.scss
 - app/assets/stylesheets/locomotive/new/_flags.scss
@@ -840,6 +857,7 @@ files:
 - 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/content_entry_imports_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
@@ -894,6 +912,7 @@ files:
 - app/inputs/locomotive/rte_input.rb
 - app/inputs/locomotive/simple_image_input.rb
 - app/inputs/locomotive/toggle_input.rb
+- app/jobs/locomotive/import_content_entry_job.rb
 - app/jobs/locomotive/send_pony_email_job.rb
 - app/mailers/locomotive/devise_mailer.rb
 - app/mailers/locomotive/notifications.rb
@@ -915,6 +934,7 @@ files:
 - app/models/locomotive/concerns/content_type/entry_template.rb
 - app/models/locomotive/concerns/content_type/filter_fields.rb
 - app/models/locomotive/concerns/content_type/group_by.rb
+- app/models/locomotive/concerns/content_type/import.rb
 - app/models/locomotive/concerns/content_type/label.rb
 - app/models/locomotive/concerns/content_type/order_by.rb
 - app/models/locomotive/concerns/content_type/public_submission_title_template.rb
@@ -972,6 +992,7 @@ files:
 - app/policies/locomotive/translation_policy.rb
 - app/services/locomotive/concerns/activity_service.rb
 - app/services/locomotive/content_asset_service.rb
+- app/services/locomotive/content_entry_import_service.rb
 - app/services/locomotive/content_entry_service.rb
 - app/services/locomotive/content_type_service.rb
 - app/services/locomotive/custom_field_finder_service.rb
@@ -1009,6 +1030,8 @@ files:
 - app/views/locomotive/content_entries/form/_tabs.html.slim
 - app/views/locomotive/content_entries/index.html.slim
 - app/views/locomotive/content_entries/new.html.slim
+- app/views/locomotive/content_entry_imports/new.html.slim
+- app/views/locomotive/content_entry_imports/show.html.slim
 - app/views/locomotive/current_site/_domain.html.slim
 - app/views/locomotive/current_site/_locale.html.slim
 - app/views/locomotive/current_site/_membership.html.slim
@@ -1409,11 +1432,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A platform to create, publish and edit sites