u-case 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b6d430bc2e38d5c9e26b06ad06dc506e24616acc19cc788c6fefbdec4e8060
-  data.tar.gz: 1deb14177315c48126e01c52c24a8aea1371de5d09f6d442ce3c257971bb0fe3
+  metadata.gz: e548c5eca296db7c02caeba9bd5a05962959f68dd4a7024518c3ec00c1349cc7
+  data.tar.gz: c02d785e60c995a6f088df9ff1b33e16c73deaa4a3c4c727410140eb198b1a7b
 SHA512:
-  metadata.gz: fe8e553554fa2f664869ad481e545a12ba231027877de8099d074e64b57ac18a5573559772a34049ccbb1389054cf285a35e5bf53479cb583297fc673746645b
-  data.tar.gz: 492b4489377c918a5347ff205edd5babb3bb9ca6c8df7efb6fb2244626a2025d895b44a39e3ecd97c6a8fa01aa145f4d49948bc43f07958293188a0226598e61
+  metadata.gz: b1319dcfd0e2139a21b7d38831d0920a17a8fa4fbe0824f19e6f2245e007dbd7546b49e2aad70bded0c118f502e80e303ce69fee36ea10ada746ee71ffa8f021
+  data.tar.gz: 9ba626fd38078d07179f1b7e261a4a26bb0a8eee565b2a5a013b50778206c4bbfcb34cf34231df1dc3c3b99c994745e23a78dc64d1c37c7ad444cf5725645906

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+
+name: build
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 3.0, 3.1]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test and generate coverage
+        run: bin/test
+      - name: Format coverage
+        if: ${{ matrix.ruby >= 3 }}
+        run: bin/prepare_coverage
+      - uses: paambaati/codeclimate-action@v2.7.5
+        if: ${{ matrix.ruby >= 3 }}
+        env:
+          CC_TEST_REPORTER_ID: 0377ece62be9c7042557d76e4e38b867e51c51b2a42d10ef5102b613ac077eab
+        with:
+          debug: true
+          coverageLocations: coverage/.resultset.json:simplecov

data/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "cSpell.enabled": true,
+  "cSpell.ignoreWords": [
+    "paambaati",
+    "resultset",
+    "simplecov"
+  ]
+}

data/Gemfile

@@ -4,23 +4,24 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 activerecord_version = ENV.fetch('ACTIVERECORD_VERSION', '7')
 
-activerecord = case activerecord_version
-              when '3.2' then '3.2.22'
-              when '4.0' then '4.0.13'
-              when '4.1' then '4.1.16'
-              when '4.2' then '4.2.11'
-              when '5.0' then '5.0.7'
-              when '5.1' then '5.1.7'
-              when '5.2' then '5.2.4'
-              when '6.0' then '6.0.3.4'
-              when '6.1' then '6.1.2'
-              end
+activerecord =
+  case activerecord_version
+  when '3.2' then '3.2.22'
+  when '4.0' then '4.0.13'
+  when '4.1' then '4.1.16'
+  when '4.2' then '4.2.11'
+  when '5.0' then '5.0.7'
+  when '5.1' then '5.1.7'
+  when '5.2' then '5.2.4'
+  when '6.0' then '6.0.3.4'
+  when '6.1' then '6.1.2'
+  end
 
 simplecov_version =
   case RUBY_VERSION
   when /\A2.[23]/ then '~> 0.17.1'
   when /\A2.4/ then '~> 0.18.5'
-  else '~> 0.19'
+  else '~> 0.21.2'
   end
 
 group :test do

data/README.md

@@ -12,8 +12,8 @@
     <img alt="Gem" src="https://img.shields.io/gem/v/u-case.svg?style=flat-square">
   </a>
 
-  <a href="https://travis-ci.com/serradura/u-case">
-    <img alt="Build Status" src="https://travis-ci.com/serradura/u-case.svg?branch=main">
+  <a href="https://github.com/serradura/u-case/actions/workflows/ci.yml">
+    <img alt="Build Status" src="https://github.com/serradura/u-case/actions/workflows/ci.yml/badge.svg">
   </a>
 
   <a href="https://codeclimate.com/github/serradura/u-case/maintainability">

data/README.pt-BR.md

@@ -12,8 +12,8 @@
     <img alt="Gem" src="https://img.shields.io/gem/v/u-case.svg?style=flat-square">
   </a>
 
