strict 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf58678470f8cc840c19af0f64ce47ea55abe7124779d1b37ebe10707708d41
-  data.tar.gz: 02fb60b1183ab1d5eb90c8438a2271512db588438e75f1f89958e67325788360
+  metadata.gz: ae43c882eaf20478716e5770eff835c3c9611b714f20ba98b23418969a40cb8f
+  data.tar.gz: b003e41e3b5efb4628e40c14dc84e4fdb64e8ab8c457a6299347d921ff4907bd
 SHA512:
-  metadata.gz: e333d0836e79b87dfe89fbdc88c915506609a815b1bfce94b4432f40cdf87696c94da52294d3410d11faa48de6c2197194f8be1216cc50ccce2fc9871ab543fc
-  data.tar.gz: 14c429b220b1a1c890f164daf50dbda22b86d85659abd1c4a8980abd90785d6c52efc7840af85a75740f2dd928c45861d1244061eb703f5e1461b4cabbe8c2f9
+  metadata.gz: c09fa26af6510b02c08c2cb7965f3ccb83703f0d5ca4c8a741516f09810e0069ed46bb69a6b5af0fec8effd105c6c0be49619a42c7ca5debacd5462391ebe9b4
+  data.tar.gz: 17d077e3ea3ed656a71ff3fed66c057c9f49468bcdbd66b3ea16c1d519a7a2ab2ff28973b4b98507035dce8367ebf5e7665772ced2eaec67e4cf300c6e69d320

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.1.2
+  TargetRubyVersion: 3.0.0
 
 Style/CaseEquality:
   Enabled: false

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.0

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    strict (1.1.0)
+    strict (1.3.0)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    debug (1.6.1)
+    debug (1.6.2)
       irb (>= 1.3.6)
       reline (>= 0.3.1)
     gem-release (2.2.2)
     io-console (0.5.11)
-    irb (1.4.1)
+    irb (1.4.2)
       reline (>= 0.3.0)
     json (2.6.2)
-    minitest (5.16.2)
+    minitest (5.16.3)
     minitest-spec-context (0.0.4)
     parallel (1.22.1)
     parser (3.1.2.1)
@@ -63,4 +63,4 @@ DEPENDENCIES
   strict!
 
 BUNDLED WITH
-   2.3.22
+   2.3.23

data/lib/strict/accessor/module.rb

@@ -12,11 +12,11 @@ module Strict
         @configuration = configuration
         const_set(Strict::Attributes::Class::CONSTANT, configuration)
         configuration.attributes.each do |attribute|
-          module_eval(
-            "def #{attribute.name} = #{attribute.instance_variable}", # def name = @instance_variable
-            __FILE__,
-            __LINE__ - 2
-          )
+          module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+            def #{attribute.name}            # def name
+              #{attribute.instance_variable} #   @instance_variable
+            end                              # end
+          RUBY
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
             def #{attribute.name}=(value)                                         # def name=(value)
@@ -28,7 +28,7 @@ module Strict
                 raise Strict::AssignmentError.new(                                #     raise Strict::AssignmentError.new(
                   assignable_class: self.class,                                   #       assignable_class: self.class,
                   invalid_attribute: attribute,                                   #       invalid_attribute: attribute,
-                  value:                                                          #       value:
+                  value: value                                                    #       value: value
                 )                                                                 #     )
               end                                                                 #   end
             end                                                                   # end

data/lib/strict/assignment_error.rb

@@ -5,7 +5,7 @@ module Strict
     attr_reader :invalid_attribute, :value
 
     def initialize(assignable_class:, invalid_attribute:, value:)
-      super(message_from(assignable_class:, invalid_attribute:, value:))
+      super(message_from(assignable_class: assignable_class, invalid_attribute: invalid_attribute, value: value))
 
       @invalid_attribute = invalid_attribute
       @value = value

data/lib/strict/attribute.rb

@@ -10,7 +10,12 @@ module Strict
           raise ArgumentError, "Only one of 'default', 'default_value', or 'default_generator' can be provided"
         end
 
-        new(name: name.to_sym, validator:, default_generator: make_default_generator(**defaults), coercer: coerce)
+        new(
+          name: name.to_sym,
+          validator: validator,
+          default_generator: make_default_generator(**defaults),
+          coercer: coerce
+        )
       end
 
       private

data/lib/strict/attributes/configuration.rb

@@ -12,7 +12,7 @@ module Strict
         attr_reader :attribute_name
 
         def initialize(attribute_name:)
-          super(message_from(attribute_name:))
+          super(message_from(attribute_name: attribute_name))
 
           @attribute_name = attribute_name
         end

data/lib/strict/attributes/dsl.rb

@@ -4,9 +4,9 @@ module Strict
   module Attributes
     class Dsl < BasicObject
       class << self
-        def run(&)
+        def run(&block)
           dsl = new
