eac_rails_utils 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdc60e761e13bcdf41dd921a5501fa3d6e4e372f3d3c2af48eef03a3f7bee723
-  data.tar.gz: 6121db8bfd8023c7360fea7d7f40c159a8411462970b37705e3d5c0217e8238f
+  metadata.gz: 5e74de3cf5f5df2ebc5dbf47d99ccf3adb446b60debbc0ae0ba4bdc0341b0702
+  data.tar.gz: 1fc1a3c6b2f1e28cca60ee396a69dcd682e739390c321c3b0ca6a4bb74aa19a0
 SHA512:
-  metadata.gz: 5171b49a17923a648dc8a94b45d4386f1aec8c9079941da2ff66744347b07bc46ab6f64f42c0a46475fb258fa41fe78e755a8d0d1140497fafd10e19cbbfe902
-  data.tar.gz: 486f7961912a84ee2cc74ff6b91c13e9c19364a42b41ee75af835a6cda82fed07c097bf9ba15007f0207eb9f6f986a84fa329c3be87b0b6776dfe147f14a7bb7
+  metadata.gz: f2227dab9cbab9704b6a227a29873c2d9db7de472cbe78e0546728ca171dff4b6e9af70b412b984ccfbf5c608bb501d03ba9ee23ac796877bf5759cd71bf542d
+  data.tar.gz: bc70bf917704e2c28f0d2a0fedeacdee1d09e48384f1ffd8fd5ed180b6d24ff77f1257c2081ea449999236c0a9a2c862e4f2897cc56904e036798489b6116476

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/select_field.rb

@@ -7,7 +7,8 @@ module EacRailsUtils
         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/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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'activemodel/associations'
+require 'eac_rails_utils/patches/active_model_associations'
 require 'virtus'
 
 module EacRailsUtils

data/lib/eac_rails_utils/patches/active_model_associations.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'active_model/associations/hooks'
+require 'activemodel/associations'
+
+module EacRailsUtils
+  module Patches
+    module ActiveModelAssociations
+      module ScopeExtensionPatch
+        def add_constraints(scope, owner, association_klass, *extra_args)
+          if extra_args.any?
+            refl = extra_args.first
+            if refl.options[:active_model]
+              target_ids = refl.options[:target_ids]
+              return scope.where(id: owner[target_ids])
+            end
+          end
+
+          super
+        end
+      end
+    end
+  end
+end
+
+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
+          )
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.11.0'
+  VERSION = '0.11.5'
 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/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.2' ? 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.2' ? 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.2' ? 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.0
+  version: 0.11.5
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
@@ -128,6 +128,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 +189,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
@@ -197,10 +213,13 @@ files:
 - lib/eac_rails_utils/models/test_utils.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
@@ -214,7 +233,6 @@ 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
@@ -240,8 +258,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..
@@ -262,9 +279,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

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