eac_rails_utils 0.11.6 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d59ee76de9d16dac158bf6ffd8f4a1e1c4efa20dd1142ed228af225b39551ab
-  data.tar.gz: 1c085391870e824b1f0ba969b0edc199a5020d32ba7bc101fe41dc9370780876
+  metadata.gz: 00fd5aed91f9c11d3b6ab34cd532aff0c5ed10da72ba420488a060f93bbd8540
+  data.tar.gz: f66267fb4600635f05bcb15475fe5186c31663e9db4a00494add6e59dc603578
 SHA512:
-  metadata.gz: c3336f477cde2ed2d42fd8fdf07166626479279719d3e17e205bff26631c0c457d2e36b802554954bf66268a9d27c455ab7c53fd144933585fbea63c3100700c
-  data.tar.gz: 3a7cd6b2a2ea0e1ed4814f5fc920d34d234aa56cfeb86efecc09482fa63532627ff6197025aead13eedc5ba7e87cb0e8fbe28a64a6a29894c63947bc5bed269b
+  metadata.gz: 9b6aa1e4febf6826c760daf62ad9c280b3b708beb00800644cffdd88021acdd69ef41262f5ff395616eefa63c240e214a0ef3eb1f4028a1fab5f5f5cfa382acd
+  data.tar.gz: 5f2a4f27e090663895222931a57bdb63eae96a4b679a95a544a47699e7c0a5e733c47968cf13fa3f628c3c90381d3796a8d54989b3f7f38a674cd94454f7936a

data/app/helpers/eac_rails_utils/common_form_helper/form_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-require 'eac_rails_utils/models/attribute_required'
+require 'eac_rails_utils/models/validations'
 
 module EacRailsUtils
   module CommonFormHelper
@@ -93,8 +93,8 @@ module EacRailsUtils
 
       def field_label(field_name, label, required)
         if required.nil?
-          required = ::EacRailsUtils::Models::AttributeRequired
-                     .required?(model_instance, field_name)
+          required = ::EacRailsUtils::Models::Validations
+                     .column_required?(model_instance, field_name)
         end
         @form.label(field_name, label, class: required ? 'required' : 'optional')
       end

data/lib/eac_rails_utils/models/tableless.rb

@@ -10,6 +10,16 @@ module EacRailsUtils
       include Virtus.model
       include ActiveModel::Associations
 
+      class << self
+        def columns
+          attribute_set.each.to_a
+        end
+
+        def columns_names
+          columns.map(&:name)
+        end
+      end
+
       def initialize(values = {})
         super(build_attributes(values))
       end

data/lib/eac_rails_utils/models/validations.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module Models
+    module Validations
+      common_concern
+
+      class << self
+        def column_errors(model_or_record, column, value)
+          model = model_class_or_record_to_model(model_or_record)
+          record = model.new
+          model.validators_on(column).each do |validator|
+            next if validator.options[:allow_blank] && value.blank?
+            next if validator.options[:allow_nil] && value.nil?
+
+            validator.validate_each(record, column, value)
+          end
+          record.errors
+        end
+
+        def column_required?(model_or_record, column)
+          !column_valid?(model_or_record, column, nil)
+        end
+
+        def column_valid?(model_or_record, column, value)
+          column_errors(model_or_record, column, value).empty?
+        end
+
+        private
+
+        def model_class_or_record_to_model(model_class_or_record)
+          model_class_or_record.is_a?(::Class) ? model_class_or_record : model_class_or_record.class
+        end
+      end
+
+      module ClassMethods
+        def column_errors(column, value)
+          ::EacRailsUtils::Models::Validations.column_errors(self, column, value)
+        end
+
+        def column_required?(column)
+          ::EacRailsUtils::Models::Validations.column_required?(self, column)
+        end
+
+        def column_valid?(attribute, value)
+          column_errors(attribute, value).empty?
+        end
+
+        private
+
+        def model_class_or_record_to_model(model_class_or_record)
+          model_class_or_record.is_a?(::Class) ? model_class_or_record : model_class_or_record.class
+        end
+      end
+
+      def attribute_errors(attribute)
+        self.class.column_errors(attribute, send(attribute))
+      end
+
+      def attribute_required?(attribute)
+        self.class.column_required?(attribute)
+      end
+
+      def attribute_valid?(attribute)
+        attribute_errors(attribute).empty?
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.11.6'
+  VERSION = '0.12.0'
 end

data/test/dummy/app/models/user.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_rails_utils/models/attribute_required'
-
 class User < ActiveRecord::Base
-  include ::EacRailsUtils::Models::AttributeRequired
-
   belongs_to :job
 
   validates :job, presence: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.12.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: '0.49'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
@@ -206,11 +200,11 @@ files:
 - lib/eac_rails_utils/engine.rb
 - lib/eac_rails_utils/htmlbeautifier.rb
 - lib/eac_rails_utils/models.rb
-- lib/eac_rails_utils/models/attribute_required.rb
 - lib/eac_rails_utils/models/fetch_errors.rb
 - lib/eac_rails_utils/models/inequality_queries.rb
 - lib/eac_rails_utils/models/tableless.rb
 - lib/eac_rails_utils/models/test_utils.rb
+- lib/eac_rails_utils/models/validations.rb
 - lib/eac_rails_utils/patches.rb
 - lib/eac_rails_utils/patches/action_controller_base.rb
 - lib/eac_rails_utils/patches/active_model_associations.rb
@@ -235,9 +229,7 @@ files:
 - test/dummy/db/schema.rb
 - test/helpers/eac_rails_utils/data_table_test_helper_test.rb
 - test/helpers/eac_rails_utils/formatter_helper_test.rb
-- test/lib/eac_rails_utils/models/attribute_required_test.rb
 - test/lib/eac_rails_utils/models/fetch_errors_test.rb
-- test/lib/eac_rails_utils/models/tableless_test.rb
 - test/test_helper.rb
 - test/validators/cpf_validator_test.rb
 homepage: 
@@ -285,6 +277,4 @@ test_files:
 - test/validators/cpf_validator_test.rb
 - test/helpers/eac_rails_utils/data_table_test_helper_test.rb
 - test/helpers/eac_rails_utils/formatter_helper_test.rb
-- test/lib/eac_rails_utils/models/attribute_required_test.rb
-- test/lib/eac_rails_utils/models/tableless_test.rb
 - test/lib/eac_rails_utils/models/fetch_errors_test.rb

data/lib/eac_rails_utils/models/attribute_required.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/concern'
-
-module EacRailsUtils
-  module Models
-    module AttributeRequired
-      extend ::ActiveSupport::Concern
-
-      class << self
-        def required?(model_class_or_record, attribute)
-          model = model_class_or_record_to_model(model_class_or_record)
-          record = model.new
-          record.validate
-          record.errors.key?(attribute.to_sym)
-        end
-
-        private
-
-        def model_class_or_record_to_model(model_class_or_record)
-          model_class_or_record.is_a?(::Class) ? model_class_or_record : model_class_or_record.class
-        end
-      end
-
-      included do
-        extend ClassMethods
-        include InstanceMethods
-      end
-
-      module ClassMethods
-        def column_required?(column)
-          ::EacRailsUtils::Models::AttributeRequired.required?(self, column)
-        end
-      end
-
-      module InstanceMethods
-        def attribute_required?(column)
-          self.class.column_required?(column)
-        end
-      end
-    end
-  end
-end

data/test/lib/eac_rails_utils/models/attribute_required_test.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module EacRailsUtils
-  module Patches
-    class ModelAttributeRequiredTest < ActiveSupport::TestCase
-      setup do
-        reset_test_database
-      end
-
-      test 'column with presence validator should be required' do
-        assert User.column_required?(:password)
-      end
-
-      test 'column with format validator should be required' do
-        assert User.column_required?(:email)
-      end
-
-      test 'column without validators should be optional' do
-        assert_not User.column_required?(:name)
-      end
-
-      test 'association with presence validator should be required' do
-        assert User.column_required?(:job)
-      end
-
-      test 'required column in active model' do
-        assert ActiveModelStub.column_required?(:name), 'name is required'
-        assert_not ActiveModelStub.column_required?(:age), 'age is optional'
-      end
-
-      class ActiveModelStub
-        include ActiveModel::Model
-        include ::EacRailsUtils::Models::AttributeRequired
-
-        attr_accessor :name, :age
-        validates :name, presence: true
-      end
-    end
-  end
-end

data/test/lib/eac_rails_utils/models/tableless_test.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module EacRailsUtils
-  module Models
-    class TablelessTest < ActiveSupport::TestCase
-      class Stub < ::EacRailsUtils::Models::Tableless
-        attribute :tempo, DateTime
-      end
-
-      test 'date time array values' do
-        stub = Stub.new('tempo(1i)' => '9', 'tempo(2i)' => '10', 'tempo(3i)' => '11',
-                        'tempo(4i)' => '12', 'tempo(5i)' => '13', 'tempo(6i)' => '14')
-        assert stub.tempo.is_a?(DateTime), "Class: |#{stub.tempo.class}|, Value: |#{stub.tempo}|"
-        assert_equal 9, stub.tempo.year, 'Year'
-        assert_equal 10, stub.tempo.month, 'Month'
-        assert_equal 11, stub.tempo.day, 'Day'
-        assert_equal 12, stub.tempo.hour, 'Hour'
-        assert_equal 13, stub.tempo.minute, 'Minute'
-        assert_equal 14, stub.tempo.second, 'Second'
-      end
-    end
-  end
-end