locomotivecms_wagon 3.0.5 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d89676829bf8c36fbe78d8ba8ae6027c85511f1ddf83681bfe2db4643caa37
-  data.tar.gz: 37e6d118553983814533030e8af5ef1087cf6bf20600c7a2beabe2ef77e3875f
+  metadata.gz: 9984c22ce3827bcf1b51e2787cf50592eb30a0fd91c8d64f40ea1e857ea99b07
+  data.tar.gz: f5b0b4691b3539dfdb2811a655eb98e597210d6f0c9731258aaf8058ee6ad30d
 SHA512:
-  metadata.gz: a6f64d982b4995cdbfd8bda086d0e07e0f5312b3f7f104b2ad69dee41a4bfea1a40887f8d7d95d702434452535b41726ccdfef5c9f1da72c4d68a137ac469b81
-  data.tar.gz: ed49b5c7d752f94973f8a841e008dacab47d9a189460a393733310b1c4656e3d306a79d58effc49c90afa4fc7998e2d685b856dd4d193776850cb7c0020b114f
+  metadata.gz: c93e3da7ee290adc943cae77e439e7d815f2a846cbbae9a5ab4a37b4f34817f916ef586a3304cdb97452f15aef528ded02c7f21f61aedc3e94480a15eff85f9a
+  data.tar.gz: 37fc328b577406c53add11b002116d0c514bc2e9af3efd93fe3b54c453079d91d9f11d579630733fa7a58749087765d89faf138cd2425d7a6717358195a5590b

data/generators/blank/package.json.tt

@@ -23,7 +23,7 @@
     "file-loader": "^1.1.11",
     "image-webpack-loader": "^4.3.0",
     "mini-css-extract-plugin": "^0.4.0",
-    "node-sass": "^4.9.0",
+    "sass": "^1.49.9",
     "optimize-css-assets-webpack-plugin": "^4.0.2",
     "postcss-flexbugs-fixes": "^3.3.1",
     "postcss-loader": "^2.1.5",

data/generators/section/template.liquid.tt

@@ -180,6 +180,8 @@ sections_content:
   <div>{{ section.settings.<%= setting.id -%> }}</div>
   <%- when 'image_picker' -%>
   <p><img src="{{ section.settings.<%= setting.id -%> }}" /></p>
+  <%- when 'asset_picker' -%>
+  <p><a href="{{ section.settings.<%= setting.id -%> }}">{{ section.settings.<%= setting.id -%>.name }}</a></p>
   <%- when 'url' -%>
   <p><a href="{{ section.settings.<%= setting.id -%> }}" {{ section.settings.<%= setting.id -%>.new_window_attribute }}><%= setting.label -%></a></p>
   <%- when 'select', 'radio', 'checkbox' -%>
@@ -203,6 +205,8 @@ sections_content:
       <div>{{ block.settings.<%= setting.id -%> }}</div>
       <%- when 'image_picker' -%>
       <p><img src="{{ block.settings.<%= setting.id -%> }}" /></p>
+      <%- when 'asset_picker' -%>
+      <p><a href="{{ block.settings.<%= setting.id -%> }}">{{ block.settings.<%= setting.id -%>.name }}</a></p>
       <%- when 'url' -%>
       <p><a href="{{ block.settings.<%= setting.id -%> }}" {{ block.settings.<%= setting.id -%>.new_window_attribute }}><%= setting.label -%></a></p>
       <%- when 'select', 'radio', 'checkbox' -%>

data/lib/locomotive/wagon/cli.rb

@@ -304,12 +304,12 @@ module Locomotive
         end
 
         desc 'serve [PATH]', 'Serve a site from the file system'
-        option :host, aliases: '-h', type: 'string', default: '0.0.0.0', desc: 'The host (address) of the Thin server'
-        option :port, aliases: '-p', type: 'string', default: '3333', desc: 'The port of the Thin server'
+        option :host, aliases: '-h', type: 'string', default: 'localhost', desc: 'The host (address) of the server'
+        option :port, aliases: '-p', type: 'string', default: '3333', desc: 'The port of the server'
         option :env, aliases: '-e', type: 'string', default: 'local', desc: 'The env used to the data of the pages and content entries'
