hanamismith 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0c8864aa328874754512be314522a523aa831bdbae209bafeec22a5e31bd0bb
-  data.tar.gz: 899e32fcfdced1478fc8b08f5e0a00758d300992417bcc723f91439f21a497e9
+  metadata.gz: b69a002fb43fc9cc1a0ff0ea8b13ff00ba6ee8661f9e306150ed25bc62f8e8cc
+  data.tar.gz: d7ee04ba5d164cbb8d488f1fb248e0441c480e43eed16f85ee1dd87709c94b86
 SHA512:
-  metadata.gz: bdad438b6b4e9e46200ee87866f94e5f631cc35c41a2e018b517871a5e7cab61320063ac30936ea7e298345ac38eeaf1e1d4bc34a8ee8fa09e91b8d403e319fa
-  data.tar.gz: 5a646edeefdaae29dcb4cf5cb260e3f43fc0c9b95fc35dc74b32859836848b9844953709644c36c6de3bae374a646b07e63daba033e7a6f7fd4625e4cf00987d
+  metadata.gz: a5381fcb09a4d24e59fbc1b39c35b79668e849881418545e0d5fc662fd1c2a19ec7322d88f56294890038b4ed8f6ae1acd94fa403db8016f09f5284b8d575941
+  data.tar.gz: 7a5f1cc3c074d83b01ffd7a4ba0a03126fbae2146a87ea485a8bbe1d34273e1bf4d4bd8ed0a1ba1710607913003284234973228d9d7f8fe25395f487cbbe4502

data/hanamismith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "hanamismith"
-  spec.version = "3.0.0"
+  spec.version = "4.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", "~> 10.0"
+  spec.add_dependency "rubysmith", "~> 11.0"
   spec.add_dependency "runcom", "~> 13.0"
   spec.add_dependency "sod", "~> 2.0"
   spec.add_dependency "spek", "~> 5.0"

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_contract
+        builder.call(settings.with(template_path: "%project_name%/app/contract.rb.erb")).render
+      end
+
       def add_mailer
         builder.call(settings.with(template_path: "%project_name%/app/mailer.rb.erb")).render
       end

data/lib/hanamismith/builders/layout.rb

@@ -20,8 +20,6 @@ module Hanamismith
                .replace("<!-- stylesheet -->", stylesheet)
                .replace("<!-- javascript -->", javascript)
                .replace("<!-- yield -->", "<%= yield %>")
-               .replace("<!-- flash:alert -->", flash(:alert))
-               .replace("<!-- flash:notice -->", flash(:notice))
 
         true
       end
@@ -53,15 +51,6 @@ module Hanamismith
           %(                 type: "image/png" %>)
       end
 
