hanamismith 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054e9513006d649fc307c5876e64c8950017f68fd039e167968eab783e2b4417
-  data.tar.gz: c18f32c274b99ae767f4224314ec257efdc38e0d0c95621e1f84425e94b0293e
+  metadata.gz: f0c8864aa328874754512be314522a523aa831bdbae209bafeec22a5e31bd0bb
+  data.tar.gz: 899e32fcfdced1478fc8b08f5e0a00758d300992417bcc723f91439f21a497e9
 SHA512:
-  metadata.gz: e6893f6165f59a26476084c0f89004cb2cc16ed4f19ee204bfd9c16d21c505944b27599415a0c2bf8b63d152c09ce23249e3545981b11a6acec97f0cd5262cd6
-  data.tar.gz: 364970a4f2ba6306ecd3b25e32ae7250ee8a7c1c047c5ba6bbfcca4d59abc4871a0e22bf71227721c3f75f53ea0f6c44625831b39f2a360e3abe1074b8db3310
+  metadata.gz: bdad438b6b4e9e46200ee87866f94e5f631cc35c41a2e018b517871a5e7cab61320063ac30936ea7e298345ac38eeaf1e1d4bc34a8ee8fa09e91b8d403e319fa
+  data.tar.gz: 5a646edeefdaae29dcb4cf5cb260e3f43fc0c9b95fc35dc74b32859836848b9844953709644c36c6de3bae374a646b07e63daba033e7a6f7fd4625e4cf00987d

data/hanamismith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "hanamismith"
-  spec.version = "2.3.0"
+  spec.version = "3.0.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/hanamismith"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmx", "~> 3.0"
   spec.add_dependency "infusible", "~> 5.0"
   spec.add_dependency "refinements", "~> 14.0"
-  spec.add_dependency "rubysmith", "~> 9.3"
+  spec.add_dependency "rubysmith", "~> 10.0"
   spec.add_dependency "runcom", "~> 13.0"
   spec.add_dependency "sod", "~> 2.0"
   spec.add_dependency "spek", "~> 5.0"

data/lib/hanamismith/builders/bundler.rb

@@ -35,35 +35,37 @@ module Hanamismith
 
       def insert_hanami
         with_template.insert_after "source", <<~CONTENT.strip
-          gem "hanami", "~> 2.3"
-          gem "hanami-assets", "~> 2.3"
-          gem "hanami-controller", "~> 2.3"
-          gem "hanami-db", "~> 2.3"
-          gem "hanami-router", "~> 2.3"
-          gem "hanami-validations", "~> 2.3"
-          gem "hanami-view", "~> 2.3"
+          gem "hanami", "~> 3.0"
+          gem "hanami-action", "~> 3.0"
+          gem "hanami-assets", "~> 3.0"
+          gem "hanami-db", "~> 3.0"
+          gem "hanami-mailer", "~> 3.0"
+          gem "hanami-router", "~> 3.0"
+          gem "hanami-view", "~> 3.0"
         CONTENT
       end
 
       def insert_main
         with_template.insert_after "source", <<~CONTENT
-          gem "dry-schema", "~> 1.15"
+          gem "cogger", "~> 2.4"
+          gem "core", "~> 3.2"
+          gem "dry-schema", "~> 1.16"
           gem "dry-types", "~> 1.9"
           gem "dry-validation", "~> 1.11"
-          gem "htmx", "~> 3.0"
-          gem "overmind", "~> 2.5"
-          gem "puma", "~> 7.0"
-          gem "rack-attack", "~> 6.7"
+          gem "htmx", "~> 3.2"
+          gem "i18n", "~> 1.15"
+          gem "puma", "~> 8.0"
+          gem "rack-attack", "~> 6.8"
         CONTENT
       end
 
       def insert_persistence
         with_template.insert_after "source", <<~CONTENT
 
-          gem "pg", "~> 1.5"
+          gem "pg", "~> 1.6", force_ruby_platform: true
           gem "rom", "~> 5.4"
           gem "rom-sql", "~> 3.7"
-          gem "sequel", "~> 5.89"
+          gem "sequel", "~> 5.106"
         CONTENT
       end
 
@@ -75,7 +77,7 @@ module Hanamismith
         with_template.insert_before(/group :development/, <<~CONTENT)
 
           group :development, :test do
-            gem "dotenv", "~> 3.1"
+            gem "dotenv", "~> 3.2"
           end
 
         CONTENT
