locomotivecms 4.0.0 → 4.0.1

data/app/controllers/locomotive/content_assets_controller.rb

@@ -22,6 +22,7 @@ module Locomotive
     end
 
     def bulk_create
+      authorize Locomotive::ContentAsset, :create?
       @content_assets = service.bulk_create(content_assets_params)
       respond_with @content_assets, location: content_assets_path
     end

data/app/controllers/locomotive/custom_fields/select_options_controller.rb

@@ -14,6 +14,7 @@ module Locomotive
       end
 
       def update
+        authorize ContentEntry
         @options = service.update_select_options(options_params.map(&:to_h))
         respond_with @custom_field, location: -> { last_saved_location!(default_back_location) }
       end

data/app/jobs/locomotive/send_pony_email_job.rb

@@ -16,10 +16,11 @@ module Locomotive
       _options = options.deep_symbolize_keys
 
       _options[:via] = _options[:via].to_sym if _options[:via]
+      _options[:via_options] ||= {}
 
-      if _options[:via_options] && (value = _options[:via_options][:authentication])
-        _options[:via_options][:authentication] = value.to_sym
-      end
+      _options[:via_options][:authentication] = _options.dig(:via_options, :authentication).presence&.to_sym
+      _options[:via_options][:user_name]      = _options.dig(:via_options, :user_name).presence
+      _options[:via_options][:password]       = _options.dig(:via_options, :password).presence
 
       # if attachments, decode them because they were enccoding in base64
       if attachments = _options.delete(:attachments)

data/app/views/locomotive/shared/account/_navigation.html.slim

@@ -9,6 +9,6 @@ ul.navigation-links
       li= link_to t(:sites, scope: 'locomotive.shared.header'), sites_path
       - if policy(current_locomotive_account).edit?
         li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path(_location: request.fullpath)
-      li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://locomotive-v3.readme.io', target: '_blank'
+      li= link_to t(:help, scope: 'locomotive.shared.header'), 'https://doc.locomotivecms.com', target: '_blank'
       li class="divider"
       li= link_to t(:logout, scope: 'locomotive.shared.header'), sign_out_path, data: { method: 'delete' }

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/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.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-01-05 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.1
     - - "<"
       - !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.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -1413,7 +1413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A platform to create, publish and edit sites