eac_rails_utils 0.9.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '070818893e602b09a2538f7fecdf3e159b04f8931aedb85910c946efa5fd0cfc'
-  data.tar.gz: 4f46a31ee815870ccf57ec9af054e535dec59401e663eeb1fc611bbf12301dd5
+  metadata.gz: bb6393471b8d317c18c157556614ea1f40444ca56b5950998a8c51157f0101d8
+  data.tar.gz: b9531813f5e6283a377e0044c1b1ad1d72336701d2e2a280fa3a0ebef6ce5102
 SHA512:
-  metadata.gz: a7c56168765423a3dbc7fd9cb5a72d98e2ae60263e1f9b93a7ac4295045c4eadcb0d5f14aec7e17c86744b2196d52b0ccd5b3e5c530d986a7574576765cbeeef
-  data.tar.gz: 7a7c5c499393c8b8d49f0e7de68df86d7a0434b5e1902572faa22a093f8178631483eec53fff74a8f0d548f40310d1303ad3c7ae5c20f2561a5af5160be443d2
+  metadata.gz: c111435248f4358873989293cc8b49826f15c01bcd78186411bb39a582c0364626ac1ec8b2ed1d4d7d2ba81b315da4eda805c13582a562a9a9881d4173ad19f4
+  data.tar.gz: add93d610c6303fe8687f193854af9527b48c2e31ff705bb849ccc346670055d1640d3dae4293637ac06733af73dcc1cbb7f15f7dffe9ad6562019761a4d42e8

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-module Eac
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
   module CommonFormHelper
+    ::EacRubyUtils.require_sub __FILE__
+
     def common_form(model_instance, options = {}, &block)
       submit_label = options.delete(:submit_label)
       options[:html] ||= {}

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-module Eac
+require 'eac_ruby_utils/require_sub'
+require 'eac_rails_utils/models/attribute_required'
+
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
+      ::EacRubyUtils.require_sub __FILE__
+
       include AssociationSelectField
       include CommonTextFields
       include CurrencyField
@@ -87,7 +92,10 @@ module Eac
       end
 
       def field_label(field_name, label, required)
-        required = model_instance.attribute_required?(field_name) if required.nil?
+        if required.nil?
+          required = ::EacRailsUtils::Models::AttributeRequired
+                     .required?(model_instance, field_name)
+        end
         @form.label(field_name, label, class: required ? 'required' : 'optional')
       end
     end

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/association_select_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module AssociationSelectField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/common_text_fields.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module CommonTextFields

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/currency_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module CurrencyField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/date_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module DateField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/fields_for.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module FieldsFor

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/file_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module FileField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/radio_select_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module RadioSelectField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/searchable_association_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       class SearchableAssociationField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/select_field.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module SelectField
         def select_field(field_name, options = {})
           options = options.dup
           field(field_name, options) do
-            form.select(field_name, select_options(field_name, options))
+            form.select(field_name, select_options(field_name, options),
+                        options, options[:html] || {})
           end
         end
 

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/time_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module TimeField

data/{lib/eac → app/helpers/eac_rails_utils}/common_form_helper/form_builder/year_month_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
       module YearMonthField

data/app/helpers/eac_rails_utils/data_table_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
+  module DataTableHelper
+    ::EacRubyUtils.require_sub __FILE__
+
+    def data_table(dataset, &block)
+      ::EacRailsUtils::DataTableHelper::DataTable.new(self, dataset, &block).output
+    end
+  end
+end

data/{lib/eac → app/helpers/eac_rails_utils}/data_table_helper/column.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module DataTableHelper
     class Column
       EMPTY_VALUE = '-'

data/{lib/eac → app/helpers/eac_rails_utils}/data_table_helper/data_table.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module DataTableHelper
     class DataTable
       def initialize(view, dataset)
         @view = view
         @dataset = dataset
-        @setup = ::Eac::DataTableHelper::Setup.new
+        @setup = ::EacRailsUtils::DataTableHelper::Setup.new
         yield(@setup)
       end
 

