attributor 7.0 → 8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5fc3c6809e4a0e21b21752683196ce018beafbb7d8b615f2217abbcb55b3c3
-  data.tar.gz: 55bba33e0b5ee71c581a029cfd3045c6f71ce5d1f578b2654d99f919626dcbc8
+  metadata.gz: 1bec1eaa11a8711121f24b64eb86dcedc3779012f3ccc2239882bfa38527a0db
+  data.tar.gz: 15e6274f319f78d5c7801015ed5a97fd3858727ce98956a2e3b0229c89bdf25c
 SHA512:
-  metadata.gz: f09888249f30f079afcbfbc09695cf828bed15d6c6b621b0ab5a55de086b740c74bfa33cfd4b75fa1c97650ccb0c7ceeb5850401af94a11619ea46b6c0aada33
-  data.tar.gz: b3876fbc0f432ff67fc0031234a4da8eea6b2b965d539a71f5a27ab615442cc8ae2420270a315a2d1461fb20d3f9aa7eae8619a1e7979f9f6cb73365d786cddd
+  metadata.gz: 1055363cc837a07b3c319f0cfec62293797361a713354c146e3c1bead0b2fa0cbb2313dfcf092400abc57f5101a6fc76b782ba51bb9876c09720c2a382bb09de
+  data.tar.gz: 0aea79491d61b6ab866aec643c93d18bd372b8afc63428ba69d4a9723d0fd55a24589ea182a4ed2a0029e30a55f522981010f5637a54ea98af68ec0f41b48ec7

data/.travis.yml

@@ -1,10 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4
-  - 2.5
-  - 2.6
   - 2.7
+  - 3.2
 script:
   - bundle exec rspec spec
 branches:

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Attributor Changelog
 
-## next
+## 8.0
+
+- Add support for Ruby 3.2.
+- Remove usage of Randexp for examples and replace with Faker.
+- The above means this also removes support for generating examples using regular expressions.
+
+## 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 ..)
@@ -32,7 +41,7 @@
 - added support for enum's out of values in json_schema generation
 
 ## 6.0 (22/11/2021)
-- removed `required_if` support and all of the necessary code. 
+- removed `required_if` support and all of the necessary code.
 - changed the semantics of the `required:` option in attributes, to really mean if the "key" is required to be passed in or not (i.e., check if the key is null, not if its value is null)
 - Introduced a new option`null: true|false` to allow for the value of an attribute to be nullable or not when the attribute is passed in.
   * The default behavior for an attribute nullability currently `null: false` (but it can be easily changed by overriding the `Attributor::Attribute.default_for_null` function to return `true`)

data/attributor.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |spec|
 
   spec.homepage = 'https://github.com/rightscale/attributor'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>=2.1'
+  spec.required_ruby_version = '>=2.7'
 
   spec.require_paths = ['lib']
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.add_runtime_dependency('hashie', ['~> 3'])
-  spec.add_runtime_dependency('randexp', ['~> 0'])
+  spec.add_runtime_dependency('faker', [' >= 3.2'])
   spec.add_runtime_dependency('activesupport', ['>= 3'])
 
   spec.add_development_dependency 'rspec', '~> 3'
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('guard', ['~> 2'])
   spec.add_development_dependency('guard-rspec', ['~> 4'])
   spec.add_development_dependency('pry')
+
   if RUBY_PLATFORM !~ /java/
     spec.add_development_dependency('pry-byebug')
     spec.add_development_dependency('pry-stack_explorer')

data/lib/attributor/attribute.rb

@@ -27,7 +27,7 @@ module Attributor
 
     class << self
       attr_accessor :custom_options
-    end    
+    end
 
     def self.custom_option(name, attr_type, options = {}, &block)
       if TOP_LEVEL_OPTIONS.include?(name) || INTERNAL_OPTIONS.include?(name)
@@ -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
 
@@ -145,8 +156,6 @@ module Attributor
     def example_from_options(parent, context)
       val = options[:example]
       generated = case val
-                  when ::Regexp
-                    val.gen
                   when ::Proc
                     if val.arity == 2
                       val.call(parent, context)
@@ -200,8 +209,10 @@ module Attributor
       description
     end
 
