mk_framework 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116dd1b29e32f3a469fc2806aab54c975373ea40188a91025e89d4ba2a3a45cd
-  data.tar.gz: 38ba4c1925e8be343c384e527d17ec0509082f24e4ddbd891f016cdf1ea5f1f4
+  metadata.gz: c68f913eebaf1aa8a9b4d423b528e4720a6508b5f0f130c03b15d039458ec6d1
+  data.tar.gz: be858c42ce6d158eb5e658bb9a7e20ec9a775795f0f5956b03100ee733dd4c2f
 SHA512:
-  metadata.gz: b1756e15b4f7ae6c8c5dffdd121ecbd632a264ab7a539cb99b9b2f7158cd83cf57c436f1a03da46bc156ad7f0a0e10dc7575982f4e934e64749cffdf617c3294
-  data.tar.gz: 5766d0fd1acd60b0ff39868145c196b07afdb758e11319d7a5c9c75c4f0e27f65bcb70aa0add146818956237324d08a97b37a30c67ad7c2aaa4de67e441fdb9d
+  metadata.gz: 79a22c1dcd019cfcb8ad3653a9fdd84c4246de7cdc95faa21132be72dc1306285c49bc5a37f29a3bdd64342718024ac126fcf33e7fe38dcdbde673dca3e73536
+  data.tar.gz: f42544ff916968bf3cfc5152b9ed3cd866050b301407e5f1b840637db4b73226f1a3a604b36102b0195b8a9e584c4e7ab90cb590afee744bf9462b1b0ac79538

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.3 — 2026-09-12
+
+- Use `rack-test` and `Rack::Test::Methods` in generated request specs.
+- Simplify generated update specs to use PUT and serialize request bodies with
+  `.to_json`.
+- Format generated Ruby hashes with spaces inside nonempty braces.
+
 ## 0.2.2 — 2026-09-08
 
 - Generate full CRUD resources: index, show, create, update (PATCH and PUT), and

data/README.md

@@ -21,14 +21,14 @@ require `mk_framework/sequel`.
 ## Install
 
 ```sh
-gem install mk_framework -v 0.2.2
+gem install mk_framework -v 0.2.3
 ```
 
 Or add it to your application's Gemfile:
 
 ```ruby
 source 'https://rubygems.org'
-gem 'mk_framework', '~> 0.2.2'
+gem 'mk_framework', '~> 0.2.3'
 ```
 
 Run `bundle install`. Add `sequel` and your database driver if you use
@@ -36,11 +36,11 @@ Run `bundle install`. Add `sequel` and your database driver if you use
 
 ## Generate an app with `mk_frame_init`
 
-Version 0.2.2 generates full CRUD apps with the `mk_frame_init` executable. Install the gem, then run
+Version 0.2.3 generates full CRUD apps with the `mk_frame_init` executable. Install the gem, then run
 it from the parent directory where you want your new app:
 
 ```sh
-gem install mk_framework -v 0.2.2
+gem install mk_framework -v 0.2.3
 mk_frame_init
 ```
 
