eac_rails_utils 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb6393471b8d317c18c157556614ea1f40444ca56b5950998a8c51157f0101d8
-  data.tar.gz: b9531813f5e6283a377e0044c1b1ad1d72336701d2e2a280fa3a0ebef6ce5102
+  metadata.gz: 00fd5aed91f9c11d3b6ab34cd532aff0c5ed10da72ba420488a060f93bbd8540
+  data.tar.gz: f66267fb4600635f05bcb15475fe5186c31663e9db4a00494add6e59dc603578
 SHA512:
-  metadata.gz: c111435248f4358873989293cc8b49826f15c01bcd78186411bb39a582c0364626ac1ec8b2ed1d4d7d2ba81b315da4eda805c13582a562a9a9881d4173ad19f4
-  data.tar.gz: add93d610c6303fe8687f193854af9527b48c2e31ff705bb849ccc346670055d1640d3dae4293637ac06733af73dcc1cbb7f15f7dffe9ad6562019761a4d42e8
+  metadata.gz: 9b6aa1e4febf6826c760daf62ad9c280b3b708beb00800644cffdd88021acdd69ef41262f5ff395616eefa63c240e214a0ef3eb1f4028a1fab5f5f5cfa382acd
+  data.tar.gz: 5f2a4f27e090663895222931a57bdb63eae96a4b679a95a544a47699e7c0a5e733c47968cf13fa3f628c3c90381d3796a8d54989b3f7f38a674cd94454f7936a

data/app/helpers/eac_rails_utils/common_form_helper.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
+require 'action_view/helpers/form_helper'
+require 'eac_ruby_utils/core_ext'
 
 module EacRailsUtils
   module CommonFormHelper
-    ::EacRubyUtils.require_sub __FILE__
+    common_concern do
+      include ::ActionView::Helpers::FormHelper
+    end
+    require_sub __FILE__
 
     def common_form(model_instance, options = {}, &block)
       submit_label = options.delete(:submit_label)

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/app/helpers/eac_rails_utils/links_helper.rb

@@ -4,24 +4,24 @@ module EacRailsUtils
   module LinksHelper
     def short_delete_link(object)
       short_object_link object, '', class: 'delete_link', method: :delete, target: '_blank',
