locomotivecms_wagon 3.1.1 → 3.2.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899cb917d33c9f96cff7040c74ab3eb5cdb8dc260f853049837d13aef67b1b73
-  data.tar.gz: 742fcc8cf7296a44a7b28f08841056b4449c1561e60b8f99f222732f4aa035f9
+  metadata.gz: a0a9b567d83067dc20a30af98839354b7133485296ee5c1f5d1453e891cab362
+  data.tar.gz: 4885df5290423f696c3174f780fabe7080b9289ae0aadc63541eb0a15c14c162
 SHA512:
-  metadata.gz: 825827f36be71a50cdb76fef76003919c7ee6b6ee5ca1e16aea16f2495e6b10c43adab06c8e3feeaa3d62eace8f4e39df687f388b7a29f5130419547800289e7
-  data.tar.gz: d4e33cca3199a9b22bca46ec445939f8ecc7770c4cd91290de08c1fbb10b47b20c9f0e378a0161cac2ef437efedff649c634db574dd69fd3d2559793c0a6a488
+  metadata.gz: 387002c374963eab9f2614e4895b2f96f046fe8083d45809d645cb7a9643890d341397cb83af6a004728ebdfbb1211e5b0e4f206117d5419b15d28a3ca5071e5
+  data.tar.gz: c4a79a201524a74911233dc41169aef27cc15666b5aa5a3262c49fff1da6df63e29c88c1bac50195505d93d9ee72e4dc60e3c372c782e3bb17ad912e788109bd

data/lib/locomotive/wagon/cli.rb

@@ -21,7 +21,7 @@ module Locomotive
 
           path = path == '.' ? Dir.pwd : File.expand_path(path)
 
-          site_or_deploy_file = File.exists?(File.join(path, 'config', 'site.yml')) || File.exists?(File.join(path, 'config', 'deploy.yml'))
+          site_or_deploy_file = File.exist?(File.join(path, 'config', 'site.yml')) || File.exist?(File.join(path, 'config', 'deploy.yml'))
 
           (site_or_deploy_file ? path : nil).tap do |_path|
             if _path.nil?

data/lib/locomotive/wagon/commands/concerns/steam_concern.rb

@@ -11,7 +11,6 @@ module Locomotive::Wagon
         config.mode           = :test
         config.adapter        = { name: :filesystem, path: path, env: options[:env]&.to_sym || :local }
         config.asset_path     = File.expand_path(File.join(path, 'public'))
-        config.minify_assets  = false
       end
 
       @steam_services = Locomotive::Steam::Services.build_instance.tap do |services|

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

@@ -50,7 +50,7 @@ module Locomotive::Wagon
     private
 
     def find_unique_filepath(filepath, binary_file, index = 1)
-      if File.exists?(filepath) && File.file?(filepath)
+      if File.exist?(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

@@ -51,7 +51,7 @@ module Locomotive::Wagon
 
       folder = File.dirname(_filepath)
 
-      FileUtils.mkdir_p(folder) unless File.exists?(folder)
+      FileUtils.mkdir_p(folder) unless File.exist?(folder)
 
       File.open(_filepath, mode) do |file|
         if content
@@ -66,7 +66,7 @@ module Locomotive::Wagon
 
     def reset_file(filepath)
       _filepath = File.join(path, filepath)
-      FileUtils.rm(_filepath) if File.exists?(_filepath)
+      FileUtils.rm(_filepath) if File.exist?(_filepath)
     end
 
     def instrument_base_name

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

@@ -67,7 +67,7 @@ module Locomotive::Wagon
         locales.each do |locale|
           next if locale != default_locale && content_type.localized_names.empty?
 
-          (_entries = api_client.content_entries(content_type).all(nil, { page: page, order_by: 'created asc' }, locale)).each do |entry|
+          (_entries = api_client.content_entries(content_type).all(nil, { page: page, order_by: 'created_at asc' }, locale)).each do |entry|
             (entries[entry._id] ||= {})[locale] = entry
           end
 

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

@@ -4,8 +4,6 @@ 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)
@@ -42,7 +40,7 @@ module Locomotive::Wagon
       return unless entity.stylesheet_or_javascript?
 
       Tempfile.new(entity.realname).tap do |file|
-        content = compress_and_minify(entity)
+        content = read_content(entity)
 
         # replace paths to images or fonts by the absolute URL used in the Engine
         content = replace_assets(content)
@@ -87,23 +85,13 @@ module Locomotive::Wagon
       @remote_urls[resource.local_path] = "#{resource.url}?#{resource.checksum}"
     end
 
-    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"
-        File.read(File.join(path, entity.source))
-      end
-    end
-
-    def sprockets_env
-      @sprockets_env ||= Locomotive::Steam::SprocketsEnvironment.new(File.join(path, 'public'),
-        minify: ENV['WAGON_NO_MINIFY_ASSETS'].present? ? false : true)
+    def read_content(entity)
+      File.read(
+        File.join(
+          Locomotive::Steam.configuration.asset_path,
+          entity.relative_url
+        )
+      )
     end
 
     def skip?(entity)

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

@@ -46,7 +46,7 @@ module Locomotive::Wagon
     end
 
     def stop(force = false)
-      unless File.exists?(server_pid_file)
+      unless File.exist?(server_pid_file)
         shell.say "No Wagon server is running.", :red
         return
       end