-          dsl.instance_eval(&)
+          dsl.instance_eval(&block)
           ::Strict::Attributes::Configuration.new(attributes: dsl.__strict_dsl_internal_attributes.values)
         end
       end

data/lib/strict/attributes/instance.rb

@@ -33,9 +33,9 @@ module Strict
 
         raise InitializationError.new(
           initializable_class: self.class,
-          remaining_attributes:,
-          invalid_attributes:,
-          missing_attributes:
+          remaining_attributes: remaining_attributes,
+          invalid_attributes: invalid_attributes,
+          missing_attributes: missing_attributes
         )
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity

data/lib/strict/implementation_does_not_conform_error.rb

@@ -4,8 +4,15 @@ module Strict
   class ImplementationDoesNotConformError < Error
     attr_reader :interface, :receiver, :missing_methods, :invalid_method_definitions
 
-    def initialize(interface:, receiver:, missing_methods:, invalid_method_definitions:)
-      super(message_from(interface:, receiver:, missing_methods:, invalid_method_definitions:))
+    def initialize(interface:, receiver:, missing_methods:, invalid_method_definitions:) # rubocop:disable Metrics/MethodLength
+      super(
+        message_from(
+          interface: interface,
+          receiver: receiver,
+          missing_methods: missing_methods,
+          invalid_method_definitions: invalid_method_definitions
+        )
+      )
 
       @interface = interface
       @receiver = receiver

data/lib/strict/initialization_error.rb

@@ -4,8 +4,15 @@ module Strict
   class InitializationError < Error
     attr_reader :remaining_attributes, :invalid_attributes, :missing_attributes
 
-    def initialize(initializable_class:, remaining_attributes:, invalid_attributes:, missing_attributes:)
-      super(message_from(initializable_class:, remaining_attributes:, invalid_attributes:, missing_attributes:))
+    def initialize(initializable_class:, remaining_attributes:, invalid_attributes:, missing_attributes:) # rubocop:disable Metrics/MethodLength
+      super(
+        message_from(
+          initializable_class: initializable_class,
+          remaining_attributes: remaining_attributes,
+          invalid_attributes: invalid_attributes,
+          missing_attributes: missing_attributes
+        )
+      )
 
       @remaining_attributes = remaining_attributes
       @invalid_attributes = invalid_attributes

data/lib/strict/interface.rb

@@ -7,13 +7,18 @@ module Strict
       mod.include(Interfaces::Instance)
     end
 
-    def expose(method_name, &)
-      sig = sig(&)
+    def coercer
+      Interfaces::Coercer.new(self)
+    end
+
+    def expose(method_name, &block)
+      sig = sig(&block)
       parameter_list = sig.parameters.map { |parameter| "#{parameter.name}:" }.join(", ")
+      argument_list = sig.parameters.map { |parameter| "#{parameter.name}: #{parameter.name}" }.join(", ")
 
       module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
         def #{method_name}(#{parameter_list}, &block)              # def method_name(one:, two:, three:, &block)
-          implementation.#{method_name}(#{parameter_list}, &block) #   implementation.method_name(one:, two:, three:, &block)
+          implementation.#{method_name}(#{argument_list}, &block)  #   implementation.method_name(one: one, two: two, three: three, &block)
         end                                                        # end
       RUBY
     end

data/lib/strict/interfaces/coercer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Strict
+  module Interfaces
+    class Coercer
+      attr_reader :interface_class
+
+      def initialize(interface_class)
+        @interface_class = interface_class
+      end
+
+      def call(value)
+        return value if value.nil? || value.instance_of?(interface_class)
+
+        interface_class.new(value)
+      end
+    end
+  end
+end

data/lib/strict/interfaces/instance.rb

@@ -41,8 +41,8 @@ module Strict
           raise Strict::ImplementationDoesNotConformError.new(
             interface: self.class,
             receiver: implementation,
-            missing_methods:,
-            invalid_method_definitions:
+            missing_methods: missing_methods,
+            invalid_method_definitions: invalid_method_definitions
           )
         end
 

data/lib/strict/method.rb

@@ -8,9 +8,9 @@ module Strict
       mod.singleton_class.extend(self)
     end
 
-    def sig(&)
+    def sig(&block)
       instance = singleton_class? ? self : singleton_class
-      instance.instance_variable_set(:@__strict_method_internal_last_sig_configuration, Methods::Dsl.run(&))
+      instance.instance_variable_set(:@__strict_method_internal_last_sig_configuration, Methods::Dsl.run(&block))
     end
 
     def strict_class_methods

data/lib/strict/method_call_error.rb

@@ -4,9 +4,15 @@ module Strict
   class MethodCallError < Error
     attr_reader :verifiable_method, :remaining_args, :remaining_kwargs, :invalid_parameters, :missing_parameters
 