-      # :reek:UtilityFunction
-      def flash kind
-        %(<% if flash[:#{kind}] %>\n) +
-          %(      <div class="site-#{kind}">\n) +
-          %(        <p><%= flash[:#{kind}] %></p>\n) +
-          %(      </div>\n) +
-          %(    <% end %>\n)
-      end
-
       def manifest
         %(<%= tag.link title: "#{settings.project_label}: Manifest",\n) +
           %(                 rel: :manifest,\n) +

data/lib/hanamismith/builders/rack/attack.rb

@@ -25,7 +25,10 @@ module Hanamismith
         def add_middleware
           builder.call(settings.with(template_path: "%project_name%/config/app.rb.erb"))
                  .insert_after(/require/, %(\nrequire_relative "initializers/rack_attack"\n))
-                 .insert_before(/environment/, "    config.middleware.use Rack::Attack\n\n")
+                 .insert_after(
+                   "rubocop:enable Layout/FirstArrayElementLineBreak\n",
+                   "\n    config.middleware.use Rack::Attack\n"
+                 )
         end
       end
     end

data/lib/hanamismith/builders/rack/deflater.rb

@@ -11,8 +11,10 @@ module Hanamismith
 
         def call
           builder.call(settings.with(template_path: "%project_name%/config/app.rb.erb"))
-                 .insert_after(/Rack::Attack/, "    config.middleware.use Rack::Deflater\n")
-
+                 .insert_after(
+                   "rubocop:enable Layout/FirstArrayElementLineBreak\n",
+                   "\n    config.middleware.use Rack::Deflater\n"
+                 )
           true
         end
       end

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

@@ -0,0 +1,17 @@
+# auto_register: false
+
+require "dry/validation"
+
+<% namespace do %>
+  # The application base contract.
+  class Contract < Dry::Validation::Contract
+    config.messages.backend = :i18n
+
+    Hanami.app.config.i18n.tap do |i18n|
+      (i18n.shared_load_path + i18n.load_path).each do |entry|
+        path = Hanami.app.root.join entry.sub(/\*.*/, "")
+        config.messages.load_paths.merge path.glob("**/*.yml")
+      end
+    end
+  end
+<% end %>

data/lib/hanamismith/templates/%project_name%/app/templates/layouts/app.html.erb.erb

@@ -28,8 +28,6 @@
   </head>
 
   <body class="site-page">
-    <!-- flash:alert -->
-    <!-- flash:notice -->
     <!-- yield -->
   </body>
 </html>

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

@@ -3,9 +3,7 @@ require "hanami"
 <% namespace do %>
   # The application base configuration.
   class App < Hanami::App
-    # :nocov:
     RubyVM::YJIT.enable
-    # :nocov:
 
     Dry::Schema.load_extensions :monads
     Dry::Validation.load_extensions :monads

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

@@ -1,16 +1,17 @@
 require "ipaddr"
 require "rack/attack"
 
-private_subnets = [
+allowed_subnets = [
   IPAddr.new("10.0.0.0/8"),
   IPAddr.new("172.16.0.0/12"),
   IPAddr.new("192.168.0.0/16"),
   IPAddr.new("127.0.0.1"),
-  IPAddr.new("::1")
+  IPAddr.new("::1"),
+  *ENV.fetch("RACK_ATTACK_ALLOWED_SUBNETS", "").split(",").map { IPAddr.new it }
 ]
 
 Rack::Attack.safelist "allow private network" do |request|
-  private_subnets.any? { |subnet| subnet.include? request.ip }
+  allowed_subnets.any? { |subnet| subnet.include? request.ip }
 end
 
 Rack::Attack.throttle("requests by IP", limit: 100, period: 60, &:ip)

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

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

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

@@ -1,16 +1,15 @@
+ENV["HANAMI_ENV"] = "test"
+
 require "capybara/cuprite"
 require "capybara/rspec"
 require "capybara/validate_html5"
 require "database_cleaner/sequel"
 require "dry/monads"
+require "hanami/prepare"
 require "rack/test"
 require "rom-factory"
 require "spec_helper"
 
-ENV["HANAMI_ENV"] = "test"
-
-require "hanami/prepare"
-
 using Refinements::Pathname
 
 ENV["LD_PRELOAD"] = nil
@@ -36,10 +35,10 @@ RSpec.configure do |config|
   config.include_context "with application dependencies", type: :feature
 
   databases = proc do
-    Hanami.app.slices.with_nested.prepend(Hanami.app).each.with_object Set.new do |slice, dbs|
+    Hanami.app.with_slices.each_with_object Set.new do |slice, databases|
       next unless slice.key? "db.rom"
 
-      dbs.merge slice["db.rom"].gateways.values.map(&:connection).to_enum
+      databases.merge slice["db.rom"].gateways.values.map(&:connection)
     end
   end
 
@@ -64,7 +63,5 @@ RSpec.configure do |config|
     end
   end
 
-  config.append_after :each, :db do
-    databases.call.each { |db| DatabaseCleaner[:sequel, db:].clean }
-  end
+  config.after(:each, :db) { databases.call.each { DatabaseCleaner[:sequel, db: it].clean } }
 end

data/lib/hanamismith/templates/%project_name%/spec/slices/health/actions/show_spec.rb.erb

@@ -4,10 +4,20 @@ RSpec.describe Health::Actions::Show do
   subject(:action) { described_class.new }
 
   describe "#call" do
-    it "answers green background" do
+    it "answers green background on success" do
       expect(action.call({}).body.first).to include(
         %(<main style="background-color: green; height: 100vh;">\n</main>)
       )
     end
+
+    it "answers red background on failure" do
+      action = described_class.new.dup
+
+      def action.handle(*) = fail StandardError, "Danger!"
+
+      expect(action.call({}).body.first).to include(
+        %(<main style="background-color: red; height: 100vh;">\n</main>)
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanamismith
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -153,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +291,7 @@ files:
 - lib/hanamismith/templates/%project_name%/app/assets/images/icon.svg.erb
 - lib/hanamismith/templates/%project_name%/app/assets/js/app.js.erb
 - lib/hanamismith/templates/%project_name%/app/assets/pwa/manifest.webmanifest.erb
+- lib/hanamismith/templates/%project_name%/app/contract.rb.erb
 - 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
@@ -366,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A command line interface for smithing Hanami projects.
 test_files: []