enumerate_it 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 114c01d4c307676728a2efbdc215df6596e5d915c8557d99f7ad3b9ff3230db0
-  data.tar.gz: ba845cf17d00731c6966148855ef2cc2cdbb37916d4c73fb6cdb070fae91c228
+  metadata.gz: eb83f052edf5a989af33b9734d8307c774b08504255a433ba86105b93dc71298
+  data.tar.gz: 62282a46a5759e6e61b053ca80adeb674c1df7ffb9d392652b818e4009e94ca9
 SHA512:
-  metadata.gz: a8c91bf450d10feb513dd975e1d94c034722e4a99198f2379fbd4fa6fb281cabe3de559082ad450ab71e9191db89dcfe6fdeaa0ed943d8b3627f01fdc1c64599
-  data.tar.gz: be7eeb6ba615cdc711a32d10eaf8f7fb26ec2a29c64e18520c3bac960d875f025536c2b432ebdb2691da8d0d0a8c03575bde9979f05047384fdcbc2d3cbf9d39
+  metadata.gz: e6c9483acab55bd80890ff5cea29c82e4a58c4ace98af47edce11244327b4d51c27d6966988d4f4a820864654576fb9c7c829a447dc1a99f45d411ce384b91ad
+  data.tar.gz: 04f383f747ff8349c4ec58e495fd08a0b654e90bb5c5337833ee257e8122204dd6786bd2cefbaf74e7b934c06219f238f2be1ead4da7f359fa72c0e3c45a4904

data/.github/workflows/ci.yml

@@ -13,12 +13,14 @@ jobs:
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
         gemfile:
           - gemfiles/rails_5.0.gemfile
           - gemfiles/rails_5.1.gemfile
           - gemfiles/rails_5.2.gemfile
           - gemfiles/rails_6.0.gemfile
           - gemfiles/rails_6.1.gemfile
+          - gemfiles/rails_7.0.gemfile
         exclude:
           # Rails < 6 does not support Ruby 3+:
           # https://github.com/rails/rails/issues/40938#issuecomment-751357907
@@ -28,6 +30,18 @@ jobs:
             gemfile: gemfiles/rails_5.1.gemfile
           - ruby: 3.0
             gemfile: gemfiles/rails_5.2.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails_5.0.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails_5.1.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails_5.2.gemfile
+
+          # Rails 7.0 requires Ruby 2.7+
+          - ruby: 2.5
+            gemfile: gemfiles/rails_7.0.gemfile
+          - ruby: 2.6
+            gemfile: gemfiles/rails_7.0.gemfile
 
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
@@ -36,7 +50,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -44,7 +58,7 @@ jobs:
         bundler-cache: true
 
     - name: Rubocop
-      if: ${{ matrix.ruby == '3.0' }}
+      if: ${{ matrix.ruby == '3.1' }}
       run: "bundle exec rubocop"
 
     - name: Tests

data/Appraisals

@@ -4,7 +4,7 @@ require 'json'
 rails_versions = JSON.parse(Net::HTTP.get(URI('https://rubygems.org/api/v1/versions/rails.json')))
   .group_by { |version| version['number'] }.keys.grep_v(/rc|racecar|beta|pre/)
 
-%w[5.0 5.1 5.2 6.0 6.1].each do |version|
+%w[5.0 5.1 5.2 6.0 6.1 7.0].each do |version|
   appraise "rails_#{version}" do
     current_version = rails_versions
       .select { |key| key.match(/\A#{version}/) }

data/CHANGELOG.md

@@ -1 +1,4 @@
-Changes are maintained under [Releases](https://github.com/lucascaton/enumerate_it/releases).
+# CHANGELOG
+
+Changes follows the [Semantic Versioning](https://semver.org/) specification and
+you can see them on the [releases page](../../releases).

data/Gemfile.lock

@@ -1,76 +1,75 @@
 PATH
   remote: .
   specs:
-    enumerate_it (3.2.2)
+    enumerate_it (3.2.4)
       activesupport (>= 5.0.7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.11)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    minitest (5.16.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    thor (1.2.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.2.0)
     wwtd (1.4.1)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -88,4 +87,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   2.2.24
+   2.3.21

data/README.md

@@ -521,14 +521,15 @@ You can also sort it by its **value** using `sort_by :value`.
 
 ## Changelog
 
-Changes are maintained under [Releases page](https://github.com/lucascaton/enumerate_it/releases).
+Changes follows the [Semantic Versioning](https://semver.org/) specification and
+you can see them on the [releases page](../../releases).
 
 ## Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
-* [Optional] Run the tests agaist a specific Gemfile: `$ bundle exec appraisal rails_6.1 rake spec`.
+* [Optional] Run the tests agaist a specific Gemfile: `$ bundle exec appraisal rails_7.0 rake spec`.
 * Run the tests agaist all supported versions: `$ bundle exec rake` (or `$ bundle exec wwtd`)
 * Commit, but please do not mess with `Rakefile`, version, or history.
 * Send a Pull Request. Bonus points for topic branches.

data/enumerate_it.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- spec/*`.split("\n")
   gem.name          = 'enumerate_it'
   gem.require_paths = ['lib']
   gem.version       = EnumerateIt::VERSION
@@ -17,7 +16,8 @@ Gem::Specification.new do |gem|
 
   gem.metadata = {
     'source_code_uri' => 'https://github.com/lucascaton/enumerate_it',
-    'changelog_uri' => 'https://github.com/lucascaton/enumerate_it/releases'
+    'changelog_uri' => 'https://github.com/lucascaton/enumerate_it/releases',
+    'rubygems_mfa_required' => 'true'
   }
 
   gem.add_dependency 'activesupport', '>= 5.0.7.2'

data/gemfiles/rails_5.2.gemfile

@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.2.6'
-gem 'activesupport', '~> 5.2.6'
+gem 'activerecord', '~> 5.2.8.1'
+gem 'activesupport', '~> 5.2.8.1'
 gem 'sqlite3', '~> 1.4.2'
 
 gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 6.0.4.1'
-gem 'activesupport', '~> 6.0.4.1'
+gem 'activerecord', '~> 6.0.6'
+gem 'activesupport', '~> 6.0.6'
 gem 'sqlite3', '~> 1.4.2'
 
 gemspec path: '../'

data/gemfiles/rails_6.1.gemfile

@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 6.1.4.1'
-gem 'activesupport', '~> 6.1.4.1'
+gem 'activerecord', '~> 6.1.7'
+gem 'activesupport', '~> 6.1.7'
 gem 'sqlite3', '~> 1.4.2'
 
 gemspec path: '../'

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.4'
+gem 'activesupport', '~> 7.0.4'
+gem 'sqlite3', '~> 1.4.2'
+
+gemspec path: '../'

data/lib/enumerate_it/version.rb

@@ -1,3 +1,3 @@
 module EnumerateIt
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.2.4'.freeze
 end

data/lib/generators/enumerate_it/enum/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Creates an EnumerateIt class an its locale file
+    Creates an EnumerateIt class and its locale file
 
 Example:
     rails g enumerate_it:enum CivilStatus single married divorced widower concubinage separated stable
@@ -11,5 +11,5 @@ Example:
     rails g enumerate_it:enum CivilStatus single:1 married:2 divorced:3 widower:4
 
     This will create:
-        app/enumerations/civil_status.rb with `associate_values :single => 1, :married => 2, :divorced => 2, :widower => 4`
+        app/enumerations/civil_status.rb with `associate_values single: 1, married: 2, divorced: 3, widower: 4`
         config/locales/civil_status.yml

data/lib/generators/enumerate_it/enum/enum_generator.rb

@@ -3,7 +3,7 @@ module EnumerateIt
     class EnumGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('templates', __dir__)
 
-      argument :attributes, type: 'array'
+      argument :attributes, type: :hash
 
       class_option :singular, type: 'string', desc: 'Singular name for i18n'
 
@@ -29,12 +29,10 @@ module EnumerateIt
         singular_name
       end
 
-      def locale_fields
-        attributes.map(&:name)
-      end
-
       def fields
-        if attributes.first.type == :string
+        if attributes.empty?
+          args
+        elsif attributes.first.type == :string
           attributes.map(&:name)
         else
           attributes.map { |attribute| [attribute.name, attribute.type] }

data/lib/generators/enumerate_it/enum/templates/locale.yml

@@ -1,6 +1,6 @@
 <%= default_lang %>:
   enumerations:
     <%= singular_name %>:
-    <%- locale_fields.each do |name| -%>
+    <%- fields.each do |name, _| -%>
       <%= name %>: '<%= name.humanize %>'
     <%- end -%>

data/spec/enumerate_it/base_spec.rb

@@ -308,12 +308,12 @@ describe EnumerateIt::Base do
       end
 
       it 'passes the given options to the validation method' do
-        expect(active_record_stub_class)
-          .to receive(:validates_presence_of).with(:bla, if: :some_method)
-
         active_record_stub_class.class_eval do
           has_enumeration_for :bla, with: TestEnumeration, required: { if: :some_method }
         end
+
+        expect(active_record_stub_class)
+          .to have_received(:validates_presence_of).with(:bla, if: :some_method)
       end
 
       it 'does not require the attribute by default' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerate_it
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Cássio Marques
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,7 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/enumerate_it.rb
 - lib/enumerate_it/base.rb
 - lib/enumerate_it/class_methods.rb
@@ -194,6 +195,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/lucascaton/enumerate_it
   changelog_uri: https://github.com/lucascaton/enumerate_it/releases
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -209,14 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby Enumerations
-test_files:
-- spec/enumerate_it/base_spec.rb
-- spec/enumerate_it_spec.rb
-- spec/i18n/en.yml
-- spec/i18n/pt.yml
-- spec/spec_helper.rb
-- spec/support/test_classes.rb
+test_files: []