-    def example(context=nil, parent: nil, values:{})
-      raise ArgumentError, "attribute example cannot take a context of type String" if (context.is_a? ::String )
+    def example(context = nil, parent: nil, values: {})
+      require 'faker'
+      raise ArgumentError, 'attribute example cannot take a context of type String' if context.is_a? ::String
+
       if context
         ctx = Attributor.humanize_context(context)
         seed, = Digest::SHA1.digest(ctx).unpack('QQ')
@@ -215,10 +226,11 @@ module Attributor
         # Only validate the type, if the proc-generated example is "complex" (has attributes)
         errors = loaded.class.respond_to?(:attributes) ? validate_type(loaded, context) : validate(loaded, context)
         raise AttributorException, "Error generating example for #{Attributor.humanize_context(context)}. Errors: #{errors.inspect}" if errors.any?
+
         return loaded
       end
 
-      return options[:values].pick if options.key? :values
+      return options[:values].sample if options.key? :values
 
       if type.respond_to?(:attributes)
         type.example(context, **values)
@@ -231,7 +243,7 @@ module Attributor
       type.attributes if @type_has_attributes ||= type.respond_to?(:attributes)
     end
 
-    # Default value for a non-specified null: option 
+    # Default value for a non-specified null: option
     def self.default_for_null
       false
     end
@@ -261,7 +273,7 @@ module Attributor
       end
 
       return errors if errors.any?
-      
+
       object.nil? ? errors : errors + type.validate(object, context, self)
     end
 
@@ -292,7 +304,7 @@ module Attributor
         raise AttributorException, 'Required must be a boolean' unless definition == true || definition == false
         raise AttributorException, 'Required cannot be enabled in combination with :default' if definition == true && options.key?(:default)
       when :null
-        raise AttributorException, 'Null must be a boolean' unless definition == true || definition == false        
+        raise AttributorException, 'Null must be a boolean' unless definition == true || definition == false
       when :example
         unless definition.is_a?(::Regexp) || definition.is_a?(::String) || definition.is_a?(::Array) || definition.is_a?(::Proc) || definition.nil? || type.valid_type?(definition)
           raise AttributorException, "Invalid example type (got: #{definition.class.name}). It must always match the type of the attribute (except if passing Regex that is allowed for some types)"
@@ -306,8 +318,8 @@ module Attributor
       :ok # passes
     end
 
-    def check_custom_option(name, definition) 
-      attribute = self.class.custom_options.fetch(name) 
+    def check_custom_option(name, definition)
+      attribute = self.class.custom_options.fetch(name)
 
       errors = attribute.validate(definition)
       raise AttributorException, "Custom option #{name.inspect} is invalid: #{errors.inspect}" if errors.any?

data/lib/attributor/extras/field_selector.rb

@@ -22,7 +22,7 @@ module Attributor
 
     def self.example(_context = nil, options: {})
       3.times.each_with_object([]) do |_i, array|
-        array << /\w{5,8}/.gen
+        array << Faker::Lordem.words(5)
       end.join(',')
     end
 

data/lib/attributor/types/bigdecimal.rb

@@ -9,7 +9,7 @@ module Attributor
     end
 
     def self.example(_context = nil, options: {})
-      BigDecimal("#{/\d{3}/.gen}.#{/\d{3}/.gen}")
+      BigDecimal("#{Faker::Number.decimal(l_digits: 3, r_digits: 3)}")
     end
 
     def self.load(value, _context = Attributor::DEFAULT_ROOT_CONTEXT, **_options)

data/lib/attributor/types/date.rb

@@ -9,7 +9,7 @@ module Attributor
     end
 
     def self.example(context = nil, options: {})
-      load(Randgen.date, context)
+      load(Faker::Date.in_date_period, context)
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **_options)
@@ -21,7 +21,7 @@ module Attributor
       case value
       when ::String
         begin
-          return ::Date.parse(value)
+          ::Date.parse(value)
         rescue ArgumentError
           raise Attributor::DeserializationError.new(context: context, from: value.class, encoding: 'Date', value: value)
         end

data/lib/attributor/types/date_time.rb

@@ -13,7 +13,7 @@ module Attributor
     end
 
     def self.example(context = nil, options: {})