@@ -83,8 +85,8 @@ module Hanamismith
 
       def insert_development
         with_template.insert_after(/group :development do/, <<~CONTENT.gsub("gem", "  gem"))
-          gem "hanami-webconsole", "~> 2.3"
-          gem "localhost", "~> 1.3"
+          gem "hanami-webconsole", "~> 3.0"
+          gem "localhost", "~> 1.8"
         CONTENT
       end
 
@@ -92,7 +94,7 @@ module Hanamismith
         with_template.insert_after(/group :test/, <<~CONTENT.gsub("gem", "  gem"))
           gem "capybara", "~> 3.40"
           gem "capybara-validate_html5", "~> 2.1"
-          gem "cuprite", "~> 0.15"
+          gem "cuprite", "~> 0.17"
           gem "database_cleaner-sequel", "~> 2.0"
           gem "launchy", "~> 3.1"
           gem "rack-test", "~> 2.2"

data/lib/hanamismith/builders/caliber.rb

@@ -12,17 +12,28 @@ module Hanamismith
         return false unless settings.build_caliber
 
         super
-        path = "%project_name%/.config/rubocop/config.yml.erb"
-        builder.call(settings.with(template_path: path))
-               .append("\nplugins: rubocop-sequel\n\n")
-               .append(<<~CONTENT)
-                 RSpec/SpecFilePathFormat:
-                   CustomTransform:
-                     #{settings.project_namespaced_class}: ""
-               CONTENT
-
+        with_template.append "\nplugins: rubocop-sequel\n\n"
+        add_configuration
         true
       end
+
+      private
+
+      def add_configuration
+        with_template.append <<~CONTENT
+          Metrics/MethodLength:
+            Exclude:
+              - config/initializers/universal_logger_patch.rb
+          RSpec/SpecFilePathFormat:
+            CustomTransform:
+              #{settings.project_namespaced_class}: ""
+        CONTENT
+      end
+
+      def with_template
+        path = "%project_name%/.config/rubocop/config.yml.erb"
+        builder.call settings.with(template_path: path)
+      end
     end
   end
 end

data/lib/hanamismith/builders/core.rb

@@ -31,6 +31,10 @@ module Hanamismith
         builder.call(settings.with(template_path: "%project_name%/app/action.rb.erb")).render
       end
 
+      def add_mailer
+        builder.call(settings.with(template_path: "%project_name%/app/mailer.rb.erb")).render
+      end
+
       def add_view
         builder.call(settings.with(template_path: "%project_name%/app/view.rb.erb")).render
       end

data/lib/hanamismith/builders/providers/logger.rb

@@ -22,10 +22,7 @@ module Hanamismith
             %project_name%/app/providers/logger.rb.erb
             %project_name%/spec/app/providers/logger_spec.rb.erb
             %project_name%/config/providers/logger.rb.erb
-            %project_name%/app/aspects/logging/rack_adapter.rb.erb
-            %project_name%/spec/app/aspects/logging/rack_adapter_spec.rb.erb
-            %project_name%/config/initializers/rack_logger_patch.rb.erb
-            %project_name%/config/initializers/sql_logger_patch.rb.erb
+            %project_name%/config/initializers/universal_logger_patch.rb.erb
           ].each { build it }
         end
 
@@ -37,8 +34,7 @@ module Hanamismith
                    /require/,
                    <<~REQUIRES
 
-                     require_relative "initializers/rack_logger_patch"
-                     require_relative "initializers/sql_logger_patch"
+                     require_relative "initializers/universal_logger_patch"
                    REQUIRES
                  )
         end

data/lib/hanamismith/builders/rake/configuration.rb

@@ -13,12 +13,21 @@ module Hanamismith
           return false unless settings.build_rake
 
           super
+          process
+          true
+        end
+
+        private
+
+        def process
           builder.call(settings.with(template_path: "%project_name%/Rakefile.erb"))
                  .render
+                 .replace(
+                   "Reek::Rake::Task.new",
+                   %(Reek::Rake::Task.new { it.source_files = "{app,config,lib,slices}/**/*.rb" })
+                 )
                  .insert_after(%r(bundler/setup), %(require "hanami/rake_tasks"))
                  .insert_after(/RuboCop::RakeTask/, %(\nRake.add_rakelib "lib/tasks"\n))
-
-          true
         end
       end
     end

data/lib/hanamismith/builders/reek.rb

@@ -12,20 +12,29 @@ module Hanamismith
         return false unless settings.build_reek
 
         super
-        add_detectors
+        add_duplicate_exclusion
+        add_too_many_statements_exclusion
         true
       end
 
-      def add_detectors
+      def add_duplicate_exclusion
+        with_template.insert_before(
+          /LongParameterList:\n/,
+          <<~DETECTORS.gsub(/^/, "  ")
+            DuplicateMethodCall:
+              exclude:
+                - UniversalLoggerPatch#_log_structured
+          DETECTORS
+        )
+      end
+
+      def add_too_many_statements_exclusion
         with_template.insert_after(
           /enabled:\sfalse\n/,
           <<~DETECTORS.gsub(/^/, "  ")
             TooManyStatements:
               exclude:
-                - RackLoggerPatch#prepare_app_providers
-            UtilityFunction:
-              exclude:
-                - SQLLoggerPatch#log_query
+                - UniversalLoggerPatch#_log_structured
           DETECTORS
         )
       end

data/lib/hanamismith/templates/%project_name%/app/mailer.rb.erb

@@ -0,0 +1,9 @@
+# auto_register: false
+
+require "hanami/mailer"
+
+<% namespace do %>
+  # The application base mailer.
+  class Mailer < Hanami::Mailer
+  end
+<% end %>

data/lib/hanamismith/templates/%project_name%/app/providers/logger.rb.erb

@@ -16,6 +16,7 @@
       def prepare = require "cogger"
 
       def start
+        add_aliases
         add_filters
         register :logger, build_instance
       end
@@ -24,7 +25,23 @@
 
       attr_reader :environment, :resolver, :id
 
-      def add_filters = cogger.add_filters :api_key, :csrf, :password, :password_confirmation
+      def add_aliases
+        cogger.add_formatter(
+          :rack,
+          Cogger::Formatters::Emoji,
+          "%<emoji:dynamic>s <dynamic>[%<id>s] [%<level>s] [%<at>s] %<verb>s " \
+          "%<status>s %<elapsed>s %<ip>s %<path>s %<length>s </dynamic>"
+        )
+
+        cogger.add_formatter :sql,
+                             Cogger::Formatters::Emoji,
+                             "%<emoji:dynamic>s <dynamic>[%<id>s] [%<level>s] [%<at>s] %<db>s " \
+                             "%<elapsed>s%<elapsed_unit>s %<query>s</dynamic>"
+      end
+
+      def add_filters
+        cogger.add_filters :csrf, :HTTP_ID, :mac_address, :password, :password_confirmation
+      end
 
       def build_instance
         io = "log/#{environment}.log"

data/lib/hanamismith/templates/%project_name%/config/app.rb.erb

@@ -10,12 +10,6 @@ require "hanami"
     Dry::Schema.load_extensions :monads
     Dry::Validation.load_extensions :monads
 
-    prepare_container do |container|
-      container.config.component_dirs.dir "app" do |dir|
-        dir.memoize = -> component { component.key.start_with? "repositories." }
-      end
-    end
-
     config.actions.content_security_policy.then do |csp|
       csp[:manifest_src] = "'self'"
       csp[:script_src] += " 'unsafe-eval' 'unsafe-inline'"
@@ -29,15 +23,5 @@ require "hanami"
                                 expire_after: 3_600 # 1 hour.
                               }
     # rubocop:enable Layout/FirstArrayElementLineBreak
-
-    environment :development do
-      # :nocov:
-      config.logger.options[:colorize] = true
-
-      config.logger = config.logger.instance.add_backend(
-        colorize: false,
-        stream: root.join("log/development.log")
-      )
-    end
   end
 <% end %>

data/lib/hanamismith/templates/%project_name%/config/initializers/universal_logger_patch.rb.erb

@@ -0,0 +1,24 @@
+# auto_register: false
+
+# Patches Hanami's universal logger to work with Cogger.
+module UniversalLoggerPatch
+  def _log_structured method, message, payload
+    tags = _current_tags
+    block_content = yield if block_given?
+
+    logger.formatter = case tags
+                         in [:rack] then tags.delete :rack
+                         in [:sql] if block_content.is_a? Hash then tags.delete :sql
+                         else Hanami.env == :development ? :emoji : :json
+                       end
+
+    unless block_content.is_a? Hash
+      message = block_content
+      block_content = {}
+    end
+
+    logger.public_send method, message, tags:, **block_content.merge!(payload)
+  end
+end
+
+Hanami::UniversalLogger.prepend UniversalLoggerPatch

