maglevcms 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23017be4bbbf4d06d99cf0f94ede1136e0e0ea343e0fbbef94edb6dc4d112d4
-  data.tar.gz: b6e5d107a2ea7a18091ffdd084a3fed631d0726fe845e0ac0f7100f1fc3e2b60
+  metadata.gz: 9cf8c513d0eabb28620a1840c317be54a8f7df53ffe0e80af5a376a64a00d517
+  data.tar.gz: 01c55bf8aa7e8137e429a13aa4632f1214b2ba1e7e89dc8de962d4e344283678
 SHA512:
-  metadata.gz: 1b579c11945ca3c28bb48f59d7efc0ea70a6d1608b7275cd507c3044cf30446bf3a342163ad9c468f0f3cf690386be137401e34f6426bbc016b4306af2d701ff
-  data.tar.gz: d4257dfeb8ef1a210fc9147325e4cae5517c4a5f676b7c27637353573ee9c4ba315283edc4b0c97253d06b6327ba48b4fbf25199b4247f21913482b17f53777a
+  metadata.gz: 3dc2dbdffdb84d20cc8d3553554b62e1b028a44e685eaf8e3e1048eb62471aec2d68fd590173ade2031279ad33e760d0b46943b594cc6c78e7cbd4d7930d6e35
+  data.tar.gz: 1a9db5f6f77fecb91b374c15f51d514a324df6f1149f3b72ccac69f44ca1ad7cf178f9f2b84fb370ac4e735b9e0b0c4594f7c1956d90ddd666ea194804ead1a3

data/app/controllers/maglev/admin/base_controller.rb

@@ -10,11 +10,10 @@ module Maglev
       private
 
       def maglev_authenticate
-        username = maglev_config.admin_username
-        password = maglev_config.admin_password
-        return if !username || !password
+        return unless Maglev.config.admin_username.present? && Maglev.config.admin_password.present?
 
-        redirect_to main_app.root_path unless authenticate_with_http_basic { |u, p| username == u && password == p }
+        http_basic_authenticate_or_request_with name: Maglev.config.admin_username,
+                                                password: Maglev.config.admin_password
       end
     end
   end

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/tasks/maglev_tasks.rake

@@ -74,8 +74,14 @@ namespace :maglev do
     desc 'Ensure build dependencies like Vite are installed before bundling'
     task install_dependencies: :environment do
       within_engine_folder do
+        install_dev_dependencies = ENV['VITE_RUBY_SKIP_INSTALL_DEV_DEPENDENCIES'] == 'true'
+        # rubocop:disable Style/StringHashKeys
+        install_env_args = install_dev_dependencies ? {} : { 'NODE_ENV' => 'development' }
+        # rubocop:enable Style/StringHashKeys
         cmd = Maglev::Engine.vite_ruby.commands.legacy_npm_version? ? 'npx ci --yes' : 'npx --yes ci'
-        system({ 'NODE_ENV' => 'development' }, cmd)
+        result = system(install_env_args, cmd)
+        # Fallback to `yarn` if `npx` is not available.
+        system(install_env_args, 'yarn install --frozen-lockfile') if result.nil?
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder