hanamismith 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0c8864aa328874754512be314522a523aa831bdbae209bafeec22a5e31bd0bb
-  data.tar.gz: 899e32fcfdced1478fc8b08f5e0a00758d300992417bcc723f91439f21a497e9
+  metadata.gz: b4e6465af13be82767b09daf96a78a165ec3d75ea5a06c5996bb231898054e70
+  data.tar.gz: c5ae3527f7210a600d383d6ad0af738e96bfbf65a36aadd3ad31cc9a17b8eed3
 SHA512:
-  metadata.gz: bdad438b6b4e9e46200ee87866f94e5f631cc35c41a2e018b517871a5e7cab61320063ac30936ea7e298345ac38eeaf1e1d4bc34a8ee8fa09e91b8d403e319fa
-  data.tar.gz: 5a646edeefdaae29dcb4cf5cb260e3f43fc0c9b95fc35dc74b32859836848b9844953709644c36c6de3bae374a646b07e63daba033e7a6f7fd4625e4cf00987d
+  metadata.gz: 3117fdf9052c7ed06089b83d559118c9ee404b07fd2b99132e5fc3d734ab530f18d37826e379dc32b9693ca83e38583f9e8f4b5e18e1e6a9ad1a829ec09b5eb0
+  data.tar.gz: 0a0e943ef27c675f0a8782816614f7d97a8d021490324ac71f88a29c3f58c5e22b40968459c8fd52ca465b21f25e377b112efcabd63fd2a31441f538112e5b91

data/hanamismith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "hanamismith"
-  spec.version = "3.0.0"
+  spec.version = "3.1.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/hanamismith"

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/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%/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanamismith
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -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