hoodoo 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ed5c7f8e4d541e0fa485aa51d93c35e10e010749e372b1d007ade4550f3ce9
-  data.tar.gz: 236eca0e1da38dce2e63b529f38d7e3d52d75f4685fbaf81341368721f7d4ac7
+  metadata.gz: d3cfd418d564c82821044bc2a95cb8d1e194a134027bc9fac61a56f823157b61
+  data.tar.gz: abd1ca2e208d34fbd00146989234daac40611f24e32869fd56debb0b1d0e62a6
 SHA512:
-  metadata.gz: ad755f6aa427b937706e02634b752ec629d6a8ed2c472fb65531eb921d1060d31bbce57a94f20a971a106b681250eb202393135afe9d651f287be47124e5bcca
-  data.tar.gz: a8a3452c1c155825b40696dc7b9f943b28976f2d59255977e94d180bda56b767a670beecd8bf309e327a8bb17c014891614665dd5517e8bbdc0d0794803d0275
+  metadata.gz: c887163252c009e44267179282e725bcfc4a49ce20e48270ab688f446dd5a03bf29bdaeab692ae4411b0f38dca2a202edd3b7025336963e29f68cd612f12ce3f
+  data.tar.gz: fa52f3e1fdb454022cd24fbdf56cdf25b3355ee0fe3cced729ae2cb73437b14c3d137f1e2958fb7d2d636222b0cf301fa4d356a7226125b31a75a0b797ffafd9

data/lib/hoodoo/presenters/types/decimal.rb

@@ -7,6 +7,14 @@ module Hoodoo
     #
     class Decimal < Hoodoo::Presenters::Field
 
+      # In theory this is derived from Rubinius source, but "master" didn't seem
+      # to include it at the time of writing. See:
+      #
+      # https://github.com/rubinius/rubinius/
+      # https://stackoverflow.com/questions/1034418/determine-if-a-string-is-a-valid-float-value
+      #
+      VALIDATOR = Regexp.new('^\s*[+-]?((\d+_?)*\d+(\.(\d+_?)*\d+)?|\.(\d+_?)*\d+)(\s*|([eE][+-]?(\d+_?)*\d+)\s*)$')
+
       # The precision of the Decimal.
       #
       attr_accessor :precision
@@ -28,11 +36,21 @@ module Hoodoo
 
       # Check if data is a valid Decimal and return a Hoodoo::Errors instance.
       #
+      # Decimals are expressed in JSON as Strings with any amount of leading or
+      # trailing space, can be positive or negative and may use simple (e.g.
+      # <tt>"-12.45"</tt>) or scientific (e.g. <tt>"-0.1245e2"</tt>) notation
+      # with a lower case or capital <tt>E</tt> in the latter case.
+      #
+      # A leading "0" before a decimal place may be omitted; "0.12" and ".12"
+      # are considered equivalent and valid. An optional leading "+" is allowed
+      # for positive numbers. Between digits, an underscore is permitted as a
+      # visual separator; "12_431_999" and "12431999" are equivalent and valid.
+      #
       def validate( data, path = '' )
         errors = super( data, path )
         return errors if errors.has_errors? || ( ! @required && data.nil? )
 