-      load(Randgen.date, context)
+      load(Faker::Date.in_date_period, context)
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **_options)
@@ -21,10 +21,11 @@ module Attributor
       return value if value.is_a?(native_type)
       return value.to_datetime if value.respond_to?(:to_datetime)
       return nil unless value.is_a?(::String)
+
       # TODO: we should be able to convert not only from String but Time...etc
       # Else, we'll decode it from String.
       begin
-        return ::DateTime.parse(value)
+        ::DateTime.parse(value)
       rescue ArgumentError
         raise Attributor::DeserializationError.new(context: context, from: value.class, encoding: 'DateTime', value: value)
       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/types/polymorphic.rb

@@ -27,7 +27,7 @@ module Attributor
     end
 
     def self.example(context = nil, **values)
-      types.values.pick.example(context, **values)
+      types.values.sample.example(context, **values)
     end
 
     def self.valid_type?(value)

data/lib/attributor/types/string.rb

@@ -17,16 +17,7 @@ module Attributor
     end
 
     def self.example(_context = nil, options: {})
-      if options[:regexp]
-        begin
-          # It may fail to generate an example, see bug #72.
-          options[:regexp].gen
-        rescue => e
-          format('Failed to generate example for %s : %s', options[:regexp].inspect, e.message)
-        end
-      else
-        /\w+/.gen
-      end
+      Faker::Lorem.word
     end
 
     def self.family

data/lib/attributor/types/tempfile.rb

@@ -10,7 +10,7 @@ module Attributor
 
     def self.example(context = Attributor::DEFAULT_ROOT_CONTEXT, options: {})
       file = ::Tempfile.new(Attributor.humanize_context(context))
-      file.write Randgen.sentence
+      file.write Faker::Lorem.paragraph
       file.write '.'
       file.rewind
       file

data/lib/attributor/types/time.rb

@@ -9,7 +9,7 @@ module Attributor
     end
 
     def self.example(context = nil, options: {})
-      load(Randgen.time, context)
+      load(Faker::Time.between(from: ::DateTime.now - 1, to: ::DateTime.now), context)
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **_options)
@@ -24,10 +24,10 @@ module Attributor
     def self.parse(value, context)
       case value
       when ::Integer
-        return ::Time.at(value)
+        ::Time.at(value)
       when ::String
         begin
-          return ::Time.parse(value)
+          ::Time.parse(value)
         rescue ArgumentError
           raise Attributor::DeserializationError.new(context: context, from: value.class, encoding: 'Time', value: value)
         end

data/lib/attributor/types/uri.rb

@@ -31,7 +31,7 @@ module Attributor
     end
 
     def self.example(_context = nil, options: {})
-      URI(Randgen.uri)
+      URI("https://example.com/#{Attributor::String.example}")
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **_options)

data/lib/attributor/version.rb

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

data/lib/attributor.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'randexp'
 
 require 'hashie'
 require 'active_support/concern'
@@ -17,8 +16,6 @@ module Attributor
 
   require_relative 'attributor/example_mixin'
 
-  require_relative 'attributor/extensions/randexp'
-
   # hierarchical separator string for composing human readable attributes
   SEPARATOR = '.'.freeze
   ROOT_PREFIX = '$'.freeze
@@ -37,11 +34,13 @@ module Attributor
 
   def self.find_type(attr_type)
     return attr_type if attr_type < Attributor::Type
+
     name = attr_type.name.split('::').last # TOO EXPENSIVE?
 
     klass = const_get(name) if const_defined?(name)
     raise AttributorException, "Could not find class with name #{name}" unless klass
     raise AttributorException, "Could not find attribute type for: #{name} [klass: #{klass.name}]" unless klass < Attributor::Type
+
     klass
   end
 
@@ -57,7 +56,7 @@ module Attributor
     context = Array(context) if context.is_a? ::String
 
     begin
-      return context.join('.')
+      context.join('.')
     rescue e
       raise "Error creating context string: #{e.message}"
     end
@@ -81,7 +80,7 @@ module Attributor
     else
       val
     end
-  end  
+  end
 
   MODULE_PREFIX       = 'Attributor::'.freeze
   MODULE_PREFIX_REGEX = ::Regexp.new(MODULE_PREFIX)

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
@@ -263,7 +273,7 @@ describe Attributor::Attribute do
     end
 
     context 'deterministic examples' do
-      let(:example) { /\w+/ }
+      let(:example) { proc { Faker::Lorem.word } }
       let(:attribute_options) { { example: example } }
 
       it 'can take a context to pre-seed the random number generator' do
@@ -322,30 +332,6 @@ describe Attributor::Attribute do
       it { should be example }
     end
 
-    context 'with a regexp' do
-      let(:example) { Regexp.new(/\w+/) }
-      let(:generated_example) { /\w+/.gen }
-
-      it 'calls #gen on the regexp' do
-        expect(example).to receive(:gen).and_return(generated_example)
-
-        expect(example_result).to match example
-      end
-
-      context 'for a type with a non-String native_type' do
-        let(:type) { Attributor::Integer }
-        let(:example) { Regexp.new(/\d{5}/) }
-        let(:generated_example) { /\d{5}/.gen }
-
-        it 'coerces the example value properly' do
-          expect(example).to receive(:gen).and_return(generated_example)
-          expect(type).to receive(:load).and_call_original
-
-          expect(example_result).to be_kind_of(type.native_type)
-        end
-      end
-    end
-
     context 'with a proc' do
       let(:parent) { Object.new }
 

data/spec/support/hashes.rb

@@ -1,6 +1,6 @@
 class HashWithModel < Attributor::Hash
   keys do
-    key :name, String, default: 'Turkey McDucken', description: 'Turducken name', example: Randgen.name
+    key :name, String, default: 'Turkey McDucken', description: 'Turducken name', example: proc { Faker::Name.first_name }
     key :chicken, Chicken
   end
 end

data/spec/support/models.rb

@@ -1,10 +1,10 @@
 class Chicken < Attributor::Model
   attributes(identity: :email) do
-    attribute :name, Attributor::String, example: Randgen.first_name
+    attribute :name, Attributor::String, example: proc { Faker::Name.first_name }
     attribute :age, Attributor::Integer, default: 1, min: 0, max: 120, description: 'The age of the chicken'
-    attribute :email, Attributor::String, example: Randgen.email, regexp: /@/, description: 'The email address of the chicken'
+    attribute :email, Attributor::String, example: proc { "#{Faker::Name.first_name.downcase}@#{Faker::Lorem.word.downcase}.example.org" }, regexp: /@/, description: 'The email address of the chicken'
     attribute :angry, Attributor::Boolean, example: 'true', description: 'Angry bird?'
-    attribute :weight, Attributor::Float, example: /\d{1,2}\.\d/, description: 'The weight of the chicken'
+    attribute :weight, Attributor::Float, example: proc { Faker::Number.number(digits: 3) }, description: 'The weight of the chicken'
     attribute :type, Attributor::Symbol, values: [:chicken]
   end
 end
@@ -14,8 +14,8 @@ class Duck < Attributor::Model
     attribute :age, Attributor::Integer
     attribute :name, Attributor::String
     attribute :email, Attributor::String
-    attribute :angry, Attributor::Boolean, default: true, example: /true|false/, description: 'Angry bird?'
-    attribute :weight, Attributor::Float, example: /\d{1,2}\.\d/, description: 'The weight of the duck'
+    attribute :angry, Attributor::Boolean, default: true, example: proc { [true, false].sample }, description: 'Angry bird?'
+    attribute :weight, Attributor::Float, example: proc { Faker::Number.number(digits: 3).to_f }, description: 'The weight of the duck'
     attribute :type, Attributor::Symbol, values: [:duck]
   end
 end
@@ -23,16 +23,16 @@ end
 class Turkey < Attributor::Model
   attributes do
     attribute :age, Integer, default: 1, min: 0, max: 120, description: 'The age of the turkey'