-        option :daemonize, aliases: '-d', type: 'boolean', default: false, desc: 'Run daemonized Thin server in the background'
+        option :daemonize, aliases: '-d', type: 'boolean', default: false, desc: 'Run daemonized server in the background'
         option :force_polling, aliases: '-o', type: 'boolean', default: false, desc: 'Force polling of files for reload'
-        option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized Thin server if found before starting a new one'
+        option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized server if found before starting a new one'
         option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'Display the full error stack trace if an error occurs'
         option :debug, type: 'boolean', default: false, desc: 'Display some debugging information (rack middleware stack)'
         def serve(path = '.')

data/lib/locomotive/wagon/commands/delete_command.rb

@@ -20,7 +20,7 @@ module Locomotive::Wagon
       new(*args).delete
     end
 
-    # @raise [ ArgumentError ] unless the given resources is in SINGLE_RESOURCES or MULTIPLE_RESOURCES
+    # @raise [ ArgumentError ] unless the given resources is in SINGLE_RESOURCES or ALL_RESOURCES
     def delete
       if resource == SITE_RESOURCE
         delete_site

data/lib/locomotive/wagon/commands/pull_command.rb

@@ -13,7 +13,7 @@ module Locomotive::Wagon
 
   class PullCommand < Struct.new(:env, :path, :options, :shell)
 
-    RESOURCES = %w(site pages content_types content_entries snippets theme_assets translations content_assets).freeze
+    RESOURCES = %w(site pages content_types content_entries snippets sections theme_assets translations content_assets).freeze
 
     include ApiConcern
     include DeployFileConcern

data/lib/locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern.rb

@@ -7,7 +7,7 @@ module Locomotive::Wagon
 
   module AssetsConcern
 
-    REGEX = /((https?:\/\/\S+)?\/sites\/[0-9a-f]{24}\/(assets|pages|theme|content_entry[0-9a-f]{24})\/(([^;.]+)\/)*([a-zA-Z_\-0-9.%]+)(\?\w+)?)/
+    REGEX = /((https?:\/\/\S+)?\/sites\/[0-9a-f]{24}\/(assets|pages|theme|content_entry[0-9a-f]{24})\/(([^;.\"]+)\/)*([a-zA-Z_\-0-9.%]+)(\?\w+)?)/
 
     # The content assets on the remote engine follows the format: /sites/<id>/assets/<type>/<file>
     # This method replaces these urls by their local representation. <type>/<file>
@@ -50,7 +50,7 @@ module Locomotive::Wagon
     private
 
     def find_unique_filepath(filepath, binary_file, index = 1)
-      if File.exists?(filepath)
+      if File.exists?(filepath) && File.file?(filepath)
         # required because we need to make sure we use the content of file from its start
         binary_file.rewind
 

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_base_command.rb

@@ -50,10 +50,17 @@ module Locomotive::Wagon
       _filepath = File.join(path, filepath)
 
       folder = File.dirname(_filepath)
+
       FileUtils.mkdir_p(folder) unless File.exists?(folder)
 
       File.open(_filepath, mode) do |file|
-        file.write(content ? content : yield)
+        if content
+          file.write(content)
+        elsif block_given?
+          file.write(yield)
+        else
+          file.write('')
+        end
       end
     end
 

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_sections_command.rb

@@ -0,0 +1,28 @@
+module Locomotive::Wagon
+
+  class PullSectionsCommand < PullBaseCommand
+
+    def _pull
+      api_client.sections.all.each do |section|
+        write_section(section)
+      end
+    end
+
+    def write_section(section)
+      write_to_file(section_filepath(section), <<-FRONT_MATTER
+#{section.definition.to_yaml}
+---
+#{section.template}
+      FRONT_MATTER
+      )
+    end
+
+    private
+
+    def section_filepath(section)
+      File.join('app', 'views', 'sections', section.slug + '.liquid')
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_site_command.rb

@@ -101,7 +101,7 @@ module Locomotive::Wagon
         attributes[name] = {}
 
         value.each do |locale, _value|
-          __value = JSON.parse(_value)
+          __value = _value ? JSON.parse(_value) : {}
           attributes[name][locale] = block_given? ? yield(__value) : __value
         end
       else

data/lib/locomotive/wagon/commands/push_sub_commands/push_pages_command.rb

@@ -49,7 +49,7 @@ module Locomotive::Wagon
     end
 
     def can_update?(local_entity)
-      # checking pathes only if the current locale is the default one
+      # checking paths only if the current locale is the default one
       if  local_entity.__locale__.to_s == default_locale.to_s &&
           local_entity.handle &&
           id = remote_entity_id_from_handle(local_entity)

data/lib/locomotive/wagon/commands/push_sub_commands/push_theme_assets_command.rb

@@ -4,6 +4,8 @@ module Locomotive::Wagon
 
   class PushThemeAssetsCommand < PushBaseCommand
 
+    WEBPACK_BUNDLED_ASSETS = ['stylesheets/bundle.css', 'javascripts/bundle.js'].freeze
+
     def entities
       repositories.theme_asset.all.map do |entity|
         next if skip?(entity)
@@ -43,7 +45,7 @@ module Locomotive::Wagon
         content = compress_and_minify(entity)
 
         # replace paths to images or fonts by the absolute URL used in the Engine
-        replace_assets!(content)
+        content = replace_assets(content)
 
         file.write(content)
 
@@ -53,8 +55,8 @@ module Locomotive::Wagon
       end
     end
 
-    def replace_assets!(content)
-      content.gsub!(/([("'])\/((images|fonts)\/[^)"']+)([)"''])/) do
+    def replace_assets(content)
+      content.gsub(/([("'])\/((images|fonts)\/[^)"']+)([)"''])/) do
         leading_char, local_path, trailing_char = $1, $2, $4
         local_path.gsub!(/\?[^\/]+\Z/, '') # remove query string if present
         "#{leading_char}#{(@remote_urls || {})[local_path] || local_path}#{trailing_char}"
@@ -87,10 +89,14 @@ module Locomotive::Wagon
 
     def compress_and_minify(entity)
       begin
+        if WEBPACK_BUNDLED_ASSETS.include?(entity.short_relative_url)
+          raise 'already compressed and minified by Webpack'
+        end
+
         sprockets_env[entity.short_relative_url].to_s
       rescue Exception => e
         instrument :warning, message: "Unable to compress and minify it, error: #{e.message}"
-        # use the original file instead
+        # use the original file instead"
         File.read(File.join(path, entity.source))
       end
     end

data/lib/locomotive/wagon/commands/serve_command.rb

@@ -141,7 +141,7 @@ module Locomotive::Wagon
         filepath = File.join(File.expand_path(path), 'app', 'views', 'pages', fullpath + (locale != default_locale ? ".#{locale}" : '') + '.liquid')
 
         message = if File.exists?(filepath)
-          "[Warning]".red + ' by default and unless you overide the slug in the YAML header of your page, Wagon will replace underscores by dashes in your page slug. Try this instead: ' + fullpath.dasherize.light_white
+          "[Warning]".red + ' by default and unless you override the slug in the YAML header of your page, Wagon will replace underscores by dashes in your page slug. Try this instead: ' + fullpath.dasherize.light_white
         else
           "[Tip]".light_white + " add a new page in your Wagon site at this location: " + filepath.light_white
         end

data/lib/locomotive/wagon/decorators/content_entry_decorator.rb

@@ -8,6 +8,8 @@ module Locomotive
 
       attr_accessor :__base_path__, :__content_assets_pusher__
 
+      DEFAULT_ATTRIBUTES = %i(_slug seo_title meta_keywords meta_description).freeze
+
       def initialize(object, locale = nil, base_path, content_assets_pusher)
         self.__base_path__ = base_path
         self.__content_assets_pusher__ = content_assets_pusher
@@ -23,7 +25,7 @@ module Locomotive
       end
 
       def __attributes__
-        %i(_slug) + fields.no_associations.map { |f| f.name.to_sym }
+        DEFAULT_ATTRIBUTES + fields.no_associations.map { |f| f.name.to_sym }
       end
 
       def method_missing(name, *args, &block)
@@ -60,7 +62,7 @@ module Locomotive
       alias :decorate_time_field :decorate_date_time_field
 
       def to_hash
-        if (hash = super).keys == [:_slug]
+        if (hash = super).keys == DEFAULT_ATTRIBUTES
           {}
         else
           hash

data/lib/locomotive/wagon/decorators/content_type_decorator.rb

@@ -17,7 +17,8 @@ module Locomotive
           public_submission_accounts
           public_submission_title_template
           public_submission_email_attachments
-          recaptcha_required entry_template display_settings filter_fields)
+          recaptcha_required entry_template display_settings filter_fields 
+          import_enabled)
       end
 
       def fields
@@ -83,6 +84,10 @@ module Locomotive
         self[:recaptcha_required]
       end
 
+      def import_enabled
+        self[:import_enabled]
+      end
+
       def with_relationships?
         __getobj__.fields.associations.count > 0
       end

data/lib/locomotive/wagon/decorators/site_decorator.rb

@@ -48,6 +48,14 @@ module Locomotive
         end
       end
 
+      def overwrite_same_content_assets
+        self[:overwrite_same_content_assets]
+      end
+
+      def allow_dots_in_slugs
+        self[:allow_dots_in_slugs]
+      end
+
       %i(robots_txt timezone seo_title meta_keywords meta_description asset_host routes).each do |name|
         define_method(name) do
           self[name]
@@ -55,9 +63,8 @@ module Locomotive
       end
 
       def __attributes__
-        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host sections_content routes)
+        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host sections_content routes overwrite_same_content_assets allow_dots_in_slugs)
       end
-
     end
 
     class RemoteSiteDecorator < SimpleDelegator
@@ -71,7 +78,7 @@ module Locomotive
     class UpdateSiteDecorator < SiteDecorator
 
       def __attributes__
-        %i(picture timezone locales metafields_schema metafields metafields_ui asset_host sections_content routes)
+        %i(picture timezone locales metafields_schema metafields metafields_ui asset_host sections_content routes overwrite_same_content_assets allow_dots_in_slugs)
       end
 
     end

data/lib/locomotive/wagon/generators/section.rb

@@ -156,6 +156,7 @@ export { default as #{js_class_name} } from './#{@options[:type]}';
           case type
           when 'text' then "\"#{Faker::Lorem.sentence}\""
           when 'image_picker' then "\"/samples/images/default.svg\""
+          when 'asset_picker' then "\"/samples/images/default.svg\""
           when 'checkbox' then true
           when 'radio', 'select' then 'option_1'
           when 'url' then "\"#\""

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '3.0.5'
+    VERSION = '3.1.0'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -25,17 +25,17 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake',      '~> 13.0.1'
 
   gem.add_dependency 'thor',                  '~> 0.20.3'
-  gem.add_dependency 'puma',                  '~> 4.3.0'
+  gem.add_dependency 'puma',                  '~> 5.0.4'
   gem.add_dependency 'netrc',                 '~> 0.11.0'
-  gem.add_dependency 'oj',                    '~> 3.9.2'
+  gem.add_dependency 'oj',                    '~> 3.10.16'
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.4.0'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.6.0'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.5.3'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.7.0'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.6.0'
 
   gem.add_dependency 'haml',                  '~> 5.1.2'
-  gem.add_dependency 'listen',                '~> 3.1.5'
-  gem.add_dependency 'neatjson',              '~> 0.8.4'
+  gem.add_dependency 'listen',                '~> 3.3.1'
+  gem.add_dependency 'neatjson',              '~> 0.9'
 
   gem.add_dependency 'faker',                 '~> 1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.16
 - !ruby/object:Gem::Dependency
   name: locomotivecms_common
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -143,28 +143,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,7 @@ files:
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_content_entries_command.rb
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_content_types_command.rb
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_pages_command.rb
+- lib/locomotive/wagon/commands/pull_sub_commands/pull_sections_command.rb
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_site_command.rb
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_snippets_command.rb
 - lib/locomotive/wagon/commands/pull_sub_commands/pull_theme_assets_command.rb
@@ -360,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Wagon is a site generator for the LocomotiveCMS engine powered by all the