@@ -632,7 +632,7 @@ bundle exec rake
 bundle exec rake build
 ```
 
-The gem is written to `pkg/mk_framework-0.2.2.gem`. See
+The gem is written to `pkg/mk_framework-0.2.3.gem`. See
 [deployment](docs/deployment.md) for migrations, connections, authentication,
 timeouts, logging, and release verification, and [upgrading](docs/upgrading.md)
 for changes from the prototype. CI runs on Ruby 4.0 on Linux.

data/lib/mk_framework/generator/templates/README.md.erb

@@ -12,7 +12,7 @@ Each action has its own controller and handler.
 | DELETE | `/<%= config.resource %>/:id` | delete |
 
 Create returns 201; the other actions return 200. Index returns
-`{<%= config.resource %>: [...]}`; member actions return `{<%= config.model_name %>: {...}}`,
+`{ <%= config.resource %>: [...] }`; member actions return `{ <%= config.model_name %>: { ... } }`,
 including the deleted record for DELETE. Missing records return 404.
 
 ## Setup

data/lib/mk_framework/generator/templates/handler.rb.erb

@@ -7,9 +7,9 @@ module <%= config.namespace %>
       r.response.status = 201
 <% end -%>
 <% if action == 'index' -%>
-      {<%= config.resource %>: model.map { |record| record.slice(*<%= config.model_class %>.public_attributes_list) }}
+      { <%= config.resource %>: model.map { |record| record.slice(*<%= config.model_class %>.public_attributes_list) } }
 <% else -%>
-      {<%= config.model_name %>: model.slice(*<%= config.model_class %>.public_attributes_list)}
+      { <%= config.model_name %>: model.slice(*<%= config.model_class %>.public_attributes_list) }
 <% end -%>
     end
   end

data/lib/mk_framework/generator/templates/request_spec.rb.erb

@@ -3,105 +3,111 @@
 require_relative '../spec_helper'
 
 RSpec.describe '<%= config.model_class %> CRUD' do
-  let(:client) { Rack::MockRequest.new(Rack::Builder.parse_file(File.join(<%= config.namespace %>::ROOT, 'config.ru'))) }
-  let(:attributes) { JSON.parse(<%= JSON.generate(config.example).inspect %>) }
+  include Rack::Test::Methods
 
-  before { <%= config.namespace %>::<%= config.model_class %>.dataset.delete }
+  let(:app) { Rack::Builder.parse_file(File.join(<%= config.namespace %>::ROOT, 'config.ru')) }
+  let(:attributes) { JSON.parse(<%= config.example.to_json.inspect %>) }
+
+  before do
+    <%= config.namespace %>::<%= config.model_class %>.dataset.delete
+    header 'CONTENT_TYPE', 'application/json'
+  end
 
   it 'persists permitted fields and returns a 201 response through the Rack entrypoint' do
-    response = client.post('/<%= config.resource %>', input: JSON.generate(attributes.merge('id' => 999)),
-      'CONTENT_TYPE' => 'application/json')
+    post('/<%= config.resource %>', attributes.merge('id' => 999).to_json)
 
-    expect(response.status).to eq(201)
+    expect(last_response.status).to eq(201)
     record = <%= config.namespace %>::<%= config.model_class %>.first
     expect(record).not_to be_nil
     expect(record.id).not_to eq(999)
-    payload = JSON.parse(response.body).fetch('<%= config.model_name %>')
+    payload = JSON.parse(last_response.body).fetch('<%= config.model_name %>')
     expect(payload.fetch('id')).to eq(record.id)
     expect(payload.keys).to match_array(%w[id <%= config.field_names.join(' ') %> created_at updated_at])
   end
 
   it 'rejects missing required fields without inserting a record' do
-    response = client.post('/<%= config.resource %>', input: '{}', 'CONTENT_TYPE' => 'application/json')
+    post('/<%= config.resource %>', {}.to_json)
 
-    expect(response.status).to eq(422)
+    expect(last_response.status).to eq(422)
     expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(0)
   end
 
   it 'rejects an invalid field type without inserting a record' do
     attributes['<%= config.fields.first[:name] %>'] = []
-    response = client.post('/<%= config.resource %>', input: JSON.generate(attributes), 'CONTENT_TYPE' => 'application/json')
+    post('/<%= config.resource %>', attributes.to_json)
 
-    expect(response.status).to eq(400)
+    expect(last_response.status).to eq(400)
     expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(0)
   end
 
   def create_record
-    response = client.post('/<%= config.resource %>', input: JSON.generate(attributes), 'CONTENT_TYPE' => 'application/json')
-    expect(response.status).to eq(201)
-    JSON.parse(response.body).fetch('<%= config.model_name %>')
+    post('/<%= config.resource %>', attributes.to_json)
+    expect(last_response.status).to eq(201)
+    JSON.parse(last_response.body).fetch('<%= config.model_name %>')
   end
 
   it 'lists records in ID order, including an empty collection' do
-    expect(JSON.parse(client.get('/<%= config.resource %>').body)).to eq('<%= config.resource %>' => [])
+    get('/<%= config.resource %>')
+    expect(JSON.parse(last_response.body)).to eq('<%= config.resource %>' => [])
     records = [create_record, create_record]
-    response = client.get('/<%= config.resource %>')
-    expect(response.status).to eq(200)
-    expect(JSON.parse(response.body).fetch('<%= config.resource %>')).to eq(records)
+    get('/<%= config.resource %>')
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body).fetch('<%= config.resource %>')).to eq(records)
   end
 
   it 'shows a single record' do
     record = create_record
-    response = client.get("/<%= config.resource %>/#{record.fetch('id')}")
-    expect(response.status).to eq(200)
-    expect(JSON.parse(response.body).fetch('<%= config.model_name %>')).to eq(record)
+    get("/<%= config.resource %>/#{record.fetch('id')}")
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body).fetch('<%= config.model_name %>')).to eq(record)
   end
 
-<% updated_value = {'string' => 'Updated', 'text' => 'Updated text', 'integer' => 2, 'float' => 2.5, 'boolean' => true, 'date' => '2027-02-03', 'datetime' => '2027-02-03T14:30:00Z'}.fetch(config.fields.first[:type]) -%>
-  %w[patch put].each do |verb|
-    it "updates permitted fields with #{verb.upcase}, preserving omitted fields and the ID" do
-      record = create_record
-      changes = {'<%= config.fields.first[:name] %>' => <%= updated_value.inspect %>, 'id' => 999}
-      response = client.public_send(verb, "/<%= config.resource %>/#{record.fetch('id')}",
-        input: JSON.generate(changes), 'CONTENT_TYPE' => 'application/json')
-      expect(response.status).to eq(200)
-      payload = JSON.parse(response.body).fetch('<%= config.model_name %>')
-      expect(payload.fetch('id')).to eq(record.fetch('id'))
+<% updated_value = { 'string' => 'Updated', 'text' => 'Updated text', 'integer' => 2, 'float' => 2.5, 'boolean' => true, 'date' => '2027-02-03', 'datetime' => '2027-02-03T14:30:00Z' }.fetch(config.fields.first[:type]) -%>
+  it 'updates permitted fields with PUT, preserving omitted fields and the ID' do
+    record = create_record
+    changes = { '<%= config.fields.first[:name] %>' => <%= updated_value.inspect %>, 'id' => 999 }
+    put("/<%= config.resource %>/#{record.fetch('id')}",
+      changes.to_json)
+    expect(last_response.status).to eq(200)
+    payload = JSON.parse(last_response.body).fetch('<%= config.model_name %>')
+    expect(payload.fetch('id')).to eq(record.fetch('id'))
 <% if config.fields.first[:type] == 'datetime' -%>
-      expect(DateTime.parse(payload.fetch('<%= config.fields.first[:name] %>'))).to eq(DateTime.iso8601(<%= updated_value.inspect %>))
+    expect(DateTime.parse(payload.fetch('<%= config.fields.first[:name] %>'))).to eq(DateTime.iso8601(<%= updated_value.inspect %>))
 <% else -%>
-      expect(payload.fetch('<%= config.fields.first[:name] %>')).to eq(<%= updated_value.inspect %>)
+    expect(payload.fetch('<%= config.fields.first[:name] %>')).to eq(<%= updated_value.inspect %>)
 <% end -%>
-      expect(payload.except('<%= config.fields.first[:name] %>', 'updated_at')).to eq(record.except('<%= config.fields.first[:name] %>', 'updated_at'))
-      expect(JSON.parse(client.get("/<%= config.resource %>/#{record.fetch('id')}").body).fetch('<%= config.model_name %>')).to eq(payload)
-      expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(1)
-    end
+    expect(payload.except('<%= config.fields.first[:name] %>', 'updated_at')).to eq(record.except('<%= config.fields.first[:name] %>', 'updated_at'))
+    get("/<%= config.resource %>/#{record.fetch('id')}")
+    expect(JSON.parse(last_response.body).fetch('<%= config.model_name %>')).to eq(payload)
+    expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(1)
   end
 
   it 'rejects invalid updates without changing stored data' do
     record = create_record
     <%= %w[string text].include?(config.fields.first[:type]) ? "[[[], 400], [nil, 400], ['', 422]]" : '[[[], 400], [nil, 400]]' %>.each do |value, status|
-      response = client.patch("/<%= config.resource %>/#{record.fetch('id')}",
-        input: JSON.generate('<%= config.fields.first[:name] %>' => value), 'CONTENT_TYPE' => 'application/json')
-      expect(response.status).to eq(status)
-      expect(JSON.parse(client.get("/<%= config.resource %>/#{record.fetch('id')}").body).fetch('<%= config.model_name %>')).to eq(record)
+      put("/<%= config.resource %>/#{record.fetch('id')}",
+        { '<%= config.fields.first[:name] %>' => value }.to_json)
+      expect(last_response.status).to eq(status)
+      get("/<%= config.resource %>/#{record.fetch('id')}")
+      expect(JSON.parse(last_response.body).fetch('<%= config.model_name %>')).to eq(record)
     end
   end
 
   it 'deletes a record and returns its public attributes' do
     record = create_record
-    response = client.delete("/<%= config.resource %>/#{record.fetch('id')}")
-    expect(response.status).to eq(200)
-    expect(JSON.parse(response.body).fetch('<%= config.model_name %>')).to eq(record)
+    delete("/<%= config.resource %>/#{record.fetch('id')}")
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body).fetch('<%= config.model_name %>')).to eq(record)
     expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(0)
-    expect(client.get("/<%= config.resource %>/#{record.fetch('id')}").status).to eq(404)
+    get("/<%= config.resource %>/#{record.fetch('id')}")
+    expect(last_response.status).to eq(404)
   end
 
-  %w[get patch put delete].each do |verb|
+  %w[get put delete].each do |verb|
     it "returns 404 for #{verb.upcase} of a missing record" do
-      response = client.public_send(verb, '/<%= config.resource %>/999999',
-        input: JSON.generate(attributes), 'CONTENT_TYPE' => 'application/json')
-      expect(response.status).to eq(404)
+      public_send(verb, '/<%= config.resource %>/999999',
+        attributes.to_json)
+      expect(last_response.status).to eq(404)
       expect(<%= config.namespace %>::<%= config.model_class %>.count).to eq(0)
     end
   end

data/lib/mk_framework/generator/templates/spec_helper.rb.erb

@@ -2,7 +2,7 @@
 
 ENV['RACK_ENV'] = 'test'
 require 'rspec'
-require 'rack/mock'
+require 'rack/test'
 require 'rack/builder'
 require 'json'
 require_relative '../database'

data/lib/mk_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MK
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mk_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Francesco Canessa