data/lib/hanamismith/templates/%project_name%/config/puma.rb.erb

@@ -1,6 +1,5 @@
 development = ENV.fetch("HANAMI_ENV", "development") == "development"
 
-require "concurrent"
 require "localhost" if development
 
 Bundler.require :tools if development
@@ -8,9 +7,10 @@ Bundler.root.join("tmp").then { |path| path.mkdir unless path.exist? }
 
 max_threads = ENV.fetch "HANAMI_MAX_THREADS", 5
 min_threads = ENV.fetch "HANAMI_MIN_THREADS", max_threads
-concurrency = ENV.fetch "HANAMI_WEB_CONCURRENCY", Concurrent.physical_processor_count
+concurrency = Integer ENV.fetch "HANAMI_WEB_CONCURRENCY", 0
 
 threads min_threads, max_threads
+max_io_threads 5
 port ENV.fetch("HANAMI_PORT", 2300)
 environment ENV.fetch("HANAMI_ENV", "development")
 workers concurrency
@@ -18,5 +18,4 @@ worker_timeout 3600 if development
 ssl_bind "localhost", 2443 if development
 pidfile ENV.fetch("PIDFILE", "tmp/server.pid")
 plugin :tmp_restart
-
-preload_app! && before_fork { Hanami.shutdown } if concurrency.to_i.positive?
+before_fork { Hanami.shutdown } if concurrency > 1

data/lib/hanamismith/templates/%project_name%/package.json.erb

@@ -8,7 +8,10 @@
   "type": "module",
   "keywords": ["hanami", "htmx", "ruby"],
   "dependencies": {
-    "hanami-assets": "^2.3.0",
-    "htmx.org": "^2.0.8"
+    "hanami-assets": "^3.0.0",
+    "htmx.org": "^2.0.10"
+  },
+  "allowScripts": {
+    "esbuild@0.28.1": true
   }
 }

data/lib/hanamismith/templates/%project_name%/spec/hanami_helper.rb.erb

@@ -15,7 +15,7 @@ using Refinements::Pathname
 
 ENV["LD_PRELOAD"] = nil
 Capybara.app = Hanami.app
-Capybara.server = :puma, {Silent: true, Threads: "0:1"}
+Capybara.server = :puma, {Silent: true, Threads: "2:2"}
 Capybara.javascript_driver = :cuprite
 Capybara.save_path = Hanami.app.root.join "tmp/capybara"
 Capybara.register_driver :cuprite do |app|
@@ -56,6 +56,14 @@ RSpec.configure do |config|
     end
   end
 
+  config.prepend_before :each, :mailers do
+    Hanami.app.with_slices.each do |slice|
+      next unless slice.key? "mailers.delivery_method"
+
+      slice["mailers.delivery_method"].clear
+    end
+  end
+
   config.append_after :each, :db do
     databases.call.each { |db| DatabaseCleaner[:sequel, db:].clean }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanamismith
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -153,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.3'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.3'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +283,6 @@ files:
 - lib/hanamismith/templates/%project_name%/Procfile.dev.erb
 - lib/hanamismith/templates/%project_name%/Procfile.erb
 - lib/hanamismith/templates/%project_name%/app/action.rb.erb
-- lib/hanamismith/templates/%project_name%/app/aspects/logging/rack_adapter.rb.erb
 - lib/hanamismith/templates/%project_name%/app/assets/css/colors.css.erb
 - lib/hanamismith/templates/%project_name%/app/assets/css/defaults.css.erb
 - lib/hanamismith/templates/%project_name%/app/assets/css/layout.css.erb
@@ -295,6 +294,7 @@ files:
 - lib/hanamismith/templates/%project_name%/app/db/relation.rb.erb
 - lib/hanamismith/templates/%project_name%/app/db/repository.rb.erb
 - lib/hanamismith/templates/%project_name%/app/db/struct.rb.erb
+- lib/hanamismith/templates/%project_name%/app/mailer.rb.erb
 - lib/hanamismith/templates/%project_name%/app/providers/logger.rb.erb
 - lib/hanamismith/templates/%project_name%/app/templates/layouts/app.html.erb.erb
 - lib/hanamismith/templates/%project_name%/app/view.rb.erb
@@ -304,8 +304,7 @@ files:
 - lib/hanamismith/templates/%project_name%/config/app.rb.erb
 - lib/hanamismith/templates/%project_name%/config/assets.js.erb
 - lib/hanamismith/templates/%project_name%/config/initializers/rack_attack.rb.erb
