active_form_model 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa5b1a5d67328998e1001805d4ff580315861877e7d6bd423de7dc280fa80a9
-  data.tar.gz: 95779536fb96ffa77cf4bf984c58ab992fedb5dfa1e5c8fa5eef6455f076ffd1
+  metadata.gz: b88234532e25374abf52ad4d112acf0bb6ead7c354ee3ea14e6b5a48d93683d2
+  data.tar.gz: b729d96a365226698fa5759a1fd235b33f6857395465f56f2cede90b29d6121f
 SHA512:
-  metadata.gz: 2c192c1f9f633ebb23ff7a0e16c4186f251e31063103124f11d2a51b73783077c0336478686f38b517d6ac67a522ce4eac9e72cf9c68d27019659d08363f9353
-  data.tar.gz: eb21b19c8e05a3409699d3f56d8bce70d84e3d2b0f27ea1ec1fa7cd7dc9f1aed4d39e8fcaf81a444f9ccc37a3131bacb20322a7eaaa544d9262308299d38368c
+  metadata.gz: 69425d5be399e0a00ab7c80d4075bbaff5f0c2098a2a48264f9715cab1e69ec8918058fb361cac72fb862ea134979695707f909977b38cd65a6ab7009b0e62bd
+  data.tar.gz: 26862a8cf1410986d7ad1252d7ac1a4854f600a159803bd281af067e53a02c6fbf09717ea92bf2b96f914dd2be51971dfe57ab1cdf0c4ab9b8a8c565b28bddd3

data/.github/workflows/main.yml

@@ -7,10 +7,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', head]
+        ruby: ['3.0', head]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -14,7 +14,8 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7
+  Exclude:
+    - 'lib/generators/**/*.rb'
 
 Style/Documentation:
   Enabled: false

data/Gemfile

@@ -11,6 +11,11 @@ gem 'rake'
 
 gem 'rubocop'
 
+gem 'actionpack'
+gem 'activemodel'
+gem 'activerecord'
 gem 'minitest-power_assert'
 gem 'rubocop-minitest'
 gem 'rubocop-rake'
+gem 'ruby-lsp', require: false
+gem 'sqlite3'

data/README.md

@@ -49,7 +49,7 @@ class UserSignUpForm < User
   include ActiveFormModel
 
   # list all the permitted params
-  fields :first_name, :email, :password
+  permit :first_name, :email, :password
 
   # add validation if necessary
   # they will be merged with base class' validation

data/active_form_model.gemspec

@@ -12,12 +12,13 @@ Gem::Specification.new do |spec|
   spec.description   = 'Based on inheritance'
   spec.homepage      = 'https://github.com/Hexlet/active_form_model'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/Hexlet/form-model.git'
+  spec.metadata['rubygems_mfa_required'] = 'true'
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
@@ -30,7 +31,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency('activesupport', '>= 3')
-
-  spec.add_development_dependency('actionpack', '>= 5')
-  spec.add_development_dependency('activemodel', '>= 5')
 end

data/lib/active_form_model/permittable.rb

@@ -1,34 +1,46 @@
 # frozen_string_literal: true
 
-require 'active_support/deprecation/reporting'
+require 'active_support/deprecation'
+require 'active_support/core_ext/class/attribute'
 
 module ActiveFormModel
   module Permittable
     extend ActiveSupport::Concern
 
     included do
-      prepend Prepended
-    end
-
-    module Prepended
-      def initialize(attrs = {})
-        permitted_attrs = permit_attrs(attrs)
-        super(permitted_attrs)
-      end
+      class_attribute(:_permitted_args, instance_predicate: false, default: [])
+      class_attribute(:_skipped_args, instance_predicate: false, default: [])
     end
 
     class_methods do
-      def fields(*args)
-        @_permitted_args = args
+      def new(attrs = nil, &block)
+        attrs = _permit_attrs(attrs) if attrs
+
+        super
       end
 
       def permit(*args)
-        ActiveSupport::Deprecation.warn('permit is deprecated in favor of fields')
-        @_permitted_args = args
+        self._permitted_args = _permitted_args | args
       end
 
-      def _permitted_args
-        @_permitted_args || (superclass.respond_to?(:_permitted_args) && superclass._permitted_args) || []
+      def skip_if_empty(*args)
+        self._skipped_args = args
+      end
+
+      alias_method :fields, :permit
+      deprecate fields: :permit, deprecator: ActiveSupport::Deprecation.new('0.6.0', 'ActiveFormModel')
+
+      def _permit_attrs(attrs)
+        permitted = attrs.respond_to?(:permit) ? attrs.send(:permit, _permitted_args) : attrs
+        _skipped_args.each do |key|
+          value = permitted[key.to_s] || permitted[key.to_sym]
+          if value.blank?
+            permitted.delete(key.to_s)
+            permitted.delete(key.to_sym)
+          end
+        end
+
+        permitted
       end
     end
 
@@ -50,7 +62,7 @@ module ActiveFormModel
     private
 
     def permit_attrs(attrs)
-      attrs.respond_to?(:permit) ? attrs.send(:permit, self.class._permitted_args) : attrs
+      self.class._permit_attrs(attrs)
     end
   end
 end

data/lib/active_form_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveFormModel
-  VERSION = '0.4.1'
+  VERSION = '0.6.0'
 end

data/lib/active_form_model/virtual.rb

@@ -10,7 +10,7 @@ module ActiveFormModel
     class_methods do
       def fields(*attrs)
         send(:attr_accessor, *attrs)
-        super(attrs)
+        permit(*attrs)
       end
     end
   end

data/lib/generators/active_form_model/form_generator.rb

@@ -7,7 +7,7 @@ module ActiveFormModel
       source_root File.expand_path('templates', __dir__)
 
       def create_form
-        template 'form.rb', File.join('app/forms', class_path, "#{file_name}_form.erb")
+        template 'form.rb', File.join('app/forms', class_path, "#{file_name}_form.rb")
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_form_model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Kirill
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,34 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description: Based on inheritance
 email:
 - mokevnin@gmail.com
@@ -77,14 +48,14 @@ files:
 - lib/active_form_model/virtual.rb
 - lib/generators/active_form_model/USAGE
 - lib/generators/active_form_model/form_generator.rb
-- lib/generators/active_form_model/templates/form.erb
+- lib/generators/active_form_model/templates/form.rb
 homepage: https://github.com/Hexlet/active_form_model
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/Hexlet/active_form_model
   source_code_uri: https://github.com/Hexlet/form-model.git
-post_install_message:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -92,15 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Painless forms for ActiveRecord
 test_files: []