-                                    title: ::I18n.t('eac_rails_base0.links.delete_object',
+                                    title: ::I18n.t('eac_rails_utils.links.delete_object',
                                                     label: object.to_s),
                                     data: {
-                                      confirm: ::I18n.t('eac_rails_base0.links.delete_confirm',
+                                      confirm: ::I18n.t('eac_rails_utils.links.delete_confirm',
                                                         label: object.to_s)
                                     }
     end
 
     def short_edit_link(object)
       short_object_link object, 'edit', class: 'edit_link', target: '_blank',
-                                        title: ::I18n.t('eac_rails_base0.links.edit_object',
+                                        title: ::I18n.t('eac_rails_utils.links.edit_object',
                                                         label: object.to_s)
     end
 
     def short_goto_link(url)
       value_or_sign(url, '') do |value|
         link_to '', value, class: 'goto_link', target: '_blank',
-                           title: ::I18n.t('eac_rails_base0.links.goto_url', url: value.to_s),
+                           title: ::I18n.t('eac_rails_utils.links.goto_url', url: value.to_s),
                            rel: 'noopener'
       end
     end
@@ -54,7 +54,7 @@ module EacRailsUtils
       short_object_link object,
                         detail ? 'detail' : nil,
                         class: 'show_link', target: '_blank',
-                        title: ::I18n.t('eac_rails_base0.links.show_object', label: object.to_s)
+                        title: ::I18n.t('eac_rails_utils.links.show_object', label: object.to_s)
     end
 
     def short_object_link(object, action = nil, options = {})

data/config/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  eac_rails_utils:
+    links:
+      delete_confirm: Do you confirm "%{label}"'s removal?
+      delete_object: Remove "%{label}".
+      edit_object: Edit "%{label}".
+      goto_url: Go to %{url}.
+      show_object: Show "%{label}".

data/config/locales/pt-BR.yml

@@ -0,0 +1,8 @@
+pt-BR:
+  eac_rails_utils:
+    links:
+      delete_confirm: Confirma a remoção de "%{label}"?
+      delete_object: Remover "%{label}".
+      edit_object: Editar "%{label}".
+      goto_url: Ir para %{url}.
+      show_object: Mostrar "%{label}".

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/patches/active_model_associations.rb

@@ -27,6 +27,8 @@ module ActiveModel
   module Associations
     module Hooks
       def self.init
+        return unless ::Rails.version < '5'
+
         ActiveSupport.on_load(:active_record) do
           ActiveRecord::Associations::AssociationScope.prepend(
             ::EacRailsUtils::Patches::ActiveModelAssociations::ScopeExtensionPatch

data/lib/eac_rails_utils/version.rb

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

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

data/test/dummy/bin/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/dummy/config/application.rb

@@ -9,6 +9,6 @@ require 'eac_rails_utils'
 
 module Dummy
   class Application < Rails::Application
-    config.active_record.raise_in_transactional_callbacks = true
+    config.active_record.raise_in_transactional_callbacks = true if ::Rails.version < '5'
   end
 end

data/test/dummy/db/migrate/20160415125333_create_users.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < (
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :users do |t|
       t.string :name

data/test/dummy/db/migrate/20160415143123_create_jobs.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateJobs < ActiveRecord::Migration
+class CreateJobs  < (
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :jobs do |t|
       t.string :name

data/test/dummy/db/migrate/20160415143229_add_job_to_users.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddJobToUsers < ActiveRecord::Migration
+class AddJobToUsers < (
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+  )
   def change
     add_belongs_to :users, :job
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 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
@@ -128,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +183,8 @@ files:
 - app/helpers/eac_rails_utils/open_graph_protocol_helper.rb
 - app/validators/eac_rails_utils/cpf_validator.rb
 - app/validators/eac_rails_utils/no_presence_validator.rb
+- config/locales/en.yml
+- config/locales/pt-BR.yml
 - lib/assets/javascripts/currency_field.js
 - lib/assets/javascripts/eac_rails_utils.js
 - lib/assets/javascripts/input_searchable.js
@@ -190,18 +200,20 @@ 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
 - lib/eac_rails_utils/version.rb
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/models/job.rb
 - test/dummy/app/models/user.rb
+- test/dummy/bin/rails
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -215,12 +227,9 @@ files:
 - test/dummy/db/migrate/20160415143123_create_jobs.rb
 - test/dummy/db/migrate/20160415143229_add_job_to_users.rb
 - test/dummy/db/schema.rb
-- test/helpers/eac_rails_utils/common_form_helper_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/fetch_errors_test.rb
-- test/lib/eac_rails_utils/models/tableless_test.rb
 - test/test_helper.rb
 - test/validators/cpf_validator_test.rb
 homepage: 
@@ -241,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Código reutilizável para as aplicações Rails da E.A.C..
@@ -263,11 +271,10 @@ test_files:
 - test/dummy/db/migrate/20160415125333_create_users.rb
 - test/dummy/app/models/job.rb
 - test/dummy/app/models/user.rb
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/bin/rails
 - test/test_helper.rb
 - test/validators/cpf_validator_test.rb
-- test/helpers/eac_rails_utils/common_form_helper_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/helpers/eac_rails_utils/common_form_helper_test.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-module EacRailsUtils
-  class CommonFormHelperTest < ActionView::TestCase
-    include ::EacRailsUtils::CommonFormHelper
-
-    setup do
-      reset_test_database
-    end
-
-    test 'test common form' do
-      common_form(User.new) do |f|
-        f.text_field :name
-        f.email_field :email
-        f.password_field :password
-        f.searchable_association_field :job, url: search_jobs_path
-      end
-    end
-
-    test 'fields for' do
-      common_form(Job.new) do |f|
-        f.text_field :name
-        f.fields_for :users do |nf|
-          nf.text_field :name
-          nf.email_field :email
-          nf.password_field :password
-        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