u-attributes 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c330847c820a244e35afcd702510d791a72822677ad97a4050b37dc0a9653a00
-  data.tar.gz: 66f7e86e1c1579f64d39e77c54eac7fab03551dbbc8fd6ce02438fab817c0939
+  metadata.gz: 75a44be0f1b71d41abdfd3e9c81f67527760a4a8f0202818fd7f04782680922b
+  data.tar.gz: bbb26faf04daffd2e92b18eb4e363d85c7677ed5ed3fb09bda485d8b34c8296d
 SHA512:
-  metadata.gz: d06af39a1601f4ba9496e5daec023cb13d1944f0ab2b986320a365788df2208fecf1122c73d023c669647fb3f826eca15d0f4bf132872c6b84459bd13c8037ce
-  data.tar.gz: 16bd3897ce372901db54506761dffbc3ba42a72e6700fabc0db83fedad6ab8eaf9bb69f1d98c26e4c0eee809311d51926431807fde187af3b80a6cdba2d73f78
+  metadata.gz: 9e7da00d4786086edc9607533ef9c9632b10dd2200ddee29a46551d311c8e5ee8c5549d161f8ea6881c95c529abbdd4a2c48fd28635464606a7877b0d94a6488
+  data.tar.gz: aa42ef9c78b7f60514ef062b78d1b6f4eb3589ce1d39ab13d6459d2a164e3dcfa8b4f54660598df76afe4b42b8087cf9060f57398609f59508952bfd49c0cda1

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+
+name: build
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 3.0]
+    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: 9015766fe58e0abd5ab58050ddfc67708e0b11430b3d3999ac17139ffcb4d3e7
+        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

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'u-case', '~> 4.0'
+gem 'u-case', '~> 4.5', '>= 4.5.1'
 
 activemodel_version = ENV['ACTIVEMODEL_VERSION']
 
@@ -20,7 +20,7 @@ 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-attributes.svg?style=flat-square">
   </a>
 
-  <a href="https://travis-ci.com/serradura/u-attributes">
-    <img alt="Build Status" src="https://travis-ci.com/serradura/u-attributes.svg?branch=main">
+  <a href="https://github.com/serradura/u-attributes/actions/workflows/ci.yml">
+    <img alt="Build Status" src="https://github.com/serradura/u-attributes/actions/workflows/ci.yml/badge.svg">
   </a>
 
   <a href="https://codeclimate.com/github/serradura/u-attributes/maintainability">
@@ -33,7 +33,7 @@ So, if you change [[1](#with_attribute)] [[2](#with_attributes)] an attribute of
 Version    | Documentation
 ---------- | -------------
 unreleased | https://github.com/serradura/u-case/blob/main/README.md
-2.7.0      | https://github.com/serradura/u-case/blob/v2.x/README.md
+2.8.0      | https://github.com/serradura/u-case/blob/v2.x/README.md
 1.2.0      | https://github.com/serradura/u-case/blob/v1.x/README.md
 
 # Table of contents <!-- omit in toc -->
@@ -94,7 +94,7 @@ gem 'u-attributes'
 | u-attributes   | branch  | ruby     |  activemodel  |
 | -------------- | ------- | -------- | ------------- |
 | unreleased     | main    | >= 2.2.0 | >= 3.2, < 7   |
-| 2.7.0          | v2.x    | >= 2.2.0 | >= 3.2, < 7   |
+| 2.8.0          | v2.x    | >= 2.2.0 | >= 3.2, < 7   |
 | 1.2.0          | v1.x    | >= 2.2.0 | >= 3.2, < 6.1 |
 
 > **Note**: The activemodel is an optional dependency, this module [can be enabled](#activemodelvalidation-extension) to validate the attributes.

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,48 @@
+#!/bin/bash
+
+set -e
+
+RUBY_V=$(ruby -v)
+
+function reset_gemfile_and_test {
+  rm Gemfile.lock
+
+  eval "$1 bundle update"
+  eval "$1 bundle exec rake test"
+}
+
+function test_with_activemodel {
+  reset_gemfile_and_test "ACTIVEMODEL_VERSION=$1"
+}
+
+RUBY_2_2345="ruby 2.[2345]."
+RUBY_2_234="ruby 2.[234]."
+RUBY_2_567="ruby 2.[567]."
+RUBY_2_2="ruby 2.2."
+RUBY_3_X="ruby 3.0."
+
+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_activemodel "3.2"
+  fi
+
+  test_with_activemodel "4.0"
+  test_with_activemodel "4.1"
+  test_with_activemodel "4.2"
+  test_with_activemodel "5.0"
+  test_with_activemodel "5.1"
+  test_with_activemodel "5.2"
+fi
+
+if [[ $RUBY_V =~ $RUBY_2_567 ]] || [[ $RUBY_V =~ $RUBY_3_X ]]; then
+  gem install bundler -v ">= 2" --no-doc
+
+  reset_gemfile_and_test
+
+  test_with_activemodel "6.0"
+  test_with_activemodel "6.1"
+fi

data/lib/micro/attributes/features/accept.rb

@@ -35,10 +35,10 @@ module Micro::Attributes
 
         KeepProc = -> validation_data { validation_data[0] == :accept && validation_data[1] == Proc }
 
-        def __attribute_assign(key, initialize_value, attribute_data)
+        def __attribute_assign(key, init_hash, attribute_data)
           validation_data = attribute_data[1]
 
-          value_to_assign = FetchValueToAssign.(initialize_value, attribute_data, KeepProc.(validation_data))
+          value_to_assign = FetchValueToAssign.(init_hash, init_hash[key], attribute_data, KeepProc.(validation_data))
 
           value = __attributes[key] = instance_variable_set("@#{key}", value_to_assign)
 

data/lib/micro/attributes/macros.rb

@@ -179,6 +179,16 @@ module Micro
         __attribute_assign(name, false, options)
       end
 
+      RaiseKindError = ->(expected, given) do
+        if (util = Kind.const_get(:KIND, false)) && util.respond_to?(:error!)
+          util.error!(expected, given)
+        else
+          raise Kind::Error.new(expected, given, label: nil)
+        end
+      end
+
+      private_constant :RaiseKindError
+
       def attributes(*args)
         return __attributes.to_a if args.empty?
 
@@ -191,7 +201,7 @@ module Micro
           if arg.is_a?(String) || arg.is_a?(Symbol)
             __attribute_assign(arg, false, options)
           else
-            Kind::KIND.error!('String/Symbol'.freeze, arg)
+            RaiseKindError.call('String/Symbol'.freeze, arg)
           end
         end
       end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = '2.7.0'.freeze
+    VERSION = '2.8.0'.freeze
   end
 end

data/lib/micro/attributes.rb

@@ -123,12 +123,16 @@ module Micro
         @__attributes ||= {}
       end
 
-      FetchValueToAssign = -> (value, attribute_data, keep_proc = false) do
+      FetchValueToAssign = -> (init_hash, value, attribute_data, keep_proc = false) do
         default = attribute_data[0]
 
         value_to_assign =
           if default.is_a?(Proc) && !keep_proc
-            default.arity > 0 ? default.call(value) : default.call
+            case default.arity
+            when 0 then default.call
+            when 2 then default.call(value, init_hash)
+            else default.call(value)
+            end
           else
             value.nil? ? default : value
           end
@@ -143,14 +147,14 @@ module Micro
 
       def __attributes_assign(hash)
         self.class.__attributes_data__.each do |name, attribute_data|
-          __attribute_assign(name, hash[name], attribute_data) if attribute?(name, true)
+          __attribute_assign(name, hash, attribute_data) if attribute?(name, true)
         end
 
         __attributes.freeze
       end
 
-      def __attribute_assign(name, initialize_value, attribute_data)
-        value_to_assign = FetchValueToAssign.(initialize_value, attribute_data)
+      def __attribute_assign(name, init_hash, attribute_data)
+        value_to_assign = FetchValueToAssign.(init_hash, init_hash[name], attribute_data)
 
         ivar_value = instance_variable_set("@#{name}", value_to_assign)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Rodrigo Serradura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind
@@ -67,16 +67,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.sh"
-- ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/prepare_coverage
 - bin/setup
+- bin/test
 - lib/micro/attributes.rb
 - lib/micro/attributes/diff.rb
 - lib/micro/attributes/features.rb
@@ -91,13 +93,12 @@ files:
 - lib/micro/attributes/utils.rb
 - lib/micro/attributes/version.rb
 - lib/u-attributes.rb
-- test.sh
 - u-attributes.gemspec
 homepage: https://github.com/serradura/u-attributes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Create "immutable" objects with no setters, just getters.
 test_files: []

data/.travis.sh

@@ -1,45 +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 $bundle_cmd exec rake test"
-}
-
-function run_with_am_version_and_bundler {
-  run_with_bundler "$2" "ACTIVEMODEL_VERSION=$1"
-}
-
-RUBY_2_2345="ruby 2.[2345]."
-
-if [[ $RUBY_V =~ $RUBY_2_2345 ]]; then
-  run_with_bundler "$BUNDLER_V1"
-
-  run_with_am_version_and_bundler "3.2" "$BUNDLER_V1"
-  run_with_am_version_and_bundler "4.0" "$BUNDLER_V1"
-  run_with_am_version_and_bundler "4.1" "$BUNDLER_V1"
-  run_with_am_version_and_bundler "4.2" "$BUNDLER_V1"
-  run_with_am_version_and_bundler "5.0" "$BUNDLER_V1"
-  run_with_am_version_and_bundler "5.1" "$BUNDLER_V1"
-  run_with_am_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_am_version_and_bundler "6.0"
-  run_with_am_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
-
-source $(dirname $0)/.travis.sh
-
-echo ''
-echo 'Resetting Gemfile'
-echo ''
-
-rm Gemfile.lock
-
-bundle