attributor 5.5 → 5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30cd524aa1a60bb34487915e2201e20b075f8eaf
-  data.tar.gz: 4a9776a1a772b00636a46caec55f583aa75d54f4
+SHA256:
+  metadata.gz: 95e7a4d30473d5e7e9dbd37f0e028b9b5dd5b17cf0ceb89593f0aed60dab20de
+  data.tar.gz: 59cc3458cd723c43733ea6a128fb4032c8aa8c7cd2ac41ea620c31842da35db6
 SHA512:
-  metadata.gz: a5a4832825c92b5530352b626ae281c134aa215f167c633a7912b22cee2927fde696d07b92bfd6159b0e88db4dc69b19b38a289181cb523e0c961005608e4f86
-  data.tar.gz: a44680f8509acf463ac0c4a22a872db8456300745d01b5c4a31a597bd17760d995e5d6ce26120d998f8df5c4c06fe2d11e7e00c35959f6c987860059425af663
+  metadata.gz: 10da45417633b8f159db72d33a81101f25bd90cf8282e3a10e80d3cfb92de90639642dcf51d12d8f8ce4237acd1e2e4e562c97173480b1525cb4914f237d8ce4
+  data.tar.gz: e5c2ebc2dd2a214ffb4254332e56366bd825f1dbc93499d26476ed73226dc0e698be75918dab0a5d9853550ba8c88c83ba02afeeae22885254f828d2ac52040e

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## next
 
+## 5.6 (11/02/2020)
+
+- Small fixes for dumping JSON-schema default values if they're Proc's or dumpable objects
+
 ## 5.5 (21/08/2020)
 
 - JSON-schema support. Enhanced all of the types to suppport describing themselves as JSON-schema format (`.as_json_schema`). This description includes a few `x-*` extensions to capture some information that Attributor supports, that JSON-schema does not.

data/lib/attributor/attribute.rb

@@ -161,7 +161,10 @@ module Attributor
 
       description[:description] = self.options[:description] if self.options[:description]
       description[:enum] = self.options[:values] if self.options[:values]
-      description[:default] = self.options[:default] if self.options[:default]
+      if the_default = self.options[:default]
+        the_object = the_default.is_a?(Proc) ? the_default.call : the_default
+        description[:default] = the_object.is_a?(Attributor::Dumpable) ? the_object.dump : the_object
+      end
       #TODO      description[:title] = "TODO: do we want to use a title??..."
 
       # Change the reference option to the actual class name.

data/lib/attributor/types/collection.rb

@@ -125,7 +125,10 @@ module Attributor
       hash = super
       opts = self.options.merge( attribute_options )
       hash[:description] = opts[:description] if opts[:description]
-      hash[:default] = opts[:default] if opts[:default]
+      if the_default = opts[:default]
+        the_object = the_default.is_a?(Proc) ? the_default.call : the_default
+        hash[:description] = the_object.is_a?(Attributor::Dumpable) ? the_object.dump : the_object
+      end
 
       #hash[:examples] = [ example.dump ] if example
       member_example = example && example.first

data/lib/attributor/version.rb

@@ -1,3 +1,3 @@
 module Attributor
-  VERSION = '5.5'.freeze
+  VERSION = '5.6'.freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: '5.5'
+  version: '5.6'
 platform: ruby
 authors:
 - Josep M. Blanquer
 - Dane Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -291,7 +291,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - blanquer@gmail.com
 - dane.jensen@gmail.com
@@ -392,7 +392,7 @@ homepage: https://github.com/rightscale/attributor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -407,9 +407,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A powerful attribute and type management library for Ruby
 test_files: