u-attributes 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0981953778c6a7130c83e54de1e8c5a992def3ee434b673cfc80c5cb2fb65298'
-  data.tar.gz: 6219cc89e480e32fd28091999b882566aa6374f7e2c9b27a1dffab1881f8ad79
+  metadata.gz: 386780594f0b0289f62e38984d59f847901e5257002fa4d1124a570304cf792e
+  data.tar.gz: 1d66e4474bbdd5a027ba91898ff3990ed72d76b2278f7c8e4ab303dacbf5b1a8
 SHA512:
-  metadata.gz: e09afedf86b00b99c76bacc9ace249177259b7ed62e3452bef4b7418f08be6ba75cc1f5c5487015d102b4677f2c9cd23bba9221547dde5f0f600ad47a4a98a45
-  data.tar.gz: b284987930d5092a3158a112d2c6e17f11b6cfb873acdc73023560592c5fcc03e29b331097be49b171c3ac1524895510db14cef1bd7c0d6546801b2f6c0e1350
+  metadata.gz: abe5248e77a398a3dbb14047c0ecfdd1fec83e5aa59cde4c2a2c99704c2a503f059f484682654e20d04f6e3cf2ae3c3038cf0103ab51922948375d1e58495917
+  data.tar.gz: 91152ebf4dafe6ce4c5a563068bee973b3c334b6600c8c16a81f62e98a120fc07116426c8d163a75b072561da25a50fe71c097fdcdf65c05d120c1ae6ec1bdc5

data/Gemfile

@@ -16,8 +16,8 @@ activemodel = case activemodel_version
               end
 
 if activemodel_version < '6.1'
-  gem 'activemodel', activemodel
-  gem 'activesupport', activemodel
+  gem 'activemodel', activemodel, require: false
+  gem 'activesupport', activemodel, require: false
 end
 
 minitest = activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'

data/Gemfile.lock

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

data/README.md

@@ -400,7 +400,7 @@ p job_changes.changed?(:state, from: 'sleeping', to: 'running') # true
 #----------------#
 # #differences() #
 #----------------#
-p job_changes.differences # {"state"=>"running"}
+p job_changes.differences # {"state"=> {"from" => "sleeping", "to" => "running"}}
 ```
 
 ## Development

data/lib/micro/attributes/attributes_utils.rb

@@ -3,7 +3,7 @@
 module Micro
   module Attributes
     module AttributesUtils
-      ARGUMENT_ERROR_MSG = 'argument must be a Hash'
+      ARGUMENT_ERROR_MSG = 'argument must be a Hash'.freeze
 
       def self.hash_argument!(arg)
         return arg if arg.is_a?(Hash)

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

@@ -3,8 +3,10 @@
 module Micro::Attributes
   module Features
     module ActiveModelValidations
-      @@__active_model_load_error = false
       @@__active_model_required = false
+      @@__active_model_load_error = false
+
+      V32 = '3.2'
 
       def self.included(base)
         if !@@__active_model_load_error && !@@__active_model_required
@@ -19,16 +21,18 @@ module Micro::Attributes
         unless @@__active_model_load_error
           base.send(:include, ::ActiveModel::Validations)
 
-          if ::ActiveModel::VERSION::STRING >= '3.2'
+          if ::ActiveModel::VERSION::STRING >= V32
             base.class_eval(<<-RUBY)
-              def initialize(options)
-                self.attributes=(options)
+              def initialize(arg)
+                self.attributes=arg
                 run_validations!
               end
             RUBY
           end
         end
       end
+
+      private_constant :V32
     end
   end
 end

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

@@ -4,6 +4,10 @@ module Micro::Attributes
   module Features
     module Diff
       class Changes
+        TO = 'to'.freeze
+        FROM = 'from'.freeze
+        FROM_TO_ERROR = 'pass the attribute name with the :from and :to values'.freeze
+
         attr_reader :from, :to, :differences
 
         def initialize(from:, to:)
@@ -24,32 +28,34 @@ module Micro::Attributes
         def changed?(name = nil, from: nil, to: nil)
           if name.nil?
             return present? if from.nil? && to.nil?
-            raise ArgumentError, 'pass the attribute name with the :from and :to values'
+            raise ArgumentError, FROM_TO_ERROR
           elsif from.nil? && to.nil?
             differences.has_key?(name.to_s)
           else
-            key = name.to_s
-            @from_attributes[key] == from && @to_attributes[key] == to
+            result = @differences[name.to_s]
+            result ? result[FROM] == from && result[TO] == to : false
           end
         end
 
         private
 
         def diff(from_attributes, to_attributes)
-          @to_attributes = to_attributes
-          @from_attributes = from_attributes
+          @from_attributes, @to_attributes = from_attributes, to_attributes
           @from_attributes.each_with_object({}) do |(from_key, from_val), acc|
             to_value = @to_attributes[from_key]
-            acc[from_key] = to_value if from_val != to_value
+            acc[from_key] = {FROM => from_val, TO => to_value}.freeze if from_val != to_value
           end
         end
+
+        private_constant :TO, :FROM, :FROM_TO_ERROR
       end
-      private_constant :Changes
 
       def diff_attributes(to)
         return Changes.new(from: self, to: to) if to.is_a?(::Micro::Attributes)
         raise ArgumentError, "#{to.inspect} must implement Micro::Attributes"
       end
+
+      private_constant :Changes
     end
   end
 end

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

@@ -4,11 +4,11 @@ module Micro::Attributes
   module Features
     module Initialize
       def self.included(base)
-        base.send(:include, ::Micro::Attributes)
-      end
-
-      def initialize(arg)
-        self.attributes = arg
+        base.class_eval(<<-RUBY)
+          def initialize(arg)
+            self.attributes = arg
+          end
+        RUBY
       end
 
       def with_attribute(key, val)

data/lib/micro/attributes/features.rb

@@ -1,63 +1,34 @@
 # frozen_string_literal: true
 
-require "micro/attributes/features/diff"
-require "micro/attributes/features/initialize"
-require "micro/attributes/features/activemodel_validations"
+require "micro/attributes/with"
 
 module Micro
   module Attributes
     module Features
-      module InitializeAndDiff
-        def self.included(base)
-          base.send(:include, ::Micro::Attributes::Features::Initialize)
-          base.send(:include, ::Micro::Attributes::Features::Diff)
-        end
-      end
-
-      module ActiveModelValidationsAndDiff
-        def self.included(base)
-          base.send(:include, ::Micro::Attributes::Features::Diff)
-          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
-        end
-      end
-
-      module ActiveModelValidationsAndInitialize
-        def self.included(base)
-          base.send(:include, ::Micro::Attributes::Features::Initialize)
-          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
-        end
-      end
-
-      module ActiveModelValidationsAndDiffAndInitialize
-        def self.included(base)
-          base.send(:include, ::Micro::Attributes::Features::Initialize)
-          base.send(:include, ::Micro::Attributes::Features::Diff)
-          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
-        end
-      end
+      INVALID_FEATURES = 'Invalid feature name! Available options: :initialize, :diff, :activemodel_validations'.freeze
 
       OPTIONS = {
         # Features
-        'diff' => Diff,
-        'initialize' => Initialize,
-        'activemodel_validations' => ActiveModelValidations,
+        'diff' => With::Diff,
+        'initialize' => With::Initialize,
+        'activemodel_validations' => With::ActiveModelValidations,
         # Combinations
-        'diff:initialize' => InitializeAndDiff,
-        'activemodel_validations:diff' => ActiveModelValidationsAndDiff,
-        'activemodel_validations:initialize' => ActiveModelValidationsAndInitialize,
-        'activemodel_validations:diff:initialize' => ActiveModelValidationsAndDiffAndInitialize
+        'diff:initialize' => With::DiffAndInitialize,
+        'activemodel_validations:diff' => With::ActiveModelValidationsAndDiff,
+        'activemodel_validations:initialize' => With::ActiveModelValidationsAndInitialize,
+        'activemodel_validations:diff:initialize' => With::ActiveModelValidationsAndDiffAndInitialize
       }.freeze
 
       private_constant :OPTIONS
 
       def self.all
-        ActiveModelValidationsAndDiffAndInitialize
+        With::ActiveModelValidationsAndDiffAndInitialize
       end
 
       def self.fetch(names)
         option = OPTIONS[names.map { |name| name.to_s.downcase }.sort.join(':')]
         return option if option
-        raise ArgumentError, 'Invalid feature name! Available options: diff, initialize, activemodel_validations'
+        raise ArgumentError, INVALID_FEATURES
       end
     end
   end

data/lib/micro/attributes/macros.rb

@@ -50,14 +50,18 @@ module Micro
       end
 
       module ForSubclasses
+        WRONG_NUMBER_OF_ARGS = 'wrong number of arguments (given 0, expected 1 or more)'.freeze
+
         def attribute!(name, value=nil)
           __attribute_set(name, value, true)
         end
 
         def attributes!(*args)
           return __attributes_set(args, can_overwrite: true) unless args.empty?
-          raise ArgumentError, 'wrong number of arguments (given 0, expected 1 or more)'
+          raise ArgumentError, WRONG_NUMBER_OF_ARGS
         end
+
+        private_constant :WRONG_NUMBER_OF_ARGS
       end
       private_constant :ForSubclasses
     end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = "0.12.0"
+    VERSION = '0.13.0'.freeze
   end
 end

data/lib/micro/attributes/with.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'micro/attributes/features/diff'
+require 'micro/attributes/features/initialize'
+require 'micro/attributes/features/activemodel_validations'
+
+module Micro
+  module Attributes
+    module With
+      #
+      # Features
+      #
+      module Diff
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+        end
+      end
+
+      module Initialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+        end
+      end
+
+      module ActiveModelValidations
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+        end
+      end
+
+      #
+      # Combinations
+      #
+      module DiffAndInitialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+        end
+      end
+
+      module ActiveModelValidationsAndDiff
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+        end
+      end
+
+      module ActiveModelValidationsAndInitialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+        end
+      end
+
+      module ActiveModelValidationsAndDiffAndInitialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+        end
+      end
+    end
+  end
+end

data/lib/micro/attributes.rb

@@ -18,7 +18,7 @@ module Micro
 
       def base.inherited(subclass)
         subclass.attributes(self.attributes_data({}))
-        subclass.extend ::Micro::Attributes.const_get('Macros::ForSubclasses')
+        subclass.extend ::Micro::Attributes.const_get('Macros::ForSubclasses'.freeze)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,6 +51,7 @@ files:
 - lib/micro/attributes/features/initialize.rb
 - lib/micro/attributes/macros.rb
 - lib/micro/attributes/version.rb
+- lib/micro/attributes/with.rb
 - lib/u-attributes.rb
 - run-tests.sh
 - u-attributes.gemspec