invokable 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b107ca53f8d89104fa38152d27141d24ae62dbec10e8e313b1428b5e711f61e9
-  data.tar.gz: b17e3b4207c4262637a08975772063f8d99583c6ef472220e18598885c272860
+  metadata.gz: b1c89f44b80135945cce3300f6f9b8e5b1210282d8c3d10256c2593ccf281948
+  data.tar.gz: 2a0e9ce82c10b9f57b1767087d56b5d53a67bdfeb139e5a642fb071a9bc6a8e6
 SHA512:
-  metadata.gz: c036b555078552a8902b83ccb7800ce878c23844a3ac6c7586d510622a56ba9ef0e4da985773662d5a605566308bb1c835b28eb988b417cc5a42a1c92aa95464
-  data.tar.gz: 900fab835907e7a8af2f8284629361ed0fbe1db81e6d05d8a2a98152fc223e4a44de352eb1eba538a9e53d406e95d97bcf4ad82f133a96e91c282626999175a7
+  metadata.gz: 20d8a431d84d973709f122211c8e606d4ac43e162c54a7bdf8e7507873c0235dede63a8e73a69d296152b6020ebd93a3001be8c73916dee7a7cfbcc6c600b0df
+  data.tar.gz: c1df682d8c7eed2525d7a2eaadce3e5dedb8114b18d64df3f7e323995b7c30c31827d2c6f2da94738094c06614a74bf4309dc20a1d3a2e9b66152c6e265b7035

data/CHANGELOG.md

@@ -9,3 +9,11 @@
 ## 0.5.0
 
 - Added `Invokable::Command` and `Invokable::Core#arity`
+
+## 0.5.2
+
+- `Invokable::Command` deprecated in favor of `Invokable::Closure`.
+
+## 0.6.0
+
+- `Invokable::Closure` deprecated comparable behavior has been added to `Invokable` itself.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    invokable (0.5.2)
+    invokable (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -49,12 +49,13 @@ User.all.map(&data_for_user)
 ```ruby
 # command objects that enclose state, can be treated as automatically curried functions.
 require 'invokable'
-require 'invokable/closure'
 
 class TwitterPoster
-  include Invokable::Closure
+  include Invokable
 
-  enclose :model
+  def initialize(model)
+    @model = model
+  end
 
   def call(user)
     # do the dirt
@@ -66,16 +67,15 @@ end
 TwitterPoster.call(Model.find(1)) # => #<TwitterPoster ...>
 TwitterPoster.call(Model.find(1), current_user) # => #<TwitterStatus ...>
 
-# both the class and it's instances can be used any where Procs are.
+# both the class and it's instances can be used anywhere Procs are.
 
-Model.where(created_at: Date.today).map(&:TwitterPoster) # => [#<TwitterPoster ...>, ...]
+Model.where(created_at: Date.today).map(&TwitterPoster) # => [#<TwitterPoster ...>, ...]
 ```
 
 Use as much or a little as you need:
 
 ```ruby
 require 'invokable'         # loads Invokable module
-require 'invokable/closure' # loads Invokable::Closure module
 require 'invokable/hash'    # loads hash patch
 require 'invokable/array'   # loads array patch
 require 'invokable/set'     # loads set patch

data/lib/invokable.rb

@@ -12,5 +12,46 @@ module Invokable
   def self.included(base)
     base.include(Invokable::Core)
     base.include(Invokable::Compose)
+    base.extend(Invokable::Core)
+    base.extend(Invokable::Compose)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    # Return the "total" arity of the class (i.e. the arity of the initializer and the arity of the call method)
+    #
+    # @version 0.6.0
+    # @see https://ruby-doc.org/core-2.7.1/Proc.html#method-i-arity Proc#arity
+    # @see initializer_arity
+    #
+    # @return [Integer]
+    def arity
+      initializer_arity + instance_method(:call).arity
+    end
+
+    # Handle automatic currying--will accept either the initializer arity or the total arity of the class. If
+    # the initializer arity is used return a class instance. If the total arity is used instantiate the class
+    # and return the results of the `call` method.
+    #
+    # @version 0.6.0
+    # @see arity
+    # @see initializer_arity
+    def call(*args)
+      if args.length == initializer_arity
+        new(*args)
+      elsif args.length == arity
+        init_args = args.slice(0, initializer_arity)
+        call_args = args.slice(initializer_arity, args.length)
+        new(*init_args).call(*call_args)
+      else
+        raise ArgumentError, "wrong number of arguments (given #{args.length}, expected #{initializer_arity} or #{arity})"
+      end
+    end
+
+    private
+
+    def initializer_arity
+      instance_method(:initialize).arity
+    end
   end
 end

data/lib/invokable/closure.rb

@@ -4,6 +4,7 @@ module Invokable
   # @see https://ruby-doc.org/core-2.7.0/Proc.html#method-i-curry Proc#curry
   #
   # @version 0.5.2
+  # @deprecated These features are included in the Invokable by default now.
   module Closure
     def self.included(klass)
       klass.include(Invokable)
@@ -31,9 +32,7 @@ module Invokable
       #
       # @return [Integer]
       def initializer_arity
-        return @initializer_arity if @initializer_arity
-
-        @initializer ? @initializer.arity : 0
+        instance_method(:initialize).arity
       end
   
       # Handle automatic currying--will accept either the initializer arity or the total arity of the class. If

data/lib/invokable/command.rb

@@ -6,6 +6,7 @@ module Invokable
   # @see https://ruby-doc.org/core-2.7.0/Proc.html#method-i-curry Proc#curry
   #
   # @version 0.5.0
+  # @deprecated These features are included in the Invokable by default now.
   module Command
     def self.included(klass)
       klass.include(Invokable)

data/lib/invokable/version.rb

@@ -1,3 +1,3 @@
 module Invokable
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invokable
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Delon Newman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler