locomotivecms 4.0.3 → 4.1.0

data/config/locales/editor.en.yml

@@ -35,9 +35,19 @@ en:
           remove_button: "Remove"
           crop_button: "Crop"
 
+        asset_picker:
+          select_button: "Select"
+          change_button: "Change"
+          remove_button: "Remove"
+
         content_type:
           show: "Show"
 
+        content_entry:
+          select_button: "Select"
+          change_button: "Change"
+          remove_button: "Remove"
+
       views:
         action_bar:
           header:
@@ -54,6 +64,12 @@ en:
             seo: "SEO"
 
         pickers:
+          assets:
+            title: "Assets"
+            loading: "Loading the assets. Please wait!"
+            add: "+ add"
+            upload_in_progress: "Uploading..."
+            search_placeholder: "Name of your asset"
           images:
             title: "Images"
             loading: "Loading the images. Please wait!"
@@ -82,9 +98,15 @@ en:
             email:
               label: Email address
               placeholder: "name@example.com"
+          content_entry:
+            title: "Pick an entry"
+            input:
+              label: Instance
+              placeholder: Type the label of the instance
 
         preview:
           view: "View"
+          errorMessage: "The page couldn't be loaded. Please contact the developer of the site."
 
         sections:
           edit:

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

@@ -334,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."
@@ -365,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"
@@ -379,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/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/templates/carrierwave_aws.rb

@@ -27,6 +27,11 @@ CarrierWave.configure do |config|
       config.aws_credentials[:endpoint] = ENV['S3_ENDPOINT']
     end
 
+    # For some endpoint like minio you need to rewrite path 
+    if ENV['S3_PATH_STYLE'].present?
+      config.aws_credentials[:force_path_style] = ENV['S3_PATH_STYLE']
+    end
+
     # Put your CDN host below instead
     if ENV['S3_ASSET_HOST_URL'].present?
       config.asset_host = ENV['S3_ASSET_HOST_URL']

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

@@ -23,9 +23,13 @@ Locomotive.configure do |config|
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
   # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk uk}
 
-  # tell if logs are enabled. Useful for debug purpose.
+  # tell if logs (back-office) are enabled. Useful for debug purpose.
   config.enable_logs = true
 
+  # setup the logger for Steam (rendering)
+  # config.steam_log_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+  # config.steam_log_level = ::Logger::DEBUG
+
   # the API authentication requires to developer to pass 2 params in the header
   # of the request: X-Locomotive-Account-Email and X-Locomotive-Token.
   # However, to keep backward compatability with v2.x versions, you can use

data/lib/locomotive/configuration.rb

@@ -15,6 +15,8 @@ module Locomotive
       site_locales:                 @@site_locales,
       cookie_key:                   '_locomotive_session',
       enable_logs:                  false,
+      steam_log_file:               nil,
+      steam_log_level:              ::Logger::DEBUG,
       enable_admin_ssl:             false,
       delayed_job:                  false,
       default_locale:               :en,
@@ -22,6 +24,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/core_ext.rb

@@ -30,6 +30,27 @@ class String #:nodoc
 
   alias :parameterize! :permalink!
 
+  # Very similar to the to_url from the Stringex gem
+  # except that we allow the dots.
+  def pathify
+    whitespace_replacement_token = self.index('_').nil? ? '-' : '_'
+    self
+      .convert_smart_punctuation
+      .convert_accented_html_entities
+      .convert_vulgar_fractions
+      .convert_unreadable_control_characters
+      .convert_miscellaneous_html_entities
+      .to_ascii
+      .collapse
+      .replace_whitespace(whitespace_replacement_token)
+      .collapse(whitespace_replacement_token)
+      .downcase
+  end
+
+  def pathify!
+    replace(self.pathify)
+  end
+
 end
 
 ## Hash

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_adaptor.rb

@@ -44,6 +44,10 @@ Locomotive::Steam.configure do |config|
   # let the Rails engine handle the "no site" error
   config.render_404_if_no_site = false
 
+  # setup the logger
+  config.log_file = Locomotive.config.steam_log_file || ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+  config.log_level = Locomotive.config.steam_log_level
+
   config.services_hook = -> (services) {
     services.cache  = Rails.cache
     repositories    = services.repositories
@@ -57,8 +61,8 @@ Locomotive::Steam.configure do |config|
   }
 end
 
-Locomotive::Common.reset
-Locomotive::Common.configure do |config|
-  config_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
-  config.notifier = Locomotive::Common::Logger.setup(config_file.to_s)
-end
+# Locomotive::Common.reset
+# Locomotive::Common.configure do |config|
+#   config_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+#   config.notifier = Locomotive::Common::Logger.setup(config_file.to_s, )
+# end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive
-  VERSION = '4.0.3'
+  VERSION = '4.1.0'
 end