locomotivecms 4.0.0 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e44478ad65f5c3ed412bfa33169edd54c95ee256b88224485a934bd41c702f
-  data.tar.gz: 6a8285d529f10e0ee1298213306d81bd2fc7a03f5726948eb771953704fb60e9
+  metadata.gz: 9ac2bdf950937bd4a07418b142bb21eea251c24db4b5682b8412a9c718374343
+  data.tar.gz: 1546625baf49879c2c70209e5f3df46f0290b689f28c141135e8d52019c3b065
 SHA512:
-  metadata.gz: 948187a1114e707c6450d0510cee335d490ae39e6ab84bec0de55b6432b9576dfe2f1194f6799d9e434ee36f8bccbef564f26e33f72093b2534e5a8b14bd3a21
-  data.tar.gz: 17f992ee3fff40aa94739eba999fd7900cf17c1c4c4a10bebc9879e8e59fa365ddb87dac62803e88d852f12341581aeded7886312f23288242fa285b4d44da5f
+  metadata.gz: d2e672fcec21c3eecba19c80fc7d1bc35f56488d57bc59f43cd2cde49946e71f900b826bef17c5255037b598f1ce4bdc912623d9b09fc477c95112e1d8ac2380
+  data.tar.gz: 9226f4e89892f1e2d66b6f6b74d71981462f53e4969de3a5b09042316e2de20ac578dc9286165055b87066978b37b6a1883bb6da62f5de26173e603d6f3ba3b6

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2010-2019, NoCoffee.
+Copyright (c) 2010-2020, NoCoffee.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -71,4 +71,4 @@ Locomotive is an open source project, we encourage contributions. If you have fo
 
 Feel free to contact me at didier at nocoffee dot fr.
 
-Copyright (c) 2019 NoCoffee, released under the MIT license
+Copyright (c) 2020 NoCoffee, released under the MIT license

data/Rakefile

@@ -24,6 +24,9 @@ begin
 rescue LoadError
 end
 
+require 'webdrivers'
+load 'webdrivers/Rakefile'
+
 # === Travis ===
 task :travis do
   puts "Install Yarn packages"

data/app/api/locomotive/api/entities/content_type_entity.rb

@@ -9,7 +9,7 @@ module Locomotive
                 :public_submission_accounts,
                 :public_submission_title_template,
                 :recaptcha_required,
-                :entry_template, :display_settings, :filter_fields
+                :entry_template, :display_settings, :filter_fields, :import_enabled
 
         expose :fields, using: ContentTypeFieldEntity do |content_type, _|
           content_type.ordered_entries_custom_fields || []

data/app/api/locomotive/api/entities/site_entity.rb

@@ -7,7 +7,7 @@ module Locomotive
         expose  :name, :handle, :seo_title, :meta_keywords, :meta_description,
                 :robots_txt, :cache_enabled, :private_access
 
-        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections
+        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections, :overwrite_same_content_assets
 
         expose :memberships, using: MembershipEntity
 

data/app/api/locomotive/api/forms/content_type_form.rb

@@ -17,7 +17,8 @@ module Locomotive
               :entry_template,
               :entries_custom_fields_attributes,
               :display_settings,
-              :filter_fields
+              :filter_fields,
+              :import_enabled
 
         # @param [ Site ] the current site, or site to scope to
         def initialize(site, attributes = {})

data/app/api/locomotive/api/forms/site_form.rb

@@ -10,6 +10,7 @@ module Locomotive
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
         attrs :cache_enabled, :cache_control, :cache_vary
         attrs :sections_content
+        attrs :overwrite_same_content_assets
 
         # Make sure locales and domains are in arrays.
         def locales

data/app/api/locomotive/api/helpers/persistence_helper.rb

@@ -118,7 +118,7 @@ module Locomotive
         def setup_singular_getter_method
           self.class.send(:define_method, singular) do
             instance_variable = "@#{singular}"
-            if instance_variable_defined?(instance_variable)
+            if instance_variable_defined?(instance_variable)              
               instance_variable_get(instance_variable)
             else
               if params[:id]

data/app/api/locomotive/api/resources/content_asset_resource.rb

@@ -40,7 +40,13 @@ module Locomotive
           end
           post do
             authorize ContentAsset, :create?
+
             form = form_klass.new(content_asset_params)
+
+            if current_site.overwrite_same_content_assets?
+              self.content_asset = content_assets.by_exact_filename(form.source['filename']).first || content_assets.new
+            end
+          
             persist_from_form(form)
 
             present content_asset, with: entity_klass

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -70,6 +70,7 @@ module Locomotive
               optional :public_submission_account_emails
               optional :public_submission_title_template
               optional :public_submission_email_attachments
+              optional :import_enabled
             end
           end
           post do
@@ -121,6 +122,7 @@ module Locomotive
               optional :public_submission_title_template
               optional :public_submission_email_attachments
               optional :recaptcha_required
+              optional :import_enabled
             end
           end
           put ':id' do

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -47,6 +47,7 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           put do
@@ -58,7 +59,6 @@ module Locomotive
             present current_site, with: entity_klass
           end
 
-
           desc "Delete current site"
           delete do
             authorize current_site, :destroy?

data/app/api/locomotive/api/resources/site_resource.rb

@@ -76,6 +76,7 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           post do
@@ -113,11 +114,12 @@ module Locomotive
               optional :asset_host
               optional :sections_content
               optional :routes
+              optional :overwrite_same_content_assets
             end
           end
           put ':id' do
             site = load_site
-            authorize site, :update?
+            authorize site, :update?            
 
             site_form = Forms::SiteForm.new(permitted_params_from_policy(site, :site, [:picture], [:metafields_ui, :metafields_schema, :metafields, :routes, :sections_content]))
             service.update!(site, site_form.serializable_hash)