invokable 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6115c057fbcfffd52d6037a190e9a36b23018f1c2b0745b2b9c7bb333cb86c
-  data.tar.gz: 4ebd7bdb25bdfbde7a762d333b9215f8e13909091fab11c1f048f52447e19b3c
+  metadata.gz: 18c3cf809df359e8e89d764f5111d97b33ce63802d5e4ee1c01be83eed583d5c
+  data.tar.gz: b431129c01229cdac6751df4e5d03a756f0852ca9aa6e78cae7e2ff7d7caf36d
 SHA512:
-  metadata.gz: 0d021ad9461294d8ee384d2302d25012b148e614c0deab1025d77da3a53355bbe62d326d9f29f15ed0685113523a577b13eef7a4d30ab81e323efaa59cecfb0a
-  data.tar.gz: 5469ed8b60c2d81cc89ad7f0a6debabf76b4f55e944f110365c2ed41db25379833f970acc288426ce61b123fffb6f3964cacc2d7ccc4689f9b7d3011b1654c02
+  metadata.gz: 56d344edf79caf64a9dec52fba375b2455c889e097dbf5be2fdf074c2ac4ee0eaf3f882e4bf55f638cb47b3de1cc00b57e56cf47910731dea825be8042d1c074
+  data.tar.gz: 465820b6b31e9a99046098fd51ccc6eccc341e9aac0ef2595faca93abde00b6c9de5452fb54b5016b351eb73455c58ecdae8ed84dbb4505c5bb25345fa5e0046

data/.github/workflows/ruby.yml

@@ -1,20 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
 name: Ruby
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
-  build:
+  test:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
       with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+ - 2.4
+ - 2.5
+ - 2.6
+ - 2.7
+ - 3.0
+ - jruby

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.0.0
+
+- More robust testing
+- Better error handling
+- Keyword argument support
+
 ## 0.7.2
 
 Variable arity invoker methods are handled properly. Variable arity initializers will result in a more meaningful exception being raised.

data/Gemfile

@@ -1,15 +1,7 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in data-functions.gemspec
 gemspec
 
 group :development do
-  gem 'pry'
   gem 'yard'
 end
-
-group :test do
-  gem 'gen-test'
-end

data/Gemfile.lock

@@ -1,53 +1,38 @@
 PATH
   remote: .
   specs:
-    invokable (0.7.2)
+    invokable (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    faker (1.9.6)
-      i18n (>= 0.7)
-    gen-test (0.1.1)
-      faker (~> 1.9.6)
-      regexp-examples (~> 1.5.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    diff-lcs (1.4.4)
     rake (13.0.1)
-    regexp-examples (1.5.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    yard (0.9.24)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    yard (0.9.25)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  gen-test
+  bundler (~> 2.1)
   invokable!
-  pry
   rake (~> 13.0)
   rspec (~> 3.0)
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.2.6

data/README.md

@@ -162,6 +162,10 @@ Or install it yourself as:
   - [Clojure](https://clojure.org)
   - [Arc](http://www.arclanguage.org)
 
+## Support
+
+Tested using MRI 2.4, 2.5, 2.6, 2.7, 3.0 and JRuby
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/invokable.gemspec

@@ -36,7 +36,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.17"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/invokable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'invokable/version'
 require 'invokable/core'
 require 'invokable/helpers'
@@ -39,6 +41,7 @@ module Invokable
   private
 
   INCLUDED_MODULES = [Core, Helpers].freeze
+  private_constant :INCLUDED_MODULES
 
   # The methods that are mixed into any class at the class level that includes {Invokable}.
   #
@@ -62,19 +65,30 @@ module Invokable
     # @version 0.6.0
     #
     # @see arity
-    def call(*args)
-      raise ArgumentError, "variable length initializer methods are not supported by Invokable" if initializer_arity < 0
-
-      return new.call        if arity.zero?
-      return new(*args).call if args.length == initializer_arity && (invoker_arity.zero? || invoker_arity == -1)
-      return new(*args)      if args.length == initializer_arity
+    def call(*args, **kwargs)
+      initializer = initializer_arity
+      raise ArgumentError, "variable length initializer methods are not supported by Invokable try using `new' or `curry' instead" if initializer < 0
+      raise ArgumentError, "block arguments are not supported by Invokable" if block_given?
+      
+      return new.call if arity.zero?
+  
+      argc    = kwargs.empty? ? args.length : args.length + 1
+      invoker = invoker_arity
+      return new(*args).call           if argc == initializer && invoker.zero? && kwargs.empty?
+      return new(*args, **kwargs).call if argc == initializer && invoker.zero?
+      return new(*args).call           if argc == initializer && invoker == -1 && kwargs.empty?
+      return new(*args).call(**kwargs) if argc == initializer && invoker == -1
+      return new(*args)                if argc == initializer && kwargs.empty?
+      return new(*args, **kwargs)      if argc == initializer
 
-      if args.length == arity || invoker_arity < 0 && (args.length - initializer_arity) >= (invoker_arity.abs - 1)
-        init_args = args.slice(0, initializer_arity)
-        call_args = args.slice(initializer_arity, args.length)
-        new(*init_args).call(*call_args)
+      if argc == arity || invoker_arity < 0 && (args.length - initializer) >= (invoker.abs - 1)
+        init_args = args.slice(0, initializer)
+        call_args = args.slice(initializer, args.length)
+        return new(*init_args).call(*call_args) if kwargs.empty?
+        return new(*init_args).call(*call_args, **kwargs)
       else
-        raise ArgumentError, "wrong number of arguments (given #{args.length}, expected #{initializer_arity} or #{arity})"
+        raise ArgumentError, "wrong number of arguments (given #{args.length}, expected #{arity})" if initializer == arity
+        raise ArgumentError, "wrong number of arguments (given #{args.length}, expected #{initializer} or #{arity})"
       end
     end
 

data/lib/invokable/version.rb

@@ -1,3 +1,3 @@
 module Invokable
-  VERSION = "0.7.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invokable
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Delon Newman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Objects are functions! Treat any Object, Hashes, Arrays and Sets as Procs