u-attributes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b3e7bb30f3fc6eb465c26378b99146dc3762f191f8554220bad22fd760cd21
-  data.tar.gz: 3c8de349ac5e966911877ca5c71f00ac5471f8b838323dd52b85a59e05b686a1
+  metadata.gz: 854cdfcbae1f568640947a0bbfdf5fa26493a1e47ebf29ce91d7d287f6388050
+  data.tar.gz: df775cef424add3e18672d03b6522d5e625b6e211b6891078b7bfb31e2ba996a
 SHA512:
-  metadata.gz: 14fbd07d3cbc6e31293417dba289b8bd91e0c4c1de7d74692f9b5498f7e016dcb4463ef70f0e6ff94e703e6e87ea514bbbd4ad36cf566367d2785533578f2e0c
-  data.tar.gz: ca9669124566003aad1d5cc520b9dcab7ec866a170b2561908a49eb8c236746352827e7fe65354584cd42120435ba7dde4723046dc6fc8d124491db000a885d1
+  metadata.gz: 6541f9295ae0cc88fec1fcc05d8307feb05769de3aadfb597710517aa76e80dacaef7fd2d165491319ef2b0e701c20ebd025459befa2e5c92f07da43f5df6f3b
+  data.tar.gz: 04e200e16d8c6258e819baa9b3f0ef00c86fc1715d6a866c6dc05fcefde54ceb7fd4746fa050e4e7b50ae7360dcd4639a2397ffe837593107368e19bfcef0dad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u-attributes (1.1.0)
+    u-attributes (1.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/micro/attributes/features.rb

@@ -32,8 +32,7 @@ module Micro
         'activemodel_validations:initialize' => With::ActiveModelValidationsAndInitialize,
         'activemodel_validations:strict_initialize' => With::ActiveModelValidationsAndStrictInitialize,
         'activemodel_validations:diff:initialize' => With::ActiveModelValidationsAndDiffAndInitialize,
-        'activemodel_validations:diff:strict_initialize' => With::ActiveModelValidationsAndDiffAndStrictInitialize,
-        ALL.join(':') => With::ActiveModelValidationsAndDiffAndStrictInitialize
+        'activemodel_validations:diff:strict_initialize' => With::ActiveModelValidationsAndDiffAndStrictInitialize
       }.freeze
 
       private_constant :OPTIONS, :INVALID_NAME
@@ -44,6 +43,8 @@ module Micro
 
       def with(args)
         valid_names!(args) do |names|
+          delete_initialize_if_has_strict_initialize(names)
+
           OPTIONS.fetch(names.sort.join(':'))
         end
       end
@@ -80,22 +81,21 @@ module Micro
         yield(names)
       end
 
-      def has_strict_initialize?(names)
-        names.include?(STRICT_INITIALIZE)
+      def an_initialize?(name)
+        name == INITIALIZE || name == STRICT_INITIALIZE
       end
 
-      def any_kind_of_initialize?(names)
-        names.include?(INITIALIZE) || has_strict_initialize?(names)
-      end
+      def delete_initialize_if_has_strict_initialize(names)
+        return unless names.include?(STRICT_INITIALIZE)
 
-      def an_initialize?(name)
-        name == INITIALIZE || name == STRICT_INITIALIZE
+        names.delete_if { |name| name == INITIALIZE }
       end
 
       def except_options(names_to_exclude)
         (ALL - names_to_exclude).tap do |names|
-          names.delete_if { |name| an_initialize?(name) } if any_kind_of_initialize?(names_to_exclude)
-          names.delete_if { |name| name == INITIALIZE } if has_strict_initialize?(names)
+          names.delete_if { |name| an_initialize?(name) } if names_to_exclude.include?(INITIALIZE)
+
+          delete_initialize_if_has_strict_initialize(names)
         end
       end
     end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Rodrigo Serradura
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Define read-only attributes