-- lib/hanamismith/templates/%project_name%/config/initializers/rack_logger_patch.rb.erb
-- lib/hanamismith/templates/%project_name%/config/initializers/sql_logger_patch.rb.erb
+- lib/hanamismith/templates/%project_name%/config/initializers/universal_logger_patch.rb.erb
 - lib/hanamismith/templates/%project_name%/config/providers/db.rb.erb
 - lib/hanamismith/templates/%project_name%/config/providers/htmx.rb.erb
 - lib/hanamismith/templates/%project_name%/config/providers/logger.rb.erb
@@ -336,7 +335,6 @@ files:
 - lib/hanamismith/templates/%project_name%/slices/home/view.rb.erb
 - lib/hanamismith/templates/%project_name%/slices/home/views/context.rb.erb
 - lib/hanamismith/templates/%project_name%/slices/home/views/show.rb.erb
-- lib/hanamismith/templates/%project_name%/spec/app/aspects/logging/rack_adapter_spec.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/app/providers/logger_spec.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/features/home_spec.rb.erb
 - lib/hanamismith/templates/%project_name%/spec/hanami_helper.rb.erb
@@ -368,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.15
 specification_version: 4
 summary: A command line interface for smithing Hanami projects.
 test_files: []

data/lib/hanamismith/templates/%project_name%/app/aspects/logging/rack_adapter.rb.erb

@@ -1,21 +0,0 @@
-<% namespace do %>
-  module Aspects
-    module Logging
-      # Adapts Cogger Rack middleware for provider registration.
-      module RackAdapter
-        module_function
-
-        def with logger
-          @logger = logger
-          self
-        end
-
-        def new application
-          @application = Cogger::Rack::Logger.new application, {logger: @logger}
-        end
-
-        def call(environment) = @application.call environment
-      end
-    end
-  end
-<% end %>

data/lib/hanamismith/templates/%project_name%/config/initializers/rack_logger_patch.rb.erb

@@ -1,21 +0,0 @@
-require "dry/system"
-
-# Patches Hanami's default providers.
-module RackLoggerPatch
-  def prepare_app_providers
-    require "hanami/providers/inflector"
-
-    logger = Class.new Hanami::Provider::Source do
-      def start
-        slice.start :logger
-        register :monitor, <%= settings.project_namespaced_class %>::Aspects::Logging::RackAdapter.with(slice[:logger])
-      end
-    end
-
-    register_provider :inflector, source: Hanami::Providers::Inflector
-    register_provider :rack, source: logger, namespace: true
-    register_provider :db_logging, source: Hanami::Providers::DBLogging
-  end
-end
-
-Hanami::App::ClassMethods.prepend RackLoggerPatch

data/lib/hanamismith/templates/%project_name%/config/initializers/sql_logger_patch.rb.erb

@@ -1,13 +0,0 @@
-require "dry-monitor"
-require "dry/monitor/sql/logger"
-
-# Patches Hanami's default SQL logger.
-module SQLLoggerPatch
-  def log_query time:, name:, query:
-    # :nocov:
-    Hanami.app[:logger].info { {message: query, tags: [{db: name, duration: time}]} }
-    # :nocov:
-  end
-end
-
-Dry::Monitor::SQL::Logger.prepend SQLLoggerPatch

data/lib/hanamismith/templates/%project_name%/spec/app/aspects/logging/rack_adapter_spec.rb.erb

@@ -1,34 +0,0 @@
-require "hanami_helper"
-
-RSpec.describe <%= settings.project_namespaced_class %>::Aspects::Logging::RackAdapter do
-  subject(:adapter) { described_class }
-
-  include_context "with application dependencies"
-
-  let(:application) { proc { [200, {"Content-Type" => "text/plain"}, "test"] } }
-
-  describe ".with" do
-    it "answers itself" do
-      expect(adapter.with(nil)).to eq(adapter)
-    end
-  end
-
-  describe ".new" do
-    it "answers Cogger middleware" do
-      expect(adapter.with(logger).new(application)).to be_a(Cogger::Rack::Logger)
-    end
-  end
-
-  describe ".call" do
-    let(:middleware) { adapter.with(logger).new application }
-
-    it "answers application" do
-      expect(middleware.call({})).to eq([200, {"Content-Type" => "text/plain"}, "test"])
-    end
-
-    it "logs request" do
-      middleware.call({})
-      expect(logger.reread).to match(/level.+INFO.+status.+200/)
-    end
-  end
-end