@@ -76,7 +76,6 @@ module Locomotive::Wagon
         config.mode           = :test
         config.adapter        = { name: :filesystem, path: File.expand_path(path), env: options[:env]&.to_sym || :local }
         config.asset_path     = File.expand_path(File.join(path, 'public'))
-        config.minify_assets  = false
 
         config.middleware.insert_before Rack::Lint, Locomotive::Wagon::Middlewares::ErrorPage
 
@@ -108,9 +107,10 @@ module Locomotive::Wagon
     end
 
     def build_puma_server
+      require 'rackup'
       require 'rack/handler/puma'
 
-      Rack::Handler::Puma.run(Locomotive::Steam.to_app, {
+      Rackup::Handler::Puma.run(Locomotive::Steam.to_app,
         daemon:           options[:daemonize],
         pidfile:          server_pid_file,
         redirect_stdout:  options[:daemonize] ? server_log_file : nil,
@@ -119,7 +119,7 @@ module Locomotive::Wagon
         Port:             options[:port],
         Verbose:          ENV['PUMA_DEBUG_ON'] || false,
         Silent:           true
-      })
+      )
     end
 
     def configure_logger
@@ -140,7 +140,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)
+        message = if File.exist?(filepath)
           "[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

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

@@ -41,7 +41,7 @@ module Locomotive
 
       def picture
         picture_path = __getobj__.picture
-        if picture_path && File.exists?(picture_path)
+        if picture_path && File.exist?(picture_path)
           Locomotive::Coal::UploadIO.new(picture_path, nil, 'icon.png')
         else
           nil

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

@@ -17,11 +17,11 @@ module Locomotive
         argument :target_path # path to the site
 
         def content_types_must_exist
-          unless File.exists?(File.join(destination_root, source_path))
+          unless File.exist?(File.join(destination_root, source_path))
             fail Thor::Error, "The #{source} content type does not exist"
           end
 
-          unless File.exists?(File.join(destination_root, target_path))
+          unless File.exist?(File.join(destination_root, target_path))
             fail Thor::Error, "The #{target} content type does not exist"
           end
         end

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

@@ -56,7 +56,7 @@ module Locomotive
         end
 
         def create_javascript_file
-          if File.exists?(sections_js_path)
+          if File.exist?(sections_js_path)
             js_class_name = @options[:type].classify
             file_path     = File.join(sections_js_path, @options[:type])
 
@@ -73,7 +73,7 @@ export { default as #{js_class_name} } from './#{@options[:type]}';
         end
 
         def create_stylesheet_file
-          if File.exists?(sections_css_path)
+          if File.exist?(sections_css_path)
             css_class_name  = "#{@options[:type].dasherize}-section"
             file_path       = File.join(sections_css_path, @options[:type])
 

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

@@ -108,7 +108,7 @@ module Locomotive
                 name:         template.name,
                 description:  template.description,
                 path:         path,
-                icon:         icon && File.exists?(icon) ? icon : nil,
+                icon:         icon && File.exist?(icon) ? icon : nil,
                 options:      class_options_to_json(template)
               }
             end.to_json

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '3.1.1'
+    VERSION = '3.2.0.alpha2'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -24,18 +24,21 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake',      '~> 13.0.1'
 
-  gem.add_dependency 'thor',                  '~> 0.20.3'
-  gem.add_dependency 'puma',                  '~> 5.0.4'
+  gem.add_dependency 'thor',                  '~> 1.3.0'
+
+  gem.add_dependency 'puma',                  '~> 6.4.0'
+  gem.add_dependency 'rackup',                '~> 2.1.0'
+  
   gem.add_dependency 'netrc',                 '~> 0.11.0'
-  gem.add_dependency 'oj',                    '~> 3.10.16'
+  gem.add_dependency 'oj',                    '~> 3.16.1'
 
-  gem.add_dependency 'locomotivecms_common',  '~> 0.4.0'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.7.0'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.6.1'
+  gem.add_dependency 'locomotivecms_common',  '~> 0.6.0.alpha1'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.8.0.alpha1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.8.0.alpha2'
 
-  gem.add_dependency 'haml',                  '~> 5.1.2'
-  gem.add_dependency 'listen',                '~> 3.3.1'
-  gem.add_dependency 'neatjson',              '~> 0.9'
+  gem.add_dependency 'haml',                  '~> 6.2.3'
+  gem.add_dependency 'listen',                '~> 3.8.0'
+  gem.add_dependency 'neatjson',              '~> 0.10'
 
-  gem.add_dependency 'faker',                 '~> 1.6'
+  gem.add_dependency 'faker',                 '~> 3.2'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0.alpha2
 platform: ruby
 authors:
 - Didier Lafforgue
 - Rodrigo Alvarez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,28 +31,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 6.4.0
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -73,112 +87,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.16
+        version: 3.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.16
+        version: 3.16.1
 - !ruby/object:Gem::Dependency
   name: locomotivecms_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0.alpha1
 - !ruby/object:Gem::Dependency
   name: locomotivecms_coal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.alpha1
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.8.0.alpha2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.2.3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.2'
 description: Wagon is a site generator for the LocomotiveCMS engine
 email:
 - did@locomotivecms.com
@@ -346,7 +360,7 @@ homepage: https://www.locomotivecms.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -361,8 +375,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.7
+signing_key:
 specification_version: 4
 summary: Wagon is a site generator for the LocomotiveCMS engine powered by all the
   efficient and modern HTML development tools (SASS, Webpack, ...etc).