data/{lib/eac → app/helpers/eac_rails_utils}/data_table_helper/setup.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module DataTableHelper
     class Setup
       attr_reader :columns
@@ -12,7 +12,7 @@ module Eac
       end
 
       def column(label, path = nil, &block)
-        @columns << ::Eac::DataTableHelper::Column.new(label, path, block)
+        @columns << ::EacRailsUtils::DataTableHelper::Column.new(label, path, block)
       end
     end
   end

data/app/helpers/eac_rails_utils/links_helper.rb

@@ -35,7 +35,7 @@ module EacRailsUtils
     end
 
     def object_path(object, action = nil)
-      current_class = object.class
+      current_class = object_class(object)
       tried_paths = []
       while current_class
         path = object_path_by_class(current_class, action)
@@ -68,5 +68,12 @@ module EacRailsUtils
       path = "#{action}_#{path}" if action.present?
       path
     end
+
+    def object_class(object)
+      return object.entity_class if object.respond_to?(:entity_class)
+      return object.__getobj__.class if object.respond_to?(:__getobj__)
+
+      object.class
+    end
   end
 end

data/{lib/eac → app/helpers/eac_rails_utils}/menus_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-module Eac
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
   module MenusHelper
+    ::EacRubyUtils.require_sub __FILE__
+
     def dropdown_menu(entries)
       entries = DataBuilder.new(self).build(entries)
       return nil unless entries

data/{lib/eac → app/helpers/eac_rails_utils}/menus_helper/bootstrap_gui_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module MenusHelper
     # http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3
     class BootstrapGuiBuilder

data/{lib/eac → app/helpers/eac_rails_utils}/menus_helper/data_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module MenusHelper
     class DataBuilder
       def initialize(view)

data/{lib/eac → app/helpers/eac_rails_utils}/menus_helper/gui_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   module MenusHelper
     class GuiBuilder
       def initialize(view)

data/{lib/eac → app/validators/eac_rails_utils}/cpf_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   class CpfValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       return if Cpf.new(value).valid?

data/{lib/eac → app/validators/eac_rails_utils}/no_presence_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Eac
+module EacRailsUtils
   # https://stackoverflow.com/questions/10070786/rails-3-validation-presence-false
   class NoPresenceValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, _value)

data/lib/eac_rails_utils.rb

@@ -1,44 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/dependencies'
+require 'eac_ruby_utils/require_sub'
 
 module EacRailsUtils
-  require 'activemodel/associations'
-  require 'nested_form_fields'
-  require 'ofx-parser'
-  require 'virtus'
-
-  require 'eac_rails_utils/patches/action_controller_base'
-  require 'eac_rails_utils/patches/model_attribute_required'
-  require 'eac_rails_utils/patches/ofx_parser'
-  require 'eac_rails_utils/engine'
-  require 'eac_rails_utils/tableless_model'
-  require 'eac/cpf_validator'
-  require 'eac/common_form_helper/form_builder/association_select_field'
-  require 'eac/common_form_helper/form_builder/common_text_fields'
-  require 'eac/common_form_helper/form_builder/currency_field'
-  require 'eac/common_form_helper/form_builder/date_field'
-  require 'eac/common_form_helper/form_builder/fields_for'
-  require 'eac/common_form_helper/form_builder/file_field'
-  require 'eac/common_form_helper/form_builder/radio_select_field'
-  require 'eac/common_form_helper/form_builder/searchable_association_field'
-  require 'eac/common_form_helper/form_builder/select_field'
-  require 'eac/common_form_helper/form_builder/time_field'
-  require 'eac/common_form_helper/form_builder/year_month_field'
-  require 'eac/common_form_helper/form_builder'
-  require 'eac/common_form_helper'
-  require 'eac/data_table_helper'
-  require 'eac/htmlbeautifier'
-  require 'eac/inequality_queries'
-  require 'eac/menus_helper'
-  require 'eac/menus_helper/bootstrap_gui_builder'
-  require 'eac/menus_helper/data_builder'
-  require 'eac/menus_helper/gui_builder'
-  require 'eac/model'
-  require 'eac/no_presence_validator'
-  require 'eac/test_utils'
-
-  ActionView::Base.include Eac::CommonFormHelper
-  ActionView::Base.include Eac::DataTableHelper
-  ActionView::Base.include Eac::MenusHelper
+  ::EacRubyUtils.require_sub __FILE__
 end

data/lib/eac_rails_utils/engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'nested_form_fields'
+
 module EacRailsUtils
   class Engine < ::Rails::Engine; end
 end

data/lib/{eac → eac_rails_utils}/htmlbeautifier.rb

@@ -2,7 +2,7 @@
 
 require 'htmlbeautifier'
 
-module Eac
+module EacRailsUtils
   class Htmlbeautifier
     def self.beautify(string)
       ::HtmlBeautifier.beautify(string, tab_stops: 2) + "\n"

data/lib/eac_rails_utils/models.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
+  module Models
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/lib/eac_rails_utils/models/attribute_required.rb

@@ -0,0 +1,43 @@
+# 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/lib/eac_rails_utils/models/fetch_errors.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module Models
+    module FetchErrors
+      # Adiciona as mensagens de erro de record. As mensagens de uma coluna X em record
+      # serão adicionadas na coluna X em self. Se options[:default_column] for especificado
+      # as mensagens da coluna X de record em que X não existe em self serão adicionadas
+      # na coluna options[:default_column].
+      # Um array de colunas pode ser passado em options[:skip] de colunas em record que não
+      # terão suas falhas adicionadas.
+      def fetch_record_errors(record, options = {})
+        record.errors.keys.each do |column|
+          fetch_column_errors(record, column, column, options)
+        end
+      end
+
+      # Similar a fetch_record_errors, mas torna possível especificar, através de mapping,
+      # colunas-alvo em self com nomes diferentes das colunas-fonte em record.
+      # mapping tem o formato { record_column => self_column }.
+      def fetch_record_errors_by_mapping(record, mapping, options = {})
+        mapping.each do |record_column, self_column|
+          fetch_column_errors(record, record_column, self_column, options)
+        end
+      end
+
+      def fetch_column_errors(record, record_column, self_column, options = {})
+        return if options[:skip]&.include?(record_column)
+
+        record.errors[record_column].each do |message|
+          fetch_error_column_message(self_column, message, options[:default_column],
+                                     "#{record.class.human_attribute_name(record_column)}: ")
+        end
+      end
+
+      # Verifica se uma coluna existe.
+      def column?(column)
+        respond_to?(column) && respond_to?("#{column}=")
+      end
+
+      def save_or_raise
+        raise "Falha ao tentar salvar #{self.class.name}: #{errors_to_string}" unless save
+
+        self
+      end
+
+      private
+
+      def fetch_error_column_message(column, message, default_column, default_column_message_prefix)
+        build_self_columns_messages(column, message, default_column,
+                                    default_column_message_prefix).each do |k, v|
+          if column?(k)
+            add_error_message(k, v)
+            break
+          end
+        end
+      end
+
+      # Adiciona uma mensagem de erro a uma coluna somente se a coluna
+      # ainda não a possui
+      def add_error_message(column, message)
+        return if errors[column].include?(message)
+
+        errors.add(column, message)
+      end
+
+      # Produz uma lista de campos-mensagens, em ordem de preferência,
+      # que podem receber uma mensagem de falha.
+      def build_self_columns_messages(column, message, default_column,
+                                      default_column_message_prefix)
+        r = { column => message }
+        m = /^(.+)_id$/.match(column)
+        if m
+          r[m[1]] = message
+        else
+          r["#{column}_id"] = message
+        end
+        r[default_column] = "#{default_column_message_prefix}#{message}" if default_column
+        r
+      end
+
+      def errors_to_string
+        b = ''
+        errors.messages.each do |field, messages|
+          b += ' / ' if b != ''
+          b += field.to_s + ': ' + messages.to_s
+        end
+        b
+      end
+    end
+  end
+end