attributor 7.0 → 7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5fc3c6809e4a0e21b21752683196ce018beafbb7d8b615f2217abbcb55b3c3
-  data.tar.gz: 55bba33e0b5ee71c581a029cfd3045c6f71ce5d1f578b2654d99f919626dcbc8
+  metadata.gz: 6207241fe519ee3ee26e4a4220077428c26850c556abd065d7c073125c0a49fa
+  data.tar.gz: bb19a849faf087d1f9fad40c9b3101b4a416ef32ef8f4d266b6a061c37f270e2
 SHA512:
-  metadata.gz: f09888249f30f079afcbfbc09695cf828bed15d6c6b621b0ab5a55de086b740c74bfa33cfd4b75fa1c97650ccb0c7ceeb5850401af94a11619ea46b6c0aada33
-  data.tar.gz: b3876fbc0f432ff67fc0031234a4da8eea6b2b965d539a71f5a27ab615442cc8ae2420270a315a2d1461fb20d3f9aa7eae8619a1e7979f9f6cb73365d786cddd
+  metadata.gz: 5bbec43bae528b47ddc5176e75bbd07f84707520a363e08257dff88409d1a7b1f9febce1a77e2a99e4df07537d0ed6253d4e6911e453a51f28bcb3f7d445b6ff
+  data.tar.gz: 12726d8e722d4ddc28c04bb6d03d3fae81b5f4abe84268f1e335f80a6e84880dcddc96ca12a9d1281abf4fac31c900d644c2f3e1ef9e1ff0d1929aeae0afe325

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## next
 
+## 7.1 (6/9/2023)
+- Enhance custom_option handling. The values provided for custom options are now loaded (and definition will fail if they aren't compatible). This was specially
+  important for custom options that were collections, etc.
+- Fix Float type .load
+
 ## 7.0 (5/23/2023)
 - Support for loading "<digits>." strings in BigDecimal/Float types (These are formats supported by JS, Java ..)
 - Support for defining collections of types using a more terse DSL: T[]

data/lib/attributor/attribute.rb

@@ -42,6 +42,17 @@ module Attributor
       @type = Attributor.resolve_type(type, options, block)
       @options = @type.respond_to?(:options) ?  @type.options.merge(options) : options
 
+      # We will give the values passed for options, a chance to be 'loaded' by its type, so we store native loaded values in the options
+      begin
+        current_option_name = nil # Use this to avoid having to wrap each loop with a begin/rescue block
+        (self.class.custom_options.keys & @options.keys).each do |custom_key|
+          current_option_name = custom_key
+          @options[custom_key] = self.class.custom_options[custom_key].load(@options[custom_key]) 
+        end
+      rescue => e
+        raise AttributorException,  "Error while loading value #{@options[current_option_name]} for custom option '#{current_option_name}': #{e.message}"
+      end
+
       check_options!
     end
 

data/lib/attributor/types/float.rb

@@ -18,7 +18,7 @@ module Attributor
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **options)
-      return BigDecimal(value + '0') if value.is_a?(::String) && value.end_with?('.')
+      return Float(value + '0') if value.is_a?(::String) && value.end_with?('.')
       Float(value)
     rescue TypeError
       super

data/lib/attributor/version.rb

@@ -1,3 +1,3 @@
 module Attributor
-  VERSION = '7.0'.freeze
+  VERSION = '7.1'.freeze
 end

data/spec/attribute_spec.rb

@@ -232,6 +232,16 @@ describe Attributor::Attribute do
         end
       end
 
+      context 'validates the type of values' do 
+        let(:custom_option_args) { [option_name, String ] }
+        
+        it 'raises with an invalid option value' do
+          expect do
+            Attributor::Attribute.new(Integer, foo: {a:1})
+          end.to raise_error(Attributor::AttributorException,/Error while loading value {:a=>1} for custom option 'foo': Type Attributor::String cannot load values of type Hash/)
+        end
+      end
+
       it 'appear in as_json_schema' do
         attribute = Attributor::Attribute.new(Integer, foo: 'valid')
         json_schema = attribute.as_json_schema

data/spec/types/float_spec.rb

@@ -61,8 +61,10 @@ describe Attributor::Float do
           expect(type.load('0.')).to eq Float('0.0')
         end
         it 'decodes it if the String represents a negative Float and ends in .' do
-          expect(type.load('-10.')).to eq Float('-10.0')
-          expect(type.load('-0.')).to eq Float('-0.0')
+          expect(type.load('-10.')).to eq -10.0
+          expect(type.load('-10.').class).to eq Float
+          expect(type.load('-0.')).to eq -0.0
+          expect(type.load('-0.').class).to eq Float
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: '7.0'
+  version: '7.1'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie