receptacle 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b12e62420e5bd820d909846002084c473572d8
-  data.tar.gz: 60385bc42c56b0770b22e7703232686fcc6a150f
+  metadata.gz: de42650ef4891b4f5cadb6a0ca4c357a8499b338
+  data.tar.gz: 9b266f6ed5637ae89aee2e5c9053ab0963015ca7
 SHA512:
-  metadata.gz: 24ea362cfb9be687030b24877c04895f5901bb29534ed6a7d86c611d2c41c901fb62d9e56563beed50e098a44726abcfb23b2231c904cb770e14b5c030af1688
-  data.tar.gz: 5532b99a99c6d49ca06c4f4e423ff2f9a4b75a092fe1775590a6b812967b0c7d056de0bbae5e0bc7a4270b8c9f1c53c66b10e69506a8eecf846bb88e77cac458
+  metadata.gz: 239ef17fba657fc3ccf5a87b01f840f8d6de7646bbee4daa3ca8e284c97137b7c348b7bc0069cd1e970df19062ccb13ff91b6922a02c6a763b434393b90e6187
+  data.tar.gz: d49b157c7427025e36aaf55ed1d0cbe878a6463723654b1de000c0272dfc72ecccaa61323b9907414a9b1811ee8ef9bfaa91c4dba345c6a2548440e0786112a4

data/.travis.yml

@@ -9,27 +9,28 @@ rvm:
 jdk:
   - oraclejdk8
 env:
-  - "JRUBY_OPTS='--dev'"
-  - "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
+  - "JRUBY_OPTS='--dev --debug'"
+  - "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
 matrix:
   exclude:
     - rvm: 2.1.10
       jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
     - rvm: 2.2.6
       jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
     - rvm: 2.3.3
       jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
     - rvm: 2.4.0
       jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
   allow_failures:
     - rvm: jruby-9.1.7.0
       jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true'"
-
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
 before_install:
   - gem update --system
   - gem install bundler -v 1.14.3
+before_script:
+  - bundle exec danger

data/CHANGELOG.md

@@ -4,20 +4,26 @@ Changelog
 master
 ---
 
+0.3.0
+---
+
+* add danger
+* also support higher arity methods (== method with more than one argument)
+
 0.2.0
 ---
 
-- update documentation
-- enable ruby 2.1+
+* update documentation
+* enable ruby 2.1+
 
 0.1.1
 ---
 
-- add changelog, update copyright
-- add test helper method `ensure_method_delegators` to make rspec stubs/mocks work as expected
+* add changelog, update copyright
+* add test helper method `ensure_method_delegators` to make rspec stubs/mocks work as expected
 
 0.1.0
 ---
 
-- initial release
+* initial release
 

data/Dangerfile

@@ -0,0 +1,26 @@
+# --------------------------------------------------------------------------------------------------------------------
+# Has any changes happened inside the actual library code?
+# --------------------------------------------------------------------------------------------------------------------
+has_app_changes = !git.modified_files.grep(/lib/).empty?
+has_test_changes = !git.modified_files.grep(/test/).empty?
+is_version_bump = git.modified_files.sort == ["CHANGELOG.md", "lib/receptacle/version.rb"].sort
+
+if has_app_changes && !has_test_changes && !is_version_bump
+  warn("Tests were not updated. That's OK if you're refactoring existing code.", sticky: false)
+end
+
+if !git.modified_files.include?("CHANGELOG.md") && has_app_changes
+  fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/andreaseger/receptacle/blob/master/CHANGELOG.md).")
+  message "Note, we hard-wrap at 80 chars and use 2 spaces after the last line."
+end
+
+# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
+warn("PR is classed as Work in Progress") if github.pr_title.include? "WIP"
+
+# Warn when there is a big PR
+warn("Big PR") if git.lines_of_code > 500
+
+commit_lint.check warn: :all, disable: [:subject_cap]
+
+# rubocop
+rubocop.lint "*"

data/Gemfile

@@ -2,3 +2,9 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development, :test do
+  gem 'danger'
+  gem 'danger-commit_lint'
+  gem 'danger-rubocop'
+end

data/Guardfile

@@ -19,7 +19,8 @@ group :red_green_refactor, halt_on_fail: true do
   guard :minitest do
     # with Minitest::Unit
     watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-    watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+    # watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+    watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { 'test' }
     watch(%r{^test/test_helper\.rb$})      { 'test' }
     watch(%r{^test/fixture\.rb$}) { 'test' }
   end

data/lib/receptacle/method_cache.rb

@@ -13,6 +13,8 @@ module Receptacle
     attr_reader :before_method_name
     # @return [Symbol] name of the after action method
     attr_reader :after_method_name
