blueprinter_schema 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9246edd433fe3a71df7924c38bfd92928af95ddfdc90aebab7285ed6270e3fdc
-  data.tar.gz: 228234c8612cdf7e8b728e67974831263bc077864ea6ec0f0608d6c23c8cbe8b
+  metadata.gz: 79f76768380ae6cbe77da6ec153325e079ca2d5ee30df459378e0ebb90f674c2
+  data.tar.gz: 50a119f7dd0fb32789a24ed6ccddd05026a0bb8525f4c5c60f94f232edcc3e31
 SHA512:
-  metadata.gz: e1d5833548d59cb364765ea3db2bee8c50c13fadb12bd18e742014e48c8636de6a1ef4519ab79ac8c194b3301fa5dc9b0f9cdd61da70383d052e50687619a496
-  data.tar.gz: 3e731df8e7f2ac8736fda0fdcd40797b6ec024297cb186c255e71087fdb9a6a9db365517c5dd9fb25a24ea5f128c2c49b5e1aebef1fd83f8ecd500f22fc82d23
+  metadata.gz: f057fdac75f35be16f955cbc083326ab32940ed5210ec8ed26922b4614741e0371e0e762371081d7afdf31dbee97d7fc14794650bde811ef636f3de64a2cb52f
+  data.tar.gz: e82e0011242c7838709c55c2d4d6ca8d2a43e620a6ff7c244c9fc70b816e6dd7c211a995ebea6fd57390744c0523d2b467168e9fc52e8bdec02ecebb10888811

data/.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "blueprinter_schema",
-  "dockerComposeFile": "../docker-compose.yml",
+  "dockerComposeFile": "../compose.yml",
   "service": "ruby",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 

data/.tool-versions

@@ -0,0 +1 @@
+ruby 4.0.1

data/Dockerfile

@@ -4,7 +4,6 @@
 ARG RUBY_VERSION=3.4.3
 FROM docker.io/library/ruby:$RUBY_VERSION-slim
 
-# Rails app lives here
 WORKDIR /workspaces/blueprinter_schema
 
 # Install packages needed to build gems

data/README.md

@@ -47,7 +47,7 @@ BlueprinterSchema.generate(serializer: UserSerializer)
 }
 ```
 
-You can pass an ActiveRecord Model to automatically infer types from DB fields:
+### Pass an ActiveRecord Model to automatically infer types from DB fields:
 
 ```rb
 class UserSerializer < Blueprinter::Base
@@ -82,7 +82,7 @@ BlueprinterSchema.generate(serializer: UserSerializer, model: User)
 }
 ```
 
-You can use associations:
+### Use associations:
 
 ```rb
 class UserSerializer < Blueprinter::Base
@@ -156,16 +156,10 @@ BlueprinterSchema.generate(
 Devcontainer / Codespaces / Native
 
 ```sh
+mise install
 bin/setup
 ```
 
-Docker
-
-```sh
-docker compose up -d
-docker compose exec ruby bin/setup
-```
-
 Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/lib/blueprinter_schema/generator.rb

@@ -74,6 +74,7 @@ module BlueprinterSchema
         type_definition = ar_column_to_json_schema(column)
       end
 
+      type_definition['items'] = field.options[:items].deep_stringify_keys if field.options[:items]
       type_definition['format'] = field.options[:format] if field.options[:format]
       type_definition['description'] = field.options[:description] if field.options[:description]
       type_definition
@@ -127,18 +128,19 @@ module BlueprinterSchema
       ar_association = @model&.reflect_on_association(association.name)
       is_collection = ar_association ? ar_association.collection? : association.options[:collection]
 
-      associated_schema = recursive_generate(blueprint_class, ar_association&.klass)
+      view = association.options[:view] || :default
+      associated_schema = recursive_generate(blueprint_class, ar_association&.klass, view)
 
       is_collection ? { 'type' => 'array', 'items' => associated_schema } : associated_schema
     end
 
-    def recursive_generate(serializer, model)
+    def recursive_generate(serializer, model, view)
       BlueprinterSchema.generate(
         serializer:,
         model:,
         skip_conditional_fields: @skip_conditional_fields,
         fallback_definition: @fallback_definition,
-        view: @view
+        view:
       )
     end
   end

data/lib/blueprinter_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlueprinterSchema
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueprinter_schema
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - thisismydesign
@@ -18,12 +18,12 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
+- ".tool-versions"
 - Dockerfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- docker-compose.yml
+- compose.yml
 - lib/blueprinter_schema.rb
 - lib/blueprinter_schema/generator.rb
 - lib/blueprinter_schema/version.rb
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Create JSON Schema from Blueprinter serializers and ActiveRecord Models.
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-ruby-3.4.3