mandate 0.3.0 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 941eb8ffe29c4078c8137e331db4b798e856f3bb746b6a988a835c5010d5a5c7
-  data.tar.gz: 34ce742d20c88fb3cecde1f624268f47192113f17be3606ad42bff6d90c4b04b
+  metadata.gz: b09d224e7ec0f4d9b2f7c3b4e15a87a2f28afb4447391172b8cb7c400d9d3a1f
+  data.tar.gz: bf5866603824cb3ee5702476c04759bee58a263606265642dacd92f7b89f5abe
 SHA512:
-  metadata.gz: 56b303c59f85575ad40b296682db47a97969631fd0611b2f536b665ad388981d218d5ca06c0ba5dfe2f8d25016bd57c1e8ed74ab889d32f6ab41d9d28b15db7b
-  data.tar.gz: e4d0917116cfb2a5dd346ded9db25c3f2ba5367913c9f9595dcea08bf3bff5e15fb85a1b8b74575886a8d2e2690c056f1795bf74e9a9de9f534265d7c0475d91
+  metadata.gz: f71376313ee4ebe4409a16a1b2bfe394a6b7c847e6ca3c93e633614f36adc8a7845cf8a0191365e03da77c65e3a7c413e93e771d5e811d1ef4b6c3e0657db866
+  data.tar.gz: c1f28ac5099779f02b1d57712d9dabd27df43be73ba1bd7032ff1d2d1098683f3170da39abf1ea07030f54948f77dae914958880cacc8cd508fb91c6f6a05a1d

data/lib/mandate/call_injector.rb

@@ -7,7 +7,15 @@ module Mandate
       #   Foobar.new(some, args).call()
       class << base
         def call(*args)
-          new(*args).call
+          # If the last argument is a hash and the last param is a keyword params (signified by 
+          # its type being :key, the we should pass the hash in in using the **kwords syntax.
+          # This fixes a deprecation issue in Ruby 2.7.
+          if args.last.is_a?(Hash) && 
+            :key == instance_method(:initialize).parameters.last&.first
+            new(*args[0..-2], **args[-1]).call
+          else
+            new(*args).call
+          end
         end
       end
     end

data/lib/mandate/callbacks.rb

@@ -71,20 +71,21 @@ module Mandate
         @__mandate_results
       end
 
-      private
-
       base.send(:define_method, :add_error!) do |error|
         @__mandate_results.add_error(error)
       end
+      base.send(:private, :add_error!)
 
       base.send(:define_method, :abort!) do |error = nil|
         add_error!(error) if error
         raise AbortError
       end
+      base.send(:private, :abort!)
 
       base.send(:define_method, :abort_if_errored!) do
         raise AbortError if @__mandate_results.errors.size > 0
       end
+      base.send(:private, :abort_if_errored!)
     end
   end
 end

data/lib/mandate/initializer_injector.rb

@@ -2,14 +2,34 @@ module Mandate
   module InitializerInjector
     def self.extended(base)
       class << base
-        def initialize_with(*attrs)
-          define_method :initialize do |*args|
-            unless args.length == attrs.length
-              raise ArgumentError.new("Wrong number of arguments (given #{args.length}, expected #{attrs.length})")
+        def initialize_with(*attrs, **kwattrs)
+          if kwattrs.empty?
+            define_method :initialize do |*args|
+              unless args.length == attrs.length
+                raise ArgumentError.new("wrong number of arguments (given #{args.length}, expected #{attrs.length})")
+              end
+
+              attrs.zip(args).each do |attr,arg|
+                instance_variable_set("@#{attr}", arg)
+              end
             end
+          else
+            define_method :initialize do |*args, **kwargs|
+              unless args.length == attrs.length
+                raise ArgumentError.new("wrong number of arguments (given #{args.length}, expected #{attrs.length})")
+              end
+
+              attrs.zip(args).each do |attr,arg|
+                instance_variable_set("@#{attr}", arg)
+              end
 
-            attrs.zip(args).each do |attr,arg|
-              instance_variable_set("@#{attr}", arg)
+              kwargs.each do |name,value|
+                if kwattrs.keys.include?(name)
+                  instance_variable_set("@#{name}", value)
+                else
+                  raise ArgumentError.new("unknown keyword: #{name}")
+                end
+              end
             end
           end
 
@@ -17,10 +37,19 @@ module Mandate
             define_method attr do instance_variable_get("@#{attr}") end
             private attr
           end
+
+          kwattrs.each do |attr,default|
+            define_method attr do
+              if instance_variable_defined?("@#{attr}")
+                instance_variable_get("@#{attr}")
+              else
+                default
+              end
+            end
+            private attr
+          end
         end
       end
     end
   end
 end
-
-

data/lib/mandate/version.rb

@@ -1,3 +1,3 @@
 module Mandate
-  VERSION = "0.3.0"
+  VERSION = "0.4.0.beta.1"
 end

data/mandate.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.beta.1
 platform: ruby
 authors:
 - Jeremy Walker
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ homepage: https://github.com/iHiD/mandate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,12 +91,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A simple command-pattern helper gem for Ruby
 test_files: []