-    attribute :name, String, description: 'name of the turkey', example: Randgen.name # , :default => "Providencia Zboncak"
-    attribute :email, String, example: Randgen.email, regexp: /@/, description: 'The email address of the turkey'
-    attribute :weight, Attributor::Float, example: /\d{1,2}\.\d/, max: 100.0, description: 'The weight of the turkey'
+    attribute :name, String, description: 'name of the turkey', example: proc { Faker::Name.name } # , :default => "Providencia Zboncak"
+    attribute :email, String, example: proc { "#{Faker::Name.first_name.downcase}@example.org" }, regexp: /@/, description: 'The email address of the turkey'
+    attribute :weight, Attributor::Float, example: proc { Faker::Number.number(digits: 2).to_f }, max: 100.0, description: 'The weight of the turkey'
     attribute :type, Attributor::Symbol, values: [:turkey]
   end
 end
 
 class Turducken < Attributor::Model
   attributes do
-    attribute :name, String, default: 'Turkey McDucken', description: 'Turducken name', example: Randgen.name
+    attribute :name, String, default: 'Turkey McDucken', description: 'Turducken name', example: proc { Faker::Name.first_name }
     attribute :chicken, Chicken
     attribute :duck, Duck
     attribute :turkey, Turkey, description: 'The turkey'
@@ -43,7 +43,7 @@ end
 
 class Cormorant < Attributor::Model
   attributes do
-    attribute :name, String, description: 'Name of the Cormorant', example: Randgen.name
+    attribute :name, String, description: 'Name of the Cormorant', example: proc { Faker::Name.name }
     attribute :timestamps do
       attribute :born_at, DateTime
       attribute :died_at, DateTime, example: proc { |timestamps| timestamps.born_at + 10 }
@@ -53,22 +53,22 @@ class Cormorant < Attributor::Model
     attribute :all_the_fish, Attributor::Collection, description: 'All kinds of fish for feeding the babies'
 
     # This will be a collection of Cormorants (note, this relationship is circular)
-    attribute :neighbors, Attributor::Collection.of(Cormorant), member_options: {null: false}, description: 'Neighbor cormorants', null: false
+    attribute :neighbors, Attributor::Collection.of(Cormorant), member_options: { null: false }, description: 'Neighbor cormorants', null: false
 
     # This will be a collection of instances of an anonymous Struct class, each having two well-defined attributes
 
     attribute :babies, Attributor::Collection.of(Attributor::Struct), description: 'All the babies', member_options: { identity: :name } do
-      attribute :name, Attributor::String, example: /[:name]/, description: 'The name of the baby cormorant', required: true
+      attribute :name, Attributor::String, example: proc { Faker::Name.name }, description: 'The name of the baby cormorant', required: true
       attribute :months, Attributor::Integer, default: 0, min: 0, description: 'The age in months of the baby cormorant'
-      attribute :weight, Attributor::Float, example: /\d{1,2}\.\d{3}/, description: 'The weight in kg of the baby cormorant'
+      attribute :weight, Attributor::Float, example:  proc { Faker::Number.number(digits: 2) }, description: 'The weight in kg of the baby cormorant'
     end
   end
 end
 
 class Person < Attributor::Model
   attributes do
-    attribute :name, String, example: Randgen.first_name
-    attribute :title, String, values: %w(Mr Mrs Ms Dr)
+    attribute :name, String, example: proc { Faker::Name.first_name }
+    attribute :title, String, values: %w[Mr Mrs Ms Dr]
     attribute :okay, Attributor::Boolean, values: [true]
     attribute :address, Address, example: proc { |person, context| Address.example(context, person: person) }
   end
@@ -77,7 +77,7 @@ end
 class Address < Attributor::Model
   attributes do
     attribute :name, String, example: /\w+/, null: true
-    attribute :state, String, values: %w(OR CA), null: false
+    attribute :state, String, values: %w[OR CA], null: false
     attribute :person, Person, example: proc { |address, context| Person.example(context, address: address) }
     attribute :substruct, reference: Address, null: false do
       attribute :state, Struct do # redefine state as a Struct

data/spec/types/csv_spec.rb

@@ -29,7 +29,7 @@ describe Attributor::CSV do
 
   context '.dump' do
     let!(:int_vals) { [1, 2, 3] }
-    let!(:str_vals) { (0..2).collect { /\w+/.gen } }
+    let!(:str_vals) { (0..2).collect { Faker::Lorem.word } }
 
     it 'dumps a String value' do
       expect(csv.dump(int_vals)).to be_a(String)

data/spec/types/date_spec.rb

@@ -19,7 +19,7 @@ describe Attributor::Date do
     let(:example) { type.example }
     subject(:value) { type.dump(example) }
     it 'is formatted correctly' do
-      expect(value).to match(/\d{4}-\d{2}-\d{2}T00:00:00\+00:00/)
+      expect(value).to match(/\d{4}-\d{2}-\d{2}/)
     end
     context 'nil values' do
       it 'should be nil' do
@@ -59,7 +59,7 @@ describe Attributor::Date do
         'Sat, 3 Feb 2001 04:05:06 +0700',
         '2013/08/23 00:39:55 +0000',
         '2007-10-19T04:11:33Z',
-        '2001-02-03T04:05:06+07:00.123456', # custom format with microseconds
+        '2001-02-03T04:05:06+07:00.123456' # custom format with microseconds
       ].each do |value|
         it "returns correct Date for #{value.inspect}" do
           expect(type.load(value)).to eq Date.parse(value)
@@ -70,7 +70,7 @@ describe Attributor::Date do
         'Sat, 30 Feb 2001 04:05:06 GMT', # No such date exists
         '2013/08/33 00:39:55 +0000',
         '2007-10-33T04:11:33Z',
-        '2001-02-33T04:05:06+07:00.123456', # custom format with microseconds
+        '2001-02-33T04:05:06+07:00.123456' # custom format with microseconds
       ].each do |value|
         it "raises Attributor::AttributorException for #{value.inspect}" do
           expect do
@@ -82,7 +82,7 @@ describe Attributor::Date do
       [
         '',
         'foobar',
-        'Sat, 30 Feb 2001 04:05:06 FOOBAR', # No such date format exists
+        'Sat, 30 Feb 2001 04:05:06 FOOBAR' # No such date format exists
       ].each do |value|
         it "raises Attributor::AttributorException for #{value.inspect}" do
           expect do
@@ -93,11 +93,11 @@ describe Attributor::Date do
     end
   end
   context '.as_json_schema' do
-    subject(:js){ type.as_json_schema }
+    subject(:js) { type.as_json_schema }
     it 'adds the right attributes' do
       expect(js.keys).to include(:type, :'x-type_name')
       expect(js[:type]).to eq(:string)
-      expect(js[:format]).to eq(:'date')
+      expect(js[:format]).to eq(:date)
       expect(js[:'x-type_name']).to eq('Date')
     end
   end

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
 

data/spec/types/model_spec.rb

@@ -80,7 +80,7 @@ describe Attributor::Model do
       subject(:chicken) { Chicken.example }
 
       let(:age_opts) { { options: Chicken.attributes[:age].options } }
-      let(:age) { /\d{2}/.gen.to_i }
+      let(:age) { Faker::Number.number(digits: 2) }
 
       context 'for a simple model' do
         it { should be_kind_of(Chicken) }

data/spec/types/string_spec.rb

@@ -22,14 +22,6 @@ describe Attributor::String do
       expect(type.example).to be_a(::String)
     end
 
-    it 'handles regexps that Randexp can not (#72)' do
-      regex = /\w+(,\w+)*/
-      expect do
-        val = Attributor::String.example(options: { regexp: regex })
-        expect(val).to be_a(::String)
-        expect(val).to match(/Failed to generate.+is too vague/)
-      end.to_not raise_error
-    end
   end
 
   context '.load' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: '7.0'
+  version: '8.0'
 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-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: randexp
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +316,6 @@ files:
 - lib/attributor/dumpable.rb
 - lib/attributor/example_mixin.rb
 - lib/attributor/exceptions.rb
-- lib/attributor/extensions/randexp.rb
 - lib/attributor/extras/field_selector.rb
 - lib/attributor/extras/field_selector/parser.rb
 - lib/attributor/extras/field_selector/transformer.rb
@@ -400,14 +399,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A powerful attribute and type management library for Ruby

data/lib/attributor/extensions/randexp.rb

@@ -1,13 +0,0 @@
-require 'date'
-
-class Randgen
-  DATE_TIME_EPOCH = ::DateTime.new(2015, 1, 1, 0, 0, 0)
-
-  def self.date
-    DATE_TIME_EPOCH - rand(800)
-  end
-
-  def self.time
-    date.to_time
-  end
-end