-    def initialize(verifiable_method:, remaining_args:, remaining_kwargs:, invalid_parameters:, missing_parameters:)
+    def initialize(verifiable_method:, remaining_args:, remaining_kwargs:, invalid_parameters:, missing_parameters:) # rubocop:disable Metrics/MethodLength
       super(
-        message_from(verifiable_method:, remaining_args:, remaining_kwargs:, invalid_parameters:, missing_parameters:)
+        message_from(
+          verifiable_method: verifiable_method,
+          remaining_args: remaining_args,
+          remaining_kwargs: remaining_kwargs,
+          invalid_parameters: invalid_parameters,
+          missing_parameters: missing_parameters
+        )
       )
 
       @verifiable_method = verifiable_method

data/lib/strict/method_definition_error.rb

@@ -5,7 +5,13 @@ module Strict
     attr_reader :verifiable_method, :missing_parameters, :additional_parameters
 
     def initialize(verifiable_method:, missing_parameters:, additional_parameters:)
-      super(message_from(verifiable_method:, missing_parameters:, additional_parameters:))
+      super(
+        message_from(
+          verifiable_method: verifiable_method,
+          missing_parameters: missing_parameters,
+          additional_parameters: additional_parameters
+        )
+      )
 
       @verifiable_method = verifiable_method
       @missing_parameters = missing_parameters

data/lib/strict/method_return_error.rb

@@ -5,7 +5,7 @@ module Strict
     attr_reader :verifiable_method, :value
 
     def initialize(verifiable_method:, value:)
-      super(message_from(verifiable_method:, value:))
+      super(message_from(verifiable_method: verifiable_method, value: value))
 
       @verifiable_method = verifiable_method
       @value = value

data/lib/strict/methods/dsl.rb

@@ -4,9 +4,9 @@ module Strict
   module Methods
     class Dsl < BasicObject
       class << self
-        def run(&)
+        def run(&block)
           dsl = new
-          dsl.instance_eval(&)
+          dsl.instance_eval(&block)
           ::Strict::Methods::Configuration.new(
             parameters: dsl.__strict_dsl_internal_parameters.values,
             returns: dsl.__strict_dsl_internal_returns

data/lib/strict/methods/verifiable_method.rb

@@ -11,7 +11,7 @@ module Strict
         attr_reader :parameter_name
 
         def initialize(parameter_name:)
-          super(message_from(parameter_name:))
+          super(message_from(parameter_name: parameter_name))
 
           @parameter_name = parameter_name
         end
@@ -47,7 +47,11 @@ module Strict
 
         missing_parameters = expected_parameters - defined_parameters
         additional_parameters = defined_parameters - expected_parameters
-        raise Strict::MethodDefinitionError.new(verifiable_method: self, missing_parameters:, additional_parameters:)
+        raise Strict::MethodDefinitionError.new(
+          verifiable_method: self,
+          missing_parameters: missing_parameters,
+          additional_parameters: additional_parameters
+        )
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockLength
@@ -113,8 +117,8 @@ module Strict
             verifiable_method: self,
             remaining_args: args,
             remaining_kwargs: kwargs,
-            invalid_parameters:,
-            missing_parameters:
+            invalid_parameters: invalid_parameters,
+            missing_parameters: missing_parameters
           )
         end
       end
@@ -124,7 +128,7 @@ module Strict
         value = returns.coerce(value)
         return if returns.valid?(value)
 
-        raise Strict::MethodReturnError.new(verifiable_method: self, value:)
+        raise Strict::MethodReturnError.new(verifiable_method: self, value: value)
       end
 
       private

data/lib/strict/parameter.rb

@@ -10,7 +10,12 @@ module Strict
           raise ArgumentError, "Only one of 'default', 'default_value', or 'default_generator' can be provided"
         end
 
-        new(name: name.to_sym, validator:, default_generator: make_default_generator(**defaults), coercer: coerce)
+        new(
+          name: name.to_sym,
+          validator: validator,
+          default_generator: make_default_generator(**defaults),
+          coercer: coerce
+        )
       end
 
       private

data/lib/strict/return.rb

@@ -4,7 +4,7 @@ module Strict
   class Return
     class << self
       def make(validator = Validators::Anything.instance, coerce: false)
-        new(validator:, coercer: coerce)
+        new(validator: validator, coercer: coerce)
       end
     end
 

data/lib/strict/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strict
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

data/strict.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Strictly define a contract for your objects and methods"
   spec.homepage = "https://github.com/kylekthompson/strict"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1.2"
+  spec.required_ruby_version = ">= 3.0.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strict
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kyle Thompson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -169,6 +170,7 @@ files:
 - lib/strict/implementation_does_not_conform_error.rb
 - lib/strict/initialization_error.rb
 - lib/strict/interface.rb
+- lib/strict/interfaces/coercer.rb
 - lib/strict/interfaces/instance.rb
 - lib/strict/method.rb
 - lib/strict/method_call_error.rb
@@ -211,14 +213,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.2
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Strictly define a contract for your objects and methods