+    # @return [Integer] arity of strategy method according to https://ruby-doc.org/core-2.3.3/Method.html#method-i-arity
+    attr_reader :arity
 
     def initialize(method_name:, strategy:, before_wrappers:, after_wrappers:)
       @strategy = strategy
@@ -24,6 +26,7 @@ module Receptacle
       @wrappers = before_wrappers | after_wrappers
       @skip_before_wrappers = before_wrappers.empty?
       @skip_after_wrappers = after_wrappers.empty?
+      @arity = strategy.new.method(method_name).arity
     end
 
     # @return [Boolean] true if no before wrappers need to be applied for this method

data/lib/receptacle/method_delegation.rb

@@ -26,6 +26,8 @@ module Receptacle
       method_cache = __build_method_call_cache(method_name)
       if method_cache.wrappers.nil? || method_cache.wrappers.empty?
         __define_shortcut_method(method_cache)
+      elsif method_cache.arity.abs > 1
+        __define_full_method_high_arity(method_cache)
       else
         __define_full_method(method_cache)
       end
@@ -57,7 +59,7 @@ module Receptacle
       end
     end
 
-    # build method to mediate method calls to strategy with full wrapper support
+    # build method to mediate method calls of arity 1 to strategy with full wrapper support
     # @param method_cache [MethodCache] method_cache of the method to be build
     # @return [void]
     def __define_full_method(method_cache)
@@ -68,31 +70,49 @@ module Receptacle
       end
     end
 
+    # build method to mediate method calls of higher arity to strategy with full wrapper support
+    # @param method_cache [MethodCache] method_cache of the method to be build
+    # @return [void]
+    def __define_full_method_high_arity(method_cache)
+      define_singleton_method(method_cache.method_name) do |*args, &inner_block|
+        __run_wrappers(method_cache, args, true) do |*call_args|
+          method_cache.strategy.new.public_send(method_cache.method_name, *call_args, &inner_block)
+        end
+      end
+    end
+
     # runtime method to call before and after wrapper in correct order
     # @param method_cache [MethodCache] method_cache for the current method
     # @param input_args input parameter of the repository method call
+    # @param high_arity [Boolean] if are intended for a higher arity method
     # @return strategy method return value after all wrappers where applied
-    def __run_wrappers(method_cache, input_args)
+    def __run_wrappers(method_cache, input_args, high_arity = false)
       wrappers = method_cache.wrappers.map(&:new)
-      args = if method_cache.skip_before_wrappers?
-               input_args
-             else
-               __run_before_wrappers(wrappers, method_cache.before_method_name, input_args)
-             end
-      ret = yield(args)
+      args =
+        if method_cache.skip_before_wrappers?
+          input_args
+        else
+          __run_before_wrappers(wrappers, method_cache.before_method_name, input_args, high_arity)
+        end
+      ret = high_arity ? yield(*args) : yield(args)
       return ret if method_cache.skip_after_wrappers?
-      __run_after_wrappers(wrappers, method_cache.after_method_name, args, ret)
+      __run_after_wrappers(wrappers, method_cache.after_method_name, args, ret, high_arity)
     end
 
     # runtime method to execute all before wrappers
     # @param wrappers [Array] all wrapper instances to be executed
     # @param method_name [Symbol] name of method to be executed on wrappers
     # @param args input args of the repository method
+    # @param high_arity [Boolean] if are intended for a higher arity method
     # @return processed method args by before wrappers
-    def __run_before_wrappers(wrappers, method_name, args)
+    def __run_before_wrappers(wrappers, method_name, args, high_arity = false)
       wrappers.each do |wrapper|
         next unless wrapper.respond_to?(method_name)
-        args = wrapper.public_send(method_name, args)
+        args = if high_arity
+                 wrapper.public_send(method_name, *args)
+               else
+                 wrapper.public_send(method_name, args)
+               end
       end
       args
     end
@@ -102,11 +122,16 @@ module Receptacle
     # @param method_name [Symbol] name of method to be executed on wrappers
     # @param args input args to the strategy method (after processing in before wrappers)
     # @param return_value return value of strategy method
+    # @param high_arity [Boolean] if are intended for a higher arity method
     # @return processed return value by all after wrappers
-    def __run_after_wrappers(wrappers, method_name, args, return_value)
+    def __run_after_wrappers(wrappers, method_name, args, return_value, high_arity = false)
       wrappers.reverse_each do |wrapper|
         next unless wrapper.respond_to?(method_name)
-        return_value = wrapper.public_send(method_name, return_value, args)
+        return_value = if high_arity
+                         wrapper.public_send(method_name, return_value, *args)
+                       else
+                         wrapper.public_send(method_name, return_value, args)
+                       end
       end
       return_value
     end

data/lib/receptacle/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Receptacle
-  VERSION = "0.2.0".freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: receptacle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andreas Eger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,6 +177,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt