stannum 0.3.0 → 0.4.0

data/lib/stannum/contract.rb

@@ -117,12 +117,12 @@ module Stannum
       # @overload property(**options) { |value| }
       #   Creates a new Stannum::Constraint object with the given block, and
       #   adds that constraint to the contract for the property.
-      def property(property, constraint = nil, **options, &block)
+      def property(property, constraint = nil, **options, &)
         self.constraint(
           constraint,
-          property: property,
+          property:,
           **options,
-          &block
+          &
         )
       end
     end
@@ -138,12 +138,12 @@ module Stannum
     # @see #add_property_constraint.
     def add_constraint(constraint, property: nil, sanity: false, **options)
       validate_constraint(constraint)
-      validate_property(property: property, **options)
+      validate_property(property:, **options)
 
       @constraints << Stannum::Contracts::Definition.new(
-        constraint: constraint,
+        constraint:,
         contract:   self,
-        options:    options.merge(property: property, sanity: sanity)
+        options:    options.merge(property:, sanity:)
       )
 
       self
@@ -179,7 +179,7 @@ module Stannum
     #
     # @see #add_constraint.
     def add_property_constraint(property, constraint, sanity: false, **options)
-      add_constraint(constraint, property: property, sanity: sanity, **options)
+      add_constraint(constraint, property:, sanity:, **options)
     end
 
     protected

data/lib/stannum/contracts/array_contract.rb

@@ -75,12 +75,7 @@ module Stannum::Contracts
     # @param options [Hash<Symbol, Object>] Configuration options for the
     #   contract. Defaults to an empty Hash.
     def initialize(allow_extra_items: false, item_type: nil, **options, &block)
-      super(
-        allow_extra_items: allow_extra_items,
-        item_type:         item_type,
-        **options,
-        &block
-      )
+      super
     end
 
     # @return [Stannum::Constraints::Base, nil] the expected type for the items
@@ -100,7 +95,7 @@ module Stannum::Contracts
 
     def add_type_constraint
       add_constraint(
-        Stannum::Constraints::Types::ArrayType.new(item_type: item_type),
+        Stannum::Constraints::Types::ArrayType.new(item_type:),
         sanity: true
       )
     end

data/lib/stannum/contracts/base.rb

@@ -104,13 +104,13 @@ module Stannum::Contracts
 
     # @param options [Hash<Symbol, Object>] Configuration options for the
     #   contract. Defaults to an empty Hash.
-    def initialize(**options, &block)
+    def initialize(**options, &)
       @constraints  = []
       @concatenated = []
 
       super(**options)
 
-      define_constraints(&block)
+      define_constraints(&)
     end
 
     # Performs an equality comparison.
@@ -141,9 +141,9 @@ module Stannum::Contracts
       validate_constraint(constraint)
 
       @constraints << Stannum::Contracts::Definition.new(
-        constraint: constraint,
+        constraint:,
         contract:   self,
-        options:    options.merge(sanity: sanity)
+        options:    options.merge(sanity:)
       )
 
       self
@@ -216,7 +216,7 @@ module Stannum::Contracts
     # @see #each_pair
     # @see #matches?
     # @see #negated_match
-    def does_not_match?(actual)
+    def does_not_match?(actual) # rubocop:disable Naming/PredicatePrefix
       each_pair(actual) do |definition, value|
         if definition.contract.match_negated_constraint(definition, value)
           next unless definition.sanity?
@@ -355,7 +355,7 @@ module Stannum::Contracts
     #
     # @param actual [Object] The object to match.
     #
-    # @return [<Array(Boolean, Stannum::Errors)>] the status (true or false) and
+    # @return [Array<Boolean, Stannum::Errors>] the status (true or false) and
     #   the generated errors object.
     #
     # @see #each_pair
@@ -459,7 +459,7 @@ module Stannum::Contracts
     #
     # @param actual [Object] The object to match.
     #
-    # @return [<Array(Boolean, Stannum::Errors)>] the status (true or false) and
+    # @return [Array<Boolean, Stannum::Errors>] the status (true or false) and
     #   the generated errors object.
     #
     # @see #does_not_match?
@@ -518,7 +518,7 @@ module Stannum::Contracts
       self
     end
 
-    def each_unscoped_constraint(&block)
+    def each_unscoped_constraint(&)
       return enum_for(:each_unscoped_constraint) unless block_given?
 
       each_concatenated_contract do |contract|
@@ -527,14 +527,14 @@ module Stannum::Contracts
         end
       end
 
-      @constraints.each(&block)
+      @constraints.each(&)
     end
 
-    def match_constraint(definition, value)
+    def match_constraint(definition, value) # rubocop:disable Naming/PredicateMethod
       definition.constraint.matches?(value)
     end
 
-    def match_negated_constraint(definition, value)
+    def match_negated_constraint(definition, value) # rubocop:disable Naming/PredicateMethod
       definition.constraint.does_not_match?(value)
     end
 
@@ -548,14 +548,14 @@ module Stannum::Contracts
 
     private
 
-    def define_constraints(&block)
-      self.class::Builder.new(self).instance_exec(&block) if block_given?
+    def define_constraints(&)
+      self.class::Builder.new(self).instance_exec(&) if block_given?
     end
 
-    def each_concatenated_contract(&block)
+    def each_concatenated_contract(&)
       return enum_for(:each_concatenated_contract) unless block_given?
 
-      @concatenated.each(&block)
+      @concatenated.each(&)
     end
 
     def equal_definitions?(other) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity

data/lib/stannum/contracts/builder.rb

@@ -47,8 +47,8 @@ module Stannum::Contracts
     #     matching object.
     #   @option options type [String] The error type generated for a
     #     non-matching object.
-    def constraint(constraint = nil, **options, &block)
-      constraint = resolve_constraint(constraint, **options, &block)
+    def constraint(constraint = nil, **options, &)
+      constraint = resolve_constraint(constraint, **options, &)
 
       contract.add_constraint(constraint, **options)
 

data/lib/stannum/contracts/hash_contract.rb

@@ -100,13 +100,7 @@ module Stannum::Contracts
       **options,
       &block
     )
-      super(
-        allow_extra_keys: allow_extra_keys,
-        key_type:         key_type,
-        value_type:       value_type,
-        **options,
-        &block
-      )
+      super
     end
 
     # @return [Stannum::Constraints::Base, Class, nil] the expected type for the
@@ -140,8 +134,8 @@ module Stannum::Contracts
     def add_type_constraint
       add_constraint(
         Stannum::Constraints::Types::HashType.new(
-          key_type:   key_type,
-          value_type: value_type
+          key_type:,
+          value_type:
         ),
         sanity: true
       )

data/lib/stannum/contracts/indifferent_hash_contract.rb

@@ -52,9 +52,9 @@ module Stannum::Contracts
       &block
     )
       super(
-        allow_extra_keys: allow_extra_keys,
+        allow_extra_keys:,
         key_type:         Stannum::Constraints::Hashes::IndifferentKey.new,
-        value_type:       value_type,
+        value_type:,
         **options,
         &block
       )

data/lib/stannum/contracts/map_contract.rb

@@ -87,13 +87,13 @@ module Stannum::Contracts
       # @overload key(**options) { |value| }
       #   Creates a new Stannum::Constraint object with the given block, and
       #   adds that constraint to the contract for the value at the given key.
-      def key(property, constraint = nil, **options, &block)
+      def key(property, constraint = nil, **options, &)
         self.constraint(
           constraint,
-          property:      property,
+          property:,
           property_type: :key,
           **options,
-          &block
+          &
         )
       end
     end
@@ -107,11 +107,7 @@ module Stannum::Contracts
       **options,
       &block
     )