-  <a href="https://travis-ci.com/serradura/u-case">
-    <img alt="Build Status" src="https://travis-ci.com/serradura/u-case.svg?branch=main">
+  <a href="https://github.com/serradura/u-case/actions/workflows/ci.yml">
+    <img alt="Build Status" src="https://github.com/serradura/u-case/actions/workflows/ci.yml/badge.svg">
   </a>
 
   <a href="https://codeclimate.com/github/serradura/u-case/maintainability">

data/bin/prepare_coverage

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+# Borrowed from https://gist.github.com/qortex/7e7c49f3731391a91ee898336183acef
+
+# Temporary hack to get CodeClimate to work with SimpleCov 0.18 JSON format until issue is fixed
+# upstream: https://github.com/codeclimate/test-reporter/issues/413
+
+require "json"
+
+filename = "coverage/.resultset.json"
+contents = JSON.parse(File.read(filename))
+
+def remove_lines_key(obj)
+  case obj
+  when Hash
+    obj.transform_values do |val|
+      val.is_a?(Hash) && val.key?("lines") ? val["lines"] : remove_lines_key(val)
+    end
+  else
+    obj
+  end
+end
+
+# overwrite
+File.write(filename, JSON.generate(remove_lines_key(contents)))
+
+puts Dir['coverage/.*.json']

data/bin/test

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -e
+
+RUBY_V=$(ruby -v)
+
+function reset_gemfile_and_test {
+  rm Gemfile.lock
+
+  eval "$1 bundle update"
+  eval "$1 ENABLE_TRANSITIONS=true bundle exec rake test"
+  eval "$1 ENABLE_TRANSITIONS=false bundle exec rake test"
+}
+
+function test_with_activerecord {
+  reset_gemfile_and_test "ACTIVERECORD_VERSION=$1"
+}
+
+RUBY_2_2345="ruby 2.[2345]."
+RUBY_2_234="ruby 2.[234]."
+RUBY_2_567="ruby 2.[567]."
+RUBY_2_23="ruby 2.[23]."
+RUBY_2_2="ruby 2.2."
+RUBY_3_01="ruby 3.[01]."
+
+if [[ $RUBY_V =~ $RUBY_2_2345 ]]; then
+  if [[ $RUBY_V =~ $RUBY_2_234 ]]; then
+    reset_gemfile_and_test
+  fi
+
+  if [[ $RUBY_V =~ $RUBY_2_2 ]]; then
+    test_with_activerecord "3.2"
+  fi
+
+  if [[ $RUBY_V =~ $RUBY_2_23 ]]; then
+    test_with_activerecord "4.0"
+    test_with_activerecord "4.1"
+    test_with_activerecord "4.2"
+  fi
+
+  test_with_activerecord "5.0"
+  test_with_activerecord "5.1"
+  test_with_activerecord "5.2"
+fi
+
+if [[ $RUBY_V =~ $RUBY_2_567 ]] || [[ $RUBY_V =~ $RUBY_3_01 ]]; then
+  gem install bundler -v ">= 2" --no-doc
+
+  reset_gemfile_and_test
+
+  test_with_activerecord "6.0"
+  test_with_activerecord "6.1"
+fi

data/lib/micro/case/utils.rb

@@ -3,12 +3,12 @@
 module Micro::Case::Utils
 
   module Hashes
-    def self.respond_to?(hash, method)
+    def self.hash_respond_to?(hash, method)
       Kind::Hash[hash].respond_to?(method)
     end
 
     def self.symbolize_keys(hash)
-      return hash.transform_keys { |key| key.to_sym rescue key } if respond_to?(hash, :transform_keys)
+      return hash.transform_keys { |key| key.to_sym rescue key } if hash_respond_to?(hash, :transform_keys)
 
       hash.each_with_object({}) do |(k, v), memo|
         key = k.to_sym rescue k
@@ -17,13 +17,13 @@ module Micro::Case::Utils
     end
 
     def self.stringify_keys(hash)
-      return hash.transform_keys(&:to_s) if respond_to?(hash, :transform_keys)
+      return hash.transform_keys(&:to_s) if hash_respond_to?(hash, :transform_keys)
 
       hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
     end
 
     def self.slice(hash, keys)
-      return hash.slice(*keys) if respond_to?(hash, :slice)
+      return hash.slice(*keys) if hash_respond_to?(hash, :slice)
 
       hash.select { |key, _value| keys.include?(key) }
     end

data/lib/micro/case/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   class Case
-    VERSION = '4.5.1'.freeze
+    VERSION = '4.5.2'.freeze
   end
 end

data/lib/micro/case.rb

@@ -117,7 +117,7 @@ module Micro
     def self.__call__!
       return const_get(FLOW_STEP) if const_defined?(FLOW_STEP, false)
 
-      class_eval("class #{FLOW_STEP} < #{self.name}; private def __call; __call_use_case; end; end")
+      class_eval("class #{FLOW_STEP} < #{self.name}; private def __call; __call_use_case; end; end; #{FLOW_STEP}")
     end
 
     private_class_method def self.__flow_use_cases

data/lib/micro/cases/map.rb

@@ -21,9 +21,11 @@ module Micro
 
       GetUseCaseResult = -> (hash) do
         -> (use_case) do
-          return use_case.call(hash) unless use_case.is_a?(Array)
-
-          use_case[0].call(hash.merge(use_case[1]))
+          if use_case.is_a?(Array)
+            use_case[0].call(hash.merge(use_case[1]))
+          else
+            use_case.call(hash)
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-case
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Rodrigo Serradura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind
@@ -86,10 +86,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".tool-versions"
-- ".travis.sh"
-- ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -97,7 +97,9 @@ files:
 - README.pt-BR.md
 - Rakefile
 - bin/console
+- bin/prepare_coverage
 - bin/setup
+- bin/test
 - lib/micro/case.rb
 - lib/micro/case/config.rb
 - lib/micro/case/error.rb
@@ -117,13 +119,12 @@ files:
 - lib/micro/cases/utils.rb
 - lib/u-case.rb
 - lib/u-case/with_activemodel_validation.rb
-- test.sh
 - u-case.gemspec
 homepage: https://github.com/serradura/u-case
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Represent use cases in a simple and powerful way while writing modular, expressive
   and sequentially logical code.

data/.travis.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-RUBY_V=$(ruby -v)
-
-function run_with_bundler {
-  rm Gemfile.lock
-
-  if [ ! -z "$1" ]; then
-    bundle_cmd="bundle _$1_"
-  else
-    bundle_cmd="bundle"
-  fi
-
-  eval "$2 $bundle_cmd update"
-  eval "$2 ENABLE_TRANSITIONS=true $bundle_cmd exec rake test"
-  eval "$2 ENABLE_TRANSITIONS=false $bundle_cmd exec rake test"
-}
-
-function run_with_ar_version_and_bundler {
-  run_with_bundler "$2" "ACTIVERECORD_VERSION=$1"
-}
-
-RUBY_2_2345="ruby 2.[2345]."
-
-if [[ $RUBY_V =~ $RUBY_2_2345 ]]; then
-  run_with_bundler "$BUNDLER_V1"
-
-  run_with_ar_version_and_bundler "3.2" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "4.0" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "4.1" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "4.2" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "5.0" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "5.1" "$BUNDLER_V1"
-  run_with_ar_version_and_bundler "5.2" "$BUNDLER_V1"
-fi
-
-RUBY_2_567="ruby 2.[567]."
-RUBY_3_x_x="ruby 3.0."
-
-if [[ $RUBY_V =~ $RUBY_2_567 ]] || [[ $RUBY_V =~ $RUBY_3_x_x ]]; then
-  gem install bundler -v ">= 2" --no-doc
-
-  run_with_bundler
-  run_with_ar_version_and_bundler "6.0"
-  run_with_ar_version_and_bundler "6.1"
-fi

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-
-cache:
-  bundler: true
-  directories:
-    - /home/travis/.rvm/
-
-rvm:
-- 2.2.2
-- 2.3.0
-- 2.4.0
-- 2.5.0
-- 2.6.0
-- 2.7.0
-- 3.0.0
-
-env:
-  - BUNDLER_V1="1.17.3"
-
-before_install:
-  - gem install bundler -v "$BUNDLER_V1"
-
-install: bundle install --jobs=3 --retry=3
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - "./cc-test-reporter before-build"
-
-script: "./.travis.sh"
-
-after_success:
-  - "./cc-test-reporter after-build -t simplecov"

data/test.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-bundle
-
-rm Gemfile.lock
-
-source $(dirname $0)/.travis.sh
-
-rm Gemfile.lock
-
-bundle