u-attributes 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 484a7b770e8ae7dd141c7538e2bc50c1b82beb63e24ee53dd9f9445cbd91f057
-  data.tar.gz: 3d555771a3deba711dc4995cd12674461b94c82e65ccbdd9bba215d354adaa52
+  metadata.gz: c330847c820a244e35afcd702510d791a72822677ad97a4050b37dc0a9653a00
+  data.tar.gz: 66f7e86e1c1579f64d39e77c54eac7fab03551dbbc8fd6ce02438fab817c0939
 SHA512:
-  metadata.gz: fc5f65eb1a10c5172f0b6a1fa5296f4470e024fa42559cfe0d64d89d0a07c0c203ae28ce1b66afae741669a8073b1c6cbb7d05d5373874946afefca6620d7874
-  data.tar.gz: db8895b0a85d803de7ec04f81fc83fb98eac4b487ed4224e7fb7b6bda3d66293758ce416341dddbd40ae630dfb96d4d26cdd380990a3fca2580df931b459311a
+  metadata.gz: d06af39a1601f4ba9496e5daec023cb13d1944f0ab2b986320a365788df2208fecf1122c73d023c669647fb3f826eca15d0f4bf132872c6b84459bd13c8037ce
+  data.tar.gz: 16bd3897ce372901db54506761dffbc3ba42a72e6700fabc0db83fedad6ab8eaf9bb69f1d98c26e4c0eee809311d51926431807fde187af3b80a6cdba2d73f78

data/.travis.sh

@@ -1,31 +1,45 @@
 #!/bin/bash
 
-bundle exec rake test
+RUBY_V=$(ruby -v)
 
-ACTIVEMODEL_VERSION='3.2' bundle update
-ACTIVEMODEL_VERSION='3.2' bundle exec rake test
+function run_with_bundler {
+  rm Gemfile.lock
 
-ACTIVEMODEL_VERSION='4.0' bundle update
-ACTIVEMODEL_VERSION='4.0' bundle exec rake test
+  if [ ! -z "$1" ]; then
+    bundle_cmd="bundle _$1_"
+  else
+    bundle_cmd="bundle"
+  fi
 
-ACTIVEMODEL_VERSION='4.1' bundle update
-ACTIVEMODEL_VERSION='4.1' bundle exec rake test
+  eval "$2 $bundle_cmd update"
+  eval "$2 $bundle_cmd exec rake test"
+}
 
-ACTIVEMODEL_VERSION='4.2' bundle update
-ACTIVEMODEL_VERSION='4.2' bundle exec rake test
+function run_with_am_version_and_bundler {
+  run_with_bundler "$2" "ACTIVEMODEL_VERSION=$1"
+}
 
-ACTIVEMODEL_VERSION='5.0' bundle update
-ACTIVEMODEL_VERSION='5.0' bundle exec rake test
+RUBY_2_2345="ruby 2.[2345]."
 
-ACTIVEMODEL_VERSION='5.1' bundle update
-ACTIVEMODEL_VERSION='5.1' bundle exec rake test
+if [[ $RUBY_V =~ $RUBY_2_2345 ]]; then
+  run_with_bundler "$BUNDLER_V1"
 
-if [[ ! $ruby_v =~ '2.2.0' ]]; then
-  ACTIVEMODEL_VERSION='5.2' bundle update
-  ACTIVEMODEL_VERSION='5.2' bundle exec rake test
+  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
 
-if [[ $ruby_v =~ '2.5.' ]] || [[ $ruby_v =~ '2.6.' ]] || [[ $ruby_v =~ '2.7.' ]]; then
-  ACTIVEMODEL_VERSION='6.0' bundle update
-  ACTIVEMODEL_VERSION='6.0' bundle exec rake test
+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,5 +1,10 @@
 language: ruby
 
+cache:
+  bundler: true
+  directories:
+    - /home/travis/.rvm/
+
 rvm:
 - 2.2.2
 - 2.3.0
@@ -7,22 +12,22 @@ rvm:
 - 2.5.0
 - 2.6.0
 - 2.7.0
-- truffleruby-head
+- 3.0.0
 
-cache: bundler
+env:
+  - BUNDLER_V1="1.17.3"
 
 before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
+  - 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'
+  - "./cc-test-reporter before-build"
 
-script: './.travis.sh'
+script: "./.travis.sh"
 
 after_success:
-  - './cc-test-reporter after-build -t simplecov'
+  - "./cc-test-reporter after-build -t simplecov"

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'u-case', '~> 4.0'
 
-activemodel_version = ENV.fetch('ACTIVEMODEL_VERSION', '6.1')
+activemodel_version = ENV['ACTIVEMODEL_VERSION']
 
 activemodel = case activemodel_version
               when '3.2' then '3.2.22'
