u-attributes 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2748d97dc4a469f8bd54558d869b735095a44c58758d8ab48a372f400e525f2f
-  data.tar.gz: c338340af08a1013d01c61ac657f6a326d2a375d0db6476f87e983a8c7d480ba
+  metadata.gz: a9b3e7bb30f3fc6eb465c26378b99146dc3762f191f8554220bad22fd760cd21
+  data.tar.gz: 3c8de349ac5e966911877ca5c71f00ac5471f8b838323dd52b85a59e05b686a1
 SHA512:
-  metadata.gz: 9aefaa228794f860a3859b4f7f9503d6de6a971ce1e584c5180be96567619cf070feaf0ba85b8bf44f46d636c943d74898ec14c21d410db7a1d3bc48db50dbec
-  data.tar.gz: d3d30b8579e0ea4b710b219c4f6ebc609c603ebcb568fd190632c4dcd5d35543bb01ec68bcc191c022b793e25c97aced729d9be290c725f769e13804ad976330
+  metadata.gz: 14fbd07d3cbc6e31293417dba289b8bd91e0c4c1de7d74692f9b5498f7e016dcb4463ef70f0e6ff94e703e6e87ea514bbbd4ad36cf566367d2785533578f2e0c
+  data.tar.gz: ca9669124566003aad1d5cc520b9dcab7ec866a170b2561908a49eb8c236746352827e7fe65354584cd42120435ba7dde4723046dc6fc8d124491db000a885d1

data/Gemfile.lock

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

data/README.md

@@ -326,14 +326,14 @@ p Person.new(name: 'John').attributes # {"age"=>nil, "name"=>"John"}
 
 You can use the method `Micro::Attributes.features()` or `Micro::Attributes.with()` to combine and require only the features that better fit your needs.
 
-Note: If you desire require only one feature, use the `Micro::Attributes.feature()` method.
+But, if you desire...
+1. only one feature, use the `Micro::Attributes.feature()` method.
+2. except one or more features, use the `Micro::Attributes.without()` method.
 
 ```ruby
-#----------------------------------#
-# Via Micro::Attributes.features() #
-#----------------------------------#
-
-# Loading specific features
+#===========================#
+# Loading specific features #
+#===========================#
 
 class Job
   include Micro::Attributes.feature(:diff)
@@ -346,8 +346,10 @@ class Job
   end
 end
 
-# Loading all features
-#         ---
+#======================#
+# Loading all features #
+#         ---          #
+#======================#
 
 class Job
   include Micro::Attributes.features
@@ -395,6 +397,20 @@ class Job
 
   # Same of `include Micro::Attributes.with(:strict_initialize, :activemodel_validations)`
 end
+
+#=====================================#
+# Loading except one or more features #
+#         -----                       #
+#=====================================#
+
+class Job
+  include Micro::Attributes.without(:diff)
+
+  attributes :id, state: 'sleeping'
+end
+
+# Note:
+# The method `Micro::Attributes.without()` returns `Micro::Attributes` if all features extensions were used.
 ```
 
 ### ActiveModel::Validations extension

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

@@ -6,10 +6,6 @@ module Micro::Attributes
       MISSING_KEYWORD = 'missing keyword'.freeze
       MISSING_KEYWORDS = 'missing keywords'.freeze
 
-      def self.included(base)
-        base.send(:include, ::Micro::Attributes::Features::Initialize)
-      end
-
       protected def attributes=(arg)
         arg_hash = AttributesUtils.stringify_hash_keys!(arg)
         att_data = self.class.attributes_data({})

data/lib/micro/attributes/features.rb

@@ -5,14 +5,26 @@ require "micro/attributes/with"
 module Micro
   module Attributes
     module Features
-      INVALID_FEATURES = 'Invalid feature name! Available options: :initialize, :strict_initialize, :diff, :activemodel_validations'.freeze
+      extend self
+
+      ALL = [
+        DIFF = 'diff'.freeze,
+        INITIALIZE = 'initialize'.freeze,
+        STRICT_INITIALIZE = 'strict_initialize'.freeze,
+        ACTIVEMODEL_VALIDATIONS = 'activemodel_validations'.freeze
+      ].sort.freeze
+
+      INVALID_NAME = [
+        'Invalid feature name! Available options: ',
+        ALL.map { |feature_name| ":#{feature_name}" }.join(', ')
+      ].join
 
       OPTIONS = {
         # Features
-        'diff' => With::Diff,
-        'initialize' => With::Initialize,
-        'strict_initialize' => With::StrictInitialize,
-        'activemodel_validations' => With::ActiveModelValidations,
+        DIFF => With::Diff,
+        INITIALIZE => With::Initialize,
+        STRICT_INITIALIZE => With::StrictInitialize,
+        ACTIVEMODEL_VALIDATIONS => With::ActiveModelValidations,
         # Combinations
         'diff:initialize' => With::DiffAndInitialize,
         'diff:strict_initialize' => With::DiffAndStrictInitialize,
@@ -20,27 +32,72 @@ 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
+        'activemodel_validations:diff:strict_initialize' => With::ActiveModelValidationsAndDiffAndStrictInitialize,
+        ALL.join(':') => With::ActiveModelValidationsAndDiffAndStrictInitialize
       }.freeze
 
-      private_constant :OPTIONS
+      private_constant :OPTIONS, :INVALID_NAME
+
+      def all
+        @all ||= self.with(ALL)
+      end
 
-      def self.all
-        With::ActiveModelValidationsAndDiffAndInitialize
+      def with(args)
+        valid_names!(args) do |names|
+          OPTIONS.fetch(names.sort.join(':'))
+        end
       end
 
-      def self.with(names)
-        option = OPTIONS[names.map { |name| name.to_s.downcase }.uniq.sort.join(':')]
-        return option if option
-        raise ArgumentError, INVALID_FEATURES
+      def without(args)
+        valid_names!(args) do |names_to_exclude|
+          names = except_options(names_to_exclude)
+          names.empty? ? ::Micro::Attributes : self.with(names)
+        end
       end
 
-      def self.options(init, diff, activemodel_validations)
+      def options(init, diff, activemodel_validations)
         [init].tap do |options|
           options << :diff if diff
           options << :activemodel_validations if activemodel_validations
         end
       end
+
+      private
+
+      def normalize_names(args)
+        Array(args).map { |arg| arg.to_s.downcase }.uniq
+      end
+
+      def valid_names?(names)
+        names.all? { |name| ALL.include?(name) }
+      end
+
+      def valid_names!(args)
+        names = normalize_names(args)
+
+        raise ArgumentError, INVALID_NAME if args.empty? || !valid_names?(names)
+
+        yield(names)
+      end
+
+      def has_strict_initialize?(names)
+        names.include?(STRICT_INITIALIZE)
+      end
+
+      def any_kind_of_initialize?(names)
+        names.include?(INITIALIZE) || has_strict_initialize?(names)
+      end
+
+      def an_initialize?(name)
+        name == INITIALIZE || name == STRICT_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)
+        end
+      end
     end
   end
 end

data/lib/micro/attributes/version.rb

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

data/lib/micro/attributes/with.rb

@@ -34,7 +34,7 @@ module Micro
 
       module StrictInitialize
         def self.included(base)
-          base.send(:include, ::Micro::Attributes)
+          base.send(:include, Initialize)
           base.send(:include, ::Micro::Attributes::Features::StrictInitialize)
         end
       end
@@ -52,9 +52,8 @@ module Micro
 
       module DiffAndStrictInitialize
         def self.included(base)
-          base.send(:include, ::Micro::Attributes)
+          base.send(:include, DiffAndInitialize)
           base.send(:include, ::Micro::Attributes::Features::StrictInitialize)
-          base.send(:include, ::Micro::Attributes::Features::Diff)
         end
       end
 
@@ -76,9 +75,8 @@ module Micro
 
       module ActiveModelValidationsAndStrictInitialize
         def self.included(base)
-          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ActiveModelValidationsAndInitialize)
           base.send(:include, ::Micro::Attributes::Features::StrictInitialize)
-          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
         end
       end
 
@@ -93,10 +91,8 @@ module Micro
 
       module ActiveModelValidationsAndDiffAndStrictInitialize
         def self.included(base)
-          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ActiveModelValidationsAndDiffAndInitialize)
           base.send(:include, ::Micro::Attributes::Features::StrictInitialize)
-          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
-          base.send(:include, ::Micro::Attributes::Features::Diff)
         end
       end
     end

data/lib/micro/attributes.rb

@@ -30,6 +30,10 @@ module Micro
       features(*Features.options(:strict_initialize, diff, activemodel_validations))
     end
 
+    def self.without(*names)
+      Features.without(names)
+    end
+
     def self.with(*names)
       Features.with(names)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake