modern 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd2d0084d17c885739efdb6c43b4bb92b063fcc97926797096f669f92e5ff62
-  data.tar.gz: 3108fb860bc3d119c66d7f86ec8e200e1c3f5be6abfe2ceeafa62ffc11fdbcf5
+  metadata.gz: b2dbaa306e3bd42e1f9b4d4e6cf8e2bdf9a1986cc138961a60e7710352734778
+  data.tar.gz: 45dd0f07b298064de38a2b51b0fe78ed8f50e4d483ac233d04c6ffd858d4b4f1
 SHA512:
-  metadata.gz: 86f097562f5e6506f5ae6fb49261065d5a05120aafc0dfdcc3c996f7d14007a16eaabe34b753e09cfdef335cc752cd36e7bb6e888a7952c62533bcac6e1897c9
-  data.tar.gz: 82ab10dacaed0357ba80395a1ad0745085925a9cc4d0f010e1f081bedd8ae738710aebdfefb8ffd5a95c65177bb892023d230a4d3e8a9aa8c9d37f64abaea8de
+  metadata.gz: 22777da99287bdc7ecd01cd355c1cbb552a67df52508f7c8627e2f70fed70a88b03f1d0f9d9f2798fc41a590073f6ab8aeae521a7e237b09cae48bd28cc25796
+  data.tar.gz: 7390e80f9f133208adbccacae00c333ca426e86f5e138a093f3c8eba820540ee4a48190e43eed10da34447fd5c7cb7fdf8dcdf57585629f1d1604ecf47125378

data/lib/modern/app/request_handling.rb

@@ -58,7 +58,7 @@ module Modern
             retval = validate_output!(route_content, retval, request, route)
 
             response.headers["Content-Type"] = output_converter.media_type
-            response.write(output_converter.converter.call(route_content.type, retval))
+            response.write(output_converter.converter.call(route_content.type, retval, output_converter))
           end
         rescue StandardError => err
           route_logger.error(err)

data/lib/modern/descriptor/converters/output/json.rb

@@ -3,6 +3,10 @@
 require 'modern/descriptor/converters/output/base'
 
 require 'json'
+# TODO: is there an alternative implementation of #as_json with less junk?
+require 'active_support/concern'
+require 'active_model/serialization'
+require 'active_model/serializers/json'
 
 # it gets confused by the blank line after the retval reassignment.
 # rubocop:disable Layout/EmptyLinesAroundArguments
@@ -13,7 +17,7 @@ module Modern
       module Output
         JSON = Base.new(
           media_type: "application/json",
-          converter: proc do |_type, retval|
+          converter: proc do |_type, retval, _output_converter|
             retval =
               if retval.is_a?(Hash)
                 retval.compact
@@ -25,8 +29,6 @@ module Modern
 
             if retval.respond_to?(:as_json)
               ::JSON.generate(retval.as_json)
-            elsif retval.respond_to?(:to_json)
-              retval.to_json
             else
               ::JSON.generate(retval)
             end

data/lib/modern/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Modern
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
   OPENAPI_VERSION = "3.0.1"
 end

data/modern.gemspec

@@ -42,6 +42,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "content-type", "~> 0.0.1"
   spec.add_runtime_dependency "http", "~> 3.0"
 
+  spec.add_runtime_dependency "activemodel", "~> 5.1"
+  spec.add_runtime_dependency "activesupport", "~> 5.1"
   spec.add_runtime_dependency "deep_dup", "~> 0.0.3"
   spec.add_runtime_dependency "deep_merge", "~> 1.2"
   spec.add_runtime_dependency "diff-lcs", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modern
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Ed Ropple
@@ -206,6 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: deep_dup
   requirement: !ruby/object:Gem::Requirement