-        unless data.is_a?( ::BigDecimal )
+        unless data.is_a?( ::String ) && data.match( VALIDATOR ) != nil
           errors.add_error(
             'generic.invalid_decimal',
             :message   => "Field `#{ full_path( path ) }` is an invalid decimal",

data/lib/hoodoo/version.rb

@@ -12,11 +12,11 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2017-11-10'
+  DATE = '2017-11-16'
 
 end

data/spec/presenters/types/array_spec.rb

@@ -274,7 +274,7 @@ describe Hoodoo::Presenters::Array do
     'boolean'   => { :valid => [ true                    ], :invalid => [ 4.51, 'false'                    ] },
     'date'      => { :valid => [ Date.today.iso8601      ], :invalid => [ Date.today, '23rd January 2041'  ] },
     'date_time' => { :valid => [ DateTime.now.iso8601    ], :invalid => [ DateTime.now, '2017-01-27 12:00' ] },
-    'decimal'   => { :valid => [ BigDecimal.new(4.51, 2) ], :invalid => [ 4.51, '4.51'                     ] },
+    'decimal'   => { :valid => [ '4.51'                  ], :invalid => [ 4.51, BigDecimal.new( '4.51' )   ] },
     'enum'      => { :valid => [ 'one'                   ], :invalid => [ 'One', 1                         ] },
     'float'     => { :valid => [ 4.51                    ], :invalid => [ BigDecimal.new(4.51, 2), '4.51'  ] },
     'integer'   => { :valid => [ 4                       ], :invalid => [ '4'                              ] },
@@ -457,8 +457,8 @@ describe Hoodoo::Presenters::Array do
         it 'validates entries' do
           data = {
             'numbers' => [
-              BigDecimal.new( '42.21' ),
-              'not a decimal'
+              '42.21',
+              '41.0 not a decimal'
             ]
           }
 

data/spec/presenters/types/decimal_spec.rb

@@ -16,14 +16,69 @@ describe Hoodoo::Presenters::Decimal do
 
   describe '#validate' do
     it 'should return [] when valid decimal' do
-      expect(@inst.validate(BigDecimal.new(12.231,3)).errors).to eq([])
+      [
+        '0',
+        '0.0',
+        '  .123245e2  ',
+        '  .1_2_3_2_4_5E-2  ',
+        '  0.123245e+2  ',
+        '  0_3.123245E2  ',
+        '  03.123245E2_3  ',
+        '  12.3245  ',
+        '  12.3245',
+        '12.3245  ',
+        '12.3245',
+        '12.00',
+        '12',
+        '  -.123245e2  ',
+        '  -.123245E2  ',
+        '  -0.123245e2  ',
+        '  -0.123245E2  ',
+        '  -12.3245  ',
+        '  -12.3245',
+        '-12.3245  ',
+        '-12.3245',
+        '-12.00',
+        '-12',
+        '  +.123245e2  ',
+        '  +.123245E2  ',
+        '  +0.123245e2  ',
+        '  +0.123245E2  ',
+        '  +12.3245  ',
+        '  +12.3245',
+        '+12.3245  ',
+        '+12.3245',
+        '+12.00',
+        '+12'
+      ].each do | item |
+        expect( @inst.validate( item ).errors ).to eq( [] )
+      end
+
     end
 
     it 'should return correct error when data is not a decimal' do
-      errors = @inst.validate('asckn')
-
-      err = [  {'code'=>"generic.invalid_decimal", 'message'=>"Field `one` is an invalid decimal", 'reference'=>"one"}]
-      expect(errors.errors).to eq(err)
+      [
+        'hello',
+        '!23.00',
+        '24!',
+        '23.41 suffix',
+        '+0.123245j2',
+        '0.123245e+-2',
+        '+-0.123245e2',
+        '03_.123245E2',
+        '03_.123245E2',
+        '03._123245E2',
+        '03.123245_E2',
+        '03.123245E23_',
+      ].each do | item |
+        expect( @inst.validate( item ).errors ).to eq( [
+          {
+            'code'      => "generic.invalid_decimal",
+            'message'   => "Field `one` is an invalid decimal",
+            'reference' => "one"
+          }
+        ] )
+      end
     end
 
     it 'should not return error when not required and absent' do

data/spec/presenters/types/hash_spec.rb

@@ -598,7 +598,7 @@ describe Hoodoo::Presenters::Hash do
       'boolean'   => { :valid => [ true                    ], :invalid => [ 4.51, 'false'                    ] },
       'date'      => { :valid => [ Date.today.iso8601      ], :invalid => [ Date.today, '23rd January 2041'  ] },
       'date_time' => { :valid => [ DateTime.now.iso8601    ], :invalid => [ DateTime.now, '2017-01-27 12:00' ] },
-      'decimal'   => { :valid => [ BigDecimal.new(4.51, 2) ], :invalid => [ 4.51, '4.51'                     ] },
+      'decimal'   => { :valid => [ '4.51'                  ], :invalid => [ 4.51, BigDecimal.new( '4.51' )   ] },
       'enum'      => { :valid => [ 'one'                   ], :invalid => [ 'One', 1                         ] },
       'float'     => { :valid => [ 4.51                    ], :invalid => [ BigDecimal.new(4.51, 2), '4.51'  ] },
       'integer'   => { :valid => [ 4                       ], :invalid => [ '4'                              ] },
@@ -1166,7 +1166,7 @@ describe Hoodoo::Presenters::Hash do
     'boolean'    => { :definition => { :length => 9, :type => :boolean                                               }, :valid => [ true                    ], :invalid => [ 4.51, 'false'                    ] },
     'date'       => { :definition => { :length => 9, :type => :date                                                  }, :valid => [ Date.today.iso8601      ], :invalid => [ Date.today, '23rd January 2041'  ] },
     'date_time'  => { :definition => { :length => 9, :type => :date_time                                             }, :valid => [ DateTime.now.iso8601    ], :invalid => [ DateTime.now, '2017-01-27 12:00' ] },
-    'decimal'    => { :definition => { :length => 9, :type => :decimal,   :field_precision => 2                      }, :valid => [ BigDecimal.new(4.51, 2) ], :invalid => [ 4.51, '4.51'                     ] },
+    'decimal'    => { :definition => { :length => 9, :type => :decimal,   :field_precision => 2                      }, :valid => [ '4.51'                  ], :invalid => [ 4.51, BigDecimal.new( '4.51' )   ] },
     'enum'       => { :definition => { :length => 9, :type => :enum,      :field_from      => [ :one, :two, :three ] }, :valid => [ 'one'                   ], :invalid => [ 'One', 1                         ] },
     'float'      => { :definition => { :length => 9, :type => :float                                                 }, :valid => [ 4.51                    ], :invalid => [ BigDecimal.new(4.51, 2), '4.51'  ] },
     'integer'    => { :definition => { :length => 9, :type => :integer                                               }, :valid => [ 4                       ], :invalid => [ '4'                              ] },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli