neo-dci 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a31f06c10ef1e97208d2c4bbf7163e690f2be3f
-  data.tar.gz: acfe255c359dfa646ef99365f80f0aa2c26ab066
+SHA256:
+  metadata.gz: 4a0fd6e30874980cc150a48995e912165343d425fc24254e0f3f9b97e49fdf13
+  data.tar.gz: bfa3c369b56c93a5e4ecfc7c915e26f6c52655245e4d5ea979280e70279e4f71
 SHA512:
-  metadata.gz: 5a961be4cbde76216490bb8cde92067488c37a8e7077d9a5dbdb86453aaa901ae4777452ec3ea5f52e92bc55cec90f601d511536aad70daebcfdff59ee59030f
-  data.tar.gz: 947ff7242840641a59a7f8ea0641b10cb415e44536d1717aa094599362d89a5b8dc13f99a4beb79102592c575c546e926e691663b162465cfce782ee1a924609
+  metadata.gz: f53b2c7652fa22003c46c002d2ebd2b717d4290294017c3c73cd85b6accf1a2abcb122c6c68b8c29508f1178209d1432f2b95a2b4c509ffcb5e93fa42bd3d1b2
+  data.tar.gz: 2aca570d841b0898e41e7138048abf5e9fc3a36c961d11ff3213db1db7dd580c147426967330f10e8faa88395132fa6b0b5fb38968f304657419127bbb38c2e7

data/.travis.yml

@@ -3,15 +3,13 @@ sudo: false
 cache: bundler
 rvm:
   - ruby-head
-  - 2.3.1
-  - 2.2
-  - 2.1
+  - 2.7.0
+  - 2.6
+  - 2.5
   - jruby
   - jruby-head
-  - rbx-2
 matrix:
   allow_failures:
-    - rvm: rbx-2
     - rvm: jruby
     - rvm: jruby-head
     - rvm: ruby-head

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in neo-dci.gemspec
 gemspec
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  gem "codeclimate-test-reporter", :group => :test, :require => nil
-end

data/lib/neo/dci/context.rb

@@ -1,31 +1,33 @@
+require "ruby2_keywords"
+
 module Neo
   module DCI
     class Context
       class << self
         private :new
-      end
 
-      attr_accessor :callback
+        def callbacks(*args)
+          @callbacks ||= []
+          @callbacks = args unless args.empty?
+          @callbacks
+        end
 
-      def self.callbacks(*args)
-        @callbacks ||= []
-        @callbacks = args unless args.empty?
-        @callbacks
-      end
+        ruby2_keywords def call(*args, &block)
+          context = new(*args)
+          context.callback = result_class.new(*callbacks, &block)
+          context.call
+          raise NoCallbackCalled, callbacks unless context.callback.called?
+        rescue NotImplementedError
+          raise
+        end
 
-      def self.call(*args, &block)
-        context = new(*args)
-        context.callback = result_class.new(*callbacks, &block)
-        context.call
-        raise NoCallbackCalled, callbacks unless context.callback.called?
-      rescue NotImplementedError
-        raise
+        def result_class(klass = :reader)
+          @result_class = klass unless klass == :reader
+          defined?(@result_class) ? @result_class : ContextResult
+        end
       end
 
-      def self.result_class(klass = :reader)
-        @result_class = klass unless klass == :reader
-        defined?(@result_class) ? @result_class : ContextResult
-      end
+      attr_accessor :callback
 
       def call
         raise NotImplementedError
@@ -33,7 +35,7 @@ module Neo
 
       class NoCallbackCalled < StandardError
         def initialize(callbacks)
-          super("No callback called. Available callbacks: #{callbacks.join(', ')}")
+          super("No callback called. Available callbacks: #{callbacks.join(", ")}")
         end
       end
     end

data/lib/neo/dci/version.rb

@@ -1,5 +1,5 @@
 module Neo
   module DCI
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/lib/ruby2_keywords.rb

@@ -0,0 +1,24 @@
+# A compatible delegation that works on Ruby 2.6, 2.7 and Ruby 3:
+#
+#    ruby2_keywords def foo(*args, &block)
+#      target(*args, &block)
+#    end
+#
+# Ruby <= 2.6 does not handle the new delegation style correctly, so the old-style delegation
+# must be used.
+#
+# `ruby2_keywords` allows you to run the old style even in Ruby 2.7 and 3.0.
+#
+# More informations:
+# https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+#
+# Discussion about adding `ruby2_keywords` semantics by default in 2.7.1:
+# https://bugs.ruby-lang.org/issues/16463
+#
+#
+# We need to remove this method if we no longer support Ruby versions < 2.7.
+#
+module Kernel
+  def ruby2_keywords(*)
+  end if RUBY_VERSION < "2.7"
+end

data/neo-dci.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Neo::DCI::VERSION
 
-  gem.add_runtime_dependency 'on', '~> 0.3.3'
+  gem.add_runtime_dependency 'on', '~> 1.0.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rdoc'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'testem'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
 end

data/test/context_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require "helper"
 
 class ContextTest < NeoDCICase
   class TestContext < Neo::DCI::Context
@@ -17,7 +17,7 @@ class ContextTest < NeoDCICase
     assert_raises NotImplementedError do
       Class.new(Neo::DCI::Context) do
         callbacks :foo
-      end.call {}
+      end.call { }
     end
   end
 
@@ -41,7 +41,7 @@ class ContextTest < NeoDCICase
     end
 
     assert_equal true, block_called
-    assert_equal [ :foo, :bar ], result
+    assert_equal [:foo, :bar], result
   end
 
   test "ensure callback called" do
@@ -63,8 +63,8 @@ class ContextTest < NeoDCICase
     context1 = Class.new(TestContext) { callbacks :foo }
     context2 = Class.new(TestContext) { callbacks :bar }
 
-    assert_equal [ :foo ], context1.callbacks
-    assert_equal [ :bar ], context2.callbacks
+    assert_equal [:foo], context1.callbacks
+    assert_equal [:bar], context2.callbacks
   end
 
   test "define own context result class" do
@@ -99,4 +99,86 @@ class ContextTest < NeoDCICase
 
     assert_equal :ok, $success_callback_arg
   end
+
+  test "pass attributes and kwargs do context" do
+    context = Class.new(TestContext) do
+      callbacks :success
+
+      def initialize(attribute, kwarg:)
+        @attribute = attribute
+        @kwarg = kwarg
+      end
+
+      def call
+        callback.call :success, @attribute, @kwarg
+      end
+    end
+
+    context.call("attribute", kwarg: "kwarg") do |result|
+      result.on :success do |attr, kwarg|
+        assert_equal "attribute", attr
+        assert_equal "kwarg", kwarg
+      end
+    end
+  end
+
+  test "pass only attributes do context" do
+    context = Class.new(TestContext) do
+      callbacks :success
+
+      def initialize(attribute)
+        @attribute = attribute
+      end
+
+      def call
+        callback.call :success, @attribute
+      end
+    end
+
+    context.call("attribute") do |result|
+      result.on :success do |attr|
+        assert_equal "attribute", attr
+      end
+    end
+  end
+
+  test "pass hash as attribute do context" do
+    context = Class.new(TestContext) do
+      callbacks :success
+
+      def initialize(uid, attribute)
+        @attribute = attribute
+      end
+
+      def call
+        callback.call :success, @attribute
+      end
+    end
+
+    context.call("1", {}) do |result|
+      result.on :success do |attr|
+        assert_equal ({}), attr
+      end
+    end
+  end
+
+  test "pass only kwargs do context" do
+    context = Class.new(TestContext) do
+      callbacks :success
+
+      def initialize(kwarg:)
+        @kwarg = kwarg
+      end
+
+      def call
+        callback.call :success, @kwarg
+      end
+    end
+
+    context.call(kwarg: "kwarg") do |result|
+      result.on :success do |kwarg|
+        assert_equal "kwarg", kwarg
+      end
+    end
+  end
 end

data/test/helper.rb

@@ -1,9 +1,5 @@
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
-require 'simplecov' if ENV['COVERAGE']
+require "simplecov"
+SimpleCov.start
 
 require 'minitest/autorun'
 require 'testem'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo-dci
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Suschlik
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: 'on'
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Simple DCI
 email:
 - ps@neopoly.de
@@ -120,6 +134,7 @@ files:
 - lib/neo/dci/role.rb
 - lib/neo/dci/task_loader.rb
 - lib/neo/dci/version.rb
+- lib/ruby2_keywords.rb
 - lib/tasks/neo-dci_tasks.rake
 - lib/tasks/share/app/contexts/context.rb
 - lib/tasks/share/app/roles/role.rb
@@ -145,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Includes Data, Roles and Context.