@@ -11,26 +11,31 @@ activemodel = case activemodel_version
               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.3'
-              when '6.0' then '6.0.0'
+              when '5.2' then '5.2.4'
+              when '6.0' then '6.0.3.4'
+              when '6.1' then '6.1.2'
               end
 
-if activemodel_version < '6.1'
-  gem 'activemodel', activemodel, require: false
-  gem 'activesupport', activemodel, require: false
-end
-
 simplecov_version =
   case RUBY_VERSION
-  when /\A2.[23]/ then '~> 0.17.1'
+  when /\A2.[23]/ then '0.17.1'
   when /\A2.4/ then '~> 0.18.5'
   else '~> 0.19'
   end
 
 group :test do
-  gem 'minitest', activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'
+  if activemodel_version
+    gem 'activesupport', activemodel, require: false
+    gem 'activemodel', activemodel, require: false
+    gem 'minitest', activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'
+  else
+    gem 'minitest', '~> 5.0'
+  end
+
   gem 'simplecov', simplecov_version, require: false
 end
 
+gem 'rake', '~> 13.0'
+
 # Specify your gem's dependencies in u-attributes.gemspec
 gemspec

data/README.md

@@ -1,12 +1,12 @@
 <p align="center">
   <img src="./assets/u-attributes_logo_v1.png" alt='Create "immutable" objects. No setters, just getters!'>
 
-  <p align="center"><i>Create "immutable" objects. No setters, just getters!</i></p>
+  <p align="center"><i>Create "immutable" objects with no setters, just getters.</i></p>
   <br>
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/ruby-2.2+-ruby.svg?colorA=99004d&colorB=cc0066" alt="Ruby">
+  <img src="https://img.shields.io/badge/ruby->%3D%202.2.0-ruby.svg?colorA=99004d&colorB=cc0066" alt="Ruby">
 
   <a href="https://rubygems.org/gems/u-attributes">
     <img alt="Gem" src="https://img.shields.io/gem/v/u-attributes.svg?style=flat-square">
@@ -25,8 +25,16 @@
   </a>
 </p>
 
-This gem allows you to define "immutable" objects, and your objects will have only getters and no setters.
-So, if you change [[1](#with_attribute)] [[2](#with_attributes)] some object attribute, you will have a new object instance. That is, you transform the object instead of modifying it.
+This gem allows you to define "immutable" objects, when using it your objects will only have getters and no setters.
+So, if you change [[1](#with_attribute)] [[2](#with_attributes)] an attribute of the object, you’ll have a new object instance. That is, you transform the object instead of modifying it.
+
+## Documentation <!-- omit in toc -->
+
+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
+1.2.0      | https://github.com/serradura/u-case/blob/v1.x/README.md
 
 # Table of contents <!-- omit in toc -->
 - [Installation](#installation)
@@ -85,7 +93,8 @@ gem 'u-attributes'
 
 | u-attributes   | branch  | ruby     |  activemodel  |
 | -------------- | ------- | -------- | ------------- |
-| 2.6.0          | main    | >= 2.2.0 | >= 3.2, < 6.1 |
+| unreleased     | main    | >= 2.2.0 | >= 3.2, < 7   |
+| 2.7.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/lib/micro/attributes/diff.rb

@@ -12,7 +12,7 @@ module Micro::Attributes
       def initialize(from:, to:)
         @from_class = from.class
 
-        @from, @to = from, Kind::Of.(@from_class, to)
+        @from, @to = from, Kind.of(@from_class, to)
 
         @from_key, @to_key =
           @from_class.attributes_access == :symbol ? FROM_TO_SYM : FROM_TO_STR

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

@@ -10,7 +10,7 @@ module Micro::Attributes
         end
 
         def __attribute_key_check__(value)
-          Kind::Of.(::Symbol, value)
+          Kind::Symbol[value]
         end
 
         def __attribute_key_transform__(value)
@@ -18,7 +18,7 @@ module Micro::Attributes
         end
 
         def __attributes_keys_transform__(hash)
-          Utils::Hashes.kind(hash)
+          Kind::Hash[hash]
         end
       end
 

data/lib/micro/attributes/macros.rb

@@ -191,7 +191,7 @@ module Micro
           if arg.is_a?(String) || arg.is_a?(Symbol)
             __attribute_assign(arg, false, options)
           else
-            raise Kind::Error.new('String/Symbol'.freeze, arg)
+            Kind::KIND.error!('String/Symbol'.freeze, arg)
           end
         end
       end

data/lib/micro/attributes/utils.rb

@@ -1,58 +1,56 @@
 # frozen_string_literal: true
 
-module Micro::Attributes
-  module Utils
-    module Hashes
-      def self.kind(hash)
-        Kind::Of.(::Hash, hash)
-      end
+module Micro::Attributes::Utils
 
-      def self.stringify_keys(arg)
-        hash = kind(arg)
+  module Hashes
+    extend self
 
-        return hash if hash.empty?
-        return hash.transform_keys(&:to_s) if hash.respond_to?(:transform_keys)
+    def stringify_keys(arg)
+      hash = Kind::Hash[arg]
 
-        hash.each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
-      end
+      return hash if hash.empty?
+      return hash.transform_keys(&:to_s) if hash.respond_to?(:transform_keys)
 
-      def self.symbolize_keys(arg)
-        hash = kind(arg)
+      hash.each_with_object({}) { |(key, val), memo| memo[key.to_s] = val }
+    end
 
-        return hash if hash.empty?
-        return hash.transform_keys(&:to_sym) if hash.respond_to?(:transform_keys)
+    def symbolize_keys(arg)
+      hash = Kind::Hash[arg]
 
-        hash.each_with_object({}) { |(key, val), memo| memo[key.to_sym] = val }
-      end
+      return hash if hash.empty?
+      return hash.transform_keys(&:to_sym) if hash.respond_to?(:transform_keys)
 
-      def self.keys_as(type, hash)
-        return kind(hash) unless type
+      hash.each_with_object({}) { |(key, val), memo| memo[key.to_sym] = val }
+    end
 
-        return symbolize_keys(hash) if type == Symbol || type == :symbol
-        return stringify_keys(hash) if type == String || type == :string
+    def keys_as(type, hash)
+      return Kind::Hash[hash] unless type
 
-        raise ArgumentError, 'argument must be one of these values: :symbol, :string, Symbol, String'.freeze
-      end
+      return symbolize_keys(hash) if type == Symbol || type == :symbol
+      return stringify_keys(hash) if type == String || type == :string
 
-      def self.assoc(hash, key)
-        value = hash[key.to_s]
+      raise ArgumentError, 'argument must be one of these values: :symbol, :string, Symbol, String'.freeze
+    end
 
-        value.nil? ? hash[key.to_sym] : value
-      end
+    def assoc(hash, key)
+      value = hash[key.to_s]
+
+      value.nil? ? hash[key.to_sym] : value
     end
+  end
 
-    module ExtractAttribute
-      def self.call(object, key:)
-        return object.public_send(key) if object.respond_to?(key)
+  module ExtractAttribute
+    def self.call(object, key:)
+      return object.public_send(key) if object.respond_to?(key)
 
-        Hashes.assoc(object, key) if object.respond_to?(:[])
-      end
+      Hashes.assoc(object, key) if object.respond_to?(:[])
+    end
 
-      def self.from(object, keys:)
-        Kind::Of.(::Array, keys).each_with_object({}) do |key, memo|
-          memo[key] = call(object, key: key)
-        end
+    def self.from(object, keys:)
+      Kind::Array[keys].each_with_object({}) do |key, memo|
+        memo[key] = call(object, key: key)
       end
     end
   end
+
 end

data/lib/micro/attributes/version.rb

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

data/test.sh

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

data/u-attributes.gemspec

@@ -9,11 +9,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Rodrigo Serradura']
   spec.email         = ['rodrigo.serradura@gmail.com']
 
-  spec.summary       = %q{Create "immutable" objects. No setters, just getters!}
+  spec.summary       = %q{Create "immutable" objects with no setters, just getters.}
   spec.description   =
-    "This gem allows you to define \"immutable\" objects, and your objects will have only getters and no setters. "\
-    "So, if you change some object attribute, you will have a new object instance. " \
-    "That is, you transform the object instead of modifying it."
+    'This gem allows you to define "immutable" objects, when using it your objects will only have getters and no setters.' \
+    'So, if you change an attribute of the object, you’ll have a new object instance.'
   spec.homepage      = 'https://github.com/serradura/u-attributes'
   spec.license       = 'MIT'
 
@@ -28,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_runtime_dependency 'kind', '>= 3.0', '< 5.0'
+  spec.add_runtime_dependency 'kind', '>= 4.0', '< 6.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,10 +58,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: This gem allows you to define "immutable" objects, and your objects will
-  have only getters and no setters. So, if you change some object attribute, you will
-  have a new object instance. That is, you transform the object instead of modifying
-  it.
+description: This gem allows you to define "immutable" objects, when using it your
+  objects will only have getters and no setters.So, if you change an attribute of
+  the object, you’ll have a new object instance.
 email:
 - rodrigo.serradura@gmail.com
 executables: []
@@ -113,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Create "immutable" objects. No setters, just getters!
+summary: Create "immutable" objects with no setters, just getters.
 test_files: []