mini_form 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d0c0c470b74ebc5e81006fa9f4f226de8d821d6
-  data.tar.gz: 38393dfb6c142a1f85dca47a2aa16072a63f657f
+SHA256:
+  metadata.gz: 4fae1bbe2eb9f254e0315e13364a0d9a19a87515061f066a37fd89689be9c657
+  data.tar.gz: 34c5ac1537cf058c0c67cdaa7ef4c88dd7aaaef63412cbabddbad5e13be73435
 SHA512:
-  metadata.gz: 1f8c4900a91ceedd1b9f7c12b73e5b2fc30f033fd47783ae792a4c9e8dbb3f0bae93c65953da6ddebf1bbc75e3bb8c4484e863e33925b67672f11246e4b094b6
-  data.tar.gz: 5a3a73ad3547ba949a1900918a1cdcfefc73c8bf77d0764d89fa0858c6fe8ae075a0493066f80b65d62429160e5a93d2734303d75fcc66d8b8746596d3455730
+  metadata.gz: ada501cc629ff6fd8701162248d095868bf2a7a9ac0e7e23f74caae5d08d1f8cbd31d9202fd47f52283cbb3117cd8c0d1a2705b9c074a09a6c95cb622ac2e4ee
+  data.tar.gz: 8cb38e2bf06594be100078b2d2b0ee10c4d5a356808ba4249fc2f63f060478619c97dc8d776004d20c5f52cb2b1dfef5b93099ca9307379c7921006a40bfa0ee

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.vimrc.local

data/.projections.json

@@ -0,0 +1,8 @@
+{
+  "lib/*.rb": {
+    "alternate": "spec/{}_spec.rb"
+  },
+  "spec/*_spec.rb": {
+    "alternate": "lib/{}.rb"
+  },
+}

data/.rubocop.yml

@@ -1,16 +1,32 @@
 require: rubocop-rspec
 
-AllCops:
-  RunRailsCops: true
+Rails:
+  Enabled: true
   Exclude:
     - example/db/**/*
     - example/config/**/*
     - search_object.gemspec
 
+# Disables "Module definition is too long"
+ModuleLength:
+  Enabled: false
+
 # Disables "Line is too long"
 LineLength:
   Enabled: false
 
+# Disables "Method is too long"
+MethodLength:
+  Enabled: false
+
+# Disables "Assignment Branch Condition size for included is too high"
+AbcSize:
+  Enabled: false
+
+# Disables "Block has too many lines"
+BlockLength:
+  Enabled: false
+
 # Disables "Missing top-level class documentation comment"
 Documentation:
   Enabled: false
@@ -22,3 +38,19 @@ Style/EachWithObject:
 # Disables "Prefer reduce over inject."
 Style/CollectionMethods:
   Enabled: false
+
+# Disables "%i-literals should be delimited by [ and ]."
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Disables "Use tr instead of gsubs"
+Performance/StringReplacement:
+  Enabled: false
+
+# Disables "Example has too many expectations"
+RSpec/MultipleExpectations:
+  Enabled: false
+
+# Disables "Example has too many lines"
+RSpec/ExampleLength:
+  Enabled: false

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.3
+  - 2.4.0
 script:
   - bundle exec rubocop
   - bundle exec rspec spec
+sudo: false
+cache: bundle
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## Version 0.2.4
+
+* Rails 6+ support (@emilov)
+
+## Version 0.2.3
+
+* Fix handling delegated attributes prefixes in `attribute_names` (@rstankov)
+
+## Version 0.2.2
+
+* Bump activemodel requirements (@vestimir)
+
+## Version 0.2.1
+
+* Fix typo in `assignment` callbaks (@ayrton)
+* Alias `assignment` to `assigment` for backwards compatibility (@ayrton)
+
 ## Version 0.2.0
 
 * Don't expose model name on `model`. _(security fix)_

data/README.md

@@ -1,7 +1,7 @@
-[![Gem Version](https://badge.fury.io/rb/mini_form.png)](http://badge.fury.io/rb/mini_form)
-[![Code Climate](https://codeclimate.com/github/RStankov/MiniForm.png)](https://codeclimate.com/github/RStankov/MiniForm)
-[![Build Status](https://secure.travis-ci.org/RStankov/MiniForm.png)](http://travis-ci.org/RStankov/MiniForm)
-[![Code coverage](https://coveralls.io/repos/RStankov/MiniForm/badge.png?branch=master)](https://coveralls.io/r/RStankov/MiniForm)
+[![Gem Version](https://badge.fury.io/rb/mini_form.svg)](http://badge.fury.io/rb/mini_form)
+[![Code Climate](https://codeclimate.com/github/RStankov/MiniForm.svg)](https://codeclimate.com/github/RStankov/MiniForm)
+[![Build Status](https://secure.travis-ci.org/RStankov/MiniForm.svg)](http://travis-ci.org/RStankov/MiniForm)
+[![Code coverage](https://coveralls.io/repos/RStankov/MiniForm/badge.svg?branch=master)](https://coveralls.io/r/RStankov/MiniForm)
 
 # MiniForm
 
@@ -267,11 +267,11 @@ form.id = 42   # => raises `NoMethodError`
     <td>Meant to be overwritten.</td>
   </tr>
   <tr>
-    <td>#before_assigment</td>
+    <td>#before_assignment</td>
     <td>Meant to be overwritten.</td>
   </tr>
   <tr>
-    <td>#after_assigment</td>
+    <td>#after_assignment</td>
     <td>Meant to be overwritten.</td>
   </tr>
   <tr>

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: %i(rubocop spec)

data/lib/mini_form/errors.rb

@@ -5,7 +5,8 @@ module MiniForm
     def initialize(object)
       @errors = object.errors
 
-      super "Form validation failed for: #{errors.keys.join(', ')}"
+      arr_obj = errors.respond_to?(:attribute_names) ? errors.attribute_names : errors.keys
+      super "Form validation failed for: #{arr_obj.join(', ')}"
     end
   end
 end

data/lib/mini_form/model.rb

@@ -3,7 +3,7 @@ require 'active_model'
 
 module MiniForm
   module Model
-    def self.included(base) # rubocop:disable MethodLength
+    def self.included(base)
       base.class_eval do
         include ActiveModel::Validations
         include ActiveModel::Validations::Callbacks
@@ -15,11 +15,18 @@ module MiniForm
         extend ClassMethods
 
         define_model_callbacks :update
+        define_model_callbacks :assignment
+
+        # For backwards compatibility purpose
         define_model_callbacks :assigment
 
         before_update :before_update
         after_update :after_update
 
+        before_assignment :before_assignment
+        after_assignment :after_assignment
+
+        # For backwards compatibility purpose
         before_assigment :before_assigment
         after_assigment :after_assigment
       end
@@ -34,14 +41,16 @@ module MiniForm
     end
 
     def attributes=(attributes)
-      run_callbacks :assigment do
-        attributes.slice(*self.class.attribute_names).each do |name, value|
-          public_send "#{name}=", value
+      run_callbacks :assignment do
+        run_callbacks :assigment do
+          attributes.slice(*self.class.attribute_names).each do |name, value|
+            public_send "#{name}=", value
+          end
         end
       end
     end
 
-    alias_method :assign_attributes, :attributes=
+    alias assign_attributes attributes=
 
     def attributes
       Hash[self.class.attribute_names.map { |name| [name, public_send(name)] }]
@@ -63,7 +72,7 @@ module MiniForm
     end
 
     def update!(attributes = {})
-      fail InvalidForm, self unless update attributes
+      raise InvalidForm, self unless update attributes
       self
     end
 
@@ -94,6 +103,14 @@ module MiniForm
       # noop
     end
 
+    def before_assignment
+      # noop
+    end
+
+    def after_assignment
+      # noop
+    end
+
     def before_assigment
       # noop
     end
@@ -123,7 +140,13 @@ module MiniForm
       end
 
       def attributes(*attributes, delegate: nil, prefix: nil, allow_nil: nil)
-        attribute_names.push(*attributes)
+        if prefix
+          attribute_names.push(*attributes.map do |name|
+            :"#{prefix == true ? delegate : prefix}_#{name}"
+          end)
+        else
+          attribute_names.push(*attributes)
+        end
 
         if delegate.nil?
           attr_accessor(*attributes)

data/lib/mini_form/nested_validator.rb

@@ -5,6 +5,15 @@ module MiniForm
     def validate_each(record, _, relation)
       return if relation.valid?
 
+      if record.errors.respond_to?(:merge!)
+        # Rails 6.1+ where accessing ActiveModel::Errors as a hash has been
+        # deprecated and the errors array is frozen. For this reason we use the new
+        # method merge!() which appends the errors as NestedErrors to the array. "This is the way."
+        record.errors.merge!(relation.errors)
+        return
+      end
+
+      # Rails < 6.1
       relation.errors.each do |name, value|
         record.errors.add name, value
       end

data/lib/mini_form/version.rb

@@ -1,3 +1,3 @@
 module MiniForm
-  VERSION = '0.2.0'
+  VERSION = '0.2.4'.freeze
 end

data/mini_form.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
+
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mini_form/version'
 
@@ -14,14 +14,14 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(spec)\//)
+  spec.executables   = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(spec)\/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', '~> 4.0'
+  spec.add_dependency 'activemodel', '>= 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler', '>= 2.1.4'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'rspec-mocks', '>= 2.12.3'
   spec.add_development_dependency 'coveralls'

data/spec/mini_form_spec.rb

@@ -24,6 +24,8 @@ module MiniForm
       attr_reader :user
 
       attributes :name, delegate: :user
+      attributes :id, delegate: :user, prefix: true
+      attributes :name, delegate: :user, prefix: 'full'
 
       def initialize(user)
         @user = user
@@ -49,6 +51,10 @@ module MiniForm
         expect(value).to eq(expected_value), message
       end
 
+      def assert_respond_to(klass, method, message = nil)
+        expect(klass).to respond_to(method), message
+      end
+
       ActiveModel::Lint::Tests.public_instance_methods.map(&:to_s).grep(/^test/).each do |method|
         example(method.gsub('_', ' ')) { send method }
       end
@@ -140,6 +146,11 @@ module MiniForm
       it 'returns attribute names' do
         expect(Example.attribute_names).to eq %i(name price)
       end
+
+      it 'can handle prefixes' do
+        expect(ExampleWithDelegate.attribute_names).to include :user_id
+        expect(ExampleWithDelegate.attribute_names).to include :full_name
+      end
     end
 
     describe '#initialize' do
@@ -204,7 +215,7 @@ module MiniForm
 
         model :user, attributes: %i(name), save: true
 
-        def initialize(user: user)
+        def initialize(user:)
           self.user = user
         end
       end
@@ -224,9 +235,11 @@ module MiniForm
       it 'calls "perfom" method when validation pass' do
         object = ExampleForUpdate.new name: 'value'
 
-        expect(object).to receive(:perform)
+        allow(object).to receive(:perform)
 
         object.update
+
+        expect(object).to have_received(:perform)
       end
 
       it 'calls "save" for the model' do
@@ -242,19 +255,37 @@ module MiniForm
       it 'supports update callbacks' do
         object = ExampleForUpdate.new name: 'value'
 
-        expect(object).to receive(:before_update)
-        expect(object).to receive(:after_update)
+        allow(object).to receive(:before_update)
+        allow(object).to receive(:after_update)
 
         object.update
+
+        expect(object).to have_received(:before_update)
+        expect(object).to have_received(:after_update)
+      end
+
+      it 'supports legacy assig callbacks' do
+        object = ExampleForUpdate.new
+
+        allow(object).to receive(:before_assigment)
+        allow(object).to receive(:after_assigment)
+
+        object.update name: 'value'
+
+        expect(object).to have_received(:before_assigment)
+        expect(object).to have_received(:after_assigment)
       end
 
       it 'supports assign callbacks' do
         object = ExampleForUpdate.new
 
-        expect(object).to receive(:before_assigment)
-        expect(object).to receive(:after_assigment)
+        allow(object).to receive(:before_assignment)
+        allow(object).to receive(:after_assignment)
 
         object.update name: 'value'
+
+        expect(object).to have_received(:before_assignment)
+        expect(object).to have_received(:after_assignment)
       end
 
       it 'returns false when validations fail' do
@@ -266,9 +297,11 @@ module MiniForm
       it 'does not call "perfom" method when validation fail' do
         object = ExampleForUpdate.new name: nil
 
-        expect(object).not_to receive(:perform)
+        allow(object).to receive(:perform)
 
         object.update
+
+        expect(object).not_to have_received(:perform)
       end
     end
 
@@ -281,9 +314,11 @@ module MiniForm
       it 'calls update with given arguments' do
         object = Example.new
 
-        expect(object).to receive(:update).with(:attributes).and_return true
+        allow(object).to receive(:update).and_return true
 
         object.update! :attributes
+
+        expect(object).to have_received(:update).with(:attributes)
       end
 
       it 'raises error when update fails' do

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mini_form
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Radoslav Stankov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".projections.json"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -151,7 +152,7 @@ homepage: https://github.com/RStankov/MiniForm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Easy to use form objects in Rails projects
 test_files: