eac_rails_utils 0.10.1 → 0.11.0

data/lib/eac_rails_utils/models/inequality_queries.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module Models
+    # == Example:
+    #
+    # Note: model Product has a attribute "foo" Date, Time or Number:
+    #
+    #   class Product
+    #     include ::EacRailsUtils::Models::InequalityQueries
+    #
+    #     add_inequality_queries(:foo)
+    #   end
+    #
+    # This add the following scopes:
+    #
+    #   Product.by_foo_gt(value) # Equivalent to Product.where("foo > ?", value)
+    #   Product.by_foo_gteq(value) # Equivalent to Product.where("foo >= ?", value)
+    #   Product.by_foo_lt(value) # Equivalent to Product.where("foo < ?", value)
+    #   Product.by_foo_lteq(value) # Equivalent to Product.where("foo <= ?", value)
+    module InequalityQueries
+      class << self
+        def included(base)
+          base.extend(ClassMethods)
+        end
+      end
+
+      module ClassMethods
+        def add_inequality_queries(attribute)
+          %w[gt gteq lt lteq].each do |ineq|
+            scope "by_#{attribute}_#{ineq}", lambda { |v|
+              where(arel_table[attribute].send(ineq, v))
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/models/tableless.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'activemodel/associations'
+require 'virtus'
+
+module EacRailsUtils
+  module Models
+    class Tableless
+      include ActiveModel::Model
+      include Virtus.model
+      include ActiveModel::Associations
+
+      def initialize(values = {})
+        super(build_attributes(values))
+      end
+
+      def attributes=(values)
+        super(build_attributes(values))
+      end
+
+      # need hash like accessor, used internal Rails
+      def [](attr)
+        send(attr)
+      end
+
+      # need hash like accessor, used internal Rails
+      def []=(attr, value)
+        send("#{attr}=", value)
+      end
+
+      def save!
+        save || raise("#{self.class}.save failed: #{errors.messages}")
+      end
+
+      private
+
+      def build_attributes(values)
+        AttributesBuilder.new(self.class, values).to_attributes
+      end
+
+      class AttributesBuilder
+        DATE_TIME_FIELDS = %i[year month day hour min sec].freeze
+
+        def initialize(model_class, values)
+          @model_class = model_class
+          @values = {}
+          values.each { |k, v| add(k, v) }
+        end
+
+        def to_attributes
+          @values
+        end
+
+        private
+
+        def add(key, value)
+          array_attr = parse_array_attr_key(key)
+          if array_attr
+            array_value_set(array_attr, value)
+          else
+            @values[key] = value
+          end
+        end
+
+        def parse_array_attr_key(key)
+          m = /\A(.+)\(([0-9]+)(.)\)\z/.match(key)
+          return unless m
+
+          ::OpenStruct.new(key: m[1], index: m[2].to_i - 1, converter: array_value_converter(m[3]))
+        end
+
+        def array_value_set(array_attr, value)
+          @values[array_attr.key] ||= {}
+          @values[array_attr.key].merge!(
+            DATE_TIME_FIELDS[array_attr.index] => value.send(array_attr.converter)
+          )
+        end
+
+        def array_value_converter(str_type)
+          case str_type
+          when 'i'
+            'to_i'
+          else
+            raise "Unknown array type: \"#{str_type}\""
+          end
+        end
+
+        def date_time_attribute?(key)
+          attr = @model_class.attributes[key]
+          return false unless attr
+
+          raise attr.to_s
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/models/test_utils.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module Models
+    module TestUtils
+      # Add more helper methods to be used by all tests here...
+      def valid_invalid_column_values_test(record, column, valid_values, invalid_values)
+        valid_values.each do |v|
+          record.send("#{column}=", v)
+          assert record.valid?,
+                 "#{record.errors.messages}, #{column} = #{v.inspect} should be valid"
+        end
+        invalid_values.each do |v|
+          record.send("#{column}=", v)
+          assert_not record.valid?, "#{column} = #{v.inspect} should be invalid"
+        end
+      end
+
+      # Verifica falhas em campos específicos de um record
+      def assert_record_errors(record, fields_without_error, fields_with_error)
+        fields_without_error.each do |c|
+          assert record.errors[c].empty?,
+                 "Column: #{c} should not have errors (#{record.errors[c]})"
+        end
+        fields_with_error. each do |c|
+          assert_not record.errors[c].empty?, "Column: #{c} should have errors"
+        end
+      end
+
+      # Verifica, campo por campo, se invalida o registro.
+      def assert_column_changes(ppp, expected_valid_result, changes)
+        changes.each do |k, v|
+          ppp.send("#{k}=", v)
+          assert_equal expected_valid_result, ppp.valid?,
+                       "\"#{k}\" change should be " + (expected_valid_result ? 'valid' : 'invalid')
+          assert_not ppp.errors[k].empty? unless expected_valid_result
+          ppp.restore_attributes
+        end
+      end
+
+      # Ex.: attrs = {a: 1, b: 2} resulta em
+      # [{a: nil, b: nil}, {a: 1, b: nil}, {a: nil, b: 2}, {a: 1, b: 2}].
+      def all_combinations(attrs)
+        combs = [{}]
+        attrs.each do |attr_name, value|
+          combs = all_combinations_new_combination(attr_name, value, combs)
+        end
+        combs
+      end
+
+      def all_combinations_new_combination(attr_name, value, combs)
+        new_comb = []
+        assert_not value.nil?, "#{attr_name}=#{value}"
+        [nil, value].each do |vv|
+          combs.each do |c|
+            cc = c.dup
+            cc[attr_name] = vv
+            new_comb << cc
+          end
+        end
+        new_comb
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/patches.rb

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

data/lib/eac_rails_utils/patches/action_controller_base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'action_controller/base'
+
 module EacRailsUtils
   module Patches
     module ActionControllerBasePatch

data/lib/eac_rails_utils/version.rb

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

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

@@ -1,6 +1,10 @@
 # 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/{lib/eac → helpers/eac_rails_utils}/common_form_helper_test.rb

@@ -2,9 +2,9 @@
 
 require 'test_helper'
 
-module Eac
+module EacRailsUtils
   class CommonFormHelperTest < ActionView::TestCase
-    include Eac::CommonFormHelper
+    include ::EacRailsUtils::CommonFormHelper
 
     setup do
       reset_test_database

data/test/{lib/eac → helpers/eac_rails_utils}/data_table_test_helper_test.rb

@@ -2,9 +2,9 @@
 
 require 'test_helper'
 
-module Eac
+module EacRailsUtils
   class DataTableTestHelperTest < ActionView::TestCase
-    include ::Eac::DataTableHelper
+    include ::EacRailsUtils::DataTableHelper
 
     class Person
       attr_reader :name, :age, :job

data/test/lib/eac_rails_utils/{patches/model_attribute_required_test.rb → models/attribute_required_test.rb}

@@ -32,6 +32,7 @@ module EacRailsUtils
 
       class ActiveModelStub
         include ActiveModel::Model
+        include ::EacRailsUtils::Models::AttributeRequired
 
         attr_accessor :name, :age
         validates :name, presence: true

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module EacRailsUtils
+  module Models
+    class FetchErrorsTest < ActiveSupport::TestCase
+      class M1
+        include ActiveModel::Model
+        include EacRailsUtils::Models::FetchErrors
+        attr_accessor :name, :age, :account, :country_id, :other
+      end
+
+      class M2
+        include ActiveModel::Model
+        attr_accessor :name, :myage, :account_id, :country
+
+        validate :my_validate
+
+        def my_validate
+          errors.add(:name, 'NAME_ERROR')
+          errors.add(:myage, 'MYAGE_ERROR')
+          errors.add(:account_id, 'ACCOUNT_ID_ERROR')
+          errors.add(:country, 'COUNTRY_ERROR')
+        end
+      end
+
+      def setup
+        reset_m1
+        reset_m2
+      end
+
+      def test_fetch_column_errors
+        @m1.fetch_column_errors(@m2, :myage, :age)
+        assert_equal @m2.errors[:myage], @m1.errors[:age]
+      end
+
+      def test_fetch_record_errors
+        @m1.fetch_record_errors(@m2)
+        { name: :name, account_id: :account, country: :country_id }.each do |c2, c1|
+          assert_equal @m2.errors[c2], @m1.errors[c1], "c2: #{c2}, c1: #{c1}"
+        end
+        assert @m1.errors[:age].empty?
+      end
+
+      def test_fetch_record_errors_with_default_column
+        @m1.fetch_record_errors(@m2, default_column: :other)
+        assert_equal @m2.errors[:name], @m1.errors[:name]
+        assert @m1.errors[:age].empty?
+        assert_equal ['Myage: MYAGE_ERROR'], @m1.errors[:other]
+      end
+
+      def test_fetch_record_errors_with_skip_option
+        @m1.fetch_record_errors(@m2, skip: [:name])
+        assert @m1.errors[:name].empty?
+        assert @m1.errors[:age].empty?
+      end
+
+      def test_fetch_record_errors_by_mapping
+        @m1.fetch_record_errors_by_mapping(@m2, name: :name, myage: :age)
+        assert_equal @m2.errors[:name], @m1.errors[:name]
+        assert_equal @m2.errors[:myage], @m1.errors[:age]
+      end
+
+      private
+
+      def reset_m1
+        @m1 = M1.new
+        assert @m1.errors.empty?
+      end
+
+      def reset_m2
+        @m2 = M2.new
+        assert_not @m2.valid?
+        assert_not @m2.errors[:name].empty?
+        assert_not @m2.errors[:myage].empty?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# 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

data/test/{lib/eac → validators}/cpf_validator_test.rb

@@ -2,14 +2,14 @@
 
 require 'test_helper'
 
-module Eac
+module EacRailsUtils
   class CpfValidatorTest < ActiveSupport::TestCase
     class M1
       include ActiveModel::Model
 
       attr_accessor :cpf
 
-      validates :cpf, 'eac/cpf' => true, allow_nil: true
+      validates :cpf, 'eac_rails_utils/cpf' => true, allow_nil: true
     end
 
     def setup

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +39,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.3.6
 - !ruby/object:Gem::Dependency
-  name: htmlbeautifier
+  name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
-  name: ofx-parser
+  name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,9 +149,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- app/helpers/eac_rails_utils/common_form_helper.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/association_select_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/common_text_fields.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/currency_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/date_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/fields_for.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/file_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/radio_select_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/searchable_association_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/select_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/time_field.rb
+- app/helpers/eac_rails_utils/common_form_helper/form_builder/year_month_field.rb
+- app/helpers/eac_rails_utils/data_table_helper.rb
+- app/helpers/eac_rails_utils/data_table_helper/column.rb
+- app/helpers/eac_rails_utils/data_table_helper/data_table.rb
+- app/helpers/eac_rails_utils/data_table_helper/setup.rb
 - app/helpers/eac_rails_utils/formatter_helper.rb
 - app/helpers/eac_rails_utils/links_helper.rb
+- app/helpers/eac_rails_utils/menus_helper.rb
+- app/helpers/eac_rails_utils/menus_helper/bootstrap_gui_builder.rb
+- app/helpers/eac_rails_utils/menus_helper/data_builder.rb
+- app/helpers/eac_rails_utils/menus_helper/gui_builder.rb
 - 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
 - lib/assets/javascripts/currency_field.js
 - lib/assets/javascripts/eac_rails_utils.js
 - lib/assets/javascripts/input_searchable.js
@@ -157,41 +186,18 @@ files:
 - lib/assets/stylesheets/eac_rails_utils.scss
 - lib/assets/stylesheets/jmenu.scss
 - lib/assets/stylesheets/jquery.dataTables.min.css
-- lib/eac/common_form_helper.rb
-- lib/eac/common_form_helper/form_builder.rb
-- lib/eac/common_form_helper/form_builder/association_select_field.rb
-- lib/eac/common_form_helper/form_builder/common_text_fields.rb
-- lib/eac/common_form_helper/form_builder/currency_field.rb
-- lib/eac/common_form_helper/form_builder/date_field.rb
-- lib/eac/common_form_helper/form_builder/fields_for.rb
-- lib/eac/common_form_helper/form_builder/file_field.rb
-- lib/eac/common_form_helper/form_builder/radio_select_field.rb
-- lib/eac/common_form_helper/form_builder/searchable_association_field.rb
-- lib/eac/common_form_helper/form_builder/select_field.rb
-- lib/eac/common_form_helper/form_builder/time_field.rb
-- lib/eac/common_form_helper/form_builder/year_month_field.rb
-- lib/eac/cpf_validator.rb
-- lib/eac/data_table_helper.rb
-- lib/eac/data_table_helper/column.rb
-- lib/eac/data_table_helper/data_table.rb
-- lib/eac/data_table_helper/setup.rb
-- lib/eac/htmlbeautifier.rb
-- lib/eac/inequality_queries.rb
-- lib/eac/menus_helper.rb
-- lib/eac/menus_helper/bootstrap_gui_builder.rb
-- lib/eac/menus_helper/data_builder.rb
-- lib/eac/menus_helper/gui_builder.rb
-- lib/eac/model.rb
-- lib/eac/no_presence_validator.rb
-- lib/eac/test_utils.rb
 - lib/eac_rails_utils.rb
 - 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/patches.rb
 - lib/eac_rails_utils/patches/action_controller_base.rb
-- lib/eac_rails_utils/patches/model_attribute_required.rb
-- lib/eac_rails_utils/patches/ofx_parser.rb
-- lib/eac_rails_utils/tableless_model.rb
 - lib/eac_rails_utils/version.rb
-- test/app/helpers/eac_rails_utils/formatter_helper_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/models/job.rb
 - test/dummy/app/models/user.rb
@@ -208,17 +214,14 @@ 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/lib/eac/common_form_helper_test.rb
-- test/lib/eac/cpf_validator_test.rb
-- test/lib/eac/data_table_test_helper_test.rb
-- test/lib/eac/model_test.rb
-- test/lib/eac/source_target_fixtures_test_files/a.source.html
-- test/lib/eac/source_target_fixtures_test_files/a.target.yaml
-- test/lib/eac/source_target_fixtures_test_files/b.source.html
-- test/lib/eac/source_target_fixtures_test_files/c.target.yaml
-- test/lib/eac_rails_utils/patches/model_attribute_required_test.rb
-- test/lib/eac_rails_utils/tableless_model_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/fetch_errors_test.rb
+- test/lib/eac_rails_utils/models/tableless_test.rb
 - test/test_helper.rb
+- test/validators/cpf_validator_test.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -260,14 +263,10 @@ test_files:
 - test/dummy/app/models/job.rb
 - test/dummy/app/models/user.rb
 - test/test_helper.rb
-- test/app/helpers/eac_rails_utils/formatter_helper_test.rb
-- test/lib/eac_rails_utils/patches/model_attribute_required_test.rb
-- test/lib/eac_rails_utils/tableless_model_test.rb
-- test/lib/eac/common_form_helper_test.rb
-- test/lib/eac/data_table_test_helper_test.rb
-- test/lib/eac/cpf_validator_test.rb
-- test/lib/eac/source_target_fixtures_test_files/c.target.yaml
-- test/lib/eac/source_target_fixtures_test_files/b.source.html
-- test/lib/eac/source_target_fixtures_test_files/a.target.yaml
-- test/lib/eac/source_target_fixtures_test_files/a.source.html
-- test/lib/eac/model_test.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