-      super(
-        allow_extra_keys: allow_extra_keys,
-        **options,
-        &block
-      )
+      super
     end
 
     # Adds a key constraint to the contract.
@@ -136,7 +132,7 @@ module Stannum::Contracts
         constraint,
         property:      key,
         property_type: :key,
-        sanity:        sanity,
+        sanity:,
         **options
       )
     end
@@ -188,7 +184,7 @@ module Stannum::Contracts
       add_constraint Stannum::Constraints::Signatures::Map.new, sanity: true
     end
 
-    def define_constraints(&block)
+    def define_constraints(&)
       add_type_constraint
 
       add_extra_keys_constraint

data/lib/stannum/contracts/parameters/arguments_contract.rb

@@ -103,7 +103,7 @@ module Stannum::Contracts::Parameters
       type       = coerce_item_type(item_type)
       constraint = Stannum::Constraints::Types::ArrayType.new(item_type: type)
 
-      set_variadic_constraint(constraint, as: as)
+      set_variadic_constraint(constraint, as:)
     end
 
     protected

data/lib/stannum/contracts/parameters/keywords_contract.rb

@@ -105,7 +105,7 @@ module Stannum::Contracts::Parameters
         value_type: type
       )
 
-      set_variadic_constraint(constraint, as: as)
+      set_variadic_constraint(constraint, as:)
     end
 
     protected

data/lib/stannum/contracts/parameters/signature_contract.rb

@@ -13,7 +13,7 @@ module Stannum::Contracts::Parameters
 
     private
 
-    def define_constraints(&block)
+    def define_constraints(&)
       super
 
       add_key_constraint :arguments,

data/lib/stannum/contracts/parameters_contract.rb

@@ -320,8 +320,8 @@ module Stannum::Contracts
       #     constraint, otherwise false.
       #
       #   @return [Stannum::Contracts::ParametersContract::Builder] the builder.
-      def keyword(name, type = nil, **options, &block)
-        type = resolve_constraint_or_type(type, **options, &block)
+      def keyword(name, type = nil, **options, &)
+        type = resolve_constraint_or_type(type, **options, &)
 
         contract.add_keyword_constraint(
           name,
@@ -515,8 +515,8 @@ module Stannum::Contracts
       end
     end
 
-    def define_constraints(&block)
-      super(&block)
+    def define_constraints(&)
+      super
 
       add_key_constraint :arguments, arguments_contract
       add_key_constraint :keywords,  keywords_contract

data/lib/stannum/contracts/tuple_contract.rb

@@ -99,7 +99,7 @@ module Stannum::Contracts
       #
       #   @param options [Hash<Symbol, Object>] Options for the constraint.
       #   @yieldparam value [Object] The value of the property when called.
-      def item(constraint = nil, **options, &block)
+      def item(constraint = nil, **options, &)
         index = (@current_index += 1)
 
         self.constraint(
@@ -107,7 +107,7 @@ module Stannum::Contracts
           property:      index,
           property_type: :index,
           **options,
-          &block
+          &
         )
       end
     end
@@ -117,7 +117,7 @@ module Stannum::Contracts
     # @param options [Hash<Symbol, Object>] Configuration options for the
     #   contract. Defaults to an empty Hash.
     def initialize(allow_extra_items: false, **options, &block)
-      super(allow_extra_items: allow_extra_items, **options, &block)
+      super
     end
 
     # Adds an index constraint to the contract.
@@ -142,7 +142,7 @@ module Stannum::Contracts
         constraint,
         property:      index,
         property_type: :index,
-        sanity:        sanity,
+        sanity:,
         **options
       )
     end
@@ -202,7 +202,7 @@ module Stannum::Contracts
       add_constraint Stannum::Constraints::Signatures::Tuple.new, sanity: true
     end
 
-    def define_constraints(&block)
+    def define_constraints(&)
       add_type_constraint
